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
 

config/root-phase0/apiexport-shards.core.kcp.io.yaml

@@ -1,13 +1,9 @@
-apiVersion: apis.kcp.io/v1alpha2
+apiVersion: apis.kcp.io/v1alpha1
 kind: APIExport
 metadata:
   creationTimestamp: null
   name: shards.core.kcp.io
 spec:
-  resources:
-  - group: core.kcp.io
-    name: shards
-    schema: v240903-d6797056a.shards.core.kcp.io
-    storage:
-      crd: {}
+  latestResourceSchemas:
+  - v240903-d6797056a.shards.core.kcp.io
 status: {}

config/root-phase0/apiexport-tenancy.kcp.io.yaml

@@ -1,20 +1,12 @@
-apiVersion: apis.kcp.io/v1alpha2
+apiVersion: apis.kcp.io/v1alpha1
 kind: APIExport
 metadata:
   creationTimestamp: null
   name: tenancy.kcp.io
 spec:
+  latestResourceSchemas:
+  - v250325-c1864de17.workspacetypes.tenancy.kcp.io
+  - v250421-25d98218b.workspaces.tenancy.kcp.io
   maximalPermissionPolicy:
     local: {}
-  resources:
-  - group: tenancy.kcp.io
-    name: workspaces
-    schema: v250421-25d98218b.workspaces.tenancy.kcp.io
-    storage:
-      crd: {}
-  - group: tenancy.kcp.io
-    name: workspacetypes
-    schema: v250325-c1864de17.workspacetypes.tenancy.kcp.io
-    storage:
-      crd: {}
 status: {}

config/root-phase0/apiexport-topology.kcp.io.yaml

@@ -1,18 +1,10 @@
-apiVersion: apis.kcp.io/v1alpha2
+apiVersion: apis.kcp.io/v1alpha1
 kind: APIExport
 metadata:
   creationTimestamp: null
   name: topology.kcp.io
 spec:
-  resources:
-  - group: topology.kcp.io
-    name: partitions
-    schema: v240903-d6797056a.partitions.topology.kcp.io
-    storage:
-      crd: {}
-  - group: topology.kcp.io
-    name: partitionsets
-    schema: v240903-d6797056a.partitionsets.topology.kcp.io
-    storage:
-      crd: {}
+  latestResourceSchemas:
+  - v240903-d6797056a.partitions.topology.kcp.io
+  - v240903-d6797056a.partitionsets.topology.kcp.io
 status: {}

pkg/openapi/zz_generated.openapi.go

