Refactoring configuration struct to better reflect the yaml files.

.github/workflows/go.yml

@@ -88,12 +88,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
 
-      - name: Starting SFTP Server
-        run: docker run -p 2222:22 -d atmoz/sftp "foo:pass:::testing"
       - name: Wait for Minio to come up.
         run: nc -z -v -w15 127.0.0.1 9000
-      - name: Wait for SSH to come up.
-        run: nc -z -v -w15 127.0.0.1 2222
       - name: Calc coverage
         if: "${{ matrix.go == '1.20.2' && matrix.grafana == '9.4.3' }}"
         run: |

cmd/alertnotifications.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/esnet/gdg/internal/apphelpers"
+	"github.com/esnet/gdg/internal/config"
 	"github.com/esnet/gdg/internal/service"
 	"github.com/jedib0t/go-pretty/v6/table"
 	log "github.com/sirupsen/logrus"
@@ -27,7 +27,7 @@ var clearAlertNotifications = &cobra.Command{
 		log.Warn("Alert Notifications will be deprecated as of Grafana 9.0, this API may no longer work soon")
 		tableObj.AppendHeader(table.Row{"type", "filename"})
 
-		log.Infof("Clearing all alert notification channels for context: '%s'", apphelpers.GetContext())
+		log.Infof("Clearing all alert notification channels for context: '%s'", config.Config().AppConfig.GetContext())
 		deleted := grafanaSvc.DeleteAllAlertNotifications()
 		for _, item := range deleted {
 			tableObj.AppendRow(table.Row{"alertnotification", item})
@@ -50,7 +50,7 @@ var uploadAlertNotifications = &cobra.Command{
 		log.Warn("Alert Notifications will be deprecated as of Grafana 9.0, this API may no longer work soon")
 		tableObj.AppendHeader(table.Row{"name", "id", "UID"})
 
-		log.Infof("Exporting alert notification channels for context: '%s'", apphelpers.GetContext())
+		log.Infof("Exporting alert notification channels for context: '%s'", config.Config().AppConfig.GetContext())
 		grafanaSvc.ExportAlertNotifications()
 		items := grafanaSvc.ListAlertNotifications()
 		for _, item := range items {
@@ -73,7 +73,7 @@ var downloadAlertNotifications = &cobra.Command{
 		log.Warn("Alert Notifications will be deprecated as of Grafana 9.0, this API may no longer work soon")
 		tableObj.AppendHeader(table.Row{"type", "filename"})
 
-		log.Infof("Importing alert notification channels for context: '%s'", apphelpers.GetContext())
+		log.Infof("Importing alert notification channels for context: '%s'", config.Config().AppConfig.GetContext())
 		savedFiles := grafanaSvc.ImportAlertNotifications()
 		for _, file := range savedFiles {
 			tableObj.AppendRow(table.Row{"alertnotification", file})
@@ -93,12 +93,12 @@ var listAlertNotifications = &cobra.Command{
 		tableObj.AppendHeader(table.Row{"id", "name", "slug", "type", "default", "url"})
 		alertnotifications := grafanaSvc.ListAlertNotifications()
 
-		log.Infof("Listing alert notifications channels for context: '%s'", apphelpers.GetContext())
+		log.Infof("Listing alert notifications channels for context: '%s'", config.Config().AppConfig.GetContext())
 		if len(alertnotifications) == 0 {
 			log.Info("No alert notifications found")
 		} else {
 			for _, link := range alertnotifications {
-				url := fmt.Sprintf("%s/alerting/notification/%d/edit", apphelpers.GetCtxDefaultGrafanaConfig().URL, link.ID)
+				url := fmt.Sprintf("%s/alerting/notification/%d/edit", config.Config().GetDefaultGrafanaConfig().URL, link.ID)
 				tableObj.AppendRow(table.Row{link.ID, link.Name, service.GetSlug(link.Name), link.Type, link.IsDefault, url})
 			}
 			tableObj.Render()

cmd/auth_serviceAccts.go

@@ -2,10 +2,10 @@ package cmd
 
 import (
 	"errors"
+	"github.com/esnet/gdg/internal/config"
 	"sort"
 	"strconv"
 
-	"github.com/esnet/gdg/internal/apphelpers"
 	"github.com/jedib0t/go-pretty/v6/table"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -74,7 +74,7 @@ var deleteServiceAcctsTokensCmd = &cobra.Command{
 			log.Fatalf("unable to parse %s as a valid numeric value", idStr)
 		}
 
-		log.Infof("Deleting Service Accounts Tokens for serviceID %d for context: '%s'", id, apphelpers.GetContext())
+		log.Infof("Deleting Service Accounts Tokens for serviceID %d for context: '%s'", id, config.Config().AppConfig.GetContext())
 		savedFiles := grafanaSvc.DeleteServiceAccountTokens(id)
 		tableObj.AppendHeader(table.Row{"serviceID", "type", "token_name"})
 		if len(savedFiles) == 0 {
@@ -95,7 +95,7 @@ var deleteServiceAcctsCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 
 		savedFiles := grafanaSvc.DeleteAllServiceAccounts()
-		log.Infof("Delete Service Accounts for context: '%s'", apphelpers.GetContext())
+		log.Infof("Delete Service Accounts for context: '%s'", config.Config().AppConfig.GetContext())
 		tableObj.AppendHeader(table.Row{"type", "filename"})
 		if len(savedFiles) == 0 {
 			log.Info("No Service Accounts found")

cmd/auth_tokens.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"errors"
-	"github.com/esnet/gdg/internal/apphelpers"
+	"github.com/esnet/gdg/internal/config"
 	"github.com/jedib0t/go-pretty/v6/table"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -54,7 +54,7 @@ var deleteTokensCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 
 		savedFiles := grafanaSvc.DeleteAllTokens()
-		log.Infof("Delete Tokens for context: '%s'", apphelpers.GetContext())
+		log.Infof("Delete Tokens for context: '%s'", config.Config().AppConfig.GetContext())
 		tableObj.AppendHeader(table.Row{"type", "filename"})
 		if len(savedFiles) == 0 {
 			log.Info("No Tokens found")

cmd/context.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"github.com/esnet/gdg/internal/apphelpers"
+	"github.com/esnet/gdg/internal/config"
 	"github.com/jedib0t/go-pretty/v6/table"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -22,7 +22,7 @@ var contextClear = &cobra.Command{
 	Short: "clear all context",
 	Long:  `clear all contexts`,
 	Run: func(cmd *cobra.Command, args []string) {
-		apphelpers.ClearContexts()
+		config.Config().ClearContexts()
 		log.Info("Successfully deleted all configured contexts")
 	},
 }
@@ -42,8 +42,7 @@ var contextCopy = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		src := args[0]
 		dest := args[1]
-		apphelpers.CopyContext(src, dest)
-
+		config.Config().CopyContext(src, dest)
 	},
 }
 
@@ -60,7 +59,7 @@ var contextDelete = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		ctx := args[0]
-		apphelpers.DeleteContext(ctx)
+		config.Config().DeleteContext(ctx)
 		log.Infof("Successfully deleted context %s", ctx)
 	},
 }
@@ -71,15 +70,15 @@ var contextList = &cobra.Command{
 	Long:  `List contexts.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		tableObj.AppendHeader(table.Row{"context", "active"})
-		contexts := apphelpers.GetContexts()
-		activeContext := apphelpers.GetContext()
-		for _, item := range contexts {
+		contexts := config.Config().GetAppConfig().GetContexts()
+		activeContext := config.Config().GetAppConfig().GetContext()
+		for key, _ := range contexts {
 			active := false
-			if item == strings.ToLower(activeContext) {
-				item = fmt.Sprintf("*%s", activeContext)
+			if key == strings.ToLower(activeContext) {
+				key = fmt.Sprintf("*%s", activeContext)
 				active = true
 			}
-			tableObj.AppendRow(table.Row{item, active})
+			tableObj.AppendRow(table.Row{key, active})
 		}
 
 		tableObj.Render()
@@ -99,8 +98,7 @@ var contextNew = &cobra.Command{
 
 	Run: func(cmd *cobra.Command, args []string) {
 		ctx := args[0]
-		apphelpers.NewContext(ctx)
-
+		config.Config().NewContext(ctx)
 	},
 }
 
@@ -117,7 +115,7 @@ var contextSet = &cobra.Command{
 
 	Run: func(cmd *cobra.Command, args []string) {
 		context := args[0]
-		apphelpers.SetContext(context)
+		config.Config().ChangeContext(context)
 
 	},
 }
@@ -127,11 +125,11 @@ var contextShow = &cobra.Command{
 	Short: "show optional[context]",
 	Long:  `show contexts optional[context]`,
 	Run: func(cmd *cobra.Command, args []string) {
-		context := apphelpers.GetContext()
-		if len(args) > 1 && len(args[0]) > 0 {
+		context := config.Config().GetAppConfig().GetContext()
+		if len(args) > 0 && len(args[0]) > 0 {
 			context = args[0]
 		}
-		apphelpers.ShowContext(context)
+		config.Config().PrintContext(context)
 
 	},
 }

cmd/dashboard.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/esnet/gdg/internal/apphelpers"
+	"github.com/esnet/gdg/internal/config"
 	"github.com/esnet/gdg/internal/service"
 	"github.com/esnet/gdg/internal/tools"
 	"github.com/jedib0t/go-pretty/v6/table"
@@ -65,7 +65,7 @@ var uploadDashboard = &cobra.Command{
 		if !skipConfirmAction {
 			tools.GetUserConfirmation(fmt.Sprintf("WARNING: this will delete all dashboards from the monitored folders: '%s' "+
 				"(or all folders if ignore_dashboard_filters is set to true) and upload your local copy.  Do you wish to "+
-				"continue (y/n) ", strings.Join(apphelpers.GetCtxDefaultGrafanaConfig().GetMonitoredFolders(), ", "),
+				"continue (y/n) ", strings.Join(config.Config().GetDefaultGrafanaConfig().GetMonitoredFolders(), ", "),
 			), "", true)
 		}
 		grafanaSvc.ExportDashboards(filter)
@@ -94,7 +94,7 @@ var downloadDashboard = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		filter := service.NewDashboardFilter(parseDashboardGlobalFlags(cmd)...)
 		savedFiles := grafanaSvc.ImportDashboards(filter)
-		log.Infof("Importing dashboards for context: '%s'", apphelpers.GetContext())
+		log.Infof("Importing dashboards for context: '%s'", config.Config().GetAppConfig().GetContext())
 		tableObj.AppendHeader(table.Row{"type", "filename"})
 		for _, file := range savedFiles {
 			tableObj.AppendRow(table.Row{"dashboard", file})
@@ -114,9 +114,9 @@ var listDashboards = &cobra.Command{
 		filters := service.NewDashboardFilter(parseDashboardGlobalFlags(cmd)...)
 		boards := grafanaSvc.ListDashboards(filters)
 
-		log.Infof("Listing dashboards for context: '%s'", apphelpers.GetContext())
+		log.Infof("Listing dashboards for context: '%s'", config.Config().GetAppConfig().GetContext())
 		for _, link := range boards {
-			url := fmt.Sprintf("%s%s", apphelpers.GetCtxDefaultGrafanaConfig().URL, link.URL)
+			url := fmt.Sprintf("%s%s", config.Config().GetDefaultGrafanaConfig().URL, link.URL)
 			tableObj.AppendRow(table.Row{link.ID, link.Title, link.Slug, link.FolderTitle,
 				link.UID, strings.Join(link.Tags, ","), url})
 

cmd/datasources.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/esnet/gdg/internal/apphelpers"
+	"github.com/esnet/gdg/internal/config"
 	"github.com/esnet/gdg/internal/service"
 	"github.com/jedib0t/go-pretty/v6/table"
 	log "github.com/sirupsen/logrus"
@@ -60,7 +60,7 @@ var downloadDataSources = &cobra.Command{
 	Long:    `download all datasources from grafana to local filesystem`,
 	Aliases: []string{"d", "import"},
 	Run: func(cmd *cobra.Command, args []string) {
-		log.Infof("Importing datasources for context: '%s'", apphelpers.GetContext())
+		log.Infof("Importing datasources for context: '%s'", config.Config().GetAppConfig().GetContext())
 		dashboardFilter, _ := cmd.Flags().GetString("datasource")
 		filters := service.NewDataSourceFilter(dashboardFilter)
 		savedFiles := grafanaSvc.ImportDataSources(filters)
@@ -83,12 +83,12 @@ var listDataSources = &cobra.Command{
 		dashboardFilter, _ := cmd.Flags().GetString("datasource")
 		filters := service.NewDataSourceFilter(dashboardFilter)
 		dsListing := grafanaSvc.ListDataSources(filters)
-		log.Infof("Listing datasources for context: '%s'", apphelpers.GetContext())
+		log.Infof("Listing datasources for context: '%s'", config.Config().GetAppConfig().GetContext())
 		if len(dsListing) == 0 {
 			log.Info("No datasources found")
 		} else {
 			for _, link := range dsListing {
-				url := fmt.Sprintf("%s/datasource/edit/%d", apphelpers.GetCtxDefaultGrafanaConfig().URL, link.ID)
+				url := fmt.Sprintf("%s/datasource/edit/%d", config.Config().GetDefaultGrafanaConfig().URL, link.ID)
 				tableObj.AppendRow(table.Row{link.ID, link.UID, link.Name, service.GetSlug(link.Name), link.Type, link.IsDefault, url})
 			}
 			tableObj.Render()

cmd/folders.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/esnet/gdg/internal/apphelpers"
+	"github.com/esnet/gdg/internal/config"
 	"github.com/esnet/gdg/internal/service"
 	"github.com/esnet/gdg/internal/service/filters"
 	"github.com/jedib0t/go-pretty/v6/table"
@@ -33,7 +33,7 @@ var deleteFoldersCmd = &cobra.Command{
 	Long:    `delete Folders from grafana`,
 	Run: func(cmd *cobra.Command, args []string) {
 
-		log.Infof("Deleting all Folders for context: '%s'", apphelpers.GetContext())
+		log.Infof("Deleting all Folders for context: '%s'", config.Config().AppConfig.GetContext())
 		tableObj.AppendHeader(table.Row{"title"})
 
 		folders := grafanaSvc.DeleteAllFolder(getFolderFilter())
@@ -56,7 +56,7 @@ var uploadFoldersCmd = &cobra.Command{
 	Aliases: []string{"export", "u"},
 	Run: func(cmd *cobra.Command, args []string) {
 
-		log.Infof("Listing Folders for context: '%s'", apphelpers.GetContext())
+		log.Infof("Listing Folders for context: '%s'", config.Config().AppConfig.GetContext())
 		tableObj.AppendHeader(table.Row{"file"})
 		folders := grafanaSvc.ExportFolder(getFolderFilter())
 		if len(folders) == 0 {
@@ -78,7 +78,7 @@ var downloadFoldersCmd = &cobra.Command{
 	Aliases: []string{"import", "d"},
 	Run: func(cmd *cobra.Command, args []string) {
 
-		log.Infof("Listing Folders for context: '%s'", apphelpers.GetContext())
+		log.Infof("Listing Folders for context: '%s'", config.Config().AppConfig.GetContext())
 		tableObj.AppendHeader(table.Row{"file"})
 		folders := grafanaSvc.ImportFolder(getFolderFilter())
 		if len(folders) == 0 {
@@ -100,7 +100,7 @@ var listFoldersCmd = &cobra.Command{
 	Aliases: []string{"l"},
 	Run: func(cmd *cobra.Command, args []string) {
 
-		log.Infof("Listing Folders for context: '%s'", apphelpers.GetContext())
+		log.Infof("Listing Folders for context: '%s'", config.Config().AppConfig.GetContext())
 		tableObj.AppendHeader(table.Row{"id", "uid", "title"})
 		folders := grafanaSvc.ListFolder(getFolderFilter())
 

cmd/library.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"encoding/json"
-	"github.com/esnet/gdg/internal/apphelpers"
+	"github.com/esnet/gdg/internal/config"
 	"github.com/esnet/gdg/internal/service/filters"
 	"github.com/jedib0t/go-pretty/v6/table"
 	log "github.com/sirupsen/logrus"
@@ -69,7 +69,7 @@ var downloadLibary = &cobra.Command{
 		log.Info("exporting lib elements")
 		//filter := parseDashboardGlobalFlags(cmd)
 		savedFiles := grafanaSvc.ImportLibraryElements(nil)
-		log.Infof("Importing library for context: '%s'", apphelpers.GetContext())
+		log.Infof("Importing library for context: '%s'", config.Config().AppConfig.GetContext())
 		tableObj.AppendHeader(table.Row{"type", "filename"})
 		for _, file := range savedFiles {
 			tableObj.AppendRow(table.Row{"library", file})
@@ -89,7 +89,7 @@ var listLibraries = &cobra.Command{
 		elements := grafanaSvc.ListLibraryElements(nil)
 		log.Infof("Number of elements is: %d", len(elements))
 
-		log.Infof("Listing library for context: '%s'", apphelpers.GetContext())
+		log.Infof("Listing library for context: '%s'", config.Config().AppConfig.GetContext())
 		for _, link := range elements {
 			tableObj.AppendRow(table.Row{link.ID, link.UID, link.Meta.FolderName, link.Name, link.Type})
 
@@ -113,7 +113,7 @@ var listLibraryConnections = &cobra.Command{
 
 		libElmentUid := args[0]
 		elements := grafanaSvc.ListLibraryElementsConnections(nil, libElmentUid)
-		log.Infof("Listing library for context: '%s'", apphelpers.GetContext())
+		log.Infof("Listing library connections for context: '%s'", config.Config().AppConfig.GetContext())
 		for _, link := range elements {
 			dash := link.Dashboard.(map[string]interface{})
 			tableObj.AppendRow(table.Row{dash["id"].(json.Number), dash["uid"].(string), link.Meta.Slug, dash["title"].(string), link.Meta.FolderTitle})

cmd/organizations.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/esnet/gdg/internal/apphelpers"
+	"github.com/esnet/gdg/internal/config"
 	"github.com/jedib0t/go-pretty/v6/table"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -21,7 +21,7 @@ var listOrgCmd = &cobra.Command{
 	Aliases: []string{"l"},
 	Run: func(cmd *cobra.Command, args []string) {
 
-		log.Infof("Listing organizations for context: '%s'", apphelpers.GetContext())
+		log.Infof("Listing organizations for context: '%s'", config.Config().AppConfig.GetContext())
 		tableObj.AppendHeader(table.Row{"id", "org"})
 		listOrganizations := grafanaSvc.ListOrganizations()
 		if len(listOrganizations) == 0 {