Updating a few toolings for orgs to use slug over IDs to be a bit more compatible with current changes

.github/workflows/code_scanners.yml

@@ -8,7 +8,7 @@ on:
       - master
 
 env:
-  GO_VERSION: 1.22
+  GO_VERSION: 1.22.1
 
 
 permissions:
@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22.0"
+          go-version: "1.22.1"
           cache: false
       - name: Install Task
         run: sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d

.github/workflows/go.yml

@@ -11,7 +11,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go: [ {version: 1.22.0, token: 1}, {version: 1.22.0, token: 0}]
+        go: [ {version: 1.22.1, token: 1}, {version: 1.22.1, token: 0}]
         grafana: [ 10.1.4 ]
 
     env:
@@ -40,11 +40,11 @@ jobs:
         run: | 
           echo "token IS $TEST_TOKEN_CONFIG"
       - name: Calc coverage
-        if: "${{ matrix.go.version == '1.22.0' && matrix.grafana == '10.1.4' && matrix.go.token == '0' }}"
+        if: "${{ matrix.go.version == '1.22.1' && matrix.grafana == '10.1.4' && matrix.go.token == '0' }}"
         run: |
           go test -v -covermode=atomic -coverprofile=coverage.out ./...
       - name: Convert coverage.out to coverage.lcov
-        if: "${{ matrix.go.version == '1.22.0' && matrix.grafana == '10.1.4' && matrix.go.token == '0' }}"
+        if: "${{ matrix.go.version == '1.22.1' && matrix.grafana == '10.1.4' && matrix.go.token == '0' }}"
         uses: jandelgado/[email protected]
       - name: Test 
         if: "${{ matrix.go.token == '1' }}"

.github/workflows/release.yml

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

Taskfile.yml

@@ -22,6 +22,8 @@ tasks:
       - go install github.com/client9/misspell/cmd/misspell@latest
       - go install github.com/securego/gosec/v2/cmd/gosec@master
       - go install golang.org/x/vuln/cmd/govulncheck@latest
+      - go install github.com/vektra/mockery/[email protected]
+
   security:
     desc: "Run security scan"
     cmds:

cli/backup/backup.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"github.com/bep/simplecobra"
 	"github.com/esnet/gdg/cli/support"
+	"github.com/esnet/gdg/internal/config"
 	"github.com/spf13/cobra"
 )
 
@@ -27,7 +28,6 @@ limited to clear/delete, list, download and upload.  Any other functionality wil
 		},
 		CommandsList: []simplecobra.Commander{
 			newDashboardCommand(),
-			newAlertNotificationsCommand(),
 			newConnectionsCommand(),
 			newFolderCommand(),
 			newLibraryElementsCommand(),
@@ -38,3 +38,13 @@ limited to clear/delete, list, download and upload.  Any other functionality wil
 	}
 
 }
+
+// GetOrganizationName wrapper for verbose version below.
+func GetOrganizationName() string {
+	return config.Config().GetDefaultGrafanaConfig().GetOrganizationName()
+}
+
+// GetContext wrapper for verbose version below.
+func GetContext() string {
+	return config.Config().GetGDGConfig().GetContext()
+}

cli/backup/connection_permissions.go

