Update go version, dependencies, ping golangci-lint

Author: paskal

.github/workflows/ci-build.yml

@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: available platforms
         run: echo ${{ steps.buildx.outputs.platforms }}

.github/workflows/ci-run.yml

@@ -12,19 +12,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: install go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v5
       with:
-        go-version: 1.18
+        go-version: 1.22
 
     - name: build and test
       run: go test -timeout=60s -covermode=count -coverprofile=$GITHUB_WORKSPACE/profile.cov ./...
 
-    - name: install golangci-lint
-      run: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $GITHUB_WORKSPACE v1.50.1
-
-    - name: run linters
-      run: $GITHUB_WORKSPACE/golangci-lint run ./... ;
-
+    - name: golangci-lint
+      uses: golangci/golangci-lint-action@v4
+      with:
+        version: v1.64

.golangci.yml

@@ -1,7 +1,6 @@
 linters:
   enable:
     - bodyclose
-    - depguard
     - dogsled
     - dupl
     - errcheck
@@ -21,7 +20,7 @@ linters:
     - misspell
     - nakedret
     - rowserrcheck
-    - exportloopref
+    - copyloopvar
     - staticcheck
     - stylecheck
     - typecheck

Dockerfile

@@ -15,7 +15,7 @@ LABEL org.opencontainers.image.authors="Dmitry Verkhoturov <paskal.07@gmail.com>
       org.opencontainers.image.description="AWS Security Connectors" \
       org.opencontainers.image.documentation="https://github.com/bookingcom/aws-security-connectors" \
       org.opencontainers.image.licenses="Apache 2.0" \
-      org.opencontainers.image.source="https://github.com/bookingcom/aws-security-connectors.git" \
+      org.opencontainers.image.source="https://github.com/bookingcom/aws-security-connectors" \
       org.opencontainers.image.title="aws-security-connectors" \
       org.opencontainers.image.vendor="Booking.com"
 

connectors/detective_test.go

@@ -98,8 +98,6 @@ func TestDetectiveInviter_AddMember(t *testing.T) {
 
 	masterSess, memberSess := NewMasterMemberSess("us-west-2", "", "")
 	for i, x := range testAPIRequestsDataset {
-		i := i
-		x := x
 		t.Run(x.description, func(t *testing.T) {
 			master := &mockDMasterClient{
 				t:           t,

connectors/guardduty_test.go

@@ -123,8 +123,6 @@ func TestGuardDutyInviter_AddMember(t *testing.T) {
 
 	masterSess, memberSess := NewMasterMemberSess("us-west-2", "", "")
 	for i, x := range testAPIRequestsDataset {
-		i := i
-		x := x
 		t.Run(x.description, func(t *testing.T) {
 			master := &mockGDMasterClient{
 				email:       &testEmail,

connectors/prisma_test.go

@@ -84,8 +84,6 @@ func TestPrisma_AddAWSAccount(t *testing.T) {
 	}
 
 	for i, x := range testAPIRequestsDataset {
-		i := i
-		x := x
 		t.Run(x.description, func(t *testing.T) {
 			m := &mockClient{t: t, requests: x.requests}
 			p := NewPrisma("", "", "")

connectors/security_hub_test.go

@@ -86,8 +86,6 @@ func TestSecurityHubInviter_AddMember(t *testing.T) {
 
 	masterSess, memberSess := NewMasterMemberSess("us-west-2", "", "")
 	for i, x := range testAPIRequestsDataset {
-		i := i
-		x := x
 		t.Run(x.description, func(t *testing.T) {
 			master := &mockSHMasterClient{
 				t:           t,

docker-compose.yaml

@@ -1,9 +1,8 @@
-version: '2'
 services:
 
   aws-security-connectors:
     build: .
-    image: paskal/aws-security-connectors:latest
+    image: ghcr.io/bookingcom/aws-security-connectors:latest
     environment:
       - DEBUG
       - AWS_ACCOUNT_ID

go.mod

@@ -1,12 +1,21 @@
 module github.com/bookingcom/aws-security-connectors
 
-go 1.14
+go 1.22
 
 require (
-	github.com/aws/aws-sdk-go v1.44.209
+	github.com/aws/aws-sdk-go v1.55.6
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/jessevdk/go-flags v1.5.0
-	github.com/paskal/go-prisma v1.0.0
-	github.com/sirupsen/logrus v1.9.0
-	github.com/stretchr/testify v1.8.2
+	github.com/jessevdk/go-flags v1.6.1
+	github.com/paskal/go-prisma v1.0.1
+	github.com/sirupsen/logrus v1.9.3
+	github.com/stretchr/testify v1.10.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )