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

Fixes to reduce spurious diffs caused by opentelekomcloud_identity_role_assignment_v3 resources. #114

Merged
merged 2 commits into from
Jul 17, 2024
Merged

Fixes to reduce spurious diffs caused by opentelekomcloud_identity_role_assignment_v3 resources. #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc5d8cc
cert_manager: remove secondary data source in favor of using parent_id
canaykin Jul 16, 2024
b9d9747
terraform-docs: automated action
github-actions[bot] Jul 16, 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
1 change: 0 additions & 1 deletion modules/cert_manager/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ No modules.
| [opentelekomcloud_identity_role_assignment_v3.dns_admin_role_to_dns_group](https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud/latest/docs/resources/identity_role_assignment_v3) | resource |
| [opentelekomcloud_identity_user_v3.user](https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud/latest/docs/resources/identity_user_v3) | resource |
| [opentelekomcloud_identity_project_v3.current](https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud/latest/docs/data-sources/identity_project_v3) | data source |
| [opentelekomcloud_identity_project_v3.toplevel](https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud/latest/docs/data-sources/identity_project_v3) | data source |
| [opentelekomcloud_identity_role_v3.dns_admin_role](https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud/latest/docs/data-sources/identity_role_v3) | data source |

## Inputs
Expand Down
2 changes: 1 addition & 1 deletion modules/cert_manager/cert_manager.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ resource "helm_release" "cert-manager" {
clusterIssuers = {
email = var.email
otcDNS = {
region = data.opentelekomcloud_identity_project_v3.toplevel.name
region = data.opentelekomcloud_identity_project_v3.current.region
accessKey = opentelekomcloud_identity_credential_v3.user_aksk.access
secretKey = opentelekomcloud_identity_credential_v3.user_aksk.secret
}
Expand Down
9 changes: 4 additions & 5 deletions modules/cert_manager/otc_user.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
data "opentelekomcloud_identity_project_v3" "current" {}

data "opentelekomcloud_identity_project_v3" "toplevel" {
name = data.opentelekomcloud_identity_project_v3.current.region
}

resource "opentelekomcloud_identity_user_v3" "user" {
name = var.username
enabled = true
Expand All @@ -20,8 +16,11 @@ resource "opentelekomcloud_identity_group_v3" "dns_admin_group" {

resource "opentelekomcloud_identity_role_assignment_v3" "dns_admin_role_to_dns_group" {
group_id = opentelekomcloud_identity_group_v3.dns_admin_group.id
project_id = data.opentelekomcloud_identity_project_v3.toplevel.id
project_id = data.opentelekomcloud_identity_project_v3.current.name == data.opentelekomcloud_identity_project_v3.current.region ? data.opentelekomcloud_identity_project_v3.current.id : data.opentelekomcloud_identity_project_v3.current.parent_id
role_id = data.opentelekomcloud_identity_role_v3.dns_admin_role.id
lifecycle {
ignore_changes = [project_id]
}
}

resource "opentelekomcloud_identity_group_membership_v3" "user_to_dns_admin_group" {
Expand Down
6 changes: 6 additions & 0 deletions modules/obs_restricted/group.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ resource "opentelekomcloud_identity_role_assignment_v3" "obs_role_to_obs_group"
group_id = opentelekomcloud_identity_group_v3.obs_group.id
project_id = data.opentelekomcloud_identity_project_v3.obs_project.id
role_id = opentelekomcloud_identity_role_v3.bucket_access.id
lifecycle {
ignore_changes = [project_id]
}
}

data "opentelekomcloud_identity_project_v3" "current" {}
Expand Down Expand Up @@ -89,4 +92,7 @@ resource "opentelekomcloud_identity_role_assignment_v3" "kms_adm_to_obs_group" {
group_id = opentelekomcloud_identity_group_v3.obs_group.id
project_id = data.opentelekomcloud_identity_project_v3.current.id
role_id = opentelekomcloud_identity_role_v3.kms_access.id
lifecycle {
ignore_changes = [project_id]
}
}
1 change: 0 additions & 1 deletion modules/projects/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ module "projects" {

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | v1.4.6 |
| <a name="requirement_opentelekomcloud"></a> [opentelekomcloud](#requirement\_opentelekomcloud) | >=1.34.4 |

## Providers
Expand Down
1 change: 0 additions & 1 deletion modules/state_bucket/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ Notes:

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | v1.4.6 |
| <a name="requirement_opentelekomcloud"></a> [opentelekomcloud](#requirement\_opentelekomcloud) | >=1.34.4 |

## Providers
Expand Down