fix name arg

vmware-tanzu · Dec 16, 2024 · 188bd3a · 188bd3a
1 parent b81353c
commit 188bd3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/starlark/ucp_provider.go b/starlark/ucp_provider.go
@@ -90,7 +90,7 @@ func UcpProviderFn(thread *starlark.Thread, _ *starlark.Builtin, args starlark.T
 		log.Fatalf("Failed to load kubeconfig: %v", err)
 	}
 
-	switchWorkspace := NewUseWorkspaceCommand(config, mgmtKubeConfigPath)
+	switchWorkspace := NewUseWorkspaceCommand(workspace, config, mgmtKubeConfigPath)
 	err = switchWorkspace.Run(context.Background())
 	if err != nil {
 		return nil, err

diff --git a/starlark/use.go b/starlark/use.go
@@ -32,7 +32,7 @@ type UseWorkspaceCommand struct {
 }
 
 // NewUseWorkspaceCommand returns a new UseWorkspaceCommand.
-func NewUseWorkspaceCommand(kubeConfig *clientcmdapi.Config, kubeconfigPath string) *UseWorkspaceCommand {
+func NewUseWorkspaceCommand(workspace string, kubeConfig *clientcmdapi.Config, kubeconfigPath string) *UseWorkspaceCommand {
 	kcpConfig, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
 		&clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeconfigPath},
 		&clientcmd.ConfigOverrides{},
@@ -50,6 +50,7 @@ func NewUseWorkspaceCommand(kubeConfig *clientcmdapi.Config, kubeconfigPath stri
 		kubeconfigPath: kubeconfigPath,
 		adminUcpConfig: kubeConfig,
 		kcpclient:      kcpClient,
+		Name:           workspace,
 
 		modifyConfig: func(newConfig *clientcmdapi.Config, kubeconfigPath string) error {
 			err := clientcmd.WriteToFile(*newConfig, kubeconfigPath)
@@ -75,7 +76,7 @@ func (o *UseWorkspaceCommand) Run(ctx context.Context) (err error) {
 	if name[0] == ':' {
 		name = strings.TrimPrefix(name, ":")
 	} else {
-		name = cluster.Server + ":space-1"
+		name = cluster.Server + ":" + name
 	}
 
 	// remove . and ..