feat: upgraded to aws-sdk-go-v2

.github/workflows/edge.yml

@@ -6,25 +6,25 @@ on:
       - main
 
 env:
-  GO_VERSION: "1.16"
+  GO_VERSION: "1.22"
   DOCKER_REGISTRY: "ghcr.io"
 
 jobs:
   edge:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
       - name: Login to GitHub Packages Docker Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.DOCKER_REGISTRY }}
           username: ${{ github.repository_owner }}
@@ -33,4 +33,4 @@ jobs:
       - name: Build and Push docker image
         run: |
           DOCKER_TAG=edge make docker
-          docker push ${{ env.DOCKER_REGISTRY }}/goodwaygroup/gwsm:edge
+          docker push ${{ env.DOCKER_REGISTRY }}/goodwaygroup/gwsm:edge

.github/workflows/lint.yml

@@ -1,12 +1,12 @@
 name: lint
-on: [ push, pull_request ]
+on: [push, pull_request]
 jobs:
   golangci:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.38
+          version: v1.62

.github/workflows/release.yml

@@ -3,35 +3,35 @@ name: goreleaser
 on:
   push:
     tags:
-      - '*'
+      - "*"
 
 env:
   GO_VERSION: "1.16"
   DOCKER_REGISTRY: "ghcr.io"
 
 jobs:
   goreleaser:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
       - name: Login to GitHub Packages Docker Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.DOCKER_REGISTRY }}
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v6
         with:
           version: latest
           args: release --rm-dist

.gitignore

@@ -28,4 +28,7 @@ build/
 .DS_Store
 bin/
 dist/
-gwsm
+gwsm
+
+temp/
+tmp/

.golangci.yml

@@ -3,7 +3,8 @@ run:
   timeout: 2m
 
 output:
-  format: tab
+  formats:
+    - format: tab
 
 issues:
   max-issues-per-linter: 0
@@ -16,6 +17,46 @@ linters:
     - gocritic
     - gocyclo
     - gofmt
-    - golint
     - misspell
     - unconvert
+
+linters-settings:
+  depguard:
+    rules:
+      main:
+        files:
+          - $all
+        allow:
+          - $gostd # Allow all Go standard library imports
+          - github.com/a8m/djson
+          - github.com/AlecAivazis/survey/v2
+          - github.com/aws/aws-sdk-go-v2/aws
+          - github.com/aws/aws-sdk-go-v2/config
+          - github.com/aws/aws-sdk-go-v2/feature/s3/manager
+          - github.com/aws/aws-sdk-go-v2/service/s3
+          - github.com/aws/aws-sdk-go-v2/service/secretsmanager
+          - github.com/aws/aws-sdk-go-v2/service/secretsmanager/types
+          - github.com/clok/avtool/v3
+          - github.com/clok/cdocs
+          - github.com/clok/kemba
+          - github.com/cyberark/summon/pkg/secretsyml
+          - github.com/GoodwayGroup/gwsm/cmd
+          - github.com/GoodwayGroup/gwsm/env
+          - github.com/GoodwayGroup/gwsm/info
+          - github.com/GoodwayGroup/gwsm/kube
+          - github.com/GoodwayGroup/gwsm/s3
+          - github.com/GoodwayGroup/gwsm/sm
+          - github.com/jedib0t/go-pretty/v6/table
+          - github.com/logrusorgru/aurora/v3
+          - github.com/manifoldco/promptui
+          - github.com/r3labs/diff/v2
+          - github.com/sergi/go-diff/diffmatchpatch
+          - github.com/TylerBrock/colorjson
+          - github.com/urfave/cli/v2
+          - k8s.io/api/core/v1
+          - k8s.io/apimachinery/pkg/apis/meta/v1
+          - k8s.io/client-go/kubernetes
+          - k8s.io/client-go/kubernetes/scheme
+          - k8s.io/client-go/rest
+          - k8s.io/client-go/tools/clientcmd
+          - k8s.io/client-go/tools/remotecommand

README.md

@@ -96,10 +96,10 @@ Each command ans subcommand has detailed help text that can be viewed using the
 
 ## Built With
 
