[TechDebt] Output of gopls modernize tool. (#404)

* [TechDebt] Output of gopls modernize tool.

ChangeLog:
  - Upgrade to 1.24.1

* Upgrading testcontainers to latest version

Author: safaci2000

.github/workflows/code_scanners.yml

@@ -7,10 +7,6 @@ on:
     branches:
       - main
 
-env:
-  GO_VERSION: 1.23.4
-
-
 permissions:
   contents: read
   # Optional: allow read access to pull request. Use with `only-new-issues` option.
@@ -23,19 +19,16 @@ jobs:
       matrix:
 #       job_name: [security, vuln_check, lint]
         job_name: [security, lint]
+        go_version: [ 1.24.1]
 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - name: Setup Go
+        uses: ./actions/setup_go
         with:
-          go-version: "1.23.0"
-          cache: false
-      - name: Install Task
-        run: sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d
-      - name: Installing Go Tools
-        run: ./bin/task install_tools      
+          go_version: "${{ matrix.go_version }}"
       - name: Running Scan
         run: ./bin/task ${{ matrix.job_name }}
 

.github/workflows/go.yml

@@ -13,7 +13,7 @@ jobs:
         grafana_version: [ 10.2.8-ubuntu, 11.6.0-ubuntu ]
 #        grafana_version: [ 10.2.8, 11.6.0]
         use_tokens: [ 0, 1 ]
-        go_version: [ 1.23.4]
+        go_version: [ 1.24.1]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/release-validation.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23.4' 
+          go-version: '1.24.1' 
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23.4' 
+          go-version: '1.24.1' 
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:

actions/setup_go/action.yml

@@ -19,3 +19,9 @@ runs:
     - name: Install GoTest
       run: go install gotest.tools/gotestsum@latest
       shell: bash
+    - name: Install Task
+      run: sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d
+      shell: bash
+    - name: Installing Go Tools
+      run: ./bin/task install_tools
+      shell: bash

cli/backup/library.go

@@ -158,7 +158,7 @@ func newLibraryElementsListConnectionsCmd() simplecobra.Commander {
 			elements := rootCmd.GrafanaSvc().ListLibraryElementsConnections(nil, libElmentUid)
 			slog.Info("Listing library connections for context", "context", config.Config().GetGDGConfig().GetContext())
 			for _, link := range elements {
-				dash := link.Dashboard.(map[string]interface{})
+				dash := link.Dashboard.(map[string]any)
 				rootCmd.TableObj.AppendRow(table.Row{dash["id"], dash["uid"], link.Meta.Slug, dash["title"], link.Meta.FolderTitle})
 			}
 			if len(elements) > 0 {

cli/support/root.go

@@ -35,7 +35,7 @@ type RootCommand struct {
 	CommandEntries []simplecobra.Commander
 }
 
-func (cmd *RootCommand) Render(command *cobra.Command, data interface{}) {
+func (cmd *RootCommand) Render(command *cobra.Command, data any) {
 	output, _ := command.Flags().GetString("output")
 	if output == "json" {
 		data, err := json.MarshalIndent(data, "", "    ")

cli/test/tools/devel_test.go

@@ -14,7 +14,7 @@ import (
 
 func TestDevelSrvInfo(t *testing.T) {
 	execMe := func(mock *mocks.GrafanaService, optionMockSvc func() support.RootOption) error {
-		expected := make(map[string]interface{})
+		expected := make(map[string]any)
 		expected["Database"] = "db"
 		expected["Commit"] = "commit"
 		expected["Version"] = "version"

cli/tools/auth_service_accounts.go

@@ -174,7 +174,7 @@ func newServiceAccount() simplecobra.Commander {
 				rootCmd.TableObj.AppendHeader(table.Row{"id", "name", "role"})
 				rootCmd.TableObj.AppendRow(table.Row{serviceAcct.ID, serviceAcct.Name, serviceAcct.Role})
 				rootCmd.Render(cd.CobraCommand,
-					map[string]interface{}{"id": serviceAcct.ID, "name": serviceAcct.Name, "role": serviceAcct.Role})
+					map[string]any{"id": serviceAcct.ID, "name": serviceAcct.Name, "role": serviceAcct.Role})
 			}
 			return nil
 		},

cli/tools/org_users.go

@@ -51,7 +51,7 @@ func newGetUserOrgCmd() simplecobra.Commander {
 				slog.Info("No organizations found")
 			} else {
 				rootCmd.TableObj.AppendRow(table.Row{org.ID, org.Name})
-				rootCmd.Render(cd.CobraCommand, map[string]interface{}{"id": org.ID, "name": org.Name})
+				rootCmd.Render(cd.CobraCommand, map[string]any{"id": org.ID, "name": org.Name})
 			}
 			return nil
 		},

cli/tools/organizations.go

@@ -85,7 +85,7 @@ func newGetTokenOrgCmd() simplecobra.Commander {
 				slog.Info("No tokens were found")
 			} else {
 				rootCmd.TableObj.AppendRow(table.Row{org.ID, org.Name})
-				rootCmd.Render(cd.CobraCommand, map[string]interface{}{"id": org.ID, "name": org.Name})
+				rootCmd.Render(cd.CobraCommand, map[string]any{"id": org.ID, "name": org.Name})
 			}
 			return nil
 		},

cli/tools/service_account_tokens.go

@@ -107,7 +107,7 @@ func newServiceAccountTokenCmd() simplecobra.Commander {
 				rootCmd.TableObj.AppendHeader(table.Row{"serviceID", "token_id", "name", "token"})
 				rootCmd.TableObj.AppendRow(table.Row{serviceID, key.ID, key.Name, key.Key})
 				rootCmd.Render(cd.CobraCommand,
-					map[string]interface{}{
+					map[string]any{
 						"serviceID": serviceID,
 						"token_id":  key.ID,
 						"name":      key.Name,

go.mod

@@ -1,6 +1,6 @@
 module github.com/esnet/gdg
 
-go 1.23.4
+go 1.24.1
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
@@ -12,6 +12,7 @@ require (
 	github.com/aws/smithy-go v1.22.2
 	github.com/bep/simplecobra v0.5.0
 	github.com/brianvoe/gofakeit/v6 v6.28.0
+	github.com/brianvoe/gofakeit/v7 v7.2.1
 	github.com/carlmjohnson/requests v0.24.3
 	github.com/go-openapi/strfmt v0.23.0
 	github.com/google/uuid v1.6.0
@@ -22,13 +23,12 @@ require (
 	github.com/joho/godotenv v1.5.1
 	github.com/lmittmann/tint v1.0.7
 	github.com/mattn/go-isatty v0.0.20
-	github.com/opentracing/opentracing-go v1.2.0
 	github.com/samber/lo v1.49.1
 	github.com/sethvargo/go-password v0.3.1
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.10.0
-	github.com/testcontainers/testcontainers-go v0.33.0
+	github.com/testcontainers/testcontainers-go v0.36.0
 	github.com/tidwall/gjson v1.18.0
 	github.com/tidwall/pretty v1.2.1
 	github.com/zeitlinger/conflate v0.0.0-20240927101413-c06be92f798f
@@ -52,7 +52,7 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.1 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
 	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
@@ -98,10 +98,11 @@ require (
 	github.com/dennwc/varint v1.0.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/docker v27.3.1+incompatible // indirect
+	github.com/docker/docker v28.1.1+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/ebitengine/purego v0.8.2 // indirect
 	github.com/edsrzf/mmap-go v1.2.0 // indirect
 	github.com/envoyproxy/go-control-plane v0.13.1 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
@@ -166,10 +167,10 @@ require (
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
+	github.com/magiconair/properties v1.8.10 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
@@ -183,21 +184,24 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/moby/go-archive v0.1.0 // indirect
 	github.com/moby/patternmatcher v0.6.0 // indirect
+	github.com/moby/sys/atomicwriter v0.1.0 // indirect
 	github.com/moby/sys/sequential v0.6.0 // indirect
-	github.com/moby/sys/user v0.3.0 // indirect
+	github.com/moby/sys/user v0.4.0 // indirect
 	github.com/moby/sys/userns v0.1.0 // indirect
-	github.com/moby/term v0.5.0 // indirect
+	github.com/moby/term v0.5.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/opentracing-contrib/go-grpc v0.0.0-20240724223109-9dec25a38fa8 // indirect
 	github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/pires/go-proxyproto v0.8.0 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
@@ -216,8 +220,7 @@ require (
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
 	github.com/sercand/kuberesolver/v5 v5.1.1 // indirect
-	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
-	github.com/shoenig/go-m1cpu v0.1.6 // indirect
+	github.com/shirou/gopsutil/v4 v4.25.3 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/sony/gobreaker v1.0.0 // indirect
@@ -228,8 +231,8 @@ require (
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tklauser/go-sysconf v0.3.14 // indirect
-	github.com/tklauser/numcpus v0.9.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.15 // indirect
+	github.com/tklauser/numcpus v0.10.0 // indirect
 	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
@@ -241,26 +244,27 @@ require (
 	go.etcd.io/etcd/client/v3 v3.5.16 // indirect
 	go.mongodb.org/mongo-driver v1.17.1 // indirect
 	go.opencensus.io v0.24.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/collector/pdata v1.17.0 // indirect
 	go.opentelemetry.io/contrib/detectors/gcp v1.31.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
-	go.opentelemetry.io/otel v1.31.0 // indirect
-	go.opentelemetry.io/otel/metric v1.31.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.31.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
-	go.opentelemetry.io/otel/trace v1.31.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
+	go.opentelemetry.io/otel v1.35.0 // indirect
+	go.opentelemetry.io/otel/metric v1.35.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.35.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
+	go.opentelemetry.io/otel/trace v1.35.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.32.0 // indirect
+	golang.org/x/crypto v0.37.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sync v0.11.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/term v0.29.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/sync v0.13.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/term v0.31.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
 	golang.org/x/time v0.7.0 // indirect
 	golang.org/x/tools v0.29.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect