Merge pull request #225 from platformsh/update-dependencies

Update dependencies, use Go 1.22 and stdlib slices

Author: akalipetis

.github/workflows/ci.yml

@@ -18,12 +18,12 @@ jobs:
         with:
           # do not enable cache here, because golangci-linter
           # has its own internal cache with better performance
-          go-version: 1.20.x
+          go-version: 1.22.x
 
       - name: Run linter
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52
+          version: v1.59
 
       - name: Run tests
         run: make test
@@ -41,7 +41,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
           cache: true
 
       - name: Run GoReleaser
@@ -73,7 +73,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
           cache: true
 
       - name: Run GoReleaser

.golangci.yml

@@ -59,7 +59,7 @@ linters:
     # checks whether HTTP response body is closed successfully
     - bodyclose
     # Go linter that checks if package imports are in a list of acceptable packages
-    - depguard
+    # - depguard
     # Checks assignments with too many blank identifiers (e.g. x, , , _, := f())
     - dogsled
     # Tool for code clone detection
@@ -157,6 +157,6 @@ issues:
       source: "^//go:generate "
 
 # golangci.com configuration
-# https://github.com/golangci/golangci/wiki/Configuration
+# https://github.com/golangci/golangci-lint-action?tab=readme-ov-file#how-to-use
 service:
-  golangci-lint-version: 1.52.x # use the fixed version to not introduce new linters unexpectedly
+  golangci-lint-version: 1.59.x # use the fixed version to not introduce new linters unexpectedly

Makefile

@@ -8,7 +8,7 @@ test: generate ## Run unit tests
 
 .PHONY: lint
 lint: ## Run linter
-	command -v golangci-lint >/dev/null || go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52
+	command -v golangci-lint >/dev/null || go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59
 	golangci-lint run --timeout=10m --verbose
 
 .PHONY: generate

commands/platformify.go

@@ -25,7 +25,7 @@ func NewPlatformifyCmd(assets *vendorization.VendorAssets) *cobra.Command {
 		Short:         fmt.Sprintf("Creates starter YAML files for your %s project", assets.ServiceName),
 		SilenceUsage:  true,
 		SilenceErrors: true,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			answers := models.NewAnswers()
 			answers.Flavor, _ = cmd.Context().Value(FlavorKey).(string)
 			ctx := models.ToContext(cmd.Context(), answers)

commands/validate.go

@@ -23,7 +23,7 @@ func NewValidateCommand(assets *vendorization.VendorAssets) *cobra.Command {
 				"This will check your git repository and validate your files.",
 			assets.ServiceName,
 		),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			cwd, err := os.Getwd()
 			if err != nil {
 				fmt.Fprintln(

go.mod

@@ -1,50 +1,55 @@
 module github.com/platformsh/platformify
 
-go 1.20
+go 1.22
 
 require (
-	github.com/AlecAivazis/survey/v2 v2.3.6
+	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/Masterminds/sprig/v3 v3.2.3
-	github.com/golang/mock v1.4.4
-	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
-	github.com/pelletier/go-toml/v2 v2.0.6
-	github.com/spf13/cobra v1.6.1
-	github.com/spf13/viper v1.15.0
-	github.com/stretchr/testify v1.8.1
+	github.com/golang/mock v1.6.0
+	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
+	github.com/pelletier/go-toml/v2 v2.2.2
+	github.com/spf13/cobra v1.8.1
+	github.com/spf13/viper v1.19.0
+	github.com/stretchr/testify v1.9.0
 	github.com/xeipuuv/gojsonschema v1.2.0
-	golang.org/x/exp v0.0.0-20230321023759-10a507213a29
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.2.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/google/uuid v1.1.2 // indirect
+	github.com/Masterminds/semver/v3 v3.2.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/huandu/xstrings v1.4.0 // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/huandu/xstrings v1.5.0 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mitchellh/copystructure v1.0.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/shopspring/decimal v1.2.0 // indirect
-	github.com/spf13/afero v1.9.3 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/sagikazarmark/locafero v0.6.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/shopspring/decimal v1.4.0 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.4.2 // indirect
-	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	golang.org/x/crypto v0.3.0 // indirect
-	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/term v0.2.0 // indirect
-	golang.org/x/text v0.5.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )
+
+replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16