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

Fix Bug in Role Helper #142

Merged
merged 5 commits into from
Aug 23, 2024
Merged

Fix Bug in Role Helper #142

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1aaaf46
fix bug
ichung08 Aug 23, 2024
dac16ec
remove release name from script release
ichung08 Aug 23, 2024
dcaf343
test for error
ichung08 Aug 23, 2024
17e741d
fix role bug
ichung08 Aug 23, 2024
3e598cf
fix role test
ichung08 Aug 23, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build-release-import-script.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ steps.get_version.outputs.VERSION }}
release_name: Release Astro Import Script ${{ steps.get_version.outputs.VERSION }}
release_name: Astro Import Script ${{ steps.get_version.outputs.VERSION }}
draft: false
prerelease: false

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Requirements

- [Terraform](https://developer.hashicorp.com/terraform/downloads) >= 1.0
- [Terraform](https://developer.hashicorp.com/terraform/downloads) >= 1.7
- [Go](https://golang.org/doc/install) >= 1.21

## Building The Provider
Expand Down
3 changes: 2 additions & 1 deletion internal/provider/common/role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,14 @@ func ValidateWorkspaceDeploymentRoles(ctx context.Context, input ValidateWorkspa
deploymentWorkspaceIds := lo.Map(listDeployments.JSON200.Deployments, func(deployment platform.Deployment, _ int) string {
return deployment.WorkspaceId
})

//deploymentWorkspaceIds = lo.Uniq(deploymentWorkspaceIds)
// get list of workspaceIds
workspaceIds := lo.Map(input.WorkspaceRoles, func(role iam.WorkspaceRole, _ int) string {
return role.WorkspaceId
})

// check if deploymentWorkspaceIds are in workspaceIds
//workspaceIds = lo.Intersect(lo.Uniq(workspaceIds), deploymentWorkspaceIds)
workspaceIds = lo.Intersect(lo.Uniq(workspaceIds), lo.Uniq(deploymentWorkspaceIds))
if len(workspaceIds) != len(deploymentWorkspaceIds) {
tflog.Error(ctx, "failed to mutate roles")
Expand Down
24 changes: 24 additions & 0 deletions internal/provider/resources/resource_user_roles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,30 @@ func TestAcc_ResourceUserRoles(t *testing.T) {
}),
ExpectError: regexp.MustCompile("Unable to mutate roles, not every deployment role has a corresponding workspace role"),
},
// Test failure: check for missing corresponding workspace role if deployment role is present
{
Config: astronomerprovider.ProviderConfig(t, astronomerprovider.HOSTED) +
userRoles(userRolesInput{
OrganizationRole: string(iam.ORGANIZATIONOWNER),
WorkspaceRoles: []utils.Role{
{
Role: string(iam.WORKSPACEOWNER),
EntityId: workspaceId,
},
},
DeploymentRoles: []utils.Role{
{
Role: "DEPLOYMENT_ADMIN",
EntityId: deploymentId,
},
{
Role: "DEPLOYMENT_ADMIN",
EntityId: "cm070pg0r00wd01qgnskk0dir",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where did this deploymentId come from?
should we create a deployment for this test and use that one instead?

},
},
}),
ExpectError: regexp.MustCompile("Unable to mutate roles, not every deployment role has a corresponding workspace role"),
},
// Test failure: check for multiple roles with same entity id
{
Config: astronomerprovider.ProviderConfig(t, astronomerprovider.HOSTED) +
Expand Down