ci: Update setup-go action (#189)

* ci: Update setup-go action

* refactor: Remove ioutils deprecated package usage

Author: tembleking

.github/workflows/ci-master.yml

@@ -44,9 +44,11 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
+          check-latest: true
+          cache: true
 
       - name: Build project
         run: GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} go build -o terraform-provider-sysdig
@@ -60,21 +62,16 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
-
-      - name: Cache modules
-        uses: actions/cache@v1
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          check-latest: true
+          cache: true
 
       - name: Get dependencies
         run: |
-          go get -u -v github.com/onsi/ginkgo/ginkgo
+          go install github.com/onsi/ginkgo/v2/ginkgo@latest
+          go mod tidy
 
       - name: Test
         run: make test

.github/workflows/ci-provider-docs.yaml

@@ -23,9 +23,11 @@ jobs:
         path: terraform-plugin-dir
         key: ${{ runner.os }}-terraform-plugin-dir-${{ hashFiles('go.sum') }}-${{ hashFiles('sysdig/**') }}
     - if: steps.cache-terraform-plugin-dir.outputs.cache-hit != 'true' || steps.cache-terraform-plugin-dir.outcome == 'failure'
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
         go-version: ${{ env.GO_VERSION }}
+        check-latest: true
+        cache: true
     # See also: https://github.com/actions/setup-go/issues/54
     - if: steps.cache-terraform-plugin-dir.outputs.cache-hit != 'true' || steps.cache-terraform-plugin-dir.outcome == 'failure'
       name: go env
@@ -90,9 +92,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
         go-version: ${{ env.GO_VERSION }}
+        check-latest: true
+        cache: true
     - uses: actions/cache@v2
       continue-on-error: true
       timeout-minutes: 2

.github/workflows/ci-pull-request.yml

@@ -44,9 +44,11 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
+          check-latest: true
+          cache: true
 
       - name: Build project
         run: GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} go build -o terraform-provider-sysdig
@@ -60,21 +62,15 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
-
-      - name: Cache modules
-        uses: actions/cache@v1
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          check-latest: true
+          cache: true
 
       - name: Get dependencies
         run: |
-          go get -u -v github.com/onsi/ginkgo/ginkgo
+          go install github.com/onsi/ginkgo/v2/ginkgo@latest
           go mod tidy
 
       - name: Test

.github/workflows/release.yml

@@ -27,9 +27,11 @@ jobs:
       - name: Unshallow
         run: git fetch --prune --unshallow
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
+          check-latest: true
+          cache: true
       - name: Import GPG key
         id: import_gpg
         uses: paultyng/ghaction-import-gpg@v2.1.0

GNUmakefile

@@ -1,6 +1,5 @@
 SWEEP?=us-east-1,us-west-2
 TEST?=./...
-GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
 PKG_NAME=sysdig
 WEBSITE_REPO=github.com/hashicorp/terraform-website
 VERSION=$(shell [ ! -z `git tag -l --contains HEAD` ] && git tag -l --contains HEAD || git rev-parse --short HEAD)
@@ -31,7 +30,9 @@ vet:
 	fi
 
 fmt:
-	gofmt -w $(GOFMT_FILES)
+	go install mvdan.cc/gofumpt@latest
+	go fmt ./...
+	gofumpt -w ./
 
 fmtcheck:
 	@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"

scripts/errcheck.sh

@@ -5,7 +5,7 @@ echo "==> Checking for unchecked errors..."
 
 if ! which errcheck > /dev/null; then
     echo "==> Installing errcheck..."
-    go get -u github.com/kisielk/errcheck
+    go install github.com/kisielk/errcheck@latest
 fi
 
 err_files=$(errcheck -ignoretests \

sysdig/data_source_sysdig_fargate_ECS_test.go

@@ -3,7 +3,7 @@ package sysdig
 import (
 	"context"
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"sort"
 	"testing"
 
@@ -55,7 +55,7 @@ func sortAndCompare(t *testing.T, expected []byte, actual []byte) {
 }
 
 func TestECStransformation(t *testing.T) {
-	inputfile, err := ioutil.ReadFile("testfiles/ECSinput.json")
+	inputfile, err := os.ReadFile("testfiles/ECSinput.json")
 
 	if err != nil {
 		t.Fatalf("Cannot find testfiles/ECSinput.json")
@@ -89,7 +89,7 @@ func TestECStransformation(t *testing.T) {
 		t.Fatalf("Cannot execute PatchFargateTaskDefinition : %v", err.Error())
 	}
 
-	expectedOutput, err := ioutil.ReadFile("testfiles/ECSInstrumented.json")
+	expectedOutput, err := os.ReadFile("testfiles/ECSInstrumented.json")
 	if err != nil {
 		t.Fatalf("Cannot find testfiles/ECSinput.json")
 	}
@@ -145,9 +145,9 @@ func TestTransform(t *testing.T) {
 				RecipeConfig:       string(jsonConfig),
 			}
 
-			inputContainerDefinition, _ := ioutil.ReadFile("testfiles/" + testName + ".json")
+			inputContainerDefinition, _ := os.ReadFile("testfiles/" + testName + ".json")
 			patched, _ := patchFargateTaskDefinition(context.Background(), string(inputContainerDefinition), kiltConfig, nil)
-			expectedContainerDefinition, _ := ioutil.ReadFile("testfiles/" + testName + "_expected.json")
+			expectedContainerDefinition, _ := os.ReadFile("testfiles/" + testName + "_expected.json")
 
 			sortAndCompare(t, expectedContainerDefinition, []byte(*patched))
 		})
@@ -170,9 +170,9 @@ func TestLogGroup(t *testing.T) {
 		"region":        "test_region",
 	}
 
-	inputContainerDefinition, _ := ioutil.ReadFile("testfiles/fargate_log_group.json")
+	inputContainerDefinition, _ := os.ReadFile("testfiles/fargate_log_group.json")
 	patched, _ := patchFargateTaskDefinition(context.Background(), string(inputContainerDefinition), kiltConfig, logConfig)
-	expectedContainerDefinition, _ := ioutil.ReadFile("testfiles/fargate_log_group_expected.json")
+	expectedContainerDefinition, _ := os.ReadFile("testfiles/fargate_log_group_expected.json")
 
 	sortAndCompare(t, expectedContainerDefinition, []byte(*patched))
 }

sysdig/internal/client/common/users.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 )
 
