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 all 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
3 changes: 3 additions & 0 deletions .github/workflows/testacc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ jobs:
HOSTED_USER_ID: clz3a4ymt004x01on8w5ydq8j
HOSTED_DUMMY_USER_ID: clzawipbm00bm01qw98vzzoca
HOSTED_DEPLOYMENT_ID: clyn6kxud003x01mtxmccegnh
HOSTED_STANDARD_DEPLOYMENT_ID: cm070pg0r00wd01qgnskk0dir
HOSTED_WORKSPACE_ID: clx42sxw501gl01o0gjenthnh
HOSTED_API_TOKEN_ID: clxm4836f00ql01me3nigmcr6
TESTARGS: "-failfast"
Expand Down Expand Up @@ -145,6 +146,7 @@ jobs:
HOSTED_USER_ID: clz3a95hw00j301jj5jfmcgwd
HOSTED_DUMMY_USER_ID: clzawlsb701vv01ikvsqz5mws
HOSTED_DEPLOYMENT_ID: cly6exz4a00zd01k18t5bo1vf
HOSTED_STANDARD_DEPLOYMENT_ID: cm077ee2807g301kpjkqdoc15
HOSTED_WORKSPACE_ID: clx480rvx068u01j9mp7t7fqh
HOSTED_API_TOKEN_ID: clxm46ged05b301neuucdqwox
TESTARGS: "-failfast"
Expand Down Expand Up @@ -196,6 +198,7 @@ jobs:
HOSTED_USER_ID: clz3a4ymt004x01on8w5ydq8j
HOSTED_DUMMY_USER_ID: clzawipbm00bm01qw98vzzoca
HOSTED_DEPLOYMENT_ID: clyn6kxud003x01mtxmccegnh
HOSTED_STANDARD_DEPLOYMENT_ID: cm070pg0r00wd01qgnskk0dir
HOSTED_WORKSPACE_ID: clx42sxw501gl01o0gjenthnh
HOSTED_API_TOKEN_ID: clxm4836f00ql01me3nigmcr6
TESTARGS: "-failfast"
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,14 +120,15 @@ 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), lo.Uniq(deploymentWorkspaceIds))
workspaceIds = lo.Intersect(lo.Uniq(workspaceIds), deploymentWorkspaceIds)
Copy link
Collaborator

Choose a reason for hiding this comment

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

can we have a test case where before this change it would fail and after it would pass

if len(workspaceIds) != len(deploymentWorkspaceIds) {
tflog.Error(ctx, "failed to mutate roles")
return diag.Diagnostics{diag.NewErrorDiagnostic(
Expand Down
54 changes: 54 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 @@ -21,6 +21,7 @@ import (
func TestAcc_ResourceUserRoles(t *testing.T) {
workspaceId := os.Getenv("HOSTED_WORKSPACE_ID")
deploymentId := os.Getenv("HOSTED_DEPLOYMENT_ID")
standardDeploymentId := os.Getenv("HOSTED_STANDARD_DEPLOYMENT_ID")
userId := os.Getenv("HOSTED_DUMMY_USER_ID")
tfVarName := fmt.Sprintf("astro_user_roles.%v", userId)
resource.Test(t, resource.TestCase{
Expand Down Expand Up @@ -130,6 +131,59 @@ func TestAcc_ResourceUserRoles(t *testing.T) {
),
),
},
// Check that multiple deployment roles under one workspace are correctly set
{
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: standardDeploymentId,
},
},
}),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(tfVarName, "user_id", userId),
resource.TestCheckResourceAttr(tfVarName, "organization_role", string(iam.ORGANIZATIONOWNER)),
resource.TestCheckResourceAttr(tfVarName, "workspace_roles.#", "1"),
resource.TestCheckResourceAttr(tfVarName, "deployment_roles.#", "2"),
resource.TestCheckResourceAttr(tfVarName, "workspace_roles.0.role", string(iam.WORKSPACEOWNER)),
resource.TestCheckResourceAttr(tfVarName, "deployment_roles.0.role", "DEPLOYMENT_ADMIN"),
resource.TestCheckResourceAttr(tfVarName, "deployment_roles.1.role", "DEPLOYMENT_ADMIN"),

// Check via API that user has correct roles
testAccCheckUserRolesCorrect(t,
string(iam.ORGANIZATIONOWNER),
[]utils.Role{
{
Role: string(iam.WORKSPACEOWNER),
EntityId: workspaceId,
},
},
[]utils.Role{
{
Role: "DEPLOYMENT_ADMIN",
EntityId: deploymentId,
},
{
Role: "DEPLOYMENT_ADMIN",
EntityId: standardDeploymentId,
},
},
),
),
},
// Import existing user_roles and check it is correctly imported - https://stackoverflow.com/questions/68824711/how-can-i-test-terraform-import-in-acceptance-tests
{
ResourceName: tfVarName,
Expand Down