Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: byoa principal ids fix #600

Merged
merged 1 commit into from
Oct 29, 2024
Merged

fix: byoa principal ids fix #600

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 31 additions & 29 deletions pkg/provider/resource_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,42 +1031,44 @@ func (c *clusterResource) makeClusterForCreate(ctx context.Context, clusterResou
}

func (c *clusterResource) buildRequestBah(ctx context.Context, clusterResourceModel ClusterResourceModel) (svAccIds, principalIds *[]string, err error) {
// If there is an existing Principal Account Id for that Region, use that one.
pids, err := c.client.GetPeAllowedPrincipalIds(ctx, clusterResourceModel.ProjectId, clusterResourceModel.CloudProvider.ValueString(), clusterResourceModel.Region.ValueString())
if err != nil {
return nil, nil, err
}
principalIds = utils.ToPointer(pids.Data)

// If there is no existing value, user should provide one
if principalIds != nil && len(*principalIds) == 0 {
// Here, we prefer to create a non-nil zero length slice, because we need empty JSON array
// while encoding JSON objects
// For more info, please visit https://github.com/golang/go/wiki/CodeReviewComments#declaring-empty-slices
plist := []string{}
for _, peId := range clusterResourceModel.PeAllowedPrincipalIds.Elements() {
plist = append(plist, peId.(basetypes.StringValue).ValueString())
if strings.Contains(clusterResourceModel.CloudProvider.ValueString(), "bah") {
// If there is an existing Principal Account Id for that Region, use that one.
pids, err := c.client.GetPeAllowedPrincipalIds(ctx, clusterResourceModel.ProjectId, clusterResourceModel.CloudProvider.ValueString(), clusterResourceModel.Region.ValueString())
if err != nil {
return nil, nil, err
}

principalIds = utils.ToPointer(plist)
}

if clusterResourceModel.CloudProvider.ValueString() == "bah:gcp" {
// If there is an existing Service Account Id for that Region, use that one.
sids, _ := c.client.GetServiceAccountIds(ctx, clusterResourceModel.ProjectId, clusterResourceModel.CloudProvider.ValueString(), clusterResourceModel.Region.ValueString())
svAccIds = utils.ToPointer(sids.Data)
principalIds = utils.ToPointer(pids.Data)

// If there is no existing value, user should provide one
if svAccIds != nil && len(*svAccIds) == 0 {
if principalIds != nil && len(*principalIds) == 0 {
// Here, we prefer to create a non-nil zero length slice, because we need empty JSON array
// while encoding JSON objects.
// while encoding JSON objects
// For more info, please visit https://github.com/golang/go/wiki/CodeReviewComments#declaring-empty-slices
slist := []string{}
for _, saId := range clusterResourceModel.ServiceAccountIds.Elements() {
slist = append(slist, saId.(basetypes.StringValue).ValueString())
plist := []string{}
for _, peId := range clusterResourceModel.PeAllowedPrincipalIds.Elements() {
plist = append(plist, peId.(basetypes.StringValue).ValueString())
}

svAccIds = utils.ToPointer(slist)
principalIds = utils.ToPointer(plist)
}

if clusterResourceModel.CloudProvider.ValueString() == "bah:gcp" {
// If there is an existing Service Account Id for that Region, use that one.
sids, _ := c.client.GetServiceAccountIds(ctx, clusterResourceModel.ProjectId, clusterResourceModel.CloudProvider.ValueString(), clusterResourceModel.Region.ValueString())
svAccIds = utils.ToPointer(sids.Data)

// If there is no existing value, user should provide one
if svAccIds != nil && len(*svAccIds) == 0 {
// Here, we prefer to create a non-nil zero length slice, because we need empty JSON array
// while encoding JSON objects.
// For more info, please visit https://github.com/golang/go/wiki/CodeReviewComments#declaring-empty-slices
slist := []string{}
for _, saId := range clusterResourceModel.ServiceAccountIds.Elements() {
slist = append(slist, saId.(basetypes.StringValue).ValueString())
}

svAccIds = utils.ToPointer(slist)
}
}
}
return
Expand Down
Loading