Dropping Deprecated functionality

Fixes #192 ChangeLog: - Drop support for import/export keywords - Drop references to legacy 'datasources' - Drop Alert Notifications as it's long been deprecated.
esnet · Mar 3, 2024 · e9f7d3b · e9f7d3b
1 parent 346cf2f
commit e9f7d3b
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 295 deletions.
diff --git a/cli/backup/alertnotifications.go b/cli/backup/alertnotifications.go
diff --git a/cli/backup/backup.go b/cli/backup/backup.go
@@ -27,7 +27,6 @@ limited to clear/delete, list, download and upload.  Any other functionality wil
 		},
 		CommandsList: []simplecobra.Commander{
 			newDashboardCommand(),
-			newAlertNotificationsCommand(),
 			newConnectionsCommand(),
 			newFolderCommand(),
 			newLibraryElementsCommand(),

diff --git a/cli/backup/connection_permissions.go b/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")

diff --git a/internal/config/config_model.go b/internal/config/config_model.go
@@ -6,9 +6,7 @@ import (
 	"fmt"
 	"github.com/grafana/grafana-openapi-client-go/models"
 	"github.com/tidwall/gjson"
-	"log"
 	"log/slog"
-	"os"
 	"path"
 	"regexp"
 )
@@ -19,7 +17,6 @@ const (
 	AlertNotificationResource    = "alertnotifications"
 	ConnectionPermissionResource = "connections-permissions"
 	ConnectionResource           = "connections"
-	LegacyConnections            = "datasources"
 	DashboardResource            = "dashboards"
 	FolderPermissionResource     = "folders-permissions"
 	FolderResource               = "folders"
@@ -192,16 +189,6 @@ func (s *GrafanaConfig) GetMonitoredFolders() []string {
 
 // Validate will return terminate if any deprecated configuration is found.
 func (s *GrafanaConfig) Validate() {
-	if len(s.LegacyConnectionSettings) > 0 {
-		log.Fatal("Using 'datasources' is now deprecated, please use 'connections' instead")
-	}
-	//Validate Connections
-	//TODO: remove code after next release
-	legacyCheck := s.GetPath(LegacyConnections)
-	if _, err := os.Stat(legacyCheck); !os.IsNotExist(err) {
-		log.Fatalf("Your export contains a datasource directry which is deprecated.  Please remove or "+
-			"rename directory to '%s'", ConnectionResource)
-	}
 
 }
 

diff --git a/internal/config/types.go b/internal/config/types.go
@@ -67,10 +67,8 @@ type GrafanaConfig struct {
 	MonitoredFoldersOverride []MonitoredOrgFolders `mapstructure:"watched_folders_override" yaml:"watched_folders_override"`
 	MonitoredFolders         []string              `mapstructure:"watched" yaml:"watched"`
 	ConnectionSettings       *ConnectionSettings   `mapstructure:"connections" yaml:"connections"`
-	//Datasources are deprecated, please use Connections
-	LegacyConnectionSettings map[string]interface{} `mapstructure:"datasources" yaml:"datasources"`
-	FilterOverrides          *FilterOverrides       `mapstructure:"filter_override" yaml:"filter_override"`
-	OutputPath               string                 `mapstructure:"output_path" yaml:"output_path"`
+	FilterOverrides          *FilterOverrides      `mapstructure:"filter_override" yaml:"filter_override"`
+	OutputPath               string                `mapstructure:"output_path" yaml:"output_path"`
 }
 
 type MonitoredOrgFolders struct {

diff --git a/internal/service/alertnotifications.go b/internal/service/alertnotifications.go
diff --git a/internal/service/contract.go b/internal/service/contract.go
@@ -13,7 +13,6 @@ type GrafanaService interface {
 	OrganizationsApi
 	DashboardsApi
 	ConnectionsApi
-	AlertNotificationsApi
 	UsersApi
 	FoldersApi
 	LibraryElementsApi