Merge pull request #3519 from ntnn/run-cli-tests

Enable and fix cli tests

Author: kcp-ci-bot

Makefile

@@ -369,6 +369,7 @@ test: WHAT ?= ./...
 test: ## Run tests
 	$(GO_TEST) -race $(COUNT_ARG) -coverprofile=coverage.txt -covermode=atomic $(TEST_ARGS) $$(go list "$(WHAT)" | grep -v -e 'test/e2e' -e 'test/integration')
 	cd sdk && $(GO_TEST) -race $(COUNT_ARG) -coverprofile=coverage.txt -covermode=atomic $(TEST_ARGS) $(WHAT)
+	cd cli && $(GO_TEST) -race $(COUNT_ARG) -coverprofile=coverage.txt -covermode=atomic $(TEST_ARGS) $(WHAT)
 
 .PHONY: test-integration
 ifdef USE_GOTESTSUM

cli/pkg/crd/plugin/snapshot_test.go

@@ -365,6 +365,8 @@ metadata:
   creationTimestamp: null
   name: testing.endpoints.core
 spec:
+  conversion:
+    strategy: None
   group: ""
   names:
     kind: Endpoints
@@ -584,6 +586,8 @@ metadata:
   creationTimestamp: null
   name: testing.services.core
 spec:
+  conversion:
+    strategy: None
   group: ""
   names:
     kind: Service

cli/pkg/workspace/plugin/create.go

@@ -63,7 +63,8 @@ type CreateWorkspaceOptions struct {
 	kcpClusterClient kcpclientset.ClusterInterface
 
 	// for testing - passed to UseWorkspaceOptions
-	modifyConfig func(configAccess clientcmd.ConfigAccess, newConfig *clientcmdapi.Config) error
+	newKCPClusterClient func(config clientcmd.ClientConfig) (kcpclientset.ClusterInterface, error)
+	modifyConfig        func(configAccess clientcmd.ConfigAccess, newConfig *clientcmdapi.Config) error
 }
 
 // NewCreateWorkspaceOptions returns a new CreateWorkspaceOptions.
