chore(platform): thin out platform client

cmd/vclusterctl/cmd/platform/access_key.go

@@ -120,7 +120,7 @@ func printToken(token string) error {
 }
 
 func getCertificate(cmd *AccessKeyCmd, platformClient platform.Client) error {
-	certificateData, keyData, err := platformClient.VirtualClusterAccessPointCertificate(cmd.Project, cmd.VirtualCluster, false)
+	certificateData, keyData, err := platform.VirtualClusterAccessPointCertificate(platformClient, cmd.Project, cmd.VirtualCluster, false)
 	if err != nil {
 		return err
 	}

cmd/vclusterctl/cmd/platform/connect/space.go

@@ -111,7 +111,7 @@ func (cmd *SpaceCmd) connectSpace(ctx context.Context, platformClient platform.C
 	}
 
 	// create kube context options
-	contextOptions, err := platformClient.CreateSpaceInstanceOptions(ctx, cmd.Config, cmd.Project, spaceInstance, true)
+	contextOptions, err := platform.CreateSpaceInstanceOptions(ctx, platformClient, cmd.Config, cmd.Project, spaceInstance, true)
 	if err != nil {
 		return err
 	}

cmd/vclusterctl/cmd/platform/create/space.go

@@ -323,7 +323,7 @@ func (cmd *SpaceCmd) createSpace(ctx context.Context, platformClient platform.Cl
 	// should we create a kube context for the space
 	if cmd.CreateContext {
 		// create kube context options
-		contextOptions, err := platformClient.CreateSpaceInstanceOptions(ctx, cmd.Config, cmd.Project, spaceInstance, cmd.SwitchContext)
+		contextOptions, err := platform.CreateSpaceInstanceOptions(ctx, platformClient, cmd.Config, cmd.Project, spaceInstance, cmd.SwitchContext)
 		if err != nil {
 			return err
 		}

pkg/cli/connect_platform.go

@@ -130,7 +130,7 @@ func (cmd *connectPlatform) validateProFlags() error {
 }
 
 func (cmd *connectPlatform) getVClusterKubeConfig(ctx context.Context, platformClient platform.Client, vCluster *platform.VirtualClusterInstanceProject) (*clientcmdapi.Config, error) {
-	contextOptions, err := platformClient.CreateVirtualClusterInstanceOptions(ctx, "", vCluster.Project.Name, vCluster.VirtualCluster, false)
+	contextOptions, err := platform.CreateVirtualClusterInstanceOptions(ctx, platformClient, "", vCluster.Project.Name, vCluster.VirtualCluster, false)
 	if err != nil {
 		return nil, fmt.Errorf("prepare vCluster kube config: %w", err)
 	}

pkg/cli/create_helm.go

@@ -347,7 +347,7 @@ func (cmd *createHelm) activateVCluster(ctx context.Context, vClusterConfig *con
 		return nil
 	}
 
-	err = platformClient.ApplyPlatformSecret(ctx, cmd.kubeClient, "", cmd.Namespace, cmd.Project)
+	err = platform.ApplyPlatformSecret(ctx, platformClient, cmd.kubeClient, "", cmd.Namespace, cmd.Project)
 	if err != nil {
 		return fmt.Errorf("apply platform secret: %w", err)
 	}

pkg/cli/create_platform.go

@@ -149,7 +149,7 @@ func CreatePlatform(ctx context.Context, options *CreateOptions, globalFlags *fl
 
 	if options.CreateContext {
 		// create kube context options
-		contextOptions, err := platformClient.CreateVirtualClusterInstanceOptions(ctx, "", options.Project, virtualClusterInstance, options.SwitchContext)
+		contextOptions, err := platform.CreateVirtualClusterInstanceOptions(ctx, platformClient, "", options.Project, virtualClusterInstance, options.SwitchContext)
 		if err != nil {
 			return err
 		}
@@ -397,8 +397,9 @@ func createWithTemplate(ctx context.Context, platformClient platform.Client, opt
 	}
 
 	// resolve template
-	virtualClusterTemplate, resolvedParameters, err := platformClient.ResolveTemplate(
+	virtualClusterTemplate, resolvedParameters, err := platform.ResolveVirtualClusterTemplate(
 		ctx,
+		platformClient,
 		options.Project,
 		options.Template,
 		options.TemplateVersion,
@@ -480,8 +481,9 @@ func upgradeWithTemplate(ctx context.Context, platformClient platform.Client, op
 	}
 
 	// resolve template
-	virtualClusterTemplate, resolvedParameters, err := platformClient.ResolveTemplate(
+	virtualClusterTemplate, resolvedParameters, err := platform.ResolveVirtualClusterTemplate(
 		ctx,
+		platformClient,
 		options.Project,
 		options.Template,
 		options.TemplateVersion,

pkg/cli/find/find.go

@@ -67,7 +67,7 @@ func CurrentContext() (string, *clientcmdapi.Config, error) {
 }
 
 func GetPlatformVCluster(ctx context.Context, platformClient platform.Client, name, project string, log log.Logger) (*platform.VirtualClusterInstanceProject, error) {
-	platformVClusters, err := platformClient.ListVClusters(ctx, name, project)
+	platformVClusters, err := platform.ListVClusters(ctx, platformClient, name, project)
 	if err != nil {
 		log.Warnf("Error retrieving platform vclusters: %v", err)
 	}

pkg/cli/import_helm.go

@@ -43,7 +43,7 @@ func ImportHelm(ctx context.Context, options *ImportOptions, globalFlags *flags.
 	}
 
 	// apply platform secret
-	err = platformClient.ApplyPlatformSecret(ctx, kubeClient, options.ImportName, vCluster.Namespace, options.Project)
+	err = platform.ApplyPlatformSecret(ctx, platformClient, kubeClient, options.ImportName, vCluster.Namespace, options.Project)
 	if err != nil {
 		return err
 	}

pkg/cli/list_helm.go

@@ -83,7 +83,7 @@ func printVClusters(ctx context.Context, options *ListOptions, output []ListVClu
 				ctx, cancel := context.WithTimeout(ctx, 2*time.Second)
 				defer cancel()
 
-				proVClusters, _ := platformClient.ListVClusters(ctx, "", "")
+				proVClusters, _ := platform.ListVClusters(ctx, platformClient, "", "")
 				if len(proVClusters) > 0 {
 					logger.Infof("You also have %d virtual clusters in your platform manager context.", len(proVClusters))
 					logger.Info("If you want to see them, run: 'vcluster list --manager platform' or 'vcluster use manager platform' to change the default")

pkg/cli/list_platform.go

@@ -27,7 +27,7 @@ func ListPlatform(ctx context.Context, options *ListOptions, globalFlags *flags.
 		return err
 	}
 
-	proVClusters, err := platformClient.ListVClusters(ctx, "", "")
+	proVClusters, err := platform.ListVClusters(ctx, platformClient, "", "")
 	if err != nil {
 		return err
 	}