fix: update go libs #4

6f641cd2 · Volker Schukai · 8edff4df · 6f641cd2 · 6f641cd2 · 6f641cd2
Verified Commit 6f641cd2 authored Oct 28, 2023 by Volker Schukai
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,16 +7,12 @@
 image: docker-registry.schukai.com:443/nixos-ci-devenv:latest
-services:
-  - docker:dind
 variables:
  # The repo name as used in
  # https://github.com/nix-community/NUR/blob/master/repos.json
  NIXOS_VERSION: "23.05"
  NIXPKGS_ALLOW_UNFREE: "1"
  NIXPKGS_ALLOW_INSECURE: "1"
-  DOCKER_DRIVER: overlay2
  GIT_DEPTH: 10
 stages:
@@ -24,8 +20,6 @@ stages:
  - deploy 
 before_script:
-  - nix shell nixpkgs#coreutils-full -c mkdir -p /certs/client/
-  - nix shell nixpkgs#coreutils-full -c ln -fs /etc/ssl/certs/ca-bundle.crt /certs/client/ca.pem
  - echo > .env-gitlab-ci
  - variables=("HOME=$HOME" "CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME" "CI_REPOSITORY_URL=$CI_REPOSITORY_URL" "GITLAB_TOKEN=$GITLAB_TOKEN" "CI_JOB_TOKEN=$CI_JOB_TOKEN" "GITLAB_USER_EMAIL=$GITLAB_USER_EMAIL" "GITLAB_USER_NAME=\"$GITLAB_USER_NAME\"" "CI_REGISTRY_USER=$CI_REGISTRY_USER" "CI_PROJECT_ID=$CI_PROJECT_ID" "CI_PROJECT_DIR=$CI_PROJECT_DIR" "CI_API_V4_URL=$CI_API_V4_URL" "CI_PROJECT_NAME=$CI_PROJECT_NAME" "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA"); for var in "${variables[@]}"; do echo "$var" >> .env-gitlab-ci; done
  - cat .env-gitlab-ci
@@ -63,7 +57,3 @@ deploy:
      paths:
        - /nix/store
