lint the cli code

Signed-off-by: Karol Szwaj <[email protected]>

On-behalf-of: @SAP [email protected]

Author: cnvergence

cli/cmd/kubectl-create-workspace/cmd/kubectlCreateWorkspace.go

@@ -41,5 +41,4 @@ func KubectlCreateWorkspaceCommand() *cobra.Command {
 	klog.InitFlags(fs)
 	createWorkspaceCommand.PersistentFlags().AddGoFlagSet(fs)
 	return createWorkspaceCommand
-
 }

cli/cmd/kubectl-ws/cmd/kubectlWs.go

@@ -41,5 +41,4 @@ func KubectlWsCommand() *cobra.Command {
 	klog.InitFlags(fs)
 	wsCommand.PersistentFlags().AddGoFlagSet(fs)
 	return wsCommand
-
 }

cli/pkg/workspace/plugin/context_test.go

@@ -196,8 +196,6 @@ func TestCreateContext(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			var got *clientcmdapi.Config
 

cli/pkg/workspace/plugin/create_test.go

@@ -184,13 +184,13 @@ func TestCreate(t *testing.T) {
 
 			var got *clientcmdapi.Config
 
-			cluster := tt.config.Clusters[tt.config.Contexts[tt.config.CurrentContext].Cluster] //nolint:govet // TODO(sttts): fixing this above breaks the test
+			cluster := tt.config.Clusters[tt.config.Contexts[tt.config.CurrentContext].Cluster]
 			u := parseURLOrDie(cluster.Server)
 			currentClusterName := logicalcluster.NewPath(strings.TrimPrefix(u.Path, "/clusters/"))
 			u.Path = ""
 
 			objects := []runtime.Object{}
-			for _, name := range tt.existingWorkspaces { //nolint:govet // TODO(sttts): fixing this above breaks the test
+			for _, name := range tt.existingWorkspaces {
 				objects = append(objects, &tenancyv1alpha1.Workspace{
 					ObjectMeta: metav1.ObjectMeta{
 						Name: name,
@@ -217,7 +217,7 @@ func TestCreate(t *testing.T) {
 				}
 			}
 
-			if tt.markReady { //nolint:govet // TODO(sttts): fixing this above breaks the test
+			if tt.markReady {
 				client.PrependReactor("create", "workspaces", func(action kcptesting.Action) (handled bool, ret runtime.Object, err error) {
 					obj := action.(kcptesting.CreateAction).GetObject().(*tenancyv1alpha1.Workspace)
 					obj.Status.Phase = corev1alpha1.LogicalClusterPhaseReady
@@ -233,30 +233,30 @@ func TestCreate(t *testing.T) {
 			}
 
 			opts := NewCreateWorkspaceOptions(genericclioptions.NewTestIOStreamsDiscard())
-			opts.Name = tt.newWorkspaceName //nolint:govet // TODO(sttts): fixing this above breaks the test
+			opts.Name = tt.newWorkspaceName
 			opts.Type = workspaceType.Path + ":" + string(workspaceType.Name)
-			opts.IgnoreExisting = tt.ignoreExisting     //nolint:govet // TODO(sttts): fixing this above breaks the test
-			opts.EnterAfterCreate = tt.useAfterCreation //nolint:govet // TODO(sttts): fixing this above breaks the test
+			opts.IgnoreExisting = tt.ignoreExisting
+			opts.EnterAfterCreate = tt.useAfterCreation
 			opts.ReadyWaitTimeout = time.Second
 			opts.modifyConfig = func(configAccess clientcmd.ConfigAccess, config *clientcmdapi.Config) error {
 				got = config
 				return nil
 			}
 			opts.kcpClusterClient = client
-			opts.ClientConfig = clientcmd.NewDefaultClientConfig(*tt.config.DeepCopy(), nil) //nolint:govet // TODO(sttts): fixing this above breaks the test
+			opts.ClientConfig = clientcmd.NewDefaultClientConfig(*tt.config.DeepCopy(), nil)
 			err := opts.Run(context.Background())
-			if tt.wantErr { //nolint:govet // TODO(sttts): fixing this above breaks the test
+			if tt.wantErr {
 				require.Error(t, err)
 			} else {
 				require.NoError(t, err)
 			}
 
-			if got != nil && tt.expected == nil { //nolint:govet // TODO(sttts): fixing this above breaks the test
+			if got != nil && tt.expected == nil {
 				t.Errorf("unexpected kubeconfig write")
-			} else if got == nil && tt.expected != nil { //nolint:govet // TODO(sttts): fixing this above breaks the test
+			} else if got == nil && tt.expected != nil {
 				t.Errorf("expected a kubeconfig write, but didn't see one")
-			} else if got != nil && !reflect.DeepEqual(got, tt.expected) { //nolint:govet // TODO(sttts): fixing this above breaks the test
-				t.Errorf("unexpected config, diff (expected, got): %s", cmp.Diff(tt.expected, got)) //nolint:govet // TODO(sttts): fixing this above breaks the test
+			} else if got != nil && !reflect.DeepEqual(got, tt.expected) {
+				t.Errorf("unexpected config, diff (expected, got): %s", cmp.Diff(tt.expected, got))
 			}
 		})
 	}

cli/pkg/workspace/plugin/use.go

@@ -206,10 +206,7 @@ func (o *UseWorkspaceOptions) Run(ctx context.Context) (err error) {
 	if err != nil && !apierrors.IsForbidden(err) {
 		return err
 	}
-	denied := false
-	if apierrors.IsForbidden(err) || len(groups.Groups) == 0 {
-		denied = true
-	}
+	denied := apierrors.IsForbidden(err) || len(groups.Groups) == 0
 
 	// first try to get Workspace from parent to potentially get a 404. A 403 in the parent though is
 	// not a blocker to enter the workspace. We do discovery as a final check.
@@ -260,9 +257,7 @@ func resolveDots(pth string) (logicalcluster.Path, error) {
 	return ret, nil
 }
 
-// swapContexts moves to previous context from the config.
-// It will update existing configuration by swapping current & previous configurations.
-// This method already commits. Do not use with commitConfig
+// This method already commits. Do not use with commitConfig.
 func (o *UseWorkspaceOptions) swapContexts(ctx context.Context, currentContext *clientcmdapi.Context) (string, error) {
 	currentContext = currentContext.DeepCopy()
 
@@ -370,21 +365,6 @@ func (o *UseWorkspaceOptions) homePath(ctx context.Context) (logicalcluster.Path
 	return logicalcluster.NewPath(strings.TrimPrefix(uh.Path, "/clusters/")), nil
 }
 
-func (o *UseWorkspaceOptions) legacyRootURL() (*url.URL, error) {
-	cluster := logicalcluster.NewPath(o.Name)
-	if !cluster.IsValid() {
-		return nil, fmt.Errorf("invalid workspace name format: %s", o.Name)
-	}
-
-	u, _, err := o.parseCurrentLogicalCluster()
-	if err != nil {
-		return nil, err
-	}
-	// root workspace
-	u.Path = path.Join(u.Path, cluster.RequestPath())
-	return u, nil
-}
-
 func (o *UseWorkspaceOptions) currentRootURL() (*url.URL, error) {
 	u, currentClusterName, err := o.parseCurrentLogicalCluster()
 	if err != nil {

cli/pkg/workspace/plugin/use_test.go

@@ -429,7 +429,7 @@ func TestUse(t *testing.T) {
 			param:       "~/..",
 			expected:    NewKubeconfig().WithKcpCurrent("root:users:ab:cd").WithKcpPrevious("root:foo").Build(),
 			destination: homeWorkspace.String(),
-			wantStdout:  []string{fmt.Sprintf("Current workspace is 'root:users:ab:cd'")},
+			wantStdout:  []string{"Current workspace is 'root:users:ab:cd'"},
 		},
 		{
 			name:   "~ unfolded",
@@ -736,8 +736,6 @@ func TestUse(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			var got *clientcmdapi.Config