update magefiles and fix staticcheck errors

Signed-off-by: Troy Connor <troy0820@users.noreply.github.com>
getporter · Feb 14, 2024 · 77344ba · 77344ba
1 parent 4e50e12
commit 77344ba
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/integ-reuseable-workflow.yml b/.github/workflows/integ-reuseable-workflow.yml
@@ -11,7 +11,7 @@ on:
             required: true
             default: ghcr.io
 env:
-    GOVERSION: 1.20.7
+    GOVERSION: 1.21.3
     PORTER_INTEG_FILE: ${{inputs.test_name}}.go
 
 jobs:

diff --git a/.github/workflows/porter-integration-pr.yml b/.github/workflows/porter-integration-pr.yml
@@ -7,7 +7,7 @@ on:
     - 'docs/**'
 
 env:
-    GOVERSION: 1.20.7
+    GOVERSION: 1.21.3
 
 jobs:
   archive_integration_test:
@@ -117,7 +117,7 @@ jobs:
       run: go run mage.go build
       shell: bash
     - name: Integration Test
-      env: 
+      env:
         PORTER_INTEG_FILE: uninstall_test.go
-      run: go run mage.go -v TestIntegration 
+      run: go run mage.go -v TestIntegration
       shell: bash
diff --git a/.github/workflows/porter-integration-release.yml b/.github/workflows/porter-integration-release.yml
@@ -8,7 +8,7 @@ on:
         default: ghcr.io
 
 env:
-  GOVERSION: 1.20.7
+  GOVERSION: 1.21.3
 
 jobs:
   archive_integration_test:
@@ -138,7 +138,7 @@ jobs:
       run: go run mage.go build
       shell: bash
     - name: Integration Test
-      env: 
+      env:
         PORTER_INTEG_FILE: uninstall_test.go
-      run: go run mage.go -v TestIntegration 
+      run: go run mage.go -v TestIntegration
       shell: bash
diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ replace (
 )
 
 require (
-	get.porter.sh/magefiles v0.6.1
+	get.porter.sh/magefiles v0.6.2
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/PaesslerAG/jsonpath v0.1.1
 	github.com/carolynvs/aferox v0.3.0

diff --git a/go.sum b/go.sum
@@ -45,6 +45,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 get.porter.sh/magefiles v0.6.1 h1:JuGYK9us7Y9GJTr172wK3Y8W5rOz9CBnheuZa8yJjGc=
 get.porter.sh/magefiles v0.6.1/go.mod h1:YsSlQWtGoXCGC4pdD7NxPpvh/FryM1bM0wzMWlJC+Bg=
+get.porter.sh/magefiles v0.6.2 h1:kHuurvykssL6iZsE5S2XLtTsps79h9D4rrxDSCiHOU8=
+get.porter.sh/magefiles v0.6.2/go.mod h1:YsSlQWtGoXCGC4pdD7NxPpvh/FryM1bM0wzMWlJC+Bg=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
 github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 h1:59MxjQVfjXsBpLy+dbd2/ELV5ofnUkUZBvWSC85sheA=

diff --git a/pkg/grpc/portergrpc/installation_test.go b/pkg/grpc/portergrpc/installation_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/protobuf/encoding/protojson"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 type instInfo struct {
@@ -31,7 +31,7 @@ func TestListInstallationReturnsListOfCorrectPorterInstallations(t *testing.T) {
 	}{
 		{
 			name: "FilterByAllNamespaces",
-			opts: &iGRPC.ListInstallationsRequest{AllNamespaces: pointer.Bool(true)},
+			opts: &iGRPC.ListInstallationsRequest{AllNamespaces: ptr.To(true)},
 		},
 		{
 			name: "FilterByNamespace",