Skip to content
This repository was archived by the owner on Mar 19, 2025. It is now read-only.

refactor: best input practices for da #250

Merged
merged 25 commits into from
Mar 4, 2025
Merged

refactor: best input practices for da #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
864f7f6
refactor: best input practices for da
Feb 20, 2025
c283bb3
Merge branch 'main' into da_best_practices
Vipin654 Feb 24, 2025
dba943b
ordered input variables in catalog
Feb 24, 2025
a296cdb
resolved merge conflicts
Feb 24, 2025
bfaa8d3
added custom config for tags
Feb 24, 2025
ff4cc1a
catalog json change
Feb 24, 2025
d4e9570
catalog json change
Feb 24, 2025
ead70ed
catalog json change
Feb 24, 2025
5cb9c72
Update pr_test.go
Vipin654 Feb 26, 2025
1e4f294
addressed review comments
Feb 26, 2025
6d857ba
Merge branch 'da_best_practices' of github.com:terraform-ibm-modules/…
Feb 26, 2025
b57d024
cos_bucket_region not required
Feb 26, 2025
9bf01ef
renamed variable cos_bucket_region
Feb 26, 2025
35995dd
addressed review comments
Feb 26, 2025
93cc056
consistent variable description
Feb 26, 2025
e3cb166
pre-commit fix
Feb 26, 2025
b616d9f
Update ibm_catalog.json
Vipin654 Feb 26, 2025
ed49974
addressed review comments
Feb 26, 2025
8045d47
added all regions for bucket support
Feb 28, 2025
711683d
addressed review comments
Mar 3, 2025
67b9b5c
addressed review comments
Mar 3, 2025
7ea78d0
Merge branch 'main' into da_best_practices
Vipin654 Mar 3, 2025
212d39c
fixed test cases
Mar 4, 2025
46d059d
Merge branch 'da_best_practices' of github.com:terraform-ibm-modules/…
Mar 4, 2025
8380271
fixed test case
Mar 4, 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
270 changes: 179 additions & 91 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,45 @@
{
"key": "ibmcloud_api_key"
},
{
"key": "prefix",
"required": true,
"description": "Prefix to add to all resources that this solution creates. To not use any prefix value, you can enter the string `__NULL__`."
},
{
"key": "use_existing_resource_group",
"required": true
},
{
"key": "resource_group_name",
"required": true
},
{
"key": "scc_region",
"required": true,
"options": [
{
"displayname": "Dallas (us-south)",
"value": "us-south"
},
{
"displayname": "Frankfurt (eu-de)",
"value": "eu-de"
},
{
"displayname": "Madrid (eu-es)",
"value": "eu-es"
},
{
"displayname": "Toronto (ca-tor)",
"value": "ca-tor"
}
]
},
{
"key": "existing_kms_instance_crn",
"required": true
},
{
"key": "provider_visibility",
"options": [
Expand All @@ -78,78 +117,121 @@
]
},
{
"key": "use_existing_resource_group"
},
{
"key": "resource_group_name"
},
{
"key": "prefix",
"required": true,
"description": "The prefix to add to all resources that this solution creates. To not use any prefix value, you can enter the string `__NULL__`."
},
{
"key": "existing_monitoring_crn"
},
{
"key": "existing_kms_instance_crn",
"required": true
},
{
"key": "existing_scc_instance_crn"
"key": "scc_instance_name"
},
{
"key": "existing_scc_cos_kms_key_crn"
"key": "scc_instance_tags",
"custom_config": {
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"type": "string"
}
}
},
{
"key": "kms_endpoint_type",
"key": "scc_service_plan",
"options": [
{
"displayname": "Public",
"value": "public"
"displayname": "Standard",
"value": "security-compliance-center-standard-plan"
},
{
"displayname": "Private",
"value": "private"
"displayname": "Trial",
"value": "security-compliance-center-trial-plan"
}
]
},
{
"key": "scc_cos_key_ring_name"
"key": "existing_scc_instance_crn"
},
{
"key": "scc_cos_key_name"
"key": "cos_instance_name"
},
{
"key": "cos_instance_tags",
"custom_config": {
"config_constraints": {
"generationType": "2"
},
"grouping": "deployment",
"original_grouping": "deployment",
"type": "region"
},
"key": "cos_region",
"required": true,
"type": "string"
},
{
"key": "cos_instance_name"
"config_constraints": {
"type": "string"
}
}
},
{
"key": "cos_instance_tags"
"key": "cos_instance_access_tags",
"custom_config": {
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"type": "string"
}
}
},
{
"key": "cos_instance_access_tags"
"key": "scc_cos_bucket_name"
},
{
"key": "scc_cos_bucket_name"
"key": "scc_cos_bucket_region",
"options": [
{
"displayname": "Same region as SCC instance",
"value": "__NULL__"
},
{
"displayname": "Dallas (us-south)",
"value": "us-south"
},
{
"displayname": "Sydney (au-syd)",
"value": "au-syd"
},
{
"displayname": "Sao Paolo (br-sao)",
"value": "br-sao"
},
{
"displayname": "Toronto (ca-tor)",
"value": "ca-tor"
},
{
"displayname": "Frankfurt (eu-de)",
"value": "eu-de"
},
{
"displayname": "London (eu-gb)",
"value": "eu-gb"
},
{
"displayname": "Madrid (eu-es)",
"value": "eu-es"
},
{
"displayname": "Osaka (jp-osa)",
"value": "jp-osa"
},
{
"displayname": "Tokyo (jp-tok)",
"value": "jp-tok"
},
{
"displayname": "Washington DC (us-east)",
"value": "us-east"
}
]
},
{
"key": "add_bucket_name_suffix"
},
{
"key": "scc_cos_bucket_access_tags"
"key": "scc_cos_bucket_access_tags",
"custom_config": {
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"type": "string"
}
}
},
{
"key": "scc_cos_bucket_class",
Expand All @@ -176,15 +258,9 @@
}
]
},
{
"key": "existing_cos_instance_crn"
},
{
"key": "existing_scc_cos_bucket_name"
},
{
"key": "skip_cos_kms_auth_policy"
},
{
"key": "management_endpoint_type_for_bucket",
"options": [
Expand All @@ -203,59 +279,41 @@
]
},
{
"key": "scc_instance_name"
"key": "existing_cos_instance_crn"
},
{
"key": "scc_region",
"options": [
{
"displayname": "Dallas (us-south)",
"value": "us-south"
},
{
"displayname": "Frankfurt (eu-de)",
"value": "eu-de"
},
{
"displayname": "Madrid (eu-es)",
"value": "eu-es"
},
{
"displayname": "Toronto (ca-tor)",
"value": "ca-tor"
}
]
"key": "existing_monitoring_crn"
},
{
"key": "skip_scc_cos_auth_policy"
"key": "skip_scc_cos_iam_auth_policy"
},
{
"key": "scc_service_plan",
"key": "existing_scc_cos_kms_key_crn"
},
{
"key": "ibmcloud_kms_api_key"
},
{
"key": "kms_endpoint_type",
"options": [
{
"displayname": "Standard",
"value": "security-compliance-center-standard-plan"
"displayname": "Public",
"value": "public"
},
{
"displayname": "Trial",
"value": "security-compliance-center-trial-plan"
"displayname": "Private",
"value": "private"
}
]
},
{
"key": "existing_en_crn"
"key": "skip_cos_kms_iam_auth_policy"
},
{
"key": "en_source_name"
},
{
"key": "en_source_description"
},
{
"key": "scc_instance_tags"
"key": "scc_cos_key_ring_name"
},
{
"key": "skip_scc_workload_protection_auth_policy"
"key": "scc_cos_key_name"
},
{
"key": "profile_attachments"
Expand Down Expand Up @@ -304,28 +362,58 @@
]
},
{
"key": "scc_workload_protection_instance_tags"
"key": "scc_workload_protection_instance_tags",
"custom_config": {
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"type": "string"
}
}
},
{
"key": "scc_workload_protection_resource_key_tags"
"key": "scc_workload_protection_resource_key_tags",
"custom_config": {
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"type": "string"
}
}
},
{
"key": "scc_workload_protection_access_tags"
"key": "scc_workload_protection_access_tags",
"custom_config": {
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"type": "string"
}
}
},
{
"key": "ibmcloud_kms_api_key"
"key": "skip_scc_workload_protection_iam_auth_policy"
},
{
"key": "existing_event_notifications_crn"
},
{
"key": "event_notifications_source_name"
},
{
"key": "event_notifications_source_description"
},
{
"key": "scc_en_email_list"
"key": "scc_event_notifications_email_list"
},
{
"key": "scc_en_from_email"
"key": "scc_event_notifications_from_email"
},
{
"key": "scc_en_reply_to_email"
"key": "scc_event_notifications_reply_to_email"
},
{
"key": "cbr_rules"
"key": "scc_instance_cbr_rules"
}
],
"iam_permissions": [
Expand Down
Loading