Skip to content

Commit a7d39c3

Browse files
huayuenhhuayuenh
authored
chore: remove scc da (#123)
1 parent ea5c550 commit a7d39c3

File tree

4 files changed

+8
-226
lines changed

4 files changed

+8
-226
lines changed

‎ibm_catalog.json‎

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -217,45 +217,6 @@
217217
}
218218
]
219219
},
220-
{
221-
"key": "scc_service_plan",
222-
"type": "string",
223-
"default_value": "security-compliance-center-standard-plan",
224-
"description": "The pricing plan to use for the IBM Cloud Security and Compliance Center.",
225-
"required": false,
226-
"options": [
227-
{
228-
"displayname": "standard",
229-
"value": "security-compliance-center-standard-plan"
230-
},
231-
{
232-
"displayname": "trial",
233-
"value": "security-compliance-center-trial-plan"
234-
}
235-
]
236-
},
237-
{
238-
"key": "scc_region",
239-
"type": "string",
240-
"default_value": "us-south",
241-
"description": "The region in which the Security and Compliance Center instance is provisioned.",
242-
"display_name": "Region",
243-
"required": true,
244-
"custom_config": {
245-
"type": "region",
246-
"grouping": "deployment",
247-
"original_grouping": "deployment",
248-
"config_constraints": {
249-
"filterString": "id:ca-tor,eu-es,eu-de,eu-fr2,us-south",
250-
"showKinds": [
251-
"region",
252-
"zone",
253-
"dc",
254-
"location"
255-
]
256-
}
257-
}
258-
},
259220
{
260221
"key": "en_region",
261222
"type": "string",
@@ -747,45 +708,6 @@
747708
}
748709
]
749710
},
750-
{
751-
"key": "scc_service_plan",
752-
"type": "string",
753-
"default_value": "security-compliance-center-standard-plan",
754-
"description": "The pricing plan to use for the IBM Cloud Security and Compliance Center.",
755-
"required": false,
756-
"options": [
757-
{
758-
"displayname": "standard",
759-
"value": "security-compliance-center-standard-plan"
760-
},
761-
{
762-
"displayname": "trial",
763-
"value": "security-compliance-center-trial-plan"
764-
}
765-
]
766-
},
767-
{
768-
"key": "scc_region",
769-
"type": "string",
770-
"default_value": "us-south",
771-
"description": "The region in which the Security and Compliance Center instance is provisioned.",
772-
"display_name": "Region",
773-
"required": true,
774-
"custom_config": {
775-
"type": "region",
776-
"grouping": "deployment",
777-
"original_grouping": "deployment",
778-
"config_constraints": {
779-
"filterString": "id:ca-tor,eu-es,eu-de,eu-fr2,us-south",
780-
"showKinds": [
781-
"region",
782-
"zone",
783-
"dc",
784-
"location"
785-
]
786-
}
787-
}
788-
},
789711
{
790712
"key": "en_region",
791713
"type": "string",

‎kubernetes/stack_definition.json‎

Lines changed: 3 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@
1515
"default": "us-south",
1616
"custom_config": {}
1717
},
18-
{
19-
"name": "scc_region",
20-
"required": true,
21-
"type": "string",
22-
"hidden": false,
23-
"default": "us-south",
24-
"custom_config": {}
25-
},
2618
{
2719
"name": "app_repo_existing_url",
2820
"type": "string",
@@ -129,14 +121,6 @@
129121
"default": "signing-certificate",
130122
"custom_config": {}
131123
},
132-
{
133-
"name": "scc_service_plan",
134-
"required": false,
135-
"type": "string",
136-
"hidden": false,
137-
"default": "security-compliance-center-standard-plan",
138-
"custom_config": {}
139-
},
140124
{
141125
"name": "app_repo_branch",
142126
"type": "string",
@@ -476,7 +460,7 @@
476460
}
477461
],
478462
"name": "1 - Key Management",
479-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.00f91756-7287-4786-9ab0-fd12d30d8919-global"
463+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global"
480464
},
481465
{
482466
"inputs": [
@@ -485,7 +469,7 @@
485469
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
486470
},
487471
{
488-
"name": "existing_resource_group",
472+
"name": "use_existing_resource_group",
489473
"value": true
490474
},
491475
{
@@ -498,7 +482,7 @@
498482
}
499483
],
500484
"name": "2 - Cloud Object Storage",
501-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.855893e4-62db-4f00-a867-0795231053fe-global"
485+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fef2dae0-dc1a-4e7f-a663-dba29dfbc01a-global"
502486
},
503487
{
504488
"inputs": [
@@ -602,60 +586,6 @@
602586
"name": "5 - Secrets Manager",
603587
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global"
604588
},
605-
{
606-
"inputs": [
607-
{
608-
"name": "resource_group_name",
609-
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
610-
},
611-
{
612-
"name": "use_existing_resource_group",
613-
"value": true
614-
},
615-
{
616-
"name": "scc_region",
617-
"value": "ref:../../inputs/scc_region"
618-
},
619-
{
620-
"name": "cos_region",
621-
"value": "ref:../../inputs/region"
622-
},
623-
{
624-
"name": "prefix",
625-
"value": "ref:../../inputs/prefix"
626-
},
627-
{
628-
"name": "existing_kms_instance_crn",
629-
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
630-
},
631-
{
632-
"name": "existing_en_crn",
633-
"value": "ref:../../members/4 - Event Notifications/outputs/crn"
634-
},
635-
{
636-
"name": "kms_endpoint_type",
637-
"value": "private"
638-
},
639-
{
640-
"name": "skip_cos_kms_auth_policy",
641-
"value": true
642-
},
643-
{
644-
"name": "scc_service_plan",
645-
"value": "ref:../../inputs/scc_service_plan"
646-
},
647-
{
648-
"name": "existing_cos_instance_crn",
649-
"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
650-
},
651-
{
652-
"name" : "provision_scc_workload_protection",
653-
"value" : false
654-
}
655-
],
656-
"name": "6 - Security and Compliance Center",
657-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e4e8fc9-8953-4456-a51c-6ed6a3ca1bd7-global"
658-
},
659589
{
660590
"name": "7 - DevSecOps Toolchains",
661591
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.40c697e5-a339-4bf2-90ed-c598f103c16b-global",

‎stack_definition.json‎

Lines changed: 3 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@
1515
"default": "us-south",
1616
"custom_config": {}
1717
},
18-
{
19-
"name": "scc_region",
20-
"required": true,
21-
"type": "string",
22-
"hidden": false,
23-
"default": "us-south",
24-
"custom_config": {}
25-
},
2618
{
2719
"name": "app_repo_existing_url",
2820
"type": "string",
@@ -128,14 +120,6 @@
128120
"hidden": false,
129121
"default": "signing-certificate",
130122
"custom_config": {}
131-
},
132-
{
133-
"name": "scc_service_plan",
134-
"required": false,
135-
"type": "string",
136-
"hidden": false,
137-
"default": "security-compliance-center-standard-plan",
138-
"custom_config": {}
139123
},
140124
{
141125
"name": "app_repo_branch",
@@ -437,7 +421,7 @@
437421
}
438422
],
439423
"name": "1 - Key Management",
440-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.00f91756-7287-4786-9ab0-fd12d30d8919-global"
424+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global"
441425
},
442426
{
443427
"inputs": [
@@ -446,7 +430,7 @@
446430
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
447431
},
448432
{
449-
"name": "existing_resource_group",
433+
"name": "use_existing_resource_group",
450434
"value": true
451435
},
452436
{
@@ -459,7 +443,7 @@
459443
}
460444
],
461445
"name": "2 - Cloud Object Storage",
462-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.855893e4-62db-4f00-a867-0795231053fe-global"
446+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fef2dae0-dc1a-4e7f-a663-dba29dfbc01a-global"
463447
},
464448
{
465449
"inputs": [
@@ -563,60 +547,6 @@
563547
"name": "5 - Secrets Manager",
564548
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global"
565549
},
566-
{
567-
"inputs": [
568-
{
569-
"name": "resource_group_name",
570-
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
571-
},
572-
{
573-
"name": "use_existing_resource_group",
574-
"value": true
575-
},
576-
{
577-
"name": "scc_region",
578-
"value": "ref:../../inputs/scc_region"
579-
},
580-
{
581-
"name": "cos_region",
582-
"value": "ref:../../inputs/region"
583-
},
584-
{
585-
"name": "prefix",
586-
"value": "ref:../../inputs/prefix"
587-
},
588-
{
589-
"name": "existing_kms_instance_crn",
590-
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
591-
},
592-
{
593-
"name": "existing_en_crn",
594-
"value": "ref:../../members/4 - Event Notifications/outputs/crn"
595-
},
596-
{
597-
"name": "kms_endpoint_type",
598-
"value": "private"
599-
},
600-
{
601-
"name": "skip_cos_kms_auth_policy",
602-
"value": true
603-
},
604-
{
605-
"name": "scc_service_plan",
606-
"value": "ref:../../inputs/scc_service_plan"
607-
},
608-
{
609-
"name": "existing_cos_instance_crn",
610-
"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
611-
},
612-
{
613-
"name": "provision_scc_workload_protection",
614-
"value": false
615-
}
616-
],
617-
"name": "6 - Security and Compliance Center",
618-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e4e8fc9-8953-4456-a51c-6ed6a3ca1bd7-global"
619-
},
620550
{
621551
"name": "7 - DevSecOps Toolchains",
622552
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.3bf38800-70e9-40db-aeca-016c9911364f-global",

‎tests/pr_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ func TestProjectsFullTest(t *testing.T) {
5454

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

0 commit comments

Comments
 (0)