Merge pull request #44 from orange-cloudfoundry/devel

upgrade go and dependencies
orange-cloudfoundry · May 14, 2024 · fdf6966 · fdf6966
2 parents a5221d6 + 50775a5
commit fdf6966
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 13 deletions.
diff --git a/.github/workflows/after-merge-dependabot.yml b/.github/workflows/after-merge-dependabot.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Fetch dependabot metadata
         id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v1.6.0
+        uses: dependabot/fetch-metadata@v2.1.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
@@ -20,12 +20,12 @@ jobs:
           fetch-depth: 0
 
       - name: set up go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.22"
 
       - name: cache go modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -36,7 +36,7 @@ jobs:
         run: |
           go mod vendor
           if [ ! -z "$(git status --porcelain)" ]; then
-            echo "::error::vendor directory if not synched with go.mod, please run go mod vendor"
+            echo "::error::vendor directory if not synced with go.mod, please run go mod vendor"
             exit 1
           fi
 

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -14,12 +14,12 @@ jobs:
           fetch-depth: 0
 
       - name: set up go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.22"
 
       - name: cache go modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

diff --git a/converters/converter.go b/converters/converter.go
@@ -32,15 +32,15 @@ func findConverter(patch model.Patch) converter {
 func ConvertConfigToYaml(patch model.Patch) ([]byte, error) {
 	converter := findConverter(patch)
 	if converter == nil {
-		return []byte{}, fmt.Errorf("Could not find converter satisfying config file %s", patch.ConfigFile)
+		return []byte{}, fmt.Errorf("could not find converter satisfying config file: %s", patch.ConfigFile)
 	}
 	return converter.ConvertToYaml(patch.ConfigFile)
 }
 
 func ConfigYamlTo(patch model.Patch, data []byte) ([]byte, error) {
 	converter := findConverter(patch)
 	if converter == nil {
-		return []byte{}, fmt.Errorf("Could not find converter satisfying config file %s", patch.ConfigFile)
+		return []byte{}, fmt.Errorf("could not find converter satisfying config file: %s", patch.ConfigFile)
 	}
 	return converter.YamlTo(data)
 }
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/orange-cloudfoundry/config-patcher
 
-go 1.21
+go 1.22.3
 
 require (
 	github.com/alecthomas/kingpin/v2 v2.4.0
@@ -12,7 +12,7 @@ require (
 )
 
 require (
-	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
+	github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/onsi/ginkgo v1.10.2 // indirect

diff --git a/go.sum b/go.sum
@@ -1,7 +1,7 @@
 github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY=
 github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
-github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
-github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
+github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 h1:ez/4by2iGztzR4L0zgAOR8lTQK9VlyBVVd7G4omaOQs=
+github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

diff --git a/vendor/github.com/alecthomas/units/renovate.json5 b/vendor/github.com/alecthomas/units/renovate.json5
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1,7 +1,7 @@
 # github.com/alecthomas/kingpin/v2 v2.4.0
 ## explicit; go 1.17
 github.com/alecthomas/kingpin/v2
-# github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137
+# github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9
 ## explicit; go 1.15
 github.com/alecthomas/units
 # github.com/hashicorp/errwrap v1.1.0