[TechDebt] Changing entrypoint and package names

ChangeLog:
  - Updating Taskfile and goreleaser to reflect new main.go location.
  - renamed cmd package to cli

.goreleaser.yml

@@ -15,6 +15,7 @@ builds:
       - CGO_ENABLED=0
     binary: gdg
     ldflags: -s -w -X github.com/esnet/gdg/internal/version.GitCommit={{ .Commit }} -X github.com/esnet/gdg/internal/version.BuildDate={{ .Date }}  -X github.com/esnet/gdg/internal/version.Version={{ .Tag }}
+    main: ./cmd/gdg
     goos:
       - linux
       - windows
@@ -74,7 +75,7 @@ dockers:
       - "ghcr.io/esnet/gdg:{{ .Major }}.{{ .Minor }}"
 
     skip_push: false
-    dockerfile: "docker/Dockerfile-gorelease"
+    dockerfile: "docker/Dockerfile"
 
 
 brews:

Taskfile.yml

@@ -22,10 +22,6 @@ 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
-  format:
-    desc: "Format code"
-    cmds:
-      - gofmt -w -s .
   security:
     desc: "Run security scan"
     cmds:
@@ -55,33 +51,18 @@ tasks:
   linux:
     desc: "Build linux binary"
     cmds:
-      - env GOOS='linux' GOARCH='amd64' go build -ldflags "{{ .LD_FLAGS }} " -o bin/{{ .BIN_NAME }}_linux
+      - env GOOS='linux' GOARCH='amd64' go build -ldflags "{{ .LD_FLAGS }}" -o bin/{{ .BIN_NAME }}_linux cmd/gdg/main.go  
   build:
     desc: "Buiding {{ .BIN_NAME }} {{ .VERSION }}" 
     cmds:
       - echo "GOPATH=${GOPATH}"
-      - go build -ldflags "{{ .LD_FLAGS }}" -o bin/{{ .BIN_NAME }}
+      - go build -ldflags "{{ .LD_FLAGS }}" -o bin/{{ .BIN_NAME }} cmd/gdg/main.go 
   install: 
     desc: "installing {{ .BIN_NAME }} {{ .VERSION }}" 
     cmds: 
       - echo "GOPATH=${GOPATH}"
-      - go install -ldflags "{{ .LD_FLAGS}}"
-      - mv ${GOPATH}/bin/gdg ${GOPATH}/bin/{{ .BIN_NAME }}
+      - go install -ldflags "{{ .LD_FLAGS}}" cmd/gdg/main.go
     silent: false
-  get-deps:
-    desc:  "Tidy Deps"
-    cmds:
-      - go mod tidy
-  pakcage:
-    desc: "building image {{ .BIN_NAME }} {{ .VERSION }} {{ .GIT_COMMIT }}"
-    cmds:
-      - docker build --build-arg VERSION={{ .VERSION }} --build-arg GIT_COMMIT={{ .GIT_COMMIT }} -t $(IMAGE_NAME):local .
-  tag: 
-    desc: "Tagging: latest {{ .VERSION }} {{ .GIT_COMMIT }}"
-    cmds:
-      - docker tag $(IMAGE_NAME):local $(IMAGE_NAME):{{ .GIT_COMMIT }}
-      - docker tag $(IMAGE_NAME):local $(IMAGE_NAME):{{ .VERSION }}
-      - docker tag $(IMAGE_NAME):local $(IMAGE_NAME):latest
   push: 
     desc: "Pushing docker image to registry: latest {{ .VERSION }} {{ .GIT_COMMIT }}"
     deps: [tag]

cmd/backup/alertnotifications.go → cli/backup/alertnotifications.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	"github.com/esnet/gdg/internal/service"
 	"github.com/jedib0t/go-pretty/v6/table"

cmd/backup/backup.go → cli/backup/backup.go

@@ -3,7 +3,7 @@ package backup
 import (
 	"context"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/spf13/cobra"
 )
 

cmd/backup/connection_permissions.go → cli/backup/connection_permissions.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	"github.com/esnet/gdg/internal/service"
 	"github.com/esnet/gdg/internal/tools"

cmd/backup/connections.go → cli/backup/connections.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	"github.com/esnet/gdg/internal/service"
 	"github.com/jedib0t/go-pretty/v6/table"

