Skip to content

test: change the existing_kms_instance_guid to use us-south hpcs and add auth policy for service credential #275

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

Merged
ocofaigh merged 6 commits into from
Jan 30, 2025
Merged

test: change the existing_kms_instance_guid to use us-south hpcs and add auth policy for service credential #275

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c03d1b0
test: change the `existing_kms_instance_guid` to use us-south hpcs
Aashiq-J Jan 29, 2025
f5e8718
adding auth policy for service credentials
Aashiq-J Jan 30, 2025
f101640
SKIP UPGRADE TEST
Aashiq-J Jan 30, 2025
689acf5
precommit
Aashiq-J Jan 30, 2025
c97e9e6
plug test gap
Aashiq-J Jan 30, 2025
fd092a2
update test
Aashiq-J Jan 30, 2025
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
6 changes: 5 additions & 1 deletion examples/complete/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ This examples handles the provisioning of a new Secrets Manager instance.
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= v1.0.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >=1.70.0 |
| <a name="requirement_time"></a> [time](#requirement\_time) | 0.12.1 |

### Modules

Expand All @@ -21,7 +22,10 @@ This examples handles the provisioning of a new Secrets Manager instance.

### Resources

No resources.
| Name | Type |
|------|------|
| [ibm_iam_authorization_policy.en_policy](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/iam_authorization_policy) | resource |
| [time_sleep.wait_for_en_policy](https://registry.terraform.io/providers/hashicorp/time/0.12.1/docs/resources/sleep) | resource |

### Inputs

Expand Down
19 changes: 19 additions & 0 deletions examples/complete/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,26 @@ module "event_notification" {
region = var.en_region
}

resource "ibm_iam_authorization_policy" "en_policy" {
source_service_name = "secrets-manager"
roles = ["Key Manager"]
target_service_name = "event-notifications"
target_resource_instance_id = module.event_notification.guid
description = "Allow the Secret manager Key Manager role access to event-notifications with guid ${module.event_notification.guid}."
# Scope of policy now includes the key, so ensure to create new policy before
# destroying old one to prevent any disruption to every day services.
lifecycle {
create_before_destroy = true
}
}

resource "time_sleep" "wait_for_en_policy" {
depends_on = [ibm_iam_authorization_policy.en_policy]
create_duration = "30s"
}

module "secrets_manager" {
depends_on = [time_sleep.wait_for_en_policy]
source = "../.."
resource_group_id = module.resource_group.resource_group_id
region = var.region
Expand Down
4 changes: 4 additions & 0 deletions examples/complete/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,9 @@ terraform {
source = "IBM-Cloud/ibm"
version = ">=1.70.0"
}
time = {
source = "hashicorp/time"
version = "0.12.1"
}
}
}
4 changes: 2 additions & 2 deletions tests/other_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ func TestFSCloudInSchematics(t *testing.T) {
{Name: "ibmcloud_api_key", Value: options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], DataType: "string", Secure: true},
{Name: "region", Value: validRegions[rand.Intn(len(validRegions))], DataType: "string"},
{Name: "prefix", Value: options.Prefix, DataType: "string"},
{Name: "existing_kms_instance_guid", Value: permanentResources["hpcs_east"], DataType: "string"},
{Name: "kms_key_crn", Value: permanentResources["hpcs_east_root_key_crn"], DataType: "string"},
{Name: "existing_kms_instance_guid", Value: permanentResources["hpcs_south"], DataType: "string"},
{Name: "kms_key_crn", Value: permanentResources["hpcs_south_root_key_crn"], DataType: "string"},
{Name: "sm_service_plan", Value: "trial", DataType: "string"},
}

Expand Down