-* go v1.16
-* make
-* [git-chglog](https://github.com/git-chglog/git-chglog)
-* [goreleaser](https://goreleaser.com/install/)
+- go v1.22
+- make
+- [git-chglog](https://github.com/git-chglog/git-chglog)
+- [goreleaser](https://goreleaser.com/install/)
 
 ## Deployment
 
@@ -122,7 +122,7 @@ requests to us.
 1. Use `go >= 1.16`
 1. Branch & Code
 1. Run linters :broom: `golangci-lint run`
-    - The project uses [golangci-lint](https://golangci-lint.run/usage/install/#local-installation)
+   - The project uses [golangci-lint](https://golangci-lint.run/welcome/install/#brew)
 1. Commit with a Conventional Commit
 1. Open a PR
 
@@ -133,7 +133,7 @@ versions available, see the [tags on this repository](https://github.com/Goodway
 
 ## Authors
 
-* **Derek Smith** - [@clok](https://github.com/clok)
+- **Derek Smith** - [@clok](https://github.com/clok)
 
 See also the list of [contributors](https://github.com/GoodwayGroup/gwvault/contributors) who participated in this
 project.

cmd/diff.go

@@ -3,16 +3,17 @@ package cmd
 import (
 	"bytes"
 	"fmt"
+	"os"
+	"sort"
+	"strings"
+
 	"github.com/GoodwayGroup/gwsm/env"
 	"github.com/clok/kemba"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/logrusorgru/aurora/v3"
 	"github.com/r3labs/diff/v2"
 	"github.com/sergi/go-diff/diffmatchpatch"
 	"github.com/urfave/cli/v2"
-	"os"
-	"sort"
-	"strings"
 )
 
 var (

cmd/local.go

@@ -2,13 +2,14 @@ package cmd
 
 import (
 	"fmt"
+	"os"
+	"sort"
+	"strings"
+
 	"github.com/GoodwayGroup/gwsm/env"
 	"github.com/clok/kemba"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/urfave/cli/v2"
-	"os"
-	"sort"
-	"strings"
 )
 
 // Print the resulting environment for a set of local ConfigMap and Summon secrets.yml file.
@@ -26,7 +27,7 @@ func ViewLocalEnv(c *cli.Context) error {
 			t.SetTitle("From ConfigMap")
 		} else {
 			l := kemba.PickColor(group)
-			t.SetTitle(fmt.Sprintf("From secret: %s", l.Sprintf(group)))
+			t.SetTitle(fmt.Sprintf("From secret: %s", l.Sprint(group)))
 		}
 		t.AppendHeader(table.Row{"Key", "Value"})
 

cmd/logger_test.go

@@ -2,10 +2,11 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/logrusorgru/aurora/v3"
-	"io/ioutil"
+	"io"
 	"os"
 	"testing"
+
+	"github.com/logrusorgru/aurora/v3"
 )
 
 func Test_PrintWarn(t *testing.T) {
@@ -16,7 +17,7 @@ func Test_PrintWarn(t *testing.T) {
 	PrintWarn("This is a test!")
 
 	w.Close()
-	out, _ := ioutil.ReadAll(r)
+	out, _ := io.ReadAll(r)
 	os.Stderr = rescueStderr
 
 	wantMsg := fmt.Sprintln(aurora.Red("✖ This is a test!"))
@@ -33,7 +34,7 @@ func Test_PrintSuccess(t *testing.T) {
 	PrintSuccess("This is a test!")
 
 	w.Close()
-	out, _ := ioutil.ReadAll(r)
+	out, _ := io.ReadAll(r)
 	os.Stderr = rescueStderr
 
 	wantMsg := fmt.Sprintln(aurora.Green("✔ This is a test!"))
@@ -50,7 +51,7 @@ func Test_PrintInfo(t *testing.T) {
 	PrintInfo("This is a test!")
 
 	w.Close()
-	out, _ := ioutil.ReadAll(r)
+	out, _ := io.ReadAll(r)
 	os.Stderr = rescueStderr
 
 	wantMsg := fmt.Sprintln(aurora.Gray(14, "➜ This is a test!"))

cmd/sm.go

@@ -3,16 +3,17 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
+	"os"
+	"sort"
+	"strings"
+
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/GoodwayGroup/gwsm/sm"
 	"github.com/TylerBrock/colorjson"
 	"github.com/a8m/djson"
-	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/urfave/cli/v2"
-	"os"
-	"sort"
-	"strings"
 )
 
 // truncateString limits the length of a string while also appending an ellipses.
@@ -41,7 +42,7 @@ func selectSecretNameFromList(c *cli.Context) (string, error) {
 
 		secretNames := make([]string, 0, len(secrets))
 		for _, secret := range secrets {
-			secretNames = append(secretNames, aws.StringValue(secret.Name))
+			secretNames = append(secretNames, aws.ToString(secret.Name))
 		}
 		sort.Strings(secretNames)
 
@@ -155,13 +156,13 @@ func ListSecrets(c *cli.Context) error {
 	})
 
 	for _, secret := range secrets {
-		lastdt := aws.TimeValue(secret.LastAccessedDate)
-		updateddt := aws.TimeValue(secret.LastChangedDate)
+		lastdt := aws.ToTime(secret.LastAccessedDate)
+		updateddt := aws.ToTime(secret.LastChangedDate)
 		t.AppendRow([]interface{}{
-			aws.StringValue(secret.Name),
+			aws.ToString(secret.Name),
 			fmt.Sprintf("%d-%02d-%02d", updateddt.Year(), updateddt.Month(), updateddt.Day()),
 			fmt.Sprintf("%d-%02d-%02d", lastdt.Year(), lastdt.Month(), lastdt.Day()),
-			truncateString(aws.StringValue(secret.Description), 40),
+			truncateString(aws.ToString(secret.Description), 40),
 		})
 	}
 
@@ -185,10 +186,10 @@ func ViewSecret(c *cli.Context) error {
 	if c.Bool("binary") {
 		fmt.Println(string(secret.SecretBinary))
 	} else {
-		result, err := djson.Decode([]byte(aws.StringValue(secret.SecretString)))
+		result, err := djson.Decode([]byte(aws.ToString(secret.SecretString)))
 		if err != nil {
 			PrintWarn("stored string value is not valid JSON.")
-			fmt.Println(aws.StringValue(secret.SecretString))
+			fmt.Println(aws.ToString(secret.SecretString))
 		} else {
 			f := colorjson.NewFormatter()
 			f.Indent = 4
@@ -213,7 +214,12 @@ func DescribeSecret(c *cli.Context) error {
 		return cli.Exit(err, 2)
 	}
 
-	fmt.Println(secret.String())
+	jString, err := json.MarshalIndent(secret, "", "  ")
+	if err != nil {
+		return cli.Exit(err, 2)
+	}
+
+	fmt.Println(string(jString))
 
 	return nil
 }
@@ -234,10 +240,10 @@ func EditSecret(c *cli.Context) error {
 	if c.Bool("binary") {
 		s = secret.SecretBinary
 	} else {
-		result, err := djson.Decode([]byte(aws.StringValue(secret.SecretString)))
+		result, err := djson.Decode([]byte(aws.ToString(secret.SecretString)))
 		if err != nil {
 			PrintWarn("stored string value is not valid JSON.")
-			s = []byte(aws.StringValue(secret.SecretString))
+			s = []byte(aws.ToString(secret.SecretString))
 		} else {
 			s, err = json.MarshalIndent(result, "", "    ")
 			if err != nil {
@@ -369,10 +375,10 @@ func PutSecret(c *cli.Context) error {
 		if c.Bool("binary") {
 			value = secret.SecretBinary
 		} else {
-			result, err := djson.Decode([]byte(aws.StringValue(secret.SecretString)))
+			result, err := djson.Decode([]byte(aws.ToString(secret.SecretString)))
 			if err != nil {
 				PrintWarn("stored string value is not valid JSON.")
-				value = []byte(aws.StringValue(secret.SecretString))
+				value = []byte(aws.ToString(secret.SecretString))
 			} else {
 				value, err = json.MarshalIndent(result, "", "    ")
 				if err != nil {