cmd/backup/dashboard.go → cli/backup/dashboard.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	"github.com/esnet/gdg/internal/service"
 	"github.com/esnet/gdg/internal/tools"

cmd/backup/folder_permissions.go → cli/backup/folder_permissions.go

@@ -3,7 +3,7 @@ package backup
 import (
 	"context"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"

cmd/backup/folders.go → cli/backup/folders.go

@@ -3,7 +3,7 @@ package backup
 import (
 	"context"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	"github.com/esnet/gdg/internal/service"
 	"github.com/esnet/gdg/internal/service/filters"

cmd/backup/library.go → cli/backup/library.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	"github.com/esnet/gdg/internal/service/filters"
 	"github.com/jedib0t/go-pretty/v6/table"
@@ -45,7 +45,7 @@ func newLibraryElementsClearCmd() simplecobra.Commander {
 			cmd.Aliases = []string{"c"}
 		},
 		RunFunc: func(ctx context.Context, cd *simplecobra.Commandeer, rootCmd *support.RootCommand, args []string) error {
-			//filter := getLibraryGlobalFlags(cmd)
+			//filter := getLibraryGlobalFlags(cli)
 			deletedLibrarys := rootCmd.GrafanaSvc().DeleteAllLibraryElements(nil)
 			rootCmd.TableObj.AppendHeader(table.Row{"type", "filename"})
 			for _, file := range deletedLibrarys {

cmd/backup/organizations.go → cli/backup/organizations.go

@@ -3,7 +3,7 @@ package backup
 import (
 	"context"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"

cmd/backup/team.go → cli/backup/team.go

@@ -3,7 +3,7 @@ package backup
 import (
 	"context"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	api "github.com/esnet/gdg/internal/service"
 	"github.com/esnet/grafana-swagger-api-golang/goclient/models"

cmd/backup/users.go → cli/backup/users.go

@@ -3,7 +3,7 @@ package backup
 import (
 	"context"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	"github.com/esnet/gdg/internal/service"
 	"github.com/jedib0t/go-pretty/v6/table"

cmd/commandeer.go → cli/commandeer.go

@@ -1,16 +1,22 @@
-package cmd
+package cli
 
 import (
 	"context"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/backup"
-	"github.com/esnet/gdg/cmd/support"
-	"github.com/esnet/gdg/cmd/tools"
+	"github.com/esnet/gdg/cli/backup"
+	"github.com/esnet/gdg/cli/support"
+	"github.com/esnet/gdg/cli/tools"
+	assets "github.com/esnet/gdg/config"
+	"log/slog"
 )
 
 // Execute executes a command.
 func Execute(defaultCfg string, args []string, options ...support.RootOption) error {
-	support.DefaultConfig = defaultCfg
+	data, err := assets.Assets.ReadFile(defaultCfg)
+	if err != nil {
+		slog.Info("unable to find load default configuration", "err", err)
+	}
+	support.DefaultConfig = string(data)
 	rootCmd := support.NewRootCmd(getNewRootCmd(), options...)
 	x, err := simplecobra.New(rootCmd)
 	if err != nil {

cmd/context.go → cli/context.go

@@ -1,11 +1,11 @@
-package cmd
+package cli
 
 import (
 	"context"
 	"errors"
 	"fmt"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"log/slog"

cmd/test/conections_test.go → cli/test/conections_test.go

@@ -1,15 +1,14 @@
 package test
 
 import (
-	"github.com/esnet/gdg/cmd"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/service"
 	"github.com/esnet/gdg/internal/service/mocks"
 	"github.com/esnet/grafana-swagger-api-golang/goclient/models"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"io"
-	"os"
 	"strings"
 	"testing"
 )
@@ -38,10 +37,8 @@ func TestConnectionCommand(t *testing.T) {
 		}
 	}
 	r, w, cleanup := InterceptStdout()
-	data, err := os.ReadFile("../../config/testing.yml")
-	assert.Nil(t, err)
 
-	err = cmd.Execute(string(data), []string{"backup", "connections", "list"}, optionMockSvc())
+	err := cli.Execute("testing.yml", []string{"backup", "connections", "list"}, optionMockSvc())
 	assert.Nil(t, err)
 	defer cleanup()
 	w.Close()

cmd/test/devel_test.go → cli/test/devel_test.go

@@ -1,8 +1,8 @@
 package test
 
 import (
-	"github.com/esnet/gdg/cmd"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/service/mocks"
 	"github.com/stretchr/testify/assert"
 	"strings"
@@ -17,7 +17,7 @@ func TestDevelSrvInfo(t *testing.T) {
 		expected["Version"] = "version"
 
 		mock.On("GetServerInfo").Return(expected)
-		err := cmd.Execute(string(data), []string{"tools", "devel", "srvinfo"}, optionMockSvc())
+		err := cli.Execute(string(data), []string{"tools", "devel", "srvinfo"}, optionMockSvc())
 		return err
 	}
 	outStr, closeReader := setupAndExecuteMockingServices(t, execMe)
@@ -31,7 +31,7 @@ func TestDevelSrvInfo(t *testing.T) {
 func TestDevelSrvCompletion(t *testing.T) {
 	fn := func(args []string) func(mock *mocks.GrafanaService, data []byte, optionMockSvc func() support.RootOption) error {
 		return func(mock *mocks.GrafanaService, data []byte, optionMockSvc func() support.RootOption) error {
-			err := cmd.Execute(string(data), args, optionMockSvc())
+			err := cli.Execute(string(data), args, optionMockSvc())
 			return err
 		}
 	}

cmd/test/support.go → cli/test/support.go

@@ -1,7 +1,7 @@
 package test
 
 import (
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	applog "github.com/esnet/gdg/internal/log"
 	"github.com/esnet/gdg/internal/service"

cmd/test/version_test.go → cli/test/version_test.go

@@ -2,8 +2,8 @@ package test
 
 import (
 	"fmt"
-	"github.com/esnet/gdg/cmd"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/service"
 	"github.com/esnet/gdg/internal/service/mocks"
 	"github.com/esnet/gdg/internal/version"
@@ -15,7 +15,7 @@ import (
 
 func TestVersionCommand(t *testing.T) {
 	var execMe = func(mock *mocks.GrafanaService, data []byte, optionMockSvc func() support.RootOption) error {
-		err := cmd.Execute(string(data), []string{"version"}, optionMockSvc())
+		err := cli.Execute(string(data), []string{"version"}, optionMockSvc())
 		return err
 	}
 	outStr, closeReader := setupAndExecuteMockingServices(t, execMe)
@@ -46,7 +46,7 @@ func TestVersionErrCommand(t *testing.T) {
 	data, err := os.ReadFile("../../config/testing.yml")
 	assert.Nil(t, err)
 
-	err = cmd.Execute(string(data), []string{"dumb", "dumb"}, optionMockSvc())
+	err = cli.Execute(string(data), []string{"dumb", "dumb"}, optionMockSvc())
 	assert.NotNil(t, err)
 	assert.Equal(t, err.Error(), `command error: unknown command "dumb" for "gdg"`)
 }

cmd/tools/auth.go → cli/tools/auth.go

@@ -3,7 +3,7 @@ package tools
 import (
 	"context"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 )
 
 func newAuthCmd() simplecobra.Commander {

cmd/tools/auth_service_accounts.go → cli/tools/auth_service_accounts.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"log"

cmd/tools/auth_tokens.go → cli/tools/auth_tokens.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"

cmd/tools/devel.go → cli/tools/devel.go

@@ -3,7 +3,7 @@ package tools
 import (
 	"context"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/spf13/cobra"
 	"log/slog"
 	"os"

cmd/tools/organizations.go → cli/tools/organizations.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"

cmd/tools/tools.go → cli/tools/tools.go

@@ -3,7 +3,7 @@ package tools
 import (
 	"context"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/spf13/cobra"
 )
 

cmd/tools/users.go → cli/tools/users.go

@@ -3,7 +3,7 @@ package tools
 import (
 	"context"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/config"
 	"github.com/spf13/cobra"
 	"log/slog"

cmd/version.go → cli/version.go

@@ -1,10 +1,10 @@
-package cmd
+package cli
 
 import (
 	"context"
 	"fmt"
 	"github.com/bep/simplecobra"
-	"github.com/esnet/gdg/cmd/support"
+	"github.com/esnet/gdg/cli/support"
 	"github.com/esnet/gdg/internal/version"
 	"github.com/spf13/cobra"
 	"os"

config/assets.go

@@ -0,0 +1,6 @@
+package config
+
+import "embed"
+
+//go:embed *
+var Assets embed.FS