-  artifacts:
-    paths:
-      - dist   
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
+# Contributing to schukai GmbH Projects
+## Code of Conduct
+Be a human, not an asshole. Common sense and basic human decency apply.
+## Getting Started
+### Setting up the Project
+1. Fork the project on GitLab.
+2. Clone your fork locally. Replace `[your-username]` with your GitLab username and `[project-name]` with the actual project name:
+    ```bash
+    git clone $(git config --get remote.origin.url)
+    ```
+3. Add the upstream repository. Replace `[original-username]` and `[project-name]` with the original repository's username and project name:
+    ```bash
+    git remote add upstream https://gitlab.schukai.com/[original-username]/[project-name].git
+    ```
+### Making Changes
+1. Create a new branch:
+    ```bash
+    git checkout -b new-feature-branch
+    ```
+2. Make your changes.
+3. Commit your changes:
+    ```bash
+    git commit -m "Description of change"
+    ```
+### Submitting a Merge Request
+1. Push your changes to your fork:
+    ```bash
+    git push origin new-feature-branch
+    ```
+2. Navigate to the original project repository on `gitlab.schukai.com`.
+3. Open a Merge Request and provide a clear description of the changes.
+## Coding Guidelines
+- Follow the coding style used in the project.
+- Write unit tests for new features.
+- Ensure that all tests pass before submitting a Merge Request.
+## Reporting Issues
+If you find an issue, please create a new issue on `gitlab.schukai.com`.
+## Additional Resources
+- [GitLab Flow](https://docs.gitlab.com/ee/topics/gitlab_flow.html)
+- [GitLab Merge Request Guidelines](https://docs.gitlab.com/ee/user/project/merge_requests/)
+Thank you for your contribution! 
--- a/LICENSE
+++ b/LICENSE
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -17,17 +17,22 @@ tasks:
  test:
    desc: Execute unit tests in Go.
+    env:
+      TEST_BY_TASK: true
    cmds:
      - echo "Execute unit tests in Go."
-      - go test -cover -v ./...
+      - gosec .
-      - go test -bench -v ./...
+      - go test -tags=runOnTask -cover -v ./...
-      - go test -race -v ./...
+      - go test -tags=runOnTask -bench -v ./...
+      - go test -tags=runOnTask -race -v ./...
  test-fuzz:
    desc: Conduct fuzzing tests.#
+    env:
+      TEST_BY_TASK: true
    cmds:  
      - echo "Conduct fuzzing tests."
-      - go test -v -fuzztime=30s -fuzz=Fuzz ./...
+      - go test -tags=runOnTask -v -fuzztime=30s -fuzz=Fuzz ./...
  add-licenses:
    desc: Attach license headers to Go files.

--- a/devenv.lock
+++ b/devenv.lock
@@ -3,11 +3,11 @@
    "devenv": {
      "locked": {
        "dir": "src/modules",
-        "lastModified": 1694097209,
+        "lastModified": 1698243190,
-        "narHash": "sha256-gQmBjjxeSyySjbh0yQVBKApo2KWIFqqbRUvG+Fa+QpM=",
+        "narHash": "sha256-n+SbyNQRhUcaZoU00d+7wi17HJpw/kAUrXOL4zRcqE8=",
        "owner": "cachix",
        "repo": "devenv",
-        "rev": "7a8e6a91510efe89d8dcb8e43233f93e86f6b189",
+        "rev": "86f476f7edb86159fd20764489ab4e4df6edb4b6",
        "type": "github"
      },
      "original": {
@@ -74,11 +74,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1694048570,
+        "lastModified": 1698288402,
-        "narHash": "sha256-PEQptwFCVaJ+jLFJgrZll2shQ9VI/7xVhrCYkJo8iIw=",
+        "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "4f77ea639305f1de0a14d9d41eef83313360638c",
+        "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344",
        "type": "github"
      },
      "original": {
@@ -106,11 +106,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1694048570,
+        "lastModified": 1698288402,
-        "narHash": "sha256-PEQptwFCVaJ+jLFJgrZll2shQ9VI/7xVhrCYkJo8iIw=",
+        "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4f77ea639305f1de0a14d9d41eef83313360638c",
+        "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344",
        "type": "github"
      },
      "original": {
@@ -130,11 +130,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1692274144,
+        "lastModified": 1698227354,
-        "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=",
+        "narHash": "sha256-Fi5H9jbaQLmLw9qBi/mkR33CoFjNbobo5xWdX4tKz1Q=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa",
+        "rev": "bd38df3d508dfcdff52cd243d297f218ed2257bf",
        "type": "github"
      },
      "original": {

--- a/devenv.nix
+++ b/devenv.nix
-{ pkgs, inputs, phps, lib, config, modulesPath, ... }:
+{ pkgs ? import <nixpkgs> {}, inputs, phps, lib, config, modulesPath, ... }:
 {
  # https://devenv.sh/packages/
@@ -9,12 +9,14 @@
    blackbox-terminal
    coreutils-full
    dbeaver
+    dbeaver
    delve
    dialog
    drill
    exa
    fd
    fd
+    feh
    gcc12
    gdlv
    git
@@ -23,6 +25,7 @@
    gnumake
    gnused
    go-licenses
+    gosec
    go-task
    gum
    httpie
@@ -34,6 +37,8 @@
    memcached
    netcat
    nixfmt
+    nodePackages.mermaid-cli
+    openssh
    procps
    ranger
    unixtools.xxd
@@ -162,6 +167,84 @@
  enterShell = ''
+cat <<'EOF' > CONTRIBUTING.md
+# Contributing to schukai GmbH Projects
+## Code of Conduct
+Be a human, not an asshole. Common sense and basic human decency apply.
+## Getting Started
+### Setting up the Project
+1. Fork the project on GitLab.
+2. Clone your fork locally. Replace `[your-username]` with your GitLab username and `[project-name]` with the actual project name:
+    ```bash
+    git clone $(git config --get remote.origin.url)
+    ```
+3. Add the upstream repository. Replace `[original-username]` and `[project-name]` with the original repository's username and project name:
+    ```bash
+    git remote add upstream https://gitlab.schukai.com/[original-username]/[project-name].git
+    ```
+### Making Changes
+1. Create a new branch:
+    ```bash
+    git checkout -b new-feature-branch
+    ```
+2. Make your changes.
+3. Commit your changes:
+    ```bash
+    git commit -m "Description of change"
+    ```
+### Submitting a Merge Request
+1. Push your changes to your fork:
+    ```bash
+    git push origin new-feature-branch
+    ```
+2. Navigate to the original project repository on `gitlab.schukai.com`.
+3. Open a Merge Request and provide a clear description of the changes.
+## Coding Guidelines
+- Follow the coding style used in the project.
+- Write unit tests for new features.
+- Ensure that all tests pass before submitting a Merge Request.
+## Reporting Issues
+If you find an issue, please create a new issue on `gitlab.schukai.com`.
+## Additional Resources
+- [GitLab Flow](https://docs.gitlab.com/ee/topics/gitlab_flow.html)
+- [GitLab Merge Request Guidelines](https://docs.gitlab.com/ee/user/project/merge_requests/)
+Thank you for your contribution! 
+EOF
+cat <<'EOF' > LICENSE
+Copyright (C) 2023 schukai GmbH 
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.  
+EOF
 cat <<'EOF' > Taskfile.yml
 # THIS FILE IS AUTOGENERATED BY THE DEVENVSHELL
@@ -182,17 +265,22 @@
  test:
    desc: Execute unit tests in Go.
+    env:
+      TEST_BY_TASK: true
    cmds:
      - echo "Execute unit tests in Go."
-          - go test -cover -v ./...
+      - gosec .
-          - go test -bench -v ./...
+      - go test -tags=runOnTask -cover -v ./...
-          - go test -race -v ./...
+      - go test -tags=runOnTask -bench -v ./...
+      - go test -tags=runOnTask -race -v ./...
  test-fuzz:
    desc: Conduct fuzzing tests.#
+    env:
+      TEST_BY_TASK: true
    cmds:  
      - echo "Conduct fuzzing tests."
-          - go test -v -fuzztime=30s -fuzz=Fuzz ./...
+      - go test -tags=runOnTask -v -fuzztime=30s -fuzz=Fuzz ./...
  add-licenses:
    desc: Attach license headers to Go files.
@@ -234,16 +322,12 @@
 image: docker-registry.schukai.com:443/nixos-ci-devenv:latest
-    services:
-      - docker:dind
 variables:
  # The repo name as used in
  # https://github.com/nix-community/NUR/blob/master/repos.json
  NIXOS_VERSION: "23.05"
  NIXPKGS_ALLOW_UNFREE: "1"
  NIXPKGS_ALLOW_INSECURE: "1"
-      DOCKER_DRIVER: overlay2
  GIT_DEPTH: 10
 stages:
@@ -251,8 +335,6 @@
  - deploy 
 before_script:
-      - nix shell nixpkgs#coreutils-full -c mkdir -p /certs/client/
-      - nix shell nixpkgs#coreutils-full -c ln -fs /etc/ssl/certs/ca-bundle.crt /certs/client/ca.pem
  - echo > .env-gitlab-ci
  - variables=("HOME=$HOME" "CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME" "CI_REPOSITORY_URL=$CI_REPOSITORY_URL" "GITLAB_TOKEN=$GITLAB_TOKEN" "CI_JOB_TOKEN=$CI_JOB_TOKEN" "GITLAB_USER_EMAIL=$GITLAB_USER_EMAIL" "GITLAB_USER_NAME=\"$GITLAB_USER_NAME\"" "CI_REGISTRY_USER=$CI_REGISTRY_USER" "CI_PROJECT_ID=$CI_PROJECT_ID" "CI_PROJECT_DIR=$CI_PROJECT_DIR" "CI_API_V4_URL=$CI_API_V4_URL" "CI_PROJECT_NAME=$CI_PROJECT_NAME" "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA"); for var in "''${variables[@]}"; do echo "$var" >> .env-gitlab-ci; done
  - cat .env-gitlab-ci
@@ -290,14 +372,8 @@
      paths:
        - /nix/store
-      artifacts:
-        paths:
-          - dist   
 EOF
  '';
  scripts.do-git-commit.exec = ''
@@ -635,4 +711,5 @@
    printLogfileAndExit 0
  '';
 }
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module gitlab.schukai.com/oss/libraries/go/utilities/watch
 go 1.20
 require (
-	github.com/fsnotify/fsnotify v1.6.0
+	github.com/fsnotify/fsnotify v1.7.0
 	github.com/stretchr/testify v1.8.4
 	gopkg.in/fsnotify.v1 v1.4.7
@@ -12,6 +12,6 @@ require (
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -2,6 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
@@ -9,6 +11,8 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=

--- a/hash.go
+++ b/hash.go
 package watch
 import (
-	"crypto/md5"
+	"crypto/md5" // #nosec
 	"encoding/hex"
 	"io"
 	"os"
@@ -103,6 +103,7 @@ func fullHashFile(info *fileStatInfo) *string {
 	file := info.opened
+	// #nosec
 	hash := md5.New()
 	if _, err := io.Copy(hash, file); err != nil {
 		info.lastError = err
@@ -134,6 +135,7 @@ func fastHashFile(info *fileStatInfo) *string {
 	offset := fileSize/2 - FastHashSize/2
+	// #nosec
 	fastHash := md5.New()
 	buffer := make([]byte, FastHashSize)