@@ -113,7 +113,7 @@ func newConnectionsPermissionDownloadCmd() simplecobra.Commander {
 			cmd.Aliases = []string{"d"}
 		},
 		RunFunc: func(ctx context.Context, cd *simplecobra.Commandeer, rootCmd *support.RootCommand, args []string) error {
-			slog.Info("import Connections for context",
+			slog.Info("Download Connections for context",
 				"context", config.Config().GetGDGConfig().GetContext())
 			rootCmd.TableObj.AppendHeader(table.Row{"filename"})
 			connectionFilter, _ := cd.CobraCommand.Flags().GetString("connection")

cli/backup/connections.go

@@ -47,7 +47,7 @@ func newClearConnectionsCmd() simplecobra.Commander {
 			cmd.Aliases = []string{"c"}
 		},
 		RunFunc: func(ctx context.Context, cd *simplecobra.Commandeer, rootCmd *support.RootCommand, args []string) error {
-			slog.Info("Delete connections")
+			slog.Info("Delete connections", slog.String("Organization", GetOrganizationName()))
 			dashboardFilter, _ := cd.CobraCommand.Flags().GetString("datasource")
 			filters := service.NewConnectionFilter(dashboardFilter)
 			savedFiles := rootCmd.GrafanaSvc().DeleteAllConnections(filters)
@@ -71,7 +71,7 @@ func newUploadConnectionsCmd() simplecobra.Commander {
 			cmd.Aliases = []string{"u"}
 		},
 		RunFunc: func(ctx context.Context, cd *simplecobra.Commandeer, rootCmd *support.RootCommand, args []string) error {
-			slog.Info("Uploading connections")
+			slog.Info("Uploading connections", slog.String("Organization", GetOrganizationName()))
 			dashboardFilter, _ := cd.CobraCommand.Flags().GetString("connection")
 			filters := service.NewConnectionFilter(dashboardFilter)
 			exportedList := rootCmd.GrafanaSvc().UploadConnections(filters)
@@ -96,6 +96,7 @@ func newDownloadConnectionsCmd() simplecobra.Commander {
 		},
 		RunFunc: func(ctx context.Context, cd *simplecobra.Commandeer, rootCmd *support.RootCommand, args []string) error {
 			slog.Info("Importing connections for context",
+				slog.String("Organization", GetOrganizationName()),
 				"context", config.Config().GetGDGConfig().GetContext())
 			dashboardFilter, _ := cd.CobraCommand.Flags().GetString("connection")
 			filters := service.NewConnectionFilter(dashboardFilter)
@@ -123,7 +124,9 @@ func newListConnectionsCmd() simplecobra.Commander {
 			dashboardFilter, _ := cd.CobraCommand.Flags().GetString("connection")
 			filters := service.NewConnectionFilter(dashboardFilter)
 			dsListing := rootCmd.GrafanaSvc().ListConnections(filters)
-			slog.Info("Listing connections for context", "context", config.Config().GetGDGConfig().GetContext())
+			slog.Info("Listing connections for context",
+				slog.String("Organization", GetOrganizationName()),
+				slog.String("context", GetContext()))
 			if len(dsListing) == 0 {
 				slog.Info("No connections found")
 			} else {

cli/backup/dashboard.go

@@ -40,11 +40,10 @@ func newDashboardCommand() simplecobra.Commander {
 		Long:  description,
 		WithCFunc: func(cmd *cobra.Command, r *support.RootCommand) {
 			cmd.Aliases = []string{"dash", "dashboard"}
-			dashboard := cmd
-			dashboard.PersistentFlags().BoolVarP(&skipConfirmAction, "skip-confirmation", "", false, "when set to true, bypass confirmation prompts")
-			dashboard.PersistentFlags().StringP("dashboard", "d", "", "filter by dashboard slug")
-			dashboard.PersistentFlags().StringP("folder", "f", "", "Filter by Folder Name (Quotes in names not supported)")
-			dashboard.PersistentFlags().StringArrayP("tags", "t", []string{}, "Filter by list of comma delimited tags")
+			cmd.PersistentFlags().BoolVarP(&skipConfirmAction, "skip-confirmation", "", false, "when set to true, bypass confirmation prompts")
+			cmd.PersistentFlags().StringP("dashboard", "d", "", "filter by dashboard slug")
+			cmd.PersistentFlags().StringP("folder", "f", "", "Filter by Folder Name (Quotes in names not supported)")
+			cmd.PersistentFlags().StringArrayP("tags", "t", []string{}, "Filter by list of comma delimited tags")
 		},
 		CommandsList: []simplecobra.Commander{
 			newListDashboardsCmd(),
@@ -110,7 +109,9 @@ func newUploadDashboardsCmd() simplecobra.Commander {
 			rootCmd.TableObj.AppendHeader(table.Row{"Title", "id", "folder", "UID"})
 			boards := rootCmd.GrafanaSvc().ListDashboards(filter)
 
-			slog.Info(fmt.Sprintf("%d dashboards have been uploaded", len(boards)))
+			slog.Info("dashboards have been uploaded", slog.Any("count", len(boards)),
+				slog.String("context", GetContext()),
+				slog.String("Organization", GetOrganizationName()))
 			for _, link := range boards {
 				rootCmd.TableObj.AppendRow(table.Row{link.Title, link.ID, link.FolderTitle, link.UID})
 			}
@@ -138,7 +139,8 @@ func newDownloadDashboardsCmd() simplecobra.Commander {
 			filter := service.NewDashboardFilter(parseDashboardGlobalFlags(cd.CobraCommand)...)
 			savedFiles := rootCmd.GrafanaSvc().DownloadDashboards(filter)
 			slog.Info("Downloading dashboards for context",
-				"context", config.Config().GetGDGConfig().GetContext())
+				slog.String("Organization", GetOrganizationName()),
+				"context", GetContext())
 			rootCmd.TableObj.AppendHeader(table.Row{"type", "filename"})
 			for _, file := range savedFiles {
 				rootCmd.TableObj.AppendRow(table.Row{"dashboard", file})
@@ -165,7 +167,10 @@ func newListDashboardsCmd() simplecobra.Commander {
 			filters := service.NewDashboardFilter(parseDashboardGlobalFlags(cd.CobraCommand)...)
 			boards := rootCmd.GrafanaSvc().ListDashboards(filters)
 
-			slog.Info("Listing dashboards for context", slog.String("context", config.Config().GetGDGConfig().GetContext()), slog.Any("count", len(boards)))
+			slog.Info("Listing dashboards for context",
+				slog.String("context", GetContext()),
+				slog.String("orgName", GetOrganizationName()),
+				slog.Any("count", len(boards)))
 			for _, link := range boards {
 				base, err := url.Parse(config.Config().GetDefaultGrafanaConfig().URL)
 				var baseHost string