Skip to content

chore: remove scc da #123

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
merged 3 commits into from
Jun 9, 2025
Merged

chore: remove scc da #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cd1f17
chore: remove scc
huayuenh Jun 6, 2025
4060f79
chore: remove scc
huayuenh Jun 6, 2025
054d705
chore: remove scc
huayuenh Jun 6, 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
78 changes: 0 additions & 78 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,45 +217,6 @@
}
]
},
{
"key": "scc_service_plan",
"type": "string",
"default_value": "security-compliance-center-standard-plan",
"description": "The pricing plan to use for the IBM Cloud Security and Compliance Center.",
"required": false,
"options": [
{
"displayname": "standard",
"value": "security-compliance-center-standard-plan"
},
{
"displayname": "trial",
"value": "security-compliance-center-trial-plan"
}
]
},
{
"key": "scc_region",
"type": "string",
"default_value": "us-south",
"description": "The region in which the Security and Compliance Center instance is provisioned.",
"display_name": "Region",
"required": true,
"custom_config": {
"type": "region",
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"filterString": "id:ca-tor,eu-es,eu-de,eu-fr2,us-south",
"showKinds": [
"region",
"zone",
"dc",
"location"
]
}
}
},
{
"key": "en_region",
"type": "string",
Expand Down Expand Up @@ -747,45 +708,6 @@
}
]
},
{
"key": "scc_service_plan",
"type": "string",
"default_value": "security-compliance-center-standard-plan",
"description": "The pricing plan to use for the IBM Cloud Security and Compliance Center.",
"required": false,
"options": [
{
"displayname": "standard",
"value": "security-compliance-center-standard-plan"
},
{
"displayname": "trial",
"value": "security-compliance-center-trial-plan"
}
]
},
{
"key": "scc_region",
"type": "string",
"default_value": "us-south",
"description": "The region in which the Security and Compliance Center instance is provisioned.",
"display_name": "Region",
"required": true,
"custom_config": {
"type": "region",
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"filterString": "id:ca-tor,eu-es,eu-de,eu-fr2,us-south",
"showKinds": [
"region",
"zone",
"dc",
"location"
]
}
}
},
{
"key": "en_region",
"type": "string",
Expand Down
76 changes: 3 additions & 73 deletions kubernetes/stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@
"default": "us-south",
"custom_config": {}
},
{
"name": "scc_region",
"required": true,
"type": "string",
"hidden": false,
"default": "us-south",
"custom_config": {}
},
{
"name": "app_repo_existing_url",
"type": "string",
Expand Down Expand Up @@ -129,14 +121,6 @@
"default": "signing-certificate",
"custom_config": {}
},
{
"name": "scc_service_plan",
"required": false,
"type": "string",
"hidden": false,
"default": "security-compliance-center-standard-plan",
"custom_config": {}
},
{
"name": "app_repo_branch",
"type": "string",
Expand Down Expand Up @@ -476,7 +460,7 @@
}
],
"name": "1 - Key Management",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.00f91756-7287-4786-9ab0-fd12d30d8919-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global"
},
{
"inputs": [
Expand All @@ -485,7 +469,7 @@
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "existing_resource_group",
"name": "use_existing_resource_group",
"value": true
},
{
Expand All @@ -498,7 +482,7 @@
}
],
"name": "2 - Cloud Object Storage",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.855893e4-62db-4f00-a867-0795231053fe-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fef2dae0-dc1a-4e7f-a663-dba29dfbc01a-global"
},
{
"inputs": [
Expand Down Expand Up @@ -602,60 +586,6 @@
"name": "5 - Secrets Manager",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global"
},
{
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
"value": true
},
{
"name": "scc_region",
"value": "ref:../../inputs/scc_region"
},
{
"name": "cos_region",
"value": "ref:../../inputs/region"
},
{
"name": "prefix",
"value": "ref:../../inputs/prefix"
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
},
{
"name": "existing_en_crn",
"value": "ref:../../members/4 - Event Notifications/outputs/crn"
},
{
"name": "kms_endpoint_type",
"value": "private"
},
{
"name": "skip_cos_kms_auth_policy",
"value": true
},
{
"name": "scc_service_plan",
"value": "ref:../../inputs/scc_service_plan"
},
{
"name": "existing_cos_instance_crn",
"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
},
{
"name" : "provision_scc_workload_protection",
"value" : false
}
],
"name": "6 - Security and Compliance Center",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e4e8fc9-8953-4456-a51c-6ed6a3ca1bd7-global"
},
{
"name": "7 - DevSecOps Toolchains",
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.40c697e5-a339-4bf2-90ed-c598f103c16b-global",
Expand Down
76 changes: 3 additions & 73 deletions stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@
"default": "us-south",
"custom_config": {}
},
{
"name": "scc_region",
"required": true,
"type": "string",
"hidden": false,
"default": "us-south",
"custom_config": {}
},
{
"name": "app_repo_existing_url",
"type": "string",
Expand Down Expand Up @@ -128,14 +120,6 @@
"hidden": false,
"default": "signing-certificate",
"custom_config": {}
},
{
"name": "scc_service_plan",
"required": false,
"type": "string",
"hidden": false,
"default": "security-compliance-center-standard-plan",
"custom_config": {}
},
{
"name": "app_repo_branch",
Expand Down Expand Up @@ -437,7 +421,7 @@
}
],
"name": "1 - Key Management",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.00f91756-7287-4786-9ab0-fd12d30d8919-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global"
},
{
"inputs": [
Expand All @@ -446,7 +430,7 @@
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "existing_resource_group",
"name": "use_existing_resource_group",
"value": true
},
{
Expand All @@ -459,7 +443,7 @@
}
],
"name": "2 - Cloud Object Storage",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.855893e4-62db-4f00-a867-0795231053fe-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fef2dae0-dc1a-4e7f-a663-dba29dfbc01a-global"
},
{
"inputs": [
Expand Down Expand Up @@ -563,60 +547,6 @@
"name": "5 - Secrets Manager",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global"
},
{
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
"value": true
},
{
"name": "scc_region",
"value": "ref:../../inputs/scc_region"
},
{
"name": "cos_region",
"value": "ref:../../inputs/region"
},
{
"name": "prefix",
"value": "ref:../../inputs/prefix"
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
},
{
"name": "existing_en_crn",
"value": "ref:../../members/4 - Event Notifications/outputs/crn"
},
{
"name": "kms_endpoint_type",
"value": "private"
},
{
"name": "skip_cos_kms_auth_policy",
"value": true
},
{
"name": "scc_service_plan",
"value": "ref:../../inputs/scc_service_plan"
},
{
"name": "existing_cos_instance_crn",
"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
},
{
"name": "provision_scc_workload_protection",
"value": false
}
],
"name": "6 - Security and Compliance Center",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e4e8fc9-8953-4456-a51c-6ed6a3ca1bd7-global"
},
{
"name": "7 - DevSecOps Toolchains",
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.3bf38800-70e9-40db-aeca-016c9911364f-global",
Expand Down
4 changes: 2 additions & 2 deletions tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ func TestProjectsFullTest(t *testing.T) {

options.StackInputs = map[string]interface{}{
"prefix": options.Prefix,
"resource_group_name": options.Prefix,
"resource_group_name": "stack-pr-rg",
"sm_service_plan": "trial",
"scc_service_plan": "security-compliance-center-standard-plan",
"use_existing_resource_group": "true",
"region": "us-south",
"existing_secrets_manager_crn": permanentResources["secretsManagerCRN"],
"ibmcloud_api_key": options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], // always required by the stack
Expand Down