@@ -233,10 +234,22 @@ func (o *CreateWorkspaceOptions) Run(ctx context.Context) error {
 	if o.EnterAfterCreate {
 		useOptions := NewUseWorkspaceOptions(o.IOStreams)
 		useOptions.Name = ws.Name
+		useOptions.ClientConfig = o.ClientConfig
+
+		startingConfig, err := o.ClientConfig.RawConfig()
+		if err != nil {
+			return fmt.Errorf("error getting rawconfig for use: %w", err)
+		}
+		useOptions.startingConfig = &startingConfig
+
 		// only for unit test needs
 		if o.modifyConfig != nil {
 			useOptions.modifyConfig = o.modifyConfig
 		}
+		if o.newKCPClusterClient != nil {
+			useOptions.newKCPClusterClient = o.newKCPClusterClient
+		}
+
 		if err := useOptions.Complete(nil); err != nil {
 			return err
 		}

cli/pkg/workspace/plugin/create_test.go

@@ -38,6 +38,7 @@ import (
 
 	corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
 	tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
+	kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster"
 	kcpfakeclient "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/fake"
 )
 
@@ -64,6 +65,7 @@ func TestCreate(t *testing.T) {
 				AuthInfos: map[string]*clientcmdapi.AuthInfo{"test": {Token: "test"}},
 			},
 			newWorkspaceName: "bar",
+			markReady:        true,
 		},
 		{
 			name: "create, use after creation, but not ready",
@@ -193,6 +195,9 @@ func TestCreate(t *testing.T) {
 			for _, name := range tt.existingWorkspaces {
 				objects = append(objects, &tenancyv1alpha1.Workspace{
 					ObjectMeta: metav1.ObjectMeta{
+						Annotations: map[string]string{
+							logicalcluster.AnnotationKey: currentClusterName.String(),
+						},
 						Name: name,
 					},
 					Spec: tenancyv1alpha1.WorkspaceSpec{
@@ -209,6 +214,24 @@ func TestCreate(t *testing.T) {
 			}
 			client := kcpfakeclient.NewSimpleClientset(objects...)
 
+			// Fill up the resources map for the discovery client
+			for _, name := range append(tt.existingWorkspaces, tt.newWorkspaceName) {
+				if client.Resources == nil {
+					client.Resources = map[logicalcluster.Path][]*metav1.APIResourceList{}
+				}
+				client.Resources[logicalcluster.NewPath(currentClusterName.String()).Join(name)] = []*metav1.APIResourceList{
+					{
+						GroupVersion: tenancyv1alpha1.SchemeGroupVersion.String(),
+						APIResources: []metav1.APIResource{
+							{
+								Name:         "workspaces",
+								SingularName: "workspace",
+							},
+						},
+					},
+				}
+			}
+
 			workspaceType := tt.newWorkspaceType
 			if tt.newWorkspaceType == nil {
 				workspaceType = &tenancyv1alpha1.WorkspaceTypeReference{
@@ -243,6 +266,9 @@ func TestCreate(t *testing.T) {
 				return nil
 			}
 			opts.kcpClusterClient = client
+			opts.newKCPClusterClient = func(config clientcmd.ClientConfig) (kcpclientset.ClusterInterface, error) {
+				return client, nil
+			}
 			opts.ClientConfig = clientcmd.NewDefaultClientConfig(*tt.config.DeepCopy(), nil)
 			err := opts.Run(context.Background())
 			if tt.wantErr {

cli/pkg/workspace/plugin/use.go

@@ -63,16 +63,18 @@ type UseWorkspaceOptions struct {
 	startingConfig   *clientcmdapi.Config
 
 	// for testing
-	modifyConfig   func(configAccess clientcmd.ConfigAccess, newConfig *clientcmdapi.Config) error
-	getAPIBindings func(ctx context.Context, kcpClusterClient kcpclientset.ClusterInterface, host string) ([]apisv1alpha2.APIBinding, error)
-	userHomeDir    func() (string, error)
+	newKCPClusterClient func(config clientcmd.ClientConfig) (kcpclientset.ClusterInterface, error)
+	modifyConfig        func(configAccess clientcmd.ConfigAccess, newConfig *clientcmdapi.Config) error
+	getAPIBindings      func(ctx context.Context, kcpClusterClient kcpclientset.ClusterInterface, host string) ([]apisv1alpha2.APIBinding, error)
+	userHomeDir         func() (string, error)
 }
 
 // NewUseWorkspaceOptions returns a new UseWorkspaceOptions.
 func NewUseWorkspaceOptions(streams genericclioptions.IOStreams) *UseWorkspaceOptions {
 	return &UseWorkspaceOptions{
 		Options: base.NewOptions(streams),
 
+		newKCPClusterClient: newKCPClusterClient,
 		modifyConfig: func(configAccess clientcmd.ConfigAccess, newConfig *clientcmdapi.Config) error {
 			return clientcmd.ModifyConfig(configAccess, *newConfig, true)
 		},
@@ -91,13 +93,15 @@ func (o *UseWorkspaceOptions) Complete(args []string) error {
 		o.Name = args[0]
 	}
 
-	var err error
-	o.startingConfig, err = o.ClientConfig.ConfigAccess().GetStartingConfig()
-	if err != nil {
-		return err
+	if o.startingConfig == nil {
+		var err error
+		o.startingConfig, err = o.ClientConfig.ConfigAccess().GetStartingConfig()
+		if err != nil {
+			return err
+		}
 	}
 
-	kcpClusterClient, err := newKCPClusterClient(o.ClientConfig)
+	kcpClusterClient, err := o.newKCPClusterClient(o.ClientConfig)
 	if err != nil {
 		return err
 	}