From cbcaf4dfafe619ac3df1ed18e4a245627194fee7 Mon Sep 17 00:00:00 2001 From: Komal Date: Mon, 22 Jul 2024 09:12:22 -0700 Subject: [PATCH] Rename StackName to StackIdentifier (#358) Refactor to clarify the namespace, needed for https://github.com/pulumi/pulumi-pulumiservice/pull/357 --- .../pulumiapi/deployment_setting_test.go | 6 ++-- .../internal/pulumiapi/deployment_settings.go | 16 +++++----- provider/pkg/internal/pulumiapi/schedules.go | 32 +++++++++---------- .../pkg/internal/pulumiapi/schedules_test.go | 2 +- provider/pkg/internal/pulumiapi/stack_tags.go | 12 +++---- .../pkg/internal/pulumiapi/stack_tags_test.go | 4 +-- provider/pkg/internal/pulumiapi/teams.go | 12 +++---- provider/pkg/internal/pulumiapi/teams_test.go | 4 +-- provider/pkg/provider/deployment_schedules.go | 14 ++++---- .../pkg/provider/deployment_setting_test.go | 8 ++--- provider/pkg/provider/deployment_settings.go | 6 ++-- provider/pkg/provider/drift_schedules.go | 2 +- provider/pkg/provider/schedules_test.go | 20 ++++++------ provider/pkg/provider/stack_tags.go | 6 ++-- provider/pkg/provider/team_stack_perm.go | 6 ++-- provider/pkg/provider/team_test.go | 6 ++-- provider/pkg/provider/ttl_schedules.go | 2 +- 17 files changed, 79 insertions(+), 79 deletions(-) diff --git a/provider/pkg/internal/pulumiapi/deployment_setting_test.go b/provider/pkg/internal/pulumiapi/deployment_setting_test.go index ac0dfda2..5d9af22c 100644 --- a/provider/pkg/internal/pulumiapi/deployment_setting_test.go +++ b/provider/pkg/internal/pulumiapi/deployment_setting_test.go @@ -31,7 +31,7 @@ func TestGetDeploymentSettings(t *testing.T) { }) defer cleanup() - ds, err := c.GetDeploymentSettings(ctx, StackName{ + ds, err := c.GetDeploymentSettings(ctx, StackIdentifier{ OrgName: orgName, ProjectName: projectName, StackName: stackName, @@ -53,7 +53,7 @@ func TestGetDeploymentSettings(t *testing.T) { }) defer cleanup() - ds, err := c.GetDeploymentSettings(ctx, StackName{ + ds, err := c.GetDeploymentSettings(ctx, StackIdentifier{ OrgName: orgName, ProjectName: projectName, StackName: stackName, @@ -87,7 +87,7 @@ func TestCreateDeploymentSettings(t *testing.T) { }) defer cleanup() - response, err := c.CreateDeploymentSettings(ctx, StackName{ + response, err := c.CreateDeploymentSettings(ctx, StackIdentifier{ OrgName: orgName, ProjectName: projectName, StackName: stackName, diff --git a/provider/pkg/internal/pulumiapi/deployment_settings.go b/provider/pkg/internal/pulumiapi/deployment_settings.go index 89689329..c79649ae 100644 --- a/provider/pkg/internal/pulumiapi/deployment_settings.go +++ b/provider/pkg/internal/pulumiapi/deployment_settings.go @@ -11,10 +11,10 @@ import ( ) type DeploymentSettingsClient interface { - CreateDeploymentSettings(ctx context.Context, stack StackName, ds DeploymentSettings) (*DeploymentSettings, error) - UpdateDeploymentSettings(ctx context.Context, stack StackName, ds DeploymentSettings) (*DeploymentSettings, error) - GetDeploymentSettings(ctx context.Context, stack StackName) (*DeploymentSettings, error) - DeleteDeploymentSettings(ctx context.Context, stack StackName) error + CreateDeploymentSettings(ctx context.Context, stack StackIdentifier, ds DeploymentSettings) (*DeploymentSettings, error) + UpdateDeploymentSettings(ctx context.Context, stack StackIdentifier, ds DeploymentSettings) (*DeploymentSettings, error) + GetDeploymentSettings(ctx context.Context, stack StackIdentifier) (*DeploymentSettings, error) + DeleteDeploymentSettings(ctx context.Context, stack StackIdentifier) error } type DeploymentSettings struct { @@ -139,7 +139,7 @@ func (v *SecretValue) UnmarshalJSON(bytes []byte) error { return nil } -func (c *Client) CreateDeploymentSettings(ctx context.Context, stack StackName, ds DeploymentSettings) (*DeploymentSettings, error) { +func (c *Client) CreateDeploymentSettings(ctx context.Context, stack StackIdentifier, ds DeploymentSettings) (*DeploymentSettings, error) { apiPath := path.Join("stacks", stack.OrgName, stack.ProjectName, stack.StackName, "deployments", "settings") var resultDS = &DeploymentSettings{} _, err := c.do(ctx, http.MethodPut, apiPath, ds, resultDS) @@ -149,7 +149,7 @@ func (c *Client) CreateDeploymentSettings(ctx context.Context, stack StackName, return resultDS, nil } -func (c *Client) UpdateDeploymentSettings(ctx context.Context, stack StackName, ds DeploymentSettings) (*DeploymentSettings, error) { +func (c *Client) UpdateDeploymentSettings(ctx context.Context, stack StackIdentifier, ds DeploymentSettings) (*DeploymentSettings, error) { apiPath := path.Join("stacks", stack.OrgName, stack.ProjectName, stack.StackName, "deployments", "settings") var resultDS = &DeploymentSettings{} _, err := c.do(ctx, http.MethodPut, apiPath, ds, resultDS) @@ -159,7 +159,7 @@ func (c *Client) UpdateDeploymentSettings(ctx context.Context, stack StackName, return resultDS, nil } -func (c *Client) GetDeploymentSettings(ctx context.Context, stack StackName) (*DeploymentSettings, error) { +func (c *Client) GetDeploymentSettings(ctx context.Context, stack StackIdentifier) (*DeploymentSettings, error) { apiPath := path.Join( "stacks", stack.OrgName, stack.ProjectName, stack.StackName, "deployments", "settings", ) @@ -176,7 +176,7 @@ func (c *Client) GetDeploymentSettings(ctx context.Context, stack StackName) (*D return &ds, nil } -func (c *Client) DeleteDeploymentSettings(ctx context.Context, stack StackName) error { +func (c *Client) DeleteDeploymentSettings(ctx context.Context, stack StackIdentifier) error { apiPath := path.Join( "stacks", stack.OrgName, stack.ProjectName, stack.StackName, "deployments", "settings", ) diff --git a/provider/pkg/internal/pulumiapi/schedules.go b/provider/pkg/internal/pulumiapi/schedules.go index aae1da43..75371eb5 100644 --- a/provider/pkg/internal/pulumiapi/schedules.go +++ b/provider/pkg/internal/pulumiapi/schedules.go @@ -9,14 +9,14 @@ import ( ) type ScheduleClient interface { - CreateDeploymentSchedule(ctx context.Context, stack StackName, req CreateDeploymentScheduleRequest) (*string, error) - CreateDriftSchedule(ctx context.Context, stack StackName, req CreateDriftScheduleRequest) (*string, error) - CreateTtlSchedule(ctx context.Context, stack StackName, req CreateTtlScheduleRequest) (*string, error) - GetSchedule(ctx context.Context, stack StackName, scheduleID string) (*ScheduleResponse, error) - UpdateDeploymentSchedule(ctx context.Context, stack StackName, req CreateDeploymentScheduleRequest, scheduleID string) (*string, error) - UpdateDriftSchedule(ctx context.Context, stack StackName, req CreateDriftScheduleRequest, scheduleID string) (*string, error) - UpdateTtlSchedule(ctx context.Context, stack StackName, req CreateTtlScheduleRequest, scheduleID string) (*string, error) - DeleteSchedule(ctx context.Context, stack StackName, scheduleID string) error + CreateDeploymentSchedule(ctx context.Context, stack StackIdentifier, req CreateDeploymentScheduleRequest) (*string, error) + CreateDriftSchedule(ctx context.Context, stack StackIdentifier, req CreateDriftScheduleRequest) (*string, error) + CreateTtlSchedule(ctx context.Context, stack StackIdentifier, req CreateTtlScheduleRequest) (*string, error) + GetSchedule(ctx context.Context, stack StackIdentifier, scheduleID string) (*ScheduleResponse, error) + UpdateDeploymentSchedule(ctx context.Context, stack StackIdentifier, req CreateDeploymentScheduleRequest, scheduleID string) (*string, error) + UpdateDriftSchedule(ctx context.Context, stack StackIdentifier, req CreateDriftScheduleRequest, scheduleID string) (*string, error) + UpdateTtlSchedule(ctx context.Context, stack StackIdentifier, req CreateTtlScheduleRequest, scheduleID string) (*string, error) + DeleteSchedule(ctx context.Context, stack StackIdentifier, scheduleID string) error } type CreateDeploymentRequest struct { @@ -60,7 +60,7 @@ type ScheduleResponse struct { Definition ScheduleDefinition `json:"definition,omitempty"` } -func (c *Client) CreateDeploymentSchedule(ctx context.Context, stack StackName, scheduleReq CreateDeploymentScheduleRequest) (*string, error) { +func (c *Client) CreateDeploymentSchedule(ctx context.Context, stack StackIdentifier, scheduleReq CreateDeploymentScheduleRequest) (*string, error) { apiPath := path.Join("stacks", stack.OrgName, stack.ProjectName, stack.StackName, "deployments", "schedules") var scheduleResponse ScheduleResponse _, err := c.do(ctx, http.MethodPost, apiPath, scheduleReq, &scheduleResponse) @@ -77,7 +77,7 @@ func (c *Client) CreateDeploymentSchedule(ctx context.Context, stack StackName, return &scheduleResponse.ID, nil } -func (c *Client) CreateDriftSchedule(ctx context.Context, stack StackName, scheduleReq CreateDriftScheduleRequest) (*string, error) { +func (c *Client) CreateDriftSchedule(ctx context.Context, stack StackIdentifier, scheduleReq CreateDriftScheduleRequest) (*string, error) { apiPath := path.Join("stacks", stack.OrgName, stack.ProjectName, stack.StackName, "deployments", "drift", "schedules") var scheduleResponse ScheduleResponse _, err := c.do(ctx, http.MethodPost, apiPath, scheduleReq, &scheduleResponse) @@ -88,7 +88,7 @@ func (c *Client) CreateDriftSchedule(ctx context.Context, stack StackName, sched return &scheduleResponse.ID, nil } -func (c *Client) CreateTtlSchedule(ctx context.Context, stack StackName, scheduleReq CreateTtlScheduleRequest) (*string, error) { +func (c *Client) CreateTtlSchedule(ctx context.Context, stack StackIdentifier, scheduleReq CreateTtlScheduleRequest) (*string, error) { apiPath := path.Join("stacks", stack.OrgName, stack.ProjectName, stack.StackName, "deployments", "ttl", "schedules") var scheduleResponse ScheduleResponse _, err := c.do(ctx, http.MethodPost, apiPath, scheduleReq, &scheduleResponse) @@ -99,7 +99,7 @@ func (c *Client) CreateTtlSchedule(ctx context.Context, stack StackName, schedul return &scheduleResponse.ID, nil } -func (c *Client) GetSchedule(ctx context.Context, stack StackName, scheduleID string) (*ScheduleResponse, error) { +func (c *Client) GetSchedule(ctx context.Context, stack StackIdentifier, scheduleID string) (*ScheduleResponse, error) { apiPath := path.Join("stacks", stack.OrgName, stack.ProjectName, stack.StackName, "deployments", "schedules", scheduleID) var scheduleResponse ScheduleResponse _, err := c.do(ctx, http.MethodGet, apiPath, nil, &scheduleResponse) @@ -109,7 +109,7 @@ func (c *Client) GetSchedule(ctx context.Context, stack StackName, scheduleID st return &scheduleResponse, nil } -func (c *Client) UpdateDeploymentSchedule(ctx context.Context, stack StackName, scheduleReq CreateDeploymentScheduleRequest, scheduleID string) (*string, error) { +func (c *Client) UpdateDeploymentSchedule(ctx context.Context, stack StackIdentifier, scheduleReq CreateDeploymentScheduleRequest, scheduleID string) (*string, error) { apiPath := path.Join("stacks", stack.OrgName, stack.ProjectName, stack.StackName, "deployments", "schedules", scheduleID) var scheduleResponse ScheduleResponse _, err := c.do(ctx, http.MethodPost, apiPath, scheduleReq, &scheduleResponse) @@ -126,7 +126,7 @@ func (c *Client) UpdateDeploymentSchedule(ctx context.Context, stack StackName, return &scheduleResponse.ID, nil } -func (c *Client) UpdateDriftSchedule(ctx context.Context, stack StackName, scheduleReq CreateDriftScheduleRequest, scheduleID string) (*string, error) { +func (c *Client) UpdateDriftSchedule(ctx context.Context, stack StackIdentifier, scheduleReq CreateDriftScheduleRequest, scheduleID string) (*string, error) { apiPath := path.Join("stacks", stack.OrgName, stack.ProjectName, stack.StackName, "deployments", "drift", "schedules", scheduleID) var scheduleResponse ScheduleResponse _, err := c.do(ctx, http.MethodPost, apiPath, scheduleReq, &scheduleResponse) @@ -137,7 +137,7 @@ func (c *Client) UpdateDriftSchedule(ctx context.Context, stack StackName, sched return &scheduleResponse.ID, nil } -func (c *Client) UpdateTtlSchedule(ctx context.Context, stack StackName, scheduleReq CreateTtlScheduleRequest, scheduleID string) (*string, error) { +func (c *Client) UpdateTtlSchedule(ctx context.Context, stack StackIdentifier, scheduleReq CreateTtlScheduleRequest, scheduleID string) (*string, error) { apiPath := path.Join("stacks", stack.OrgName, stack.ProjectName, stack.StackName, "deployments", "ttl", "schedules", scheduleID) var scheduleResponse ScheduleResponse _, err := c.do(ctx, http.MethodPost, apiPath, scheduleReq, &scheduleResponse) @@ -148,7 +148,7 @@ func (c *Client) UpdateTtlSchedule(ctx context.Context, stack StackName, schedul return &scheduleResponse.ID, nil } -func (c *Client) DeleteSchedule(ctx context.Context, stack StackName, scheduleID string) error { +func (c *Client) DeleteSchedule(ctx context.Context, stack StackIdentifier, scheduleID string) error { apiPath := path.Join("stacks", stack.OrgName, stack.ProjectName, stack.StackName, "deployments", "schedules", scheduleID) _, err := c.do(ctx, http.MethodDelete, apiPath, nil, nil) if err != nil { diff --git a/provider/pkg/internal/pulumiapi/schedules_test.go b/provider/pkg/internal/pulumiapi/schedules_test.go index b9534393..a73aa529 100644 --- a/provider/pkg/internal/pulumiapi/schedules_test.go +++ b/provider/pkg/internal/pulumiapi/schedules_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" ) -var testStack = StackName{ +var testStack = StackIdentifier{ OrgName: "org", ProjectName: "project", StackName: "stack", diff --git a/provider/pkg/internal/pulumiapi/stack_tags.go b/provider/pkg/internal/pulumiapi/stack_tags.go index 2f0440a7..207e0079 100644 --- a/provider/pkg/internal/pulumiapi/stack_tags.go +++ b/provider/pkg/internal/pulumiapi/stack_tags.go @@ -8,17 +8,17 @@ import ( "strings" ) -type StackName struct { +type StackIdentifier struct { OrgName string `json:"orgName"` ProjectName string `json:"projectName"` StackName string `json:"stackName"` } -func (s *StackName) String() string { +func (s *StackIdentifier) String() string { return fmt.Sprintf("%s/%s/%s", s.OrgName, s.ProjectName, s.StackName) } -func (s *StackName) FromID(id string) error { +func (s *StackIdentifier) FromID(id string) error { splitID := strings.Split(id, "/") if len(splitID) != 3 { return fmt.Errorf("invalid stack id: %s", id) @@ -39,7 +39,7 @@ type stack struct { Tags map[string]string `json:"tags"` } -func (c *Client) CreateTag(ctx context.Context, stack StackName, tag StackTag) error { +func (c *Client) CreateTag(ctx context.Context, stack StackIdentifier, tag StackTag) error { apiPath := path.Join("stacks", stack.OrgName, stack.ProjectName, stack.StackName, "tags") _, err := c.do(ctx, http.MethodPost, apiPath, tag, nil) if err != nil { @@ -48,7 +48,7 @@ func (c *Client) CreateTag(ctx context.Context, stack StackName, tag StackTag) e return nil } -func (c *Client) GetStackTag(ctx context.Context, stackName StackName, tagName string) (*StackTag, error) { +func (c *Client) GetStackTag(ctx context.Context, stackName StackIdentifier, tagName string) (*StackTag, error) { apiPath := path.Join("stacks", stackName.OrgName, stackName.ProjectName, stackName.StackName) var s stack _, err := c.do(ctx, http.MethodGet, apiPath, nil, &s) @@ -65,7 +65,7 @@ func (c *Client) GetStackTag(ctx context.Context, stackName StackName, tagName s }, nil } -func (c *Client) DeleteStackTag(ctx context.Context, stackName StackName, tagName string) error { +func (c *Client) DeleteStackTag(ctx context.Context, stackName StackIdentifier, tagName string) error { apiPath := path.Join( "stacks", stackName.OrgName, stackName.ProjectName, stackName.StackName, "tags", tagName, ) diff --git a/provider/pkg/internal/pulumiapi/stack_tags_test.go b/provider/pkg/internal/pulumiapi/stack_tags_test.go index 95e339fa..f15b2ea7 100644 --- a/provider/pkg/internal/pulumiapi/stack_tags_test.go +++ b/provider/pkg/internal/pulumiapi/stack_tags_test.go @@ -15,7 +15,7 @@ func TestCreateStackTags(t *testing.T) { Name: tagName, Value: tagValue, } - stackName := StackName{ + stackName := StackIdentifier{ OrgName: "organization", ProjectName: "project", StackName: "stack", @@ -47,7 +47,7 @@ func TestCreateStackTags(t *testing.T) { } func TestDeleteStackTags(t *testing.T) { - stackName := StackName{ + stackName := StackIdentifier{ OrgName: "organization", ProjectName: "project", StackName: "stack", diff --git a/provider/pkg/internal/pulumiapi/teams.go b/provider/pkg/internal/pulumiapi/teams.go index 9f5f6dfe..1514a829 100644 --- a/provider/pkg/internal/pulumiapi/teams.go +++ b/provider/pkg/internal/pulumiapi/teams.go @@ -29,9 +29,9 @@ type TeamClient interface { DeleteTeam(ctx context.Context, orgName, teamName string) error AddMemberToTeam(ctx context.Context, orgName, teamName, userName string) error DeleteMemberFromTeam(ctx context.Context, orgName, teamName, userName string) error - AddStackPermission(ctx context.Context, stack StackName, teamName string, permission int) error - RemoveStackPermission(ctx context.Context, stack StackName, teamName string) error - GetTeamStackPermission(ctx context.Context, stack StackName, teamName string) (*int, error) + AddStackPermission(ctx context.Context, stack StackIdentifier, teamName string, permission int) error + RemoveStackPermission(ctx context.Context, stack StackIdentifier, teamName string) error + GetTeamStackPermission(ctx context.Context, stack StackIdentifier, teamName string) (*int, error) AddEnvironmentPermission(ctx context.Context, req CreateTeamEnvironmentPermissionRequest) error RemoveEnvironmentPermission(ctx context.Context, req TeamEnvironmentPermissionRequest) error GetTeamEnvironmentPermission(ctx context.Context, req TeamEnvironmentPermissionRequest) (*string, error) @@ -305,7 +305,7 @@ func (c *Client) DeleteMemberFromTeam(ctx context.Context, orgName, teamName, us } } -func (c *Client) AddStackPermission(ctx context.Context, stack StackName, teamName string, permission int) error { +func (c *Client) AddStackPermission(ctx context.Context, stack StackIdentifier, teamName string, permission int) error { if len(stack.OrgName) == 0 { return errors.New("orgname must not be empty") } @@ -327,7 +327,7 @@ func (c *Client) AddStackPermission(ctx context.Context, stack StackName, teamNa return nil } -func (c *Client) RemoveStackPermission(ctx context.Context, stack StackName, teamName string) error { +func (c *Client) RemoveStackPermission(ctx context.Context, stack StackIdentifier, teamName string) error { if len(stack.OrgName) == 0 { return errors.New("orgname must not be empty") } @@ -349,7 +349,7 @@ func (c *Client) RemoveStackPermission(ctx context.Context, stack StackName, tea return nil } -func (c *Client) GetTeamStackPermission(ctx context.Context, stack StackName, teamName string) (*int, error) { +func (c *Client) GetTeamStackPermission(ctx context.Context, stack StackIdentifier, teamName string) (*int, error) { if len(stack.OrgName) == 0 { return nil, errors.New("orgname must not be empty") } diff --git a/provider/pkg/internal/pulumiapi/teams_test.go b/provider/pkg/internal/pulumiapi/teams_test.go index 021b80d9..ad82bf0e 100644 --- a/provider/pkg/internal/pulumiapi/teams_test.go +++ b/provider/pkg/internal/pulumiapi/teams_test.go @@ -252,7 +252,7 @@ func TestAddMemberToTeam(t *testing.T) { func TestAddStackPermission(t *testing.T) { teamName := "a-team" - stack := StackName{ + stack := StackIdentifier{ OrgName: "an-organization", ProjectName: "a-project", StackName: "a-stack", @@ -278,7 +278,7 @@ func TestAddStackPermission(t *testing.T) { func TestRemoveStackPermission(t *testing.T) { teamName := "a-team" - stack := StackName{ + stack := StackIdentifier{ OrgName: "an-organization", ProjectName: "a-project", StackName: "a-stack", diff --git a/provider/pkg/provider/deployment_schedules.go b/provider/pkg/provider/deployment_schedules.go index c7039807..e25464f2 100644 --- a/provider/pkg/provider/deployment_schedules.go +++ b/provider/pkg/provider/deployment_schedules.go @@ -20,18 +20,18 @@ type PulumiServiceDeploymentScheduleResource struct { } type PulumiServiceDeploymentScheduleInput struct { - Stack pulumiapi.StackName + Stack pulumiapi.StackIdentifier ScheduleCron *string `pulumi:"scheduleCron"` ScheduleOnce *time.Time `pulumi:"scheduleOnce"` PulumiOperation string `pulumi:"pulumiOperation"` } type PulumiServiceSharedScheduleOutput struct { - Stack pulumiapi.StackName + Stack pulumiapi.StackIdentifier ScheduleID string `pulumi:"scheduleId"` } -func StackToPropertyMap(stack pulumiapi.StackName) resource.PropertyMap { +func StackToPropertyMap(stack pulumiapi.StackIdentifier) resource.PropertyMap { propertyMap := resource.PropertyMap{} propertyMap["organization"] = resource.NewPropertyValue(stack.OrgName) propertyMap["project"] = resource.NewPropertyValue(stack.ProjectName) @@ -58,8 +58,8 @@ func AddScheduleIdToPropertyMap(scheduleID string, propertyMap resource.Property return propertyMap } -func ParseStack(inputMap resource.PropertyMap) (*pulumiapi.StackName, error) { - var stack pulumiapi.StackName +func ParseStack(inputMap resource.PropertyMap) (*pulumiapi.StackIdentifier, error) { + var stack pulumiapi.StackIdentifier if inputMap["organization"].HasValue() && inputMap["organization"].IsString() { organization := inputMap["organization"].StringValue() stack.OrgName = organization @@ -387,12 +387,12 @@ func (st *PulumiServiceDeploymentScheduleResource) Name() string { func (st *PulumiServiceDeploymentScheduleResource) Configure(_ PulumiServiceConfig) { } -func ParseScheduleID(id string, scheduleType string) (*pulumiapi.StackName, *string, error) { +func ParseScheduleID(id string, scheduleType string) (*pulumiapi.StackIdentifier, *string, error) { splitID := strings.Split(id, "/") if len(splitID) < 4 { return nil, nil, fmt.Errorf("invalid stack id: %s", id) } - stack := pulumiapi.StackName{ + stack := pulumiapi.StackIdentifier{ OrgName: splitID[0], ProjectName: splitID[1], StackName: splitID[2], diff --git a/provider/pkg/provider/deployment_setting_test.go b/provider/pkg/provider/deployment_setting_test.go index b26e5eff..7b5413c3 100644 --- a/provider/pkg/provider/deployment_setting_test.go +++ b/provider/pkg/provider/deployment_setting_test.go @@ -17,16 +17,16 @@ type DeploymentSettingsClientMock struct { getDeploymentSettingsFunc getDeploymentSettingsFunc } -func (c *DeploymentSettingsClientMock) CreateDeploymentSettings(ctx context.Context, stack pulumiapi.StackName, ds pulumiapi.DeploymentSettings) (*pulumiapi.DeploymentSettings, error) { +func (c *DeploymentSettingsClientMock) CreateDeploymentSettings(ctx context.Context, stack pulumiapi.StackIdentifier, ds pulumiapi.DeploymentSettings) (*pulumiapi.DeploymentSettings, error) { return nil, nil } -func (c *DeploymentSettingsClientMock) UpdateDeploymentSettings(ctx context.Context, stack pulumiapi.StackName, ds pulumiapi.DeploymentSettings) (*pulumiapi.DeploymentSettings, error) { +func (c *DeploymentSettingsClientMock) UpdateDeploymentSettings(ctx context.Context, stack pulumiapi.StackIdentifier, ds pulumiapi.DeploymentSettings) (*pulumiapi.DeploymentSettings, error) { return nil, nil } -func (c *DeploymentSettingsClientMock) GetDeploymentSettings(ctx context.Context, stack pulumiapi.StackName) (*pulumiapi.DeploymentSettings, error) { +func (c *DeploymentSettingsClientMock) GetDeploymentSettings(ctx context.Context, stack pulumiapi.StackIdentifier) (*pulumiapi.DeploymentSettings, error) { return c.getDeploymentSettingsFunc() } -func (c *DeploymentSettingsClientMock) DeleteDeploymentSettings(ctx context.Context, stack pulumiapi.StackName) error { +func (c *DeploymentSettingsClientMock) DeleteDeploymentSettings(ctx context.Context, stack pulumiapi.StackIdentifier) error { return nil } diff --git a/provider/pkg/provider/deployment_settings.go b/provider/pkg/provider/deployment_settings.go index 8b5b08eb..9ac9e48a 100644 --- a/provider/pkg/provider/deployment_settings.go +++ b/provider/pkg/provider/deployment_settings.go @@ -21,7 +21,7 @@ const replaceMe = "" type PulumiServiceDeploymentSettingsInput struct { pulumiapi.DeploymentSettings - Stack pulumiapi.StackName + Stack pulumiapi.StackIdentifier } // plaintextInputSettings are the latest inputs of the resource, containing plaintext values wrapped in Secrets @@ -701,7 +701,7 @@ func (ds *PulumiServiceDeploymentSettingsResource) Configure(_ PulumiServiceConf func (ds *PulumiServiceDeploymentSettingsResource) Read(req *pulumirpc.ReadRequest) (*pulumirpc.ReadResponse, error) { ctx := context.Background() - var stack pulumiapi.StackName + var stack pulumiapi.StackIdentifier if err := stack.FromID(req.Id); err != nil { return nil, err } @@ -770,7 +770,7 @@ func (ds *PulumiServiceDeploymentSettingsResource) Read(req *pulumirpc.ReadReque func (ds *PulumiServiceDeploymentSettingsResource) Delete(req *pulumirpc.DeleteRequest) (*pbempty.Empty, error) { ctx := context.Background() - var stack pulumiapi.StackName + var stack pulumiapi.StackIdentifier if err := stack.FromID(req.Id); err != nil { return nil, err } diff --git a/provider/pkg/provider/drift_schedules.go b/provider/pkg/provider/drift_schedules.go index cc08b311..5973c15f 100644 --- a/provider/pkg/provider/drift_schedules.go +++ b/provider/pkg/provider/drift_schedules.go @@ -18,7 +18,7 @@ type PulumiServiceDriftScheduleResource struct { } type PulumiServiceDriftScheduleInput struct { - Stack pulumiapi.StackName + Stack pulumiapi.StackIdentifier ScheduleCron string `pulumi:"scheduleCron"` AutoRemediate bool `pulumi:"autoRemediate"` } diff --git a/provider/pkg/provider/schedules_test.go b/provider/pkg/provider/schedules_test.go index b9a6a5a9..28f52db8 100644 --- a/provider/pkg/provider/schedules_test.go +++ b/provider/pkg/provider/schedules_test.go @@ -16,35 +16,35 @@ type ScheduleClientMock struct { getDeploymentScheduleFunc getDeploymentScheduleFunc } -func (c *ScheduleClientMock) GetSchedule(ctx context.Context, stack pulumiapi.StackName, scheduleID string) (*pulumiapi.ScheduleResponse, error) { +func (c *ScheduleClientMock) GetSchedule(ctx context.Context, stack pulumiapi.StackIdentifier, scheduleID string) (*pulumiapi.ScheduleResponse, error) { return c.getDeploymentScheduleFunc() } -func (c *ScheduleClientMock) CreateDeploymentSchedule(ctx context.Context, stack pulumiapi.StackName, req pulumiapi.CreateDeploymentScheduleRequest) (*string, error) { +func (c *ScheduleClientMock) CreateDeploymentSchedule(ctx context.Context, stack pulumiapi.StackIdentifier, req pulumiapi.CreateDeploymentScheduleRequest) (*string, error) { return nil, nil } -func (c *ScheduleClientMock) CreateDriftSchedule(ctx context.Context, stack pulumiapi.StackName, req pulumiapi.CreateDriftScheduleRequest) (*string, error) { +func (c *ScheduleClientMock) CreateDriftSchedule(ctx context.Context, stack pulumiapi.StackIdentifier, req pulumiapi.CreateDriftScheduleRequest) (*string, error) { return nil, nil } -func (c *ScheduleClientMock) CreateTtlSchedule(ctx context.Context, stack pulumiapi.StackName, req pulumiapi.CreateTtlScheduleRequest) (*string, error) { +func (c *ScheduleClientMock) CreateTtlSchedule(ctx context.Context, stack pulumiapi.StackIdentifier, req pulumiapi.CreateTtlScheduleRequest) (*string, error) { return nil, nil } -func (c *ScheduleClientMock) UpdateDeploymentSchedule(ctx context.Context, stack pulumiapi.StackName, req pulumiapi.CreateDeploymentScheduleRequest, scheduleID string) (*string, error) { +func (c *ScheduleClientMock) UpdateDeploymentSchedule(ctx context.Context, stack pulumiapi.StackIdentifier, req pulumiapi.CreateDeploymentScheduleRequest, scheduleID string) (*string, error) { return nil, nil } -func (c *ScheduleClientMock) UpdateDriftSchedule(ctx context.Context, stack pulumiapi.StackName, req pulumiapi.CreateDriftScheduleRequest, scheduleID string) (*string, error) { +func (c *ScheduleClientMock) UpdateDriftSchedule(ctx context.Context, stack pulumiapi.StackIdentifier, req pulumiapi.CreateDriftScheduleRequest, scheduleID string) (*string, error) { return nil, nil } -func (c *ScheduleClientMock) UpdateTtlSchedule(ctx context.Context, stack pulumiapi.StackName, req pulumiapi.CreateTtlScheduleRequest, scheduleID string) (*string, error) { +func (c *ScheduleClientMock) UpdateTtlSchedule(ctx context.Context, stack pulumiapi.StackIdentifier, req pulumiapi.CreateTtlScheduleRequest, scheduleID string) (*string, error) { return nil, nil } -func (c *ScheduleClientMock) DeleteSchedule(ctx context.Context, stack pulumiapi.StackName, scheduleID string) error { +func (c *ScheduleClientMock) DeleteSchedule(ctx context.Context, stack pulumiapi.StackIdentifier, scheduleID string) error { return nil } @@ -65,7 +65,7 @@ func TestDeploymentSchedule(t *testing.T) { } input := PulumiServiceDeploymentScheduleInput{ - Stack: pulumiapi.StackName{ + Stack: pulumiapi.StackIdentifier{ OrgName: "org", ProjectName: "project", StackName: "stack", @@ -123,7 +123,7 @@ func TestDeploymentSchedule(t *testing.T) { } input := PulumiServiceDeploymentScheduleInput{ - Stack: pulumiapi.StackName{ + Stack: pulumiapi.StackIdentifier{ OrgName: "org", ProjectName: "project", StackName: "stack", diff --git a/provider/pkg/provider/stack_tags.go b/provider/pkg/provider/stack_tags.go index 4e0a86ab..f1b6e03b 100644 --- a/provider/pkg/provider/stack_tags.go +++ b/provider/pkg/provider/stack_tags.go @@ -86,7 +86,7 @@ func (st *PulumiServiceStackTagResource) Delete(req *pulumirpc.DeleteRequest) (* if err != nil { return nil, err } - stackName := pulumiapi.StackName{ + stackName := pulumiapi.StackIdentifier{ OrgName: inputs.Organization, ProjectName: inputs.Project, StackName: inputs.Stack, @@ -105,7 +105,7 @@ func (st *PulumiServiceStackTagResource) Create(req *pulumirpc.CreateRequest) (* if err != nil { return nil, err } - stackName := pulumiapi.StackName{ + stackName := pulumiapi.StackIdentifier{ OrgName: inputs.Organization, ProjectName: inputs.Project, StackName: inputs.Stack, @@ -140,7 +140,7 @@ func (st *PulumiServiceStackTagResource) Read(req *pulumirpc.ReadRequest) (*pulu if err != nil { return nil, err } - stackName := pulumiapi.StackName{ + stackName := pulumiapi.StackIdentifier{ OrgName: inputs.Organization, ProjectName: inputs.Project, StackName: inputs.Stack, diff --git a/provider/pkg/provider/team_stack_perm.go b/provider/pkg/provider/team_stack_perm.go index 2b5cbcfa..497467d0 100644 --- a/provider/pkg/provider/team_stack_perm.go +++ b/provider/pkg/provider/team_stack_perm.go @@ -65,7 +65,7 @@ func (tp *TeamStackPermissionResource) Read(req *pulumirpc.ReadRequest) (*pulumi return nil, err } - permission, err := tp.client.GetTeamStackPermission(ctx, pulumiapi.StackName{ + permission, err := tp.client.GetTeamStackPermission(ctx, pulumiapi.StackIdentifier{ OrgName: permId.Organization, ProjectName: permId.Project, StackName: permId.Stack, @@ -103,7 +103,7 @@ func (tp *TeamStackPermissionResource) Create(req *pulumirpc.CreateRequest) (*pu if err != nil { return nil, err } - stackName := pulumiapi.StackName{ + stackName := pulumiapi.StackIdentifier{ OrgName: inputs.Organization, ProjectName: inputs.Project, StackName: inputs.Stack, @@ -129,7 +129,7 @@ func (tp *TeamStackPermissionResource) Delete(req *pulumirpc.DeleteRequest) (*pb if err != nil { return nil, err } - stackName := pulumiapi.StackName{ + stackName := pulumiapi.StackIdentifier{ OrgName: inputs.Organization, ProjectName: inputs.Project, StackName: inputs.Stack, diff --git a/provider/pkg/provider/team_test.go b/provider/pkg/provider/team_test.go index 0592b76a..e7d83fa6 100644 --- a/provider/pkg/provider/team_test.go +++ b/provider/pkg/provider/team_test.go @@ -35,13 +35,13 @@ func (c *TeamClientMock) AddMemberToTeam(ctx context.Context, orgName, teamName, func (c *TeamClientMock) DeleteMemberFromTeam(ctx context.Context, orgName, teamName, userName string) error { return nil } -func (c *TeamClientMock) AddStackPermission(ctx context.Context, stack pulumiapi.StackName, teamName string, permission int) error { +func (c *TeamClientMock) AddStackPermission(ctx context.Context, stack pulumiapi.StackIdentifier, teamName string, permission int) error { return nil } -func (c *TeamClientMock) RemoveStackPermission(ctx context.Context, stack pulumiapi.StackName, teamName string) error { +func (c *TeamClientMock) RemoveStackPermission(ctx context.Context, stack pulumiapi.StackIdentifier, teamName string) error { return nil } -func (c *TeamClientMock) GetTeamStackPermission(ctx context.Context, stack pulumiapi.StackName, teamName string) (*int, error) { +func (c *TeamClientMock) GetTeamStackPermission(ctx context.Context, stack pulumiapi.StackIdentifier, teamName string) (*int, error) { return nil, nil } func (c *TeamClientMock) AddEnvironmentPermission(ctx context.Context, req pulumiapi.CreateTeamEnvironmentPermissionRequest) error { diff --git a/provider/pkg/provider/ttl_schedules.go b/provider/pkg/provider/ttl_schedules.go index 060cc587..e347cd0e 100644 --- a/provider/pkg/provider/ttl_schedules.go +++ b/provider/pkg/provider/ttl_schedules.go @@ -19,7 +19,7 @@ type PulumiServiceTtlScheduleResource struct { } type PulumiServiceTtlScheduleInput struct { - Stack pulumiapi.StackName + Stack pulumiapi.StackIdentifier Timestamp time.Time `pulumi:"timestamp"` DeleteAfterDestroy bool `pulumi:"deleteAfterDestroy"` }