@@ -20,7 +20,7 @@ func (client *sysdigCommonClient) GetUserById(ctx context.Context, id int) (u *U
 		return
 	}
 
-	body, _ := ioutil.ReadAll(response.Body)
+	body, _ := io.ReadAll(response.Body)
 	user := UserFromJSON(body)
 	return &user, nil
 }
@@ -68,7 +68,7 @@ func (client *sysdigCommonClient) CreateUser(ctx context.Context, uRequest *User
 		return
 	}
 
-	body, _ := ioutil.ReadAll(response.Body)
+	body, _ := io.ReadAll(response.Body)
 	user := UserFromJSON(body)
 	return &user, nil
 }
@@ -85,7 +85,7 @@ func (client *sysdigCommonClient) UpdateUser(ctx context.Context, uRequest *User
 		return
 	}
 
-	body, _ := ioutil.ReadAll(response.Body)
+	body, _ := io.ReadAll(response.Body)
 	user := UserFromJSON(body)
 	return &user, nil
 }
@@ -115,7 +115,7 @@ func (client *sysdigCommonClient) GetCurrentUser(ctx context.Context) (u *User,
 		return
 	}
 
-	body, _ := ioutil.ReadAll(response.Body)
+	body, _ := io.ReadAll(response.Body)
 	user := UserFromJSON(body)
 	return &user, nil
 }

sysdig/internal/client/monitor/alerts.go

@@ -3,7 +3,7 @@ package monitor
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 )
 
@@ -19,7 +19,7 @@ func (c *sysdigMonitorClient) CreateAlert(ctx context.Context, alert Alert) (cre
 		return
 	}
 
-	body, err := ioutil.ReadAll(response.Body)
+	body, err := io.ReadAll(response.Body)
 	if err != nil {
 		return
 	}
@@ -52,7 +52,7 @@ func (c *sysdigMonitorClient) UpdateAlert(ctx context.Context, alert Alert) (upd
 		return
 	}
 
-	body, err := ioutil.ReadAll(response.Body)
+	body, err := io.ReadAll(response.Body)
 	if err != nil {
 		return
 	}
@@ -71,7 +71,7 @@ func (c *sysdigMonitorClient) GetAlertById(ctx context.Context, alertID int) (al
 		return
 	}
 
-	body, err := ioutil.ReadAll(response.Body)
+	body, err := io.ReadAll(response.Body)
 	if err != nil {
 		return
 	}

sysdig/internal/client/monitor/dashboards.go

@@ -3,7 +3,7 @@ package monitor
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	"github.com/draios/terraform-provider-sysdig/sysdig/internal/client/monitor/model"
@@ -20,7 +20,7 @@ func (client *sysdigMonitorClient) GetDashboardByID(ctx context.Context, ID int)
 		return nil, errorFromResponse(response)
 	}
 
-	body, err := ioutil.ReadAll(response.Body)
+	body, err := io.ReadAll(response.Body)
 	if err != nil {
 		return nil, nil
 	}
@@ -38,7 +38,7 @@ func (client *sysdigMonitorClient) CreateDashboard(ctx context.Context, dashboar
 		return nil, errorFromResponse(response)
 	}
 
-	body, err := ioutil.ReadAll(response.Body)
+	body, err := io.ReadAll(response.Body)
 	if err != nil {
 		return nil, err
 	}
@@ -56,7 +56,7 @@ func (client *sysdigMonitorClient) UpdateDashboard(ctx context.Context, dashboar
 		return nil, errorFromResponse(response)
 	}
 
-	body, err := ioutil.ReadAll(response.Body)
+	body, err := io.ReadAll(response.Body)
 	if err != nil {
 		return nil, err
 	}