Skip to content

test: update tests to use existing SM and EN instances #253

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

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
+13 −31
Open

test: update tests to use existing SM and EN instances #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a17c5ff
use existing SM
Aayush-Abhyarthi Oct 12, 2025
8c53d5d
remove sm references
Aayush-Abhyarthi Oct 13, 2025
a92ac63
update test
Aayush-Abhyarthi Oct 15, 2025
9d3226e
Merge branch 'main' into useExistingSM
Aayush-Abhyarthi Oct 15, 2025
c54b4ab
revert
Aayush-Abhyarthi Oct 15, 2025
3570272
Merge remote-tracking branch 'origin/useExistingSM' into useExistingSM
Aayush-Abhyarthi Oct 15, 2025
969e0f2
revert
Aayush-Abhyarthi Oct 15, 2025
90e71c5
update: en version
Aayush-Abhyarthi Oct 16, 2025
1d8968f
fix: version
Aayush-Abhyarthi Oct 16, 2025
42da16b
upgrade terratest wrapper
Aayush-Abhyarthi Oct 17, 2025
008542b
resolve conflicts
Aayush-Abhyarthi Oct 30, 2025
745b606
fix: pre-commit
Aayush-Abhyarthi Oct 31, 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
2 changes: 1 addition & 1 deletion stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
}
],
"name": "2 - Event Notifications",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fa8ebdf4-db44-4e25-9846-9278b516cd73-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1a745fcf-1b76-48ed-9332-1300d8b0b126-global"
},
{
"inputs": [
Expand Down
23 changes: 12 additions & 11 deletions tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func TestProjectsExistingResourcesTest(t *testing.T) {
t.Parallel()

// ------------------------------------------------------------------------------------
// Provision RG, EN and SM
// Provision RG and EN
// ------------------------------------------------------------------------------------

region := validRegions[rand.Intn(len(validRegions))]
Expand Down Expand Up @@ -114,16 +114,17 @@ func TestProjectsExistingResourcesTest(t *testing.T) {
})

options.StackInputs = map[string]interface{}{
"prefix": terraform.Output(t, existingTerraformOptions, "prefix"),
"region": terraform.Output(t, existingTerraformOptions, "region"),
"existing_resource_group_name": terraform.Output(t, existingTerraformOptions, "resource_group_name"),
"ibmcloud_api_key": options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], // always required by the stack
"enable_platform_metrics": false,
"existing_secrets_manager_crn": terraform.Output(t, existingTerraformOptions, "secrets_manager_instance_crn"),
"skip_secrets_manager_iam_auth_policy": true, // skip as s2s auth policy was already created for existing instance
"existing_kms_instance_crn": terraform.Output(t, existingTerraformOptions, "key_project_instance_crn"),
"event_notifications_email_list": []string{"[email protected]"},
"secrets_manager_secret_groups": []string{}, // Don't create any secret groups in existing instance (The default 'General' group already exists)
"prefix": terraform.Output(t, existingTerraformOptions, "prefix"),
"region": terraform.Output(t, existingTerraformOptions, "region"),
"existing_resource_group_name": terraform.Output(t, existingTerraformOptions, "resource_group_name"),
"ibmcloud_api_key": options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], // always required by the stack
"enable_platform_metrics": false,
"existing_secrets_manager_crn": permanentResources["privateOnlySecMgrCRN"],
"skip_secrets_manager_iam_auth_policy": true, // skip as s2s auth policy was already created for existing instance
"existing_kms_instance_crn": terraform.Output(t, existingTerraformOptions, "key_project_instance_crn"),
"existing_event_notifications_instance_crn": terraform.Output(t, existingTerraformOptions, "event_notification_instance_crn"),
"event_notifications_email_list": []string{"[email protected]"},
"secrets_manager_secret_groups": []string{}, // Don't create any secret groups in existing instance (The default 'General' group already exists)
}

err := options.RunProjectsTest()
Expand Down
14 changes: 0 additions & 14 deletions tests/resources/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,6 @@ module "event_notifications" {
region = var.region
}

##############################################################################
# Secrets Manager
##############################################################################

module "secrets_manager" {
source = "terraform-ibm-modules/secrets-manager/ibm"
version = "2.11.3"
resource_group_id = module.resource_group.resource_group_id
region = var.region
secrets_manager_name = "${var.prefix}-secrets-manager" #tfsec:ignore:general-secrets-no-plaintext-exposure
sm_service_plan = "trial"
sm_tags = var.resource_tags
}

##############################################################################
# Key Protect
##############################################################################
Expand Down
5 changes: 0 additions & 5 deletions tests/resources/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ output "event_notification_instance_crn" {
description = "CRN of created event notification"
}

output "secrets_manager_instance_crn" {
value = module.secrets_manager.secrets_manager_crn
description = "CRN of created secret manager instance"
}

output "key_project_instance_crn" {
value = module.key_protect.key_protect_crn
description = "CRN of created Key Protect instance"
Expand Down