Merge pull request #21 from stackitcloud/hs/global-flags-package

Move global flags to common flags package
stackitcloud · Nov 23, 2023 · 7c4949a · 7c4949a
2 parents 5a86952 + 865fca3
commit 7c4949a
Show file tree

Hide file tree

Showing 57 changed files with 273 additions and 384 deletions.
diff --git a/internal/cmd/dns/record-set/create/create.go b/internal/cmd/dns/record-set/create/create.go
@@ -4,25 +4,23 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/stackitcloud/stackit-cli/internal/pkg/config"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/dns/client"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"github.com/stackitcloud/stackit-sdk-go/services/dns"
 	"github.com/stackitcloud/stackit-sdk-go/services/dns/wait"
 )
 
 const (
-	projectIdFlag = "project-id"
-	zoneIdFlag    = "zone-id"
-	commentFlag   = "comment"
-	nameFlag      = "name"
-	recordFlag    = "record"
-	ttlFlag       = "ttl"
-	typeFlag      = "type"
+	zoneIdFlag  = "zone-id"
+	commentFlag = "comment"
+	nameFlag    = "name"
+	recordFlag  = "record"
+	ttlFlag     = "ttl"
+	typeFlag    = "type"
 )
 
 type flagModel struct {
@@ -91,7 +89,7 @@ func configureFlags(cmd *cobra.Command) {
 }
 
 func parseFlags(cmd *cobra.Command) (*flagModel, error) {
-	projectId := viper.GetString(config.ProjectIdKey)
+	projectId := globalflags.GetString(globalflags.ProjectIdFlag)
 	if projectId == "" {
 		return nil, fmt.Errorf("project ID not set")
 	}

diff --git a/internal/cmd/dns/record-set/create/create_test.go b/internal/cmd/dns/record-set/create/create_test.go
@@ -4,8 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/stackitcloud/stackit-cli/internal/pkg/config"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/google/go-cmp/cmp"
@@ -15,6 +14,8 @@ import (
 	"github.com/stackitcloud/stackit-sdk-go/services/dns"
 )
 
+var projectIdFlag = globalflags.ProjectIdFlag.FlagName()
+
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -230,15 +231,12 @@ func TestParseFlags(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
 			cmd := &cobra.Command{}
-
-			// Flag defined in root command
-			err := testutils.ConfigureBindUUIDFlag(cmd, projectIdFlag, config.ProjectIdKey)
+			configureFlags(cmd)
+			err := globalflags.Configure(cmd.Flags())
 			if err != nil {
-				t.Fatalf("configure global flag --%s: %v", projectIdFlag, err)
+				t.Fatalf("configure global flags: %v", err)
 			}
 
-			configureFlags(cmd)
-
 			for flag, value := range tt.flagValues {
 				err := cmd.Flags().Set(flag, value)
 				if err != nil {

diff --git a/internal/cmd/dns/record-set/delete/delete.go b/internal/cmd/dns/record-set/delete/delete.go
@@ -4,19 +4,17 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/stackitcloud/stackit-cli/internal/pkg/config"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/dns/client"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"github.com/stackitcloud/stackit-sdk-go/services/dns"
 	"github.com/stackitcloud/stackit-sdk-go/services/dns/wait"
 )
 
 const (
-	projectIdFlag   = "project-id"
 	zoneIdFlag      = "zone-id"
 	recordSetIdFlag = "record-set-id"
 )
@@ -79,7 +77,7 @@ func configureFlags(cmd *cobra.Command) {
 }
 
 func parseFlags(cmd *cobra.Command) (*flagModel, error) {
-	projectId := viper.GetString(config.ProjectIdKey)
+	projectId := globalflags.GetString(globalflags.ProjectIdFlag)
 	if projectId == "" {
 		return nil, fmt.Errorf("project ID not set")
 	}

diff --git a/internal/cmd/dns/record-set/delete/delete_test.go b/internal/cmd/dns/record-set/delete/delete_test.go
@@ -4,8 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/stackitcloud/stackit-cli/internal/pkg/config"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -14,6 +13,8 @@ import (
 	"github.com/stackitcloud/stackit-sdk-go/services/dns"
 )
 
+var projectIdFlag = globalflags.ProjectIdFlag.FlagName()
+
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -140,15 +141,12 @@ func TestParseFlags(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
 			cmd := &cobra.Command{}
-
-			// Flag defined in root command
-			err := testutils.ConfigureBindUUIDFlag(cmd, projectIdFlag, config.ProjectIdKey)
+			configureFlags(cmd)
+			err := globalflags.Configure(cmd.Flags())
 			if err != nil {
-				t.Fatalf("configure global flag --%s: %v", projectIdFlag, err)
+				t.Fatalf("configure global flags: %v", err)
 			}
 
-			configureFlags(cmd)
-
 			for flag, value := range tt.flagValues {
 				err := cmd.Flags().Set(flag, value)
 				if err != nil {

diff --git a/internal/cmd/dns/record-set/describe/describe.go b/internal/cmd/dns/record-set/describe/describe.go
@@ -5,18 +5,16 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/stackitcloud/stackit-cli/internal/pkg/config"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/dns/client"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"github.com/stackitcloud/stackit-sdk-go/services/dns"
 )
 
 const (
-	projectIdFlag   = "project-id"
 	zoneIdFlag      = "zone-id"
 	recordSetIdFlag = "record-set-id"
 )
@@ -77,7 +75,7 @@ func configureFlags(cmd *cobra.Command) {
 }
 
 func parseFlags(cmd *cobra.Command) (*flagModel, error) {
-	projectId := viper.GetString(config.ProjectIdKey)
+	projectId := globalflags.GetString(globalflags.ProjectIdFlag)
 	if projectId == "" {
 		return nil, fmt.Errorf("project ID not set")
 	}

diff --git a/internal/cmd/dns/record-set/describe/describe_test.go b/internal/cmd/dns/record-set/describe/describe_test.go
@@ -4,8 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/stackitcloud/stackit-cli/internal/pkg/config"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -14,6 +13,8 @@ import (
 	"github.com/stackitcloud/stackit-sdk-go/services/dns"
 )
 
+var projectIdFlag = globalflags.ProjectIdFlag.FlagName()
+
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -140,15 +141,12 @@ func TestParseFlags(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
 			cmd := &cobra.Command{}
-
-			// Flag defined in root command
-			err := testutils.ConfigureBindUUIDFlag(cmd, projectIdFlag, config.ProjectIdKey)
+			configureFlags(cmd)
+			err := globalflags.Configure(cmd.Flags())
 			if err != nil {
-				t.Fatalf("configure global flag --%s: %v", projectIdFlag, err)
+				t.Fatalf("configure global flags: %v", err)
 			}
 
-			configureFlags(cmd)
-
 			for flag, value := range tt.flagValues {
 				err := cmd.Flags().Set(flag, value)
 				if err != nil {

diff --git a/internal/cmd/dns/record-set/list/list.go b/internal/cmd/dns/record-set/list/list.go
@@ -5,19 +5,17 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/stackitcloud/stackit-cli/internal/pkg/config"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/dns/client"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"github.com/stackitcloud/stackit-sdk-go/services/dns"
 )
 
 const (
-	projectIdFlag   = "project-id"
 	zoneIdFlag      = "zone-id"
 	nameLikeFlag    = "name-like"
 	activeFlag      = "is-active"
@@ -102,7 +100,7 @@ func configureFlags(cmd *cobra.Command) {
 }
 
 func parseFlags(cmd *cobra.Command) (*flagModel, error) {
-	projectId := viper.GetString(config.ProjectIdKey)
+	projectId := globalflags.GetString(globalflags.ProjectIdFlag)
 	if projectId == "" {
 		return nil, fmt.Errorf("project ID not set")
 	}

diff --git a/internal/cmd/dns/record-set/list/list_test.go b/internal/cmd/dns/record-set/list/list_test.go
@@ -4,8 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/stackitcloud/stackit-cli/internal/pkg/config"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/google/go-cmp/cmp"
@@ -15,6 +14,8 @@ import (
 	"github.com/stackitcloud/stackit-sdk-go/services/dns"
 )
 
+var projectIdFlag = globalflags.ProjectIdFlag.FlagName()
+
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -191,15 +192,12 @@ func TestParseFlags(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
 			cmd := &cobra.Command{}
-
-			// Flag defined in root command
-			err := testutils.ConfigureBindUUIDFlag(cmd, projectIdFlag, config.ProjectIdKey)
+			configureFlags(cmd)
+			err := globalflags.Configure(cmd.Flags())
 			if err != nil {
-				t.Fatalf("configure global flag --%s: %v", projectIdFlag, err)
+				t.Fatalf("configure global flags: %v", err)
 			}
 
-			configureFlags(cmd)
-
 			for flag, value := range tt.flagValues {
 				err := cmd.Flags().Set(flag, value)
 				if err != nil {

diff --git a/internal/cmd/dns/record-set/update/update.go b/internal/cmd/dns/record-set/update/update.go
@@ -4,19 +4,17 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/stackitcloud/stackit-cli/internal/pkg/config"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/dns/client"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"github.com/stackitcloud/stackit-sdk-go/services/dns"
 	"github.com/stackitcloud/stackit-sdk-go/services/dns/wait"
 )
 
 const (
-	projectIdFlag   = "project-id"
 	zoneIdFlag      = "zone-id"
 	recordSetIdFlag = "record-set-id"
 	commentFlag     = "comment"
@@ -88,7 +86,7 @@ func configureFlags(cmd *cobra.Command) {
 }
 
 func parseFlags(cmd *cobra.Command) (*flagModel, error) {
-	projectId := viper.GetString(config.ProjectIdKey)
+	projectId := globalflags.GetString(globalflags.ProjectIdFlag)
 	if projectId == "" {
 		return nil, fmt.Errorf("project ID not set")
 	}

diff --git a/internal/cmd/dns/record-set/update/update_test.go b/internal/cmd/dns/record-set/update/update_test.go
@@ -4,8 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/stackitcloud/stackit-cli/internal/pkg/config"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/google/go-cmp/cmp"
@@ -15,6 +14,8 @@ import (
 	"github.com/stackitcloud/stackit-sdk-go/services/dns"
 )
 
+var projectIdFlag = globalflags.ProjectIdFlag.FlagName()
+
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -212,15 +213,12 @@ func TestParseFlags(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
 			cmd := &cobra.Command{}
-
-			// Flag defined in root command
-			err := testutils.ConfigureBindUUIDFlag(cmd, projectIdFlag, config.ProjectIdKey)
+			configureFlags(cmd)
+			err := globalflags.Configure(cmd.Flags())
 			if err != nil {
-				t.Fatalf("configure global flag --%s: %v", projectIdFlag, err)
+				t.Fatalf("configure global flags: %v", err)
 			}
 
-			configureFlags(cmd)
-
 			for flag, value := range tt.flagValues {
 				err := cmd.Flags().Set(flag, value)
 				if err != nil {

diff --git a/internal/cmd/dns/zone/create/create.go b/internal/cmd/dns/zone/create/create.go
@@ -4,18 +4,16 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/stackitcloud/stackit-cli/internal/pkg/config"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/dns/client"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"github.com/stackitcloud/stackit-sdk-go/services/dns"
 	"github.com/stackitcloud/stackit-sdk-go/services/dns/wait"
 )
 
 const (
-	projectIdFlag     = "project-id"
 	nameFlag          = "name"
 	dnsNameFlag       = "dns-name"
 	defaultTTLFlag    = "default-ttl"
@@ -109,7 +107,7 @@ func configureFlags(cmd *cobra.Command) {
 }
 
 func parseFlags(cmd *cobra.Command) (*flagModel, error) {
-	projectId := viper.GetString(config.ProjectIdKey)
+	projectId := globalflags.GetString(globalflags.ProjectIdFlag)
 	if projectId == "" {
 		return nil, fmt.Errorf("project ID not set")
 	}