@@ -170,7 +170,7 @@ type CustomResourceConversion struct {
 // ConversionStrategyType describes different conversion types.
 type ConversionStrategyType string
 
-// WebhookConversion describes how to call a conversion webhook
+// WebhookConversion describes how to call a conversion webhook.
 type WebhookConversion struct {
 	// clientConfig is the instructions for how to call the webhook if strategy is `Webhook`.
 	// +optional

sdk/apis/apis/v1alpha1/types_apiresourceschema.go

@@ -25,7 +25,7 @@ import (
 	"github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
 )
 
-// Install registers the API group and adds types to a scheme
+// Install registers the API group and adds types to a scheme.
 func Install(scheme *runtime.Scheme) {
 	utilruntime.Must(v1alpha1.AddToScheme(scheme))
 }

sdk/apis/core/install/install.go

@@ -37,6 +37,6 @@ const (
 var (
 	// RootCluster is the root of workspace based logical clusters.
 	RootCluster = logicalcluster.Name("root")
-	// SystemCluster is the system logical cluster
+	// SystemCluster is the system logical cluster.
 	SystemCluster = logicalcluster.Name("system")
 )

sdk/apis/core/types.go

@@ -67,7 +67,7 @@ const (
 	LogicalClusterPhaseInitializing LogicalClusterPhaseType = "Initializing"
 	LogicalClusterPhaseReady        LogicalClusterPhaseType = "Ready"
 	// LogicalClusterPhaseUnavailable phase is used to indicate that the logical cluster is unavailable to be used.
-	// It will will not be served via front-proxy when in this state.
+	// It will not be served via front-proxy when in this state.
 	// Possible state transitions are from Ready to Unavailable and from Unavailable to Ready.
 	// This should be used when we really can't serve the logical cluster content and not some
 	// temporary flakes, like readiness probe failing.

sdk/apis/core/v1alpha1/logicalcluster_types.go

@@ -36,7 +36,7 @@ import (
 	sdktesting "github.com/kcp-dev/kcp/sdk/testing"
 )
 
-// in non-race-detection mode, a higher number of iterations is reasonable
+// in non-race-detection mode, a higher number of iterations is reasonable.
 const defaultFuzzIters = 200
 
 var FuzzIters = flag.Int("fuzz-iters", defaultFuzzIters, "How many fuzzing iterations to do.")
@@ -56,7 +56,6 @@ func TestRoundTripTypes(t *testing.T) {
 	seed := rand.Int63()
 	fuzzer := fuzzer.FuzzerFor(sdktesting.FuzzerFuncs, rand.NewSource(seed), codecs)
 	roundtrip.RoundTripExternalTypesWithoutProtobuf(t, scheme, codecs, fuzzer, nil)
-
 }
 
 type ConvertionTests struct {

sdk/apis/roundtrip_test.go

@@ -75,7 +75,7 @@ const (
 	// ControlPlaneReadyCondition reports the ready condition from the control plane object defined for this cluster.
 	// This condition is mirrored from the Ready condition in the control plane ref object, and
 	// the absence of this condition might signal problems in the reconcile external loops or the fact that
-	// the control plane provider does not not implements the Ready condition yet.
+	// the control plane provider does not implements the Ready condition yet.
 	ControlPlaneReadyCondition ConditionType = "ControlPlaneReady"
 
 	// WaitingForControlPlaneFallbackReason (Severity=Info) documents a cluster waiting for the control plane

sdk/apis/third_party/conditions/apis/conditions/v1alpha1/constants.go

@@ -20,5 +20,5 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
-// SchemeGroupVersion is group version used to register these objects
+// SchemeGroupVersion is group version used to register these objects.
 var SchemeGroupVersion = schema.GroupVersion{Group: "conditions.kcp.io", Version: "v1alpha1"}

sdk/apis/third_party/conditions/apis/conditions/v1alpha1/register.go

@@ -235,7 +235,7 @@ func mirror(from Getter, targetCondition conditionsapi.ConditionType, options ..
 	return condition
 }
 
-// Aggregates all the the Ready condition from a list of dependent objects into the target object;
+// Aggregates all the Ready condition from a list of dependent objects into the target object;
 // if the Ready condition does not exists in one of the source object, the object is excluded from
 // the aggregation; if none of the source object have ready condition, no target conditions is generated.
 func aggregate(from []Getter, targetCondition conditionsapi.ConditionType, options ...MergeOption) *conditionsapi.Condition {

sdk/apis/third_party/conditions/util/conditions/getter.go

@@ -132,25 +132,25 @@ func (g conditionGroups) Swap(i, j int) {
 	g[i], g[j] = g[j], g[i]
 }
 
-// TopGroup returns the the condition group with the highest mergePriority.
+// TopGroup returns the condition group with the highest mergePriority.
 func (g conditionGroups) TopGroup() *conditionGroup {
 	if len(g) == 0 {
 		return nil
 	}
 	return &g[0]
 }
 
-// TrueGroup returns the the condition group with status True, if any.
+// TrueGroup returns the condition group with status True, if any.
 func (g conditionGroups) TrueGroup() *conditionGroup {
 	return g.getByStatusAndSeverity(corev1.ConditionTrue, conditionsapi.ConditionSeverityNone)
 }
 
-// ErrorGroup returns the the condition group with status False and severity Error, if any.
+// ErrorGroup returns the condition group with status False and severity Error, if any.
 func (g conditionGroups) ErrorGroup() *conditionGroup {
 	return g.getByStatusAndSeverity(corev1.ConditionFalse, conditionsapi.ConditionSeverityError)
 }
 
-// WarningGroup returns the the condition group with status False and severity Warning, if any.
+// WarningGroup returns the condition group with status False and severity Warning, if any.
 func (g conditionGroups) WarningGroup() *conditionGroup {
 	return g.getByStatusAndSeverity(corev1.ConditionFalse, conditionsapi.ConditionSeverityWarning)
 }

sdk/apis/third_party/conditions/util/conditions/merge.go

@@ -127,13 +127,13 @@ func SetSummary(to Setter, options ...MergeOption) {
 	Set(to, summary(to, options...))
 }
 
-// SetMirror creates a new condition by mirroring the the Ready condition from a dependent object;
+// SetMirror creates a new condition by mirroring the Ready condition from a dependent object;
 // if the Ready condition does not exists in the source object, no target conditions is generated.
 func SetMirror(to Setter, targetCondition conditionsapi.ConditionType, from Getter, options ...MirrorOptions) {
 	Set(to, mirror(from, targetCondition, options...))
 }
 
-// SetAggregate creates a new condition with the aggregation of all the the Ready condition
+// SetAggregate creates a new condition with the aggregation of all the Ready condition
 // from a list of dependent objects; if the Ready condition does not exists in one of the source object,
 // the object is excluded from the aggregation; if none of the source object have ready condition,
 // no target conditions is generated.

sdk/apis/third_party/conditions/util/conditions/setter.go

@@ -22,7 +22,7 @@ import (
 	apisfuzzer "github.com/kcp-dev/kcp/sdk/apis/apis/fuzzer"
 )
 
-// FuzzerFuncs is a list of fuzzer functions
+// FuzzerFuncs is a list of fuzzer functions.
 var FuzzerFuncs = fuzzer.MergeFuzzerFuncs(
 	apisfuzzer.Funcs,
 )

sdk/testing/fuzzer.go

@@ -102,7 +102,7 @@ func NewFixture(t TestingT, cfgs ...Config) Fixture {
 	t.Log("Starting kcp servers...")
 	ctx, cancel := context.WithCancel(context.Background())
 	t.Cleanup(cancel)
-	g, ctx := errgroup.WithContext(ctx)
+	g, _ := errgroup.WithContext(ctx)
 	for i, srv := range servers {
 		err := srv.Run(t)
 		require.NoError(t, err)