Golang 1.22 upgrade

staticdev · staticdev · commit dd35d019414b · 2025-02-15T18:37:24.000+01:00
diff --git a/.envrc b/.envrc
@@ -0,0 +1,3 @@
+source_url "https://raw.githubusercontent.com/cachix/devenv/82c0147677e510b247d8b9165c54f73d32dfd899/direnvrc" "sha256-7u4iDd1nZpxL4tCzmPG0dQgC5V+/44Ba+tHkPob1v2k="
+
+use devenv
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22
 
       - name: Draft release notes
         uses: release-drafter/release-drafter@v6.1.0
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22
 
       - name: Check out the repository
         uses: actions/checkout@v4
@@ -26,7 +26,7 @@ jobs:
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v6.4.0
         with:
-          version: v1.45.0
+          version: v1.62.2
           args: --timeout=3m
           skip-go-installation: true
 
@@ -37,9 +37,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { go: "1.21", os: "ubuntu-latest" }
-          - { go: "1.21", os: "macos-latest" }
-          - { go: "1.21", os: "windows-latest" }
+          - { go: "1.22", os: "ubuntu-latest" }
+          - { go: "1.22", os: "macos-latest" }
+          - { go: "1.22", os: "windows-latest" }
 
     steps:
       - name: Check out the repository
@@ -67,7 +67,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
 
       - name: Run coverage
         run: go test ./... -failfast -race -coverprofile=coverage.out -covermode=atomic
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,12 @@ coverage*
 .vscode/
 
 dist/
+# Devenv
+.devenv*
+devenv.local.nix
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,6 @@
 ---
 run:
-  go: "1.21"
+  go: "1.22"
 linters:
   enable:
     - thelper
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -1,4 +1,5 @@
 ---
+version: 2
 builds:
   - env:
       - CGO_ENABLED=0
@@ -31,7 +32,7 @@ archives:
 checksum:
   name_template: "checksums.txt"
 snapshot:
