diff --git a/cmd/env_flags_test.go b/cmd/env_flags_test.go index 206187011f..ca37732fc8 100644 --- a/cmd/env_flags_test.go +++ b/cmd/env_flags_test.go @@ -39,7 +39,7 @@ func TestOptInEnvFlags_AppliesEnvValueToFlag(t *testing.T) { cmdPath: "platform workspace list", flagName: "host", envName: envDevsyHost, - want: "pro.example.com", + want: "platform.example.com", }, { cmdPath: "platform cluster list", diff --git a/cmd/pro/login_test.go b/cmd/pro/login_test.go index 9bd015ff50..f4b4197142 100644 --- a/cmd/pro/login_test.go +++ b/cmd/pro/login_test.go @@ -40,7 +40,7 @@ func (s *loginSuite) TearDownTest() { } func (s *loginSuite) TestConcurrentLoginFindsCreatedInstance() { - lock, err := provider.GetPlatformInstanceOperationLock("default", "pro.example") + lock, err := provider.GetPlatformInstanceOperationLock("default", "platform.example") s.Require().NoError(err) s.Require().NoError(lock.Lock()) s.T().Cleanup(func() { _ = lock.Unlock() }) @@ -48,7 +48,7 @@ func (s *loginSuite) TestConcurrentLoginFindsCreatedInstance() { cmd := &LoginCmd{GlobalFlags: platformflags.GlobalFlags{GlobalFlags: &rootflags.GlobalFlags{}}} result := make(chan error, 1) go func() { - _, err := cmd.prepareProvider(context.Background(), "https://pro.example") + _, err := cmd.prepareProvider(context.Background(), "https://platform.example") result <- err }() select { @@ -59,7 +59,7 @@ func (s *loginSuite) TestConcurrentLoginFindsCreatedInstance() { s.Require().NoError(provider.SavePlatformInstanceConfig("default", &provider.PlatformInstance{ Provider: testPlatformProviderName, - Host: "pro.example", + Host: "platform.example", })) s.Require().NoError(lock.Unlock()) s.Require().NoError(<-result) @@ -92,9 +92,9 @@ func (s *loginSuite) TestDifferentHostDoesNotWaitForLoginLock() { } func (s *loginSuite) TestHostLockDoesNotConflictWithProviderLock() { - hostLock, err := provider.GetPlatformInstanceOperationLock("default", "pro.example") + hostLock, err := provider.GetPlatformInstanceOperationLock("default", "platform.example") s.Require().NoError(err) - providerLock, err := provider.GetProviderOperationLock("default", "pro-login") + providerLock, err := provider.GetProviderOperationLock("default", "platform-login") s.Require().NoError(err) s.Require().NoError(hostLock.Lock()) defer func() { _ = hostLock.Unlock() }() diff --git a/cmd/pro/start_test.go b/cmd/pro/start_test.go index 2472b410b2..8c47716046 100644 --- a/cmd/pro/start_test.go +++ b/cmd/pro/start_test.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" ) -const startTestHost = "pro.example.com" +const startTestHost = "platform.example.com" type startSuite struct { suite.Suite @@ -66,11 +66,11 @@ func (s *startSuite) TestAppendHostArgsConfiguresIngress() { ) for _, want := range []string{ "ingress.enabled=true", - "ingress.host=pro.example.com", - "env.DEVSY_HOST=pro.example.com", + "ingress.host=platform.example.com", + "env.DEVSY_HOST=platform.example.com", "devsyIngress.enabled=true", - "devsyIngress.host=*.pro.example.com", - "env.DEVSY_SUBDOMAIN=*.pro.example.com", + "devsyIngress.host=*.platform.example.com", + "env.DEVSY_SUBDOMAIN=*.platform.example.com", } { s.True(hasSet(args, want), "missing %q in %v", want, args) } diff --git a/pkg/workspace/list.go b/pkg/workspace/list.go index 3d0ed1f0a2..8fd64323ce 100644 --- a/pkg/workspace/list.go +++ b/pkg/workspace/list.go @@ -204,12 +204,14 @@ func listPlatformWorkspaces( } wg.Go(func() { - workspaces, err := listProWorkspacesForProvider( + workspaces, err := listPlatformWorkspacesForProvider( ctx, - devsyConfig, - provider, - providerConfig, - owner, + listPlatformWorkspacesForProviderParams{ + devsyConfig: devsyConfig, + provider: provider, + providerConfig: providerConfig, + owner: owner, + }, ) mu.Lock() defer mu.Unlock() @@ -224,22 +226,30 @@ func listPlatformWorkspaces( return results } -func listProWorkspacesForProvider( +type listPlatformWorkspacesForProviderParams struct { + devsyConfig *config.Config + provider string + providerConfig *providerpkg.ProviderConfig + owner platform.OwnerFilter +} + +func listPlatformWorkspacesForProvider( ctx context.Context, - devsyConfig *config.Config, - provider string, - providerConfig *providerpkg.ProviderConfig, - owner platform.OwnerFilter, + params listPlatformWorkspacesForProviderParams, ) ([]*providerpkg.Workspace, error) { instances, err := listPlatformInstances(ctx, listPlatformInstancesParams{ - devsyConfig: devsyConfig, - provider: provider, - providerConfig: providerConfig, - owner: owner, + devsyConfig: params.devsyConfig, + provider: params.provider, + providerConfig: params.providerConfig, + owner: params.owner, }) if err != nil { if log.DebugEnabled() { - log.Warnf("Failed to list platform workspaces for provider %s: %v", provider, err) + log.Warnf( + "Failed to list platform workspaces for provider %s: %v", + params.provider, + err, + ) } return nil, err } @@ -248,8 +258,8 @@ func listProWorkspacesForProvider( for _, instance := range instances { if workspace := platformWorkspaceFromInstance( instance, - provider, - devsyConfig.DefaultContext, + params.provider, + params.devsyConfig.DefaultContext, ); workspace != nil { retWorkspaces = append(retWorkspaces, workspace) }