From 3b781e6bb46043e32f4d2bf77eac4f6039ffb9e6 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Sun, 18 Oct 2026 11:04:35 -0600 Subject: [PATCH] refactor(platform): rename kube Loft accessor to Devsy --- cmd/pro/cluster/add.go | 6 +++--- cmd/pro/provider/delete.go | 2 +- cmd/pro/provider/list/clusters.go | 2 +- cmd/pro/provider/list/projects.go | 2 +- cmd/pro/provider/list/templates.go | 4 ++-- cmd/pro/provider/list/workspaces.go | 4 ++-- cmd/pro/provider/watch/workspaces.go | 4 ++-- cmd/pro/user/reset_password.go | 6 +++--- cmd/pro/workspace/sleep.go | 4 ++-- cmd/pro/workspace/wakeup.go | 2 +- cmd/workspace/troubleshoot.go | 3 +-- .../daemonclient/delete.go | 4 ++-- .../clientimplementation/daemonclient/stop.go | 2 +- .../clientimplementation/daemonclient/up.go | 12 ++++++------ pkg/daemon/platform/local_server.go | 16 ++++++++-------- pkg/daemon/platform/workspace_watcher.go | 8 ++++---- pkg/platform/client/client.go | 12 ++++++------ pkg/platform/instance.go | 8 ++++---- pkg/platform/instance_ops.go | 2 +- pkg/platform/instance_ops_test.go | 18 +++++++++--------- pkg/platform/kube/kube.go | 18 +++++++++--------- pkg/platform/kubeconfig.go | 14 +++++++------- 22 files changed, 76 insertions(+), 77 deletions(-) diff --git a/cmd/pro/cluster/add.go b/cmd/pro/cluster/add.go index 548fb8b72a..9df04b4bc0 100644 --- a/cmd/pro/cluster/add.go +++ b/cmd/pro/cluster/add.go @@ -155,7 +155,7 @@ func (cmd *ClusterCmd) setupCluster( return clusterSetup{}, err } - accessKey, err := managementClient.Loft(). + accessKey, err := managementClient.Devsy(). ManagementV1(). Clusters(). GetAccessKey(ctx, clusterName, metav1.GetOptions{}) @@ -175,7 +175,7 @@ func (cmd *ClusterCmd) createClusterResource( managementClient kube.Interface, params createClusterParams, ) error { - _, err := managementClient.Loft().ManagementV1().Clusters().Create(ctx, &managementv1.Cluster{ + _, err := managementClient.Devsy().ManagementV1().Clusters().Create(ctx, &managementv1.Cluster{ ObjectMeta: metav1.ObjectMeta{ Name: params.clusterName, }, @@ -401,7 +401,7 @@ func waitForClusterInitialized( 5*time.Minute, false, func(ctx context.Context) (done bool, err error) { - clusterInstance, err := managementClient.Loft(). + clusterInstance, err := managementClient.Devsy(). ManagementV1(). Clusters(). Get(ctx, clusterName, metav1.GetOptions{}) diff --git a/cmd/pro/provider/delete.go b/cmd/pro/provider/delete.go index 075afbabb4..d60c673687 100644 --- a/cmd/pro/provider/delete.go +++ b/cmd/pro/provider/delete.go @@ -65,7 +65,7 @@ func (cmd *DeleteCmd) Run( return err } - err = managementClient.Loft(). + err = managementClient.Devsy(). ManagementV1(). DevsyWorkspaceInstances(workspace.Namespace). Delete(ctx, workspace.Name, metav1.DeleteOptions{}) diff --git a/cmd/pro/provider/list/clusters.go b/cmd/pro/provider/list/clusters.go index 60dc5cde4b..dd28197e16 100644 --- a/cmd/pro/provider/list/clusters.go +++ b/cmd/pro/provider/list/clusters.go @@ -71,7 +71,7 @@ func Clusters( return nil, err } - clustersList, err := managementClient.Loft(). + clustersList, err := managementClient.Devsy(). ManagementV1(). Projects(). ListClusters(ctx, projectName, metav1.GetOptions{}) diff --git a/cmd/pro/provider/list/projects.go b/cmd/pro/provider/list/projects.go index 92a53ce361..68fcecdf87 100644 --- a/cmd/pro/provider/list/projects.go +++ b/cmd/pro/provider/list/projects.go @@ -61,7 +61,7 @@ func Projects(ctx context.Context, client client.Client) (*managementv1.ProjectL return nil, err } - projectList, err := managementClient.Loft(). + projectList, err := managementClient.Devsy(). ManagementV1(). Projects(). List(ctx, metav1.ListOptions{}) diff --git a/cmd/pro/provider/list/templates.go b/cmd/pro/provider/list/templates.go index 03c94a35cf..866234cbdc 100644 --- a/cmd/pro/provider/list/templates.go +++ b/cmd/pro/provider/list/templates.go @@ -77,7 +77,7 @@ func Templates( return nil, err } - templateList, err := managementClient.Loft(). + templateList, err := managementClient.Devsy(). ManagementV1(). Projects(). ListTemplates(ctx, projectName, metav1.GetOptions{}) @@ -99,7 +99,7 @@ func FindTemplate( managementClient kube.Interface, projectName, templateName string, ) (*managementv1.DevsyWorkspaceTemplate, error) { - templateList, err := managementClient.Loft(). + templateList, err := managementClient.Devsy(). ManagementV1(). Projects(). ListTemplates(ctx, projectName, metav1.GetOptions{}) diff --git a/cmd/pro/provider/list/workspaces.go b/cmd/pro/provider/list/workspaces.go index ff401478d5..4df60466d2 100644 --- a/cmd/pro/provider/list/workspaces.go +++ b/cmd/pro/provider/list/workspaces.go @@ -51,7 +51,7 @@ func (cmd *WorkspacesCmd) Run(ctx context.Context) error { return err } - projectList, err := managementClient.Loft(). + projectList, err := managementClient.Devsy(). ManagementV1(). Projects(). List(ctx, metav1.ListOptions{}) @@ -98,7 +98,7 @@ func projectWorkspaces( params projectWorkspacesParams, ) []*managementv1.DevsyWorkspaceInstance { ns := project.ProjectNamespace(params.projectName) - workspaceList, err := params.managementClient.Loft(). + workspaceList, err := params.managementClient.Devsy(). ManagementV1(). DevsyWorkspaceInstances(ns). List(ctx, metav1.ListOptions{}) diff --git a/cmd/pro/provider/watch/workspaces.go b/cmd/pro/provider/watch/workspaces.go index 9c2f902493..6c0c51bfd2 100644 --- a/cmd/pro/provider/watch/workspaces.go +++ b/cmd/pro/provider/watch/workspaces.go @@ -11,7 +11,7 @@ import ( managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - loftclient "github.com/devsy-org/api/pkg/clientset/versioned" + devsyclient "github.com/devsy-org/api/pkg/clientset/versioned" informers "github.com/devsy-org/api/pkg/informers/externalversions" informermanagementv1 "github.com/devsy-org/api/pkg/informers/externalversions/management/v1" "github.com/devsy-org/devsy/cmd/pro/flags" @@ -89,7 +89,7 @@ func (cmd *WorkspacesCmd) Run( return err } - clientset, err := loftclient.NewForConfig(managementConfig) + clientset, err := devsyclient.NewForConfig(managementConfig) if err != nil { return err } diff --git a/cmd/pro/user/reset_password.go b/cmd/pro/user/reset_password.go index 259601b8e9..f7e5311c25 100644 --- a/cmd/pro/user/reset_password.go +++ b/cmd/pro/user/reset_password.go @@ -117,7 +117,7 @@ func (cmd *PasswordCmd) resolveUser( ctx context.Context, managementClient kube.Interface, ) (*storagev1.User, error) { - user, err := managementClient.Loft(). + user, err := managementClient.Devsy(). StorageV1(). Users(). Get(ctx, cmd.User, metav1.GetOptions{}) @@ -131,7 +131,7 @@ func (cmd *PasswordCmd) resolveUser( ) } - user, err = managementClient.Loft(). + user, err = managementClient.Devsy(). StorageV1(). Users(). Create(ctx, &storagev1.User{ @@ -164,7 +164,7 @@ func (cmd *PasswordCmd) persistPasswordRef( if !changed { return nil } - _, err := managementClient.Loft(). + _, err := managementClient.Devsy(). StorageV1(). Users(). Update(ctx, user, metav1.UpdateOptions{}) diff --git a/cmd/pro/workspace/sleep.go b/cmd/pro/workspace/sleep.go index 6c977e090b..c1abfc9080 100644 --- a/cmd/pro/workspace/sleep.go +++ b/cmd/pro/workspace/sleep.go @@ -152,7 +152,7 @@ func (cmd *SleepCmd) patchSleep( return fmt.Errorf("create patch: %w", err) } - _, err = managementClient.Loft(). + _, err = managementClient.Devsy(). ManagementV1(). DevsyWorkspaceInstances(project.ProjectNamespace(cmd.Project)). Patch(ctx, workspaceInstance.Name, patch.Type(), patchData, metav1.PatchOptions{}) @@ -177,7 +177,7 @@ func waitForWorkspacePhase( platform.Timeout(), false, func(ctx context.Context) (done bool, err error) { - workspaceInstance, err := params.managementClient.Loft(). + workspaceInstance, err := params.managementClient.Devsy(). ManagementV1(). DevsyWorkspaceInstances(project.ProjectNamespace(params.projectName)). Get(ctx, params.name, metav1.GetOptions{}) diff --git a/cmd/pro/workspace/wakeup.go b/cmd/pro/workspace/wakeup.go index b981c81d36..114ff32f4c 100644 --- a/cmd/pro/workspace/wakeup.go +++ b/cmd/pro/workspace/wakeup.go @@ -145,7 +145,7 @@ func (cmd *WakeupCmd) patchWakeup( return err } - _, err = managementClient.Loft(). + _, err = managementClient.Devsy(). ManagementV1(). DevsyWorkspaceInstances(project.ProjectNamespace(cmd.Project)). Patch(ctx, workspaceInstance.Name, patch.Type(), patchData, metav1.PatchOptions{}) diff --git a/cmd/workspace/troubleshoot.go b/cmd/workspace/troubleshoot.go index 54f94a78a4..b8275e33b1 100644 --- a/cmd/workspace/troubleshoot.go +++ b/cmd/workspace/troubleshoot.go @@ -213,8 +213,7 @@ func collectProWorkspaceInfo( return nil, fmt.Errorf("management: %w", err) } - troubleshoot, err := managementClient. - Loft(). + troubleshoot, err := managementClient.Devsy(). ManagementV1(). DevsyWorkspaceInstances(workspace.Namespace). Troubleshoot(ctx, workspace.Name, metav1.GetOptions{}) diff --git a/pkg/client/clientimplementation/daemonclient/delete.go b/pkg/client/clientimplementation/daemonclient/delete.go index 3a0981e5f6..1a4103a021 100644 --- a/pkg/client/clientimplementation/daemonclient/delete.go +++ b/pkg/client/clientimplementation/daemonclient/delete.go @@ -95,7 +95,7 @@ func (c *client) deleteInstance( workspace *managementv1.DevsyWorkspaceInstance, force bool, ) error { - err := managementClient.Loft(). + err := managementClient.Devsy(). ManagementV1(). DevsyWorkspaceInstances(workspace.Namespace). Delete(ctx, workspace.Name, metav1.DeleteOptions{}) @@ -130,7 +130,7 @@ func (c *client) waitForWorkspaceDeleted( waitTimeout, false, func(ctx context.Context) (done bool, err error) { - workspaceInstance, err := managementClient.Loft(). + workspaceInstance, err := managementClient.Devsy(). ManagementV1(). DevsyWorkspaceInstances(workspace.Namespace). Get(ctx, workspace.Name, metav1.GetOptions{}) diff --git a/pkg/client/clientimplementation/daemonclient/stop.go b/pkg/client/clientimplementation/daemonclient/stop.go index 65faee2cb8..bd43542e32 100644 --- a/pkg/client/clientimplementation/daemonclient/stop.go +++ b/pkg/client/clientimplementation/daemonclient/stop.go @@ -34,7 +34,7 @@ func (c *client) Stop(ctx context.Context, opt clientpkg.StopOptions) error { } rawOptions, _ := json.Marshal(opt) - retStop, err := managementClient.Loft(). + retStop, err := managementClient.Devsy(). ManagementV1(). DevsyWorkspaceInstances(workspace.Namespace). Stop(ctx, workspace.Name, &managementv1.DevsyWorkspaceInstanceStop{ diff --git a/pkg/client/clientimplementation/daemonclient/up.go b/pkg/client/clientimplementation/daemonclient/up.go index b0eb188940..ec5c8f396c 100644 --- a/pkg/client/clientimplementation/daemonclient/up.go +++ b/pkg/client/clientimplementation/daemonclient/up.go @@ -177,7 +177,7 @@ func cancelActiveUpTask( } log.Warnf("Found active up task %s, attempting to cancel it", activeUpTask.ID) - _, err := managementClient.Loft(). + _, err := managementClient.Devsy(). ManagementV1(). DevsyWorkspaceInstances(instance.Namespace). Cancel(ctx, instance.Name, &managementv1.DevsyWorkspaceInstanceCancel{ @@ -191,7 +191,7 @@ func cancelActiveUpTask( } func createUpTask(ctx context.Context, params createUpTaskParams) (string, error) { - task, err := params.managementClient.Loft(). + task, err := params.managementClient.Devsy(). ManagementV1(). DevsyWorkspaceInstances(params.instance.Namespace). Up(ctx, params.instance.Name, &managementv1.DevsyWorkspaceInstanceUp{ @@ -226,7 +226,7 @@ func waitTaskDone( // get result tasks := &managementv1.DevsyWorkspaceInstanceTasks{} - err = managementClient.Loft().ManagementV1().RESTClient().Get(). + err = managementClient.Devsy().ManagementV1().RESTClient().Get(). Namespace(instance.Namespace). Resource("devsyworkspaceinstances"). Name(instance.Name). @@ -311,7 +311,7 @@ func observeTask( defer cancel() defer cancelPrintCtx() - _, err := managementClient.Loft(). + _, err := managementClient.Devsy(). ManagementV1(). DevsyWorkspaceInstances(instance.Namespace). Cancel(timeoutCtx, instance.Name, &managementv1.DevsyWorkspaceInstanceCancel{ @@ -387,7 +387,7 @@ func openTaskLogsStream( taskID string, ) (io.ReadCloser, error) { log.Debugf("printing logs of task: %s", taskID) - logsReader, err := managementClient.Loft().ManagementV1().RESTClient().Get(). + logsReader, err := managementClient.Devsy().ManagementV1().RESTClient().Get(). Namespace(workspace.Namespace). Resource("devsyworkspaceinstances"). Name(workspace.Name). @@ -582,7 +582,7 @@ func findActiveUpTask( instance *managementv1.DevsyWorkspaceInstance, ) (*managementv1.DevsyWorkspaceInstanceTask, error) { tasks := &managementv1.DevsyWorkspaceInstanceTasks{} - err := managementClient.Loft().ManagementV1().RESTClient().Get(). + err := managementClient.Devsy().ManagementV1().RESTClient().Get(). Namespace(instance.Namespace). Resource("devsyworkspaceinstances"). Name(instance.Name). diff --git a/pkg/daemon/platform/local_server.go b/pkg/daemon/platform/local_server.go index db6300f6dc..da225700eb 100644 --- a/pkg/daemon/platform/local_server.go +++ b/pkg/daemon/platform/local_server.go @@ -176,7 +176,7 @@ func (l *localServer) watchPlatform(stopChan <-chan struct{}) { if err != nil { log.Error(fmt.Errorf("create mangement client: %w", err)) } else { - _, err = managementClient.Loft(). + _, err = managementClient.Devsy(). ManagementV1(). Selves(). Create(context.Background(), &managementv1.Self{}, metav1.CreateOptions{}) @@ -295,7 +295,7 @@ func (l *localServer) userProfile( } userName := l.pc.Self().Status.User.Name - profile, err := managementClient.Loft(). + profile, err := managementClient.Devsy(). ManagementV1(). Users(). GetProfile(r.Context(), userName, metav1.GetOptions{}) @@ -322,7 +322,7 @@ func (l *localServer) updateUserProfile( return err } userName := l.pc.Self().Status.User.Name - updatedProfile, err := managementClient.Loft(). + updatedProfile, err := managementClient.Devsy(). ManagementV1(). Users(). UpdateProfile(r.Context(), userName, profile, metav1.CreateOptions{}) @@ -339,7 +339,7 @@ func (l *localServer) projects(w http.ResponseWriter, r *http.Request) error { return err } - projectList, err := managementClient.Loft(). + projectList, err := managementClient.Devsy(). ManagementV1(). Projects(). List(r.Context(), metav1.ListOptions{}) @@ -365,7 +365,7 @@ func (l *localServer) projectTemplates( return err } - templateList, err := managementClient.Loft(). + templateList, err := managementClient.Devsy(). ManagementV1(). Projects(). ListTemplates(r.Context(), projectName, metav1.GetOptions{}) @@ -393,7 +393,7 @@ func (l *localServer) projectClusters( return err } - clusterList, err := managementClient.Loft(). + clusterList, err := managementClient.Devsy(). ManagementV1(). Projects(). ListClusters(r.Context(), projectName, metav1.GetOptions{}) @@ -422,7 +422,7 @@ func collectProjectWorkspaces( ownerFilter workspaceOwnerFilter, ) ([]managementv1.DevsyWorkspaceInstance, error) { ns := project.ProjectNamespace(p.GetName()) - workspaceList, err := managementClient.Loft(). + workspaceList, err := managementClient.Devsy(). ManagementV1(). DevsyWorkspaceInstances(ns). List(ctx, metav1.ListOptions{}) @@ -462,7 +462,7 @@ func (l *localServer) listWorkspace( return err } - projectList, err := managementClient.Loft(). + projectList, err := managementClient.Devsy(). ManagementV1(). Projects(). List(r.Context(), metav1.ListOptions{}) diff --git a/pkg/daemon/platform/workspace_watcher.go b/pkg/daemon/platform/workspace_watcher.go index 80104d613e..8319531a9b 100644 --- a/pkg/daemon/platform/workspace_watcher.go +++ b/pkg/daemon/platform/workspace_watcher.go @@ -10,7 +10,7 @@ import ( managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - loftclient "github.com/devsy-org/api/pkg/clientset/versioned" + devsyclient "github.com/devsy-org/api/pkg/clientset/versioned" typedmanagementv1 "github.com/devsy-org/api/pkg/clientset/versioned/typed/management/v1" informers "github.com/devsy-org/api/pkg/informers/externalversions" "github.com/devsy-org/devsy/pkg/log" @@ -432,8 +432,8 @@ func (s *instanceStore) pingAndRecord( s.metricsMu.Unlock() } -func getClientSet(config *rest.Config) (loftclient.Interface, error) { - clientset, err := loftclient.NewForConfig(config) +func getClientSet(config *rest.Config) (devsyclient.Interface, error) { + clientset, err := devsyclient.NewForConfig(config) if err != nil { return nil, err } @@ -449,7 +449,7 @@ func getClientSet(config *rest.Config) (loftclient.Interface, error) { var _ rest.Interface = (*extendedRESTClient)(nil) type extendedClientset struct { - *loftclient.Clientset + *devsyclient.Clientset ManagementClient typedmanagementv1.ManagementV1Interface } diff --git a/pkg/platform/client/client.go b/pkg/platform/client/client.go index e02516b643..64e1d0c797 100644 --- a/pkg/platform/client/client.go +++ b/pkg/platform/client/client.go @@ -126,7 +126,7 @@ func (c *client) RefreshSelf(ctx context.Context) error { return fmt.Errorf("create mangement client: %w", err) } - c.self, err = managementClient.Loft(). + c.self, err = managementClient.Devsy(). ManagementV1(). Selves(). Create(ctx, &managementv1.Self{}, metav1.CreateOptions{}) @@ -159,7 +159,7 @@ func (c *client) Logout(ctx context.Context) error { return fmt.Errorf("create management client: %w", err) } - self, err := managementClient.Loft(). + self, err := managementClient.Devsy(). ManagementV1(). Selves(). Create(ctx, &managementv1.Self{}, metav1.CreateOptions{}) @@ -168,7 +168,7 @@ func (c *client) Logout(ctx context.Context) error { } if self.Status.AccessKey != "" && self.Status.AccessKeyType == storagev1.AccessKeyTypeLogin { - err = managementClient.Loft(). + err = managementClient.Devsy(). ManagementV1(). OwnedAccessKeys(). Delete(ctx, self.Status.AccessKey, metav1.DeleteOptions{}) @@ -387,7 +387,7 @@ func (c *client) deleteOldAccessKey() { return } - self, err := managementClient.Loft(). + self, err := managementClient.Devsy(). ManagementV1(). Selves(). Create(context.TODO(), &managementv1.Self{}, metav1.CreateOptions{}) @@ -395,7 +395,7 @@ func (c *client) deleteOldAccessKey() { return } if self.Status.AccessKey != "" && self.Status.AccessKeyType == storagev1.AccessKeyTypeLogin { - _ = managementClient.Loft(). + _ = managementClient.Devsy(). ManagementV1(). OwnedAccessKeys(). Delete(context.TODO(), self.Status.AccessKey, metav1.DeleteOptions{}) @@ -409,7 +409,7 @@ func (c *client) verifyConnection() error { } // try to get self - _, err = managementClient.Loft(). + _, err = managementClient.Devsy(). ManagementV1(). Selves(). Create(context.TODO(), &managementv1.Self{}, metav1.CreateOptions{}) diff --git a/pkg/platform/instance.go b/pkg/platform/instance.go index f63cbed8c9..fa4c825f9e 100644 --- a/pkg/platform/instance.go +++ b/pkg/platform/instance.go @@ -94,7 +94,7 @@ func findInstanceByUID( listOpts := metav1.ListOptions{ LabelSelector: storagev1.DevsyWorkspaceUIDLabel + "=" + uid, } - workspaceList, err := managementClient.Loft().ManagementV1(). + workspaceList, err := managementClient.Devsy().ManagementV1(). DevsyWorkspaceInstances(namespace).List(ctx, listOpts) if err != nil { return nil, err @@ -112,7 +112,7 @@ func findInstanceByName( name string, namespace string, ) (*managementv1.DevsyWorkspaceInstance, error) { - workspace, err := managementClient.Loft().ManagementV1(). + workspace, err := managementClient.Devsy().ManagementV1(). DevsyWorkspaceInstances(namespace).Get(ctx, name, metav1.GetOptions{}) if err != nil { if kerrors.IsNotFound(err) { @@ -251,7 +251,7 @@ func UpdateInstance( return newInstance, nil } - res, err := managementClient.Loft().ManagementV1(). + res, err := managementClient.Devsy().ManagementV1(). DevsyWorkspaceInstances(oldInstance.GetNamespace()). Patch(ctx, oldInstance.GetName(), patch.Type(), data, metav1.PatchOptions{}) if err != nil { @@ -295,7 +295,7 @@ func getInstanceIfReady( managementClient kube.Interface, instance *managementv1.DevsyWorkspaceInstance, ) (*managementv1.DevsyWorkspaceInstance, bool, error) { - updatedInstance, err := managementClient.Loft().ManagementV1(). + updatedInstance, err := managementClient.Devsy().ManagementV1(). DevsyWorkspaceInstances(instance.GetNamespace()). Get(ctx, instance.GetName(), metav1.GetOptions{}) if err != nil { diff --git a/pkg/platform/instance_ops.go b/pkg/platform/instance_ops.go index d864162c43..779ba77bcd 100644 --- a/pkg/platform/instance_ops.go +++ b/pkg/platform/instance_ops.go @@ -20,7 +20,7 @@ func CreateInstance( return nil, err } - updatedInstance, err := managementClient.Loft().ManagementV1(). + updatedInstance, err := managementClient.Devsy().ManagementV1(). DevsyWorkspaceInstances(instance.GetNamespace()). Create(ctx, instance, metav1.CreateOptions{}) if err != nil { diff --git a/pkg/platform/instance_ops_test.go b/pkg/platform/instance_ops_test.go index aee5b8b83f..3133a5477a 100644 --- a/pkg/platform/instance_ops_test.go +++ b/pkg/platform/instance_ops_test.go @@ -7,8 +7,8 @@ import ( managementv1 "github.com/devsy-org/api/pkg/apis/management/v1" storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1" - loftclient "github.com/devsy-org/api/pkg/clientset/versioned" - loftfake "github.com/devsy-org/api/pkg/clientset/versioned/fake" + devsyclient "github.com/devsy-org/api/pkg/clientset/versioned" + devsyfake "github.com/devsy-org/api/pkg/clientset/versioned/fake" "github.com/devsy-org/devsy/pkg/platform/client" "github.com/devsy-org/devsy/pkg/platform/kube" "github.com/stretchr/testify/suite" @@ -44,15 +44,15 @@ func (s *instanceOpsSuite) TestSetTemplateSyncOnceLeavesInstanceWithoutTemplateR func (s *instanceOpsSuite) TestCreateInstanceWrapsCreateError() { createErr := errors.New("boom") - loft := loftfake.NewSimpleClientset() - loft.PrependReactor( + devsy := devsyfake.NewSimpleClientset() + devsy.PrependReactor( "create", "devsyworkspaceinstances", func(k8stesting.Action) (bool, runtime.Object, error) { return true, nil, createErr }, ) - pc := &instanceOpsPlatformClient{management: &instanceOpsKubeClient{loft: loft}} + pc := &instanceOpsPlatformClient{management: &instanceOpsKubeClient{devsy: devsy}} instance := &managementv1.DevsyWorkspaceInstance{ ObjectMeta: metav1.ObjectMeta{Name: "ws", Namespace: "p-default"}, } @@ -63,14 +63,14 @@ func (s *instanceOpsSuite) TestCreateInstanceWrapsCreateError() { s.EqualError(err, "create workspace instance: boom") } -// instanceOpsKubeClient provides only Loft(); other kube.Interface methods are unused by these tests. +// instanceOpsKubeClient provides only Devsy(); other kube.Interface methods are unused by these tests. type instanceOpsKubeClient struct { kube.Interface - loft loftclient.Interface + devsy devsyclient.Interface } -func (c *instanceOpsKubeClient) Loft() loftclient.Interface { - return c.loft +func (c *instanceOpsKubeClient) Devsy() devsyclient.Interface { + return c.devsy } // instanceOpsPlatformClient provides only Management(); other client.Client methods are unused by these tests. diff --git a/pkg/platform/kube/kube.go b/pkg/platform/kube/kube.go index 775750ce56..df2f28698f 100644 --- a/pkg/platform/kube/kube.go +++ b/pkg/platform/kube/kube.go @@ -3,14 +3,14 @@ package kube import ( "fmt" - loftclient "github.com/devsy-org/api/pkg/clientset/versioned" + devsyclient "github.com/devsy-org/api/pkg/clientset/versioned" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" ) type Interface interface { kubernetes.Interface - Loft() loftclient.Interface + Devsy() devsyclient.Interface } func NewForConfig(c *rest.Config) (Interface, error) { @@ -19,22 +19,22 @@ func NewForConfig(c *rest.Config) (Interface, error) { return nil, fmt.Errorf("create kube client: %w", err) } - loftClient, err := loftclient.NewForConfig(c) + devsyClient, err := devsyclient.NewForConfig(c) if err != nil { - return nil, fmt.Errorf("create loft client: %w", err) + return nil, fmt.Errorf("create devsy client: %w", err) } return &client{ - Interface: kubeClient, - loftClient: loftClient, + Interface: kubeClient, + devsyClient: devsyClient, }, nil } type client struct { kubernetes.Interface - loftClient loftclient.Interface + devsyClient devsyclient.Interface } -func (c *client) Loft() loftclient.Interface { - return c.loftClient +func (c *client) Devsy() devsyclient.Interface { + return c.devsyClient } diff --git a/pkg/platform/kubeconfig.go b/pkg/platform/kubeconfig.go index 3fd8ed5893..a45336493c 100644 --- a/pkg/platform/kubeconfig.go +++ b/pkg/platform/kubeconfig.go @@ -107,7 +107,7 @@ func kubeConfigForSpaceInstance( return nil, err } - spaceInstance, err := managementClient.Loft(). + spaceInstance, err := managementClient.Devsy(). ManagementV1(). SpaceInstances(namespace). Get(ctx, spaceInstanceName, metav1.GetOptions{}) @@ -180,7 +180,7 @@ func directClusterEndpointKubeConfigForSpace( TTL: p.ttl, }, } - directClusterEndpointToken, err := p.managementClient.Loft(). + directClusterEndpointToken, err := p.managementClient.Devsy(). ManagementV1(). DirectClusterEndpointTokens(). Create(p.ctx, tok, metav1.CreateOptions{}) @@ -230,7 +230,7 @@ func kubeConfigViaAccessKey(p accessKeyKubeConfigParams) (*clientcmdapi.Config, }, }, } - ownedAccessKey, err := p.managementClient.Loft(). + ownedAccessKey, err := p.managementClient.Devsy(). ManagementV1(). OwnedAccessKeys(). Create(p.ctx, key, metav1.CreateOptions{}) @@ -264,7 +264,7 @@ func kubeConfigForVirtualClusterInstance( return nil, err } - virtualClusterInstance, err := managementClient.Loft(). + virtualClusterInstance, err := managementClient.Devsy(). ManagementV1(). VirtualClusterInstances(namespace). Get(ctx, virtualClusterInstanceName, metav1.GetOptions{}) @@ -398,7 +398,7 @@ func directIngressKubeConfig(req vClusterKubeConfigRequest) (*clientcmdapi.Confi CertificateTTL: &certTTL, }, } - directVirtualClusterKubeConfig, err := req.managementClient.Loft(). + directVirtualClusterKubeConfig, err := req.managementClient.Devsy(). ManagementV1(). VirtualClusterInstances(req.namespace). GetKubeConfig(req.ctx, req.instance.Name, config, metav1.CreateOptions{}) @@ -424,7 +424,7 @@ func directClusterEndpointKubeConfig( TTL: req.ttl, }, } - directClusterEndpointToken, err := req.managementClient.Loft(). + directClusterEndpointToken, err := req.managementClient.Devsy(). ManagementV1(). DirectClusterEndpointTokens(). Create(req.ctx, tok, metav1.CreateOptions{}) @@ -457,7 +457,7 @@ func findHostCluster( if err != nil { return managementv1.Cluster{}, err } - projectClusters, err := managementClient.Loft(). + projectClusters, err := managementClient.Devsy(). ManagementV1(). Projects(). ListClusters(ctx, projectName, metav1.GetOptions{})