-  name_template: "{{ incpatch .Version }}-next"
+  version_template: "{{ incpatch .Version }}-next"
 changelog:
   sort: asc
   filters:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -7,7 +7,7 @@
 Prerequisites:
 
 - [Task](https://taskfile.dev/#/installation)
-- [Go 1.21+](https://golang.org/doc/install)
+- [Go 1.22+](https://golang.org/doc/install)
 
 Clone `cleancontacts`:
 
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Export your contacts in VCard format and run the program. BANG! You have a new V
 
 Download the relevant binary on Assets of latest [release](https://github.com/staticdev/cleancontacts/releases).
 
-Alternatively, if you have golang 1.21+ installed:
+Alternatively, if you have golang 1.22+ installed:
 
 ```sh
 go install github.com/staticdev/cleancontacts
diff --git a/clean/clean.go b/clean/clean.go
@@ -41,9 +41,8 @@ func (Clean) ContactClean(fileSystem afero.Fs, fileNameIn, filePathOut string) e
 		card, err := dec.Decode()
 		if err == io.EOF {
 			break
-		} else {
-			errs = handleError(err, errs)
 		}
+		errs = handleError(err, errs)
 		ns := card.Values("N")
 		tels := card.Values("TEL")
 
diff --git a/cmd/root.go b/cmd/root.go
@@ -33,7 +33,7 @@ Export your contacts in VCard format and run the program. BANG! You have a new V
 		Version: "0.3.0",
 		Example: `cleancontacts contacts.vcf
 cleancontacts /path/contacts.vcf`,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, args []string) error {
 			if len(args) != 1 {
 				return CommandError{Msg: "Contact file argument not provided."}
 			}
diff --git a/cmd/root_test.go b/cmd/root_test.go
@@ -10,25 +10,25 @@ import (
 
 type FakeFileIO struct{}
 
-func (FakeFileIO) GetOutputFileName(fileSystem afero.Fs, fileName string) (string, error) {
+func (FakeFileIO) GetOutputFileName(_ afero.Fs, _ string) (string, error) {
 	return "", nil
 }
 
 type FailingFileIO struct{}
 
-func (FailingFileIO) GetOutputFileName(fileSystem afero.Fs, fileName string) (string, error) {
+func (FailingFileIO) GetOutputFileName(_ afero.Fs, _ string) (string, error) {
 	return "", cmd.CommandError{Msg: "some file io error"}
 }
 
 type FakeClean struct{}
 
-func (FakeClean) ContactClean(fileSystem afero.Fs, fileNameIn, filePathOut string) error {
+func (FakeClean) ContactClean(_ afero.Fs, _, _ string) error {
 	return nil
 }
 
 type FailingClean struct{}
 
-func (FailingClean) ContactClean(fileSystem afero.Fs, fileNameIn, filePathOut string) error {
+func (FailingClean) ContactClean(_ afero.Fs, _, _ string) error {
 	return cmd.CommandError{Msg: "some clean error"}
 }
 
diff --git a/devenv.lock b/devenv.lock
@@ -0,0 +1,100 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1739444039,
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "1235cd13f47df6ad19c8a183c6eabc1facb7c399",
+        "type": "github"
+      },
+      "original": {
+        "dir": "src/modules",
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1733477122,
+        "owner": "cachix",
+        "repo": "devenv-nixpkgs",
+        "rev": "7bd9e84d0452f6d2e63b6e6da29fe73fac951857",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "rolling",
+        "repo": "devenv-nixpkgs",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737465171,
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devenv": "devenv",
+        "nixpkgs": "nixpkgs",
+        "pre-commit-hooks": "pre-commit-hooks"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/devenv.nix b/devenv.nix
@@ -0,0 +1,50 @@
+{ pkgs, lib, config, inputs, ... }:
+
+{
+  # https://devenv.sh/basics/
+  env.GREET = "devenv";
+
+  # https://devenv.sh/packages/
+  packages = [
+    pkgs.git
+    pkgs.go_1_22
+    pkgs.golangci-lint
+    pkgs.goreleaser
+  ];
+
+  # https://devenv.sh/languages/
+  # languages.go.enable = true;
+
+  # https://devenv.sh/processes/
+  # processes = {};
+
+  # https://devenv.sh/services/
+  # services.postgres.enable = true;
+
+  # https://devenv.sh/scripts/
+  scripts.hello.exec = ''
+    echo hello from $GREET
+  '';
+
+  enterShell = ''
+    hello
+    git --version
+  '';
+
+  # https://devenv.sh/tasks/
+  # tasks = {
+  #   "myproj:setup".exec = "mytool build";
+  #   "devenv:enterShell".after = [ "myproj:setup" ];
+  # };
+
+  # https://devenv.sh/tests/
+  enterTest = ''
+    echo "Running tests"
+    git --version | grep --color=auto "${pkgs.git.version}"
+  '';
+
+  # https://devenv.sh/pre-commit-hooks/
+  # pre-commit.hooks.shellcheck.enable = true;
+
+  # See full reference at https://devenv.sh/reference/options/
+}
diff --git a/devenv.yaml b/devenv.yaml
@@ -0,0 +1,15 @@
+# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json
+inputs:
+  nixpkgs:
+    url: github:cachix/devenv-nixpkgs/rolling
+
+# If you're using non-OSS software, you can set allowUnfree to true.
+# allowUnfree: true
+
+# If you're willing to use a package that's vulnerable
+# permittedInsecurePackages:
+#  - "openssl-1.1.1w"
+
+# If you have more than one devenv you can merge them
+#imports:
+# - ./backend
diff --git a/go.mod b/go.mod
@@ -2,6 +2,8 @@ module github.com/staticdev/cleancontacts
 
 go 1.21
 
+toolchain go1.22.9
+
 require (
 	github.com/emersion/go-vcard v0.0.0-20210521075357-3445b9171995
 	github.com/spf13/afero v1.12.0

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+source_url "https://raw.githubusercontent.com/cachix/devenv/82c0147677e510b247d8b9165c54f73d32dfd899/direnvrc" "sha256-7u4iDd1nZpxL4tCzmPG0dQgC5V+/44Ba+tHkPob1v2k="`
	`2`	`+`
	`3`	`+use devenv`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ Export your contacts in VCard format and run the program. BANG! You have a new V`
`33`	`33`	`Version: "0.3.0",`
`34`	`34`	Example: `cleancontacts contacts.vcf
`35`	`35`	cleancontacts /path/contacts.vcf`,
`36`		`- RunE: func(cmd *cobra.Command, args []string) error {`
	`36`	`+ RunE: func(_ *cobra.Command, args []string) error {`
`37`	`37`	`if len(args) != 1 {`
`38`	`38`	`return CommandError{Msg: "Contact file argument not provided."}`
`39`	`39`	`}`