CLI Unification: Reset config file to v1 (#1015)

* remove CLIName from config * remove further references to confluent and ccloud * remove cliName references from goreleaser and login/logout * remove last remaining ccloud and confluent references * ps1 refactor * remove extra confluent folder from autogenerated docs * trigger build * reset config back to v1 * fix inappropriately named package * fix lint * switch version number * trigger build
confluentinc · Sep 30, 2021 · 5b0e49e · 5b0e49e
1 parent 0a5c703
commit 5b0e49e
Show file tree

Hide file tree

Showing 115 changed files with 1,059 additions and 3,498 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -3,7 +3,6 @@ root = true
 [*]
 charset=utf-8
 end_of_line=lf
-insert_final_newline=true
 indent_style=space
 indent_size=4
 

diff --git a/cmd/docs/main.go b/cmd/docs/main.go
@@ -4,7 +4,7 @@ import (
 	"os"
 
 	"github.com/confluentinc/cli/internal/cmd"
-	v3 "github.com/confluentinc/cli/internal/pkg/config/v3"
+	v1 "github.com/confluentinc/cli/internal/pkg/config/v1"
 	"github.com/confluentinc/cli/internal/pkg/docs"
 	"github.com/confluentinc/cli/internal/pkg/version"
 )
@@ -21,13 +21,13 @@ func main() {
 	}
 
 	// Auto-generate documentation for cloud and on-prem commands.
-	configs := []*v3.Config{
+	configs := []*v1.Config{
 		{
-			Contexts:       map[string]*v3.Context{"Cloud": {PlatformName: v3.CCloudHostnames[0]}},
+			Contexts:       map[string]*v1.Context{"Cloud": {PlatformName: v1.CCloudHostnames[0]}},
 			CurrentContext: "Cloud",
 		},
 		{
-			Contexts:       map[string]*v3.Context{"On-Prem": {PlatformName: "https://example.com"}},
+			Contexts:       map[string]*v1.Context{"On-Prem": {PlatformName: "https://example.com"}},
 			CurrentContext: "On-Prem",
 		},
 	}

diff --git a/cmd/lint/main.go b/cmd/lint/main.go
@@ -10,7 +10,7 @@ import (
 	"github.com/client9/gospell"
 
 	"github.com/confluentinc/cli/internal/cmd"
-	v3 "github.com/confluentinc/cli/internal/pkg/config/v3"
+	v1 "github.com/confluentinc/cli/internal/pkg/config/v1"
 	linter "github.com/confluentinc/cli/internal/pkg/lint-cli"
 	"github.com/confluentinc/cli/internal/pkg/version"
 )
@@ -220,16 +220,16 @@ func main() {
 	}
 
 	// Lint all three subsets of commands: no context, cloud, and on-prem
-	configs := []*v3.Config{
+	configs := []*v1.Config{
 		{
 			CurrentContext: "no context",
 		},
 		{
-			Contexts:       map[string]*v3.Context{"cloud": {PlatformName: v3.CCloudHostnames[0]}},
+			Contexts:       map[string]*v1.Context{"cloud": {PlatformName: v1.CCloudHostnames[0]}},
 			CurrentContext: "cloud",
 		},
 		{
-			Contexts:       map[string]*v3.Context{"on-prem": {PlatformName: "https://example.com"}},
+			Contexts:       map[string]*v1.Context{"on-prem": {PlatformName: "https://example.com"}},
 			CurrentContext: "on-prem",
 		},
 	}

diff --git a/internal/cmd/admin/command_payment_test.go b/internal/cmd/admin/command_payment_test.go
@@ -5,9 +5,6 @@ import (
 	"context"
 	"testing"
 
-	v1 "github.com/confluentinc/cli/internal/pkg/config/v1"
-	v2 "github.com/confluentinc/cli/internal/pkg/config/v2"
-
 	billingv1 "github.com/confluentinc/cc-structs/kafka/billing/v1"
 	orgv1 "github.com/confluentinc/cc-structs/kafka/org/v1"
 	"github.com/confluentinc/ccloud-sdk-go-v1"
@@ -16,7 +13,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	pcmd "github.com/confluentinc/cli/internal/pkg/cmd"
-	v3 "github.com/confluentinc/cli/internal/pkg/config/v3"
+	v1 "github.com/confluentinc/cli/internal/pkg/config/v1"
 	"github.com/confluentinc/cli/internal/pkg/mock"
 	climock "github.com/confluentinc/cli/mock"
 )
@@ -140,7 +137,7 @@ func getCommand() (c *command) {
 				Version: nil,
 			},
 			Client: mockClient(),
-			State: &v2.ContextState{
+			State: &v1.ContextState{
 				Auth: &v1.AuthConfig{
 					User: &orgv1.User{},
 					Organization: &orgv1.Organization{
@@ -156,7 +153,7 @@ func getCommand() (c *command) {
 
 func mockAdminCommand() *cobra.Command {
 	client := mockClient()
-	cfg := v3.AuthenticatedCloudConfigMock()
+	cfg := v1.AuthenticatedCloudConfigMock()
 	return New(climock.NewPreRunnerMock(client, nil, nil, cfg), true)
 }
 

diff --git a/internal/cmd/admin/command_promo_test.go b/internal/cmd/admin/command_promo_test.go
@@ -13,7 +13,7 @@ import (
 	ccloudmock "github.com/confluentinc/ccloud-sdk-go-v1/mock"
 
 	pcmd "github.com/confluentinc/cli/internal/pkg/cmd"
-	v3 "github.com/confluentinc/cli/internal/pkg/config/v3"
+	v1 "github.com/confluentinc/cli/internal/pkg/config/v1"
 	climock "github.com/confluentinc/cli/mock"
 )
 
@@ -26,7 +26,7 @@ func TestPromoAdd(t *testing.T) {
 		},
 	}
 
-	cfg := v3.AuthenticatedCloudConfigMock()
+	cfg := v1.AuthenticatedCloudConfigMock()
 	cmd := New(climock.NewPreRunnerMock(client, nil, nil, cfg), true)
 
 	out, err := pcmd.ExecuteCommand(cmd, "promo", "add", "XXXXX")
@@ -44,7 +44,7 @@ func TestPromoListEmpty(t *testing.T) {
 		},
 	}
 
-	cfg := v3.AuthenticatedCloudConfigMock()
+	cfg := v1.AuthenticatedCloudConfigMock()
 	cmd := New(climock.NewPreRunnerMock(client, nil, nil, cfg), true)
 
 	out, err := pcmd.ExecuteCommand(cmd, "promo", "list")

diff --git a/internal/cmd/api-key/apikey_test.go b/internal/cmd/api-key/apikey_test.go
@@ -14,16 +14,15 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	v1 "github.com/confluentinc/cc-structs/kafka/org/v1"
+	orgv1 "github.com/confluentinc/cc-structs/kafka/org/v1"
 	schedv1 "github.com/confluentinc/cc-structs/kafka/scheduler/v1"
 	"github.com/confluentinc/ccloud-sdk-go-v1"
 	ccsdkmock "github.com/confluentinc/ccloud-sdk-go-v1/mock"
 
 	"github.com/confluentinc/cli/internal/cmd/utils"
 	"github.com/confluentinc/cli/internal/pkg/analytics"
 	pcmd "github.com/confluentinc/cli/internal/pkg/cmd"
-	v0 "github.com/confluentinc/cli/internal/pkg/config/v0"
-	v3 "github.com/confluentinc/cli/internal/pkg/config/v3"
+	v1 "github.com/confluentinc/cli/internal/pkg/config/v1"
 	"github.com/confluentinc/cli/internal/pkg/mock"
 	cliMock "github.com/confluentinc/cli/mock"
 )
@@ -78,7 +77,7 @@ var (
 
 type APITestSuite struct {
 	suite.Suite
-	conf             *v3.Config
+	conf             *v1.Config
 	apiMock          *ccsdkmock.APIKey
 	keystore         *mock.KeyStore
 	kafkaCluster     *schedv1.KafkaCluster
@@ -95,14 +94,14 @@ type APITestSuite struct {
 
 //Require
 func (suite *APITestSuite) SetupTest() {
-	suite.conf = v3.AuthenticatedCloudConfigMock()
+	suite.conf = v1.AuthenticatedCloudConfigMock()
 	ctx := suite.conf.Context()
 
 	srCluster := ctx.SchemaRegistryClusters[ctx.State.Auth.Account.Id]
-	srCluster.SrCredentials = &v0.APIKeyPair{Key: apiKeyVal, Secret: apiSecretVal}
+	srCluster.SrCredentials = &v1.APIKeyPair{Key: apiKeyVal, Secret: apiSecretVal}
 	cluster := ctx.KafkaClusterContext.GetActiveKafkaClusterConfig()
 	// Set up audit logs
-	ctx.State.Auth.Organization.AuditLog = &v1.AuditLog{
+	ctx.State.Auth.Organization.AuditLog = &orgv1.AuditLog{
 		ClusterId:        cluster.ID,
 		AccountId:        "env-zy987",
 		ServiceAccountId: auditLogServiceAccountId,
@@ -180,22 +179,22 @@ func (suite *APITestSuite) SetupTest() {
 		},
 	}
 	suite.userMock = &ccsdkmock.User{
-		DescribeFunc: func(arg0 context.Context, arg1 *v1.User) (user *v1.User, e error) {
-			return &v1.User{
+		DescribeFunc: func(arg0 context.Context, arg1 *orgv1.User) (user *orgv1.User, e error) {
+			return &orgv1.User{
 				Email: "csreesangkom@confluent.io",
 			}, nil
 		},
-		GetServiceAccountsFunc: func(arg0 context.Context) (users []*v1.User, e error) {
-			return []*v1.User{
+		GetServiceAccountsFunc: func(arg0 context.Context) (users []*orgv1.User, e error) {
+			return []*orgv1.User{
 				{
 					Id:          serviceAccountId,
 					ResourceId:  userResourceId,
 					ServiceName: serviceAccountName,
 				},
 			}, nil
 		},
-		ListFunc: func(_ context.Context) ([]*v1.User, error) {
-			return []*v1.User{
+		ListFunc: func(_ context.Context) ([]*orgv1.User, error) {
+			return []*orgv1.User{
 				{
 					Id:          serviceAccountId,
 					ResourceId:  userResourceId,

diff --git a/internal/cmd/api-key/command.go b/internal/cmd/api-key/command.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/confluentinc/cli/internal/pkg/analytics"
 	pcmd "github.com/confluentinc/cli/internal/pkg/cmd"
-	configv1 "github.com/confluentinc/cli/internal/pkg/config/v1"
+	v1 "github.com/confluentinc/cli/internal/pkg/config/v1"
 	"github.com/confluentinc/cli/internal/pkg/errors"
 	"github.com/confluentinc/cli/internal/pkg/examples"
 	"github.com/confluentinc/cli/internal/pkg/keystore"
@@ -457,7 +457,7 @@ func (c *command) delete(cmd *cobra.Command, args []string) error {
 func (c *command) store(cmd *cobra.Command, args []string) error {
 	c.setKeyStoreIfNil()
 
-	var cluster *configv1.KafkaClusterConfig
+	var cluster *v1.KafkaClusterConfig
 
 	// Attempt to get cluster from --resource flag if set; if that doesn't work,
 	// attempt to fall back to the currently active Kafka cluster

diff --git a/internal/cmd/audit-log/command_describe_test.go b/internal/cmd/audit-log/command_describe_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	pcmd "github.com/confluentinc/cli/internal/pkg/cmd"
-	v3 "github.com/confluentinc/cli/internal/pkg/config/v3"
+	v1 "github.com/confluentinc/cli/internal/pkg/config/v1"
 	climock "github.com/confluentinc/cli/mock"
 )
 
@@ -32,7 +32,7 @@ func TestAuditLogDescribeUnconfigured(t *testing.T) {
 
 func mockAuditLogCommand(configured bool) *cobra.Command {
 	client := &ccloud.Client{}
-	cfg := v3.AuthenticatedCloudConfigMock()
+	cfg := v1.AuthenticatedCloudConfigMock()
 	if configured {
 		cfg.Context().State.Auth.Organization.AuditLog = &orgv1.AuditLog{
 			ClusterId:        "lkc-ab123",

diff --git a/internal/cmd/audit-log/command_test.go b/internal/cmd/audit-log/command_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	v3 "github.com/confluentinc/cli/internal/pkg/config/v3"
+	v1 "github.com/confluentinc/cli/internal/pkg/config/v1"
 	cliMock "github.com/confluentinc/cli/mock"
 )
 
@@ -84,7 +84,7 @@ var (
 
 type AuditConfigTestSuite struct {
 	suite.Suite
-	conf    *v3.Config
+	conf    *v1.Config
 	mockApi mds.AuditLogConfigurationApi
 }
 
@@ -104,7 +104,7 @@ type MockCall struct {
 }
 
 func (suite *AuditConfigTestSuite) SetupSuite() {
-	suite.conf = v3.AuthenticatedOnPremConfigMock()
+	suite.conf = v1.AuthenticatedOnPremConfigMock()
 }
 
 func (suite *AuditConfigTestSuite) TearDownSuite() {

diff --git a/internal/cmd/cloud-signup/command_signup.go b/internal/cmd/cloud-signup/command_signup.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	v1 "github.com/confluentinc/cc-structs/kafka/org/v1"
+	orgv1 "github.com/confluentinc/cc-structs/kafka/org/v1"
 	"github.com/confluentinc/ccloud-sdk-go-v1"
 
 	pauth "github.com/confluentinc/cli/internal/pkg/auth"
@@ -122,17 +122,17 @@ func (c *command) Signup(cmd *cobra.Command, prompt form.Prompt, client *ccloud.
 		return err
 	}
 
-	req := &v1.SignupRequest{
-		Organization: &v1.Organization{
+	req := &orgv1.SignupRequest{
+		Organization: &orgv1.Organization{
 			Name: fOrgPswdTosPri.Responses["organization"].(string),
-			Plan: &v1.Plan{AcceptTos: &types.BoolValue{Value: fOrgPswdTosPri.Responses["tos"].(bool)}},
+			Plan: &orgv1.Plan{AcceptTos: &types.BoolValue{Value: fOrgPswdTosPri.Responses["tos"].(bool)}},
 		},
-		User: &v1.User{
+		User: &orgv1.User{
 			Email:     fEmailName.Responses["email"].(string),
 			FirstName: fEmailName.Responses["first"].(string),
 			LastName:  fEmailName.Responses["last"].(string),
 		},
-		Credentials: &v1.Credentials{
+		Credentials: &orgv1.Credentials{
 			Password: fOrgPswdTosPri.Responses["password"].(string),
 		},
 		CountryCode: countryCode,
@@ -155,7 +155,7 @@ func (c *command) Signup(cmd *cobra.Command, prompt form.Prompt, client *ccloud.
 		}
 
 		if !v.Responses["verified"].(bool) {
-			if err := client.Signup.SendVerificationEmail(context.Background(), &v1.User{Email: fEmailName.Responses["email"].(string)}); err != nil {
+			if err := client.Signup.SendVerificationEmail(context.Background(), &orgv1.User{Email: fEmailName.Responses["email"].(string)}); err != nil {
 				return err
 			}
 

diff --git a/internal/cmd/cloud-signup/command_signup_test.go b/internal/cmd/cloud-signup/command_signup_test.go
@@ -13,7 +13,7 @@ import (
 	ccloudmock "github.com/confluentinc/ccloud-sdk-go-v1/mock"
 
 	cmdPkg "github.com/confluentinc/cli/internal/pkg/cmd"
-	v3 "github.com/confluentinc/cli/internal/pkg/config/v3"
+	v1 "github.com/confluentinc/cli/internal/pkg/config/v1"
 	"github.com/confluentinc/cli/internal/pkg/form"
 	"github.com/confluentinc/cli/internal/pkg/mock"
 	cliMock "github.com/confluentinc/cli/mock"
@@ -150,9 +150,9 @@ func testCloudSignup(t *testing.T, prompt form.Prompt, expected ...string) {
 	buf := new(bytes.Buffer)
 	cmd.SetOut(buf)
 
-	cloudSignupCmd := newCmd(v3.AuthenticatedCloudConfigMock())
+	cloudSignupCmd := newCmd(v1.AuthenticatedCloudConfigMock())
 	cloudSignupCmd.Config = &cmdPkg.DynamicConfig{
-		Config: v3.UnauthenticatedCloudConfigMock(),
+		Config: v1.UnauthenticatedCloudConfigMock(),
 	}
 
 	err := cloudSignupCmd.Signup(cmd, prompt, mockCcloudClient())
@@ -163,7 +163,7 @@ func testCloudSignup(t *testing.T, prompt form.Prompt, expected ...string) {
 	}
 }
 
-func newCmd(conf *v3.Config) *command {
+func newCmd(conf *v1.Config) *command {
 	client := mockCcloudClient()
 	prerunner := cliMock.NewPreRunnerMock(client, nil, nil, conf)
 	auth := &ccloudmock.Auth{