Skip to content

Commit fab02f3

Browse files
committed
SKIP UPGRADE TEST address feedback
1 parent 839e79a commit fab02f3

31 files changed

+1191
-461
lines changed

.catalog-onboard-pipeline.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,17 @@ offerings:
66
catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
77
offering_id: c7ac3ee6-4f48-4236-b974-b0cd8c624a46
88
variations:
9-
- name: standard
9+
- name: security-enforced
1010
mark_ready: true
1111
install_type: fullstack
1212
scc:
1313
instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
1414
region: us-south
15+
scope_resource_group_var_name: existing_resource_group_name
16+
- name: fully-configurable
17+
mark_ready: true
18+
install_type: fullstack
19+
scc:
20+
instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
21+
region: us-south
22+
scope_resource_group_var_name: existing_resource_group_name

.secrets.baseline

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2023-12-14T05:17:42Z",
6+
"generated_at": "2025-05-06T12:28:55Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -77,7 +77,7 @@
7777
}
7878
],
7979
"results": {
80-
"solutions/standard/DA-types.md": [
80+
"solutions/fully-configurable/DA-types.md": [
8181
{
8282
"hashed_secret": "1e5c2f367f02e47a8c160cda1cd9d91decbac441",
8383
"is_secret": false,
@@ -86,6 +86,26 @@
8686
"type": "Secret Keyword",
8787
"verified_result": null
8888
}
89+
],
90+
"solutions/fully-configurable/README.md": [
91+
{
92+
"hashed_secret": "99046450b7d19bfd57bfe3773719f57af84c7f12",
93+
"is_secret": false,
94+
"is_verified": false,
95+
"line_number": 91,
96+
"type": "Secret Keyword",
97+
"verified_result": null
98+
}
99+
],
100+
"solutions/security-enforced/README.md": [
101+
{
102+
"hashed_secret": "99046450b7d19bfd57bfe3773719f57af84c7f12",
103+
"is_secret": false,
104+
"is_verified": false,
105+
"line_number": 67,
106+
"type": "Secret Keyword",
107+
"verified_result": null
108+
}
89109
]
90110
},
91111
"version": "0.13.1+ibm.62.dss",

cra-config.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
# More info about this file at https://github.com/terraform-ibm-modules/common-pipeline-assets/blob/main/.github/workflows/terraform-test-pipeline.md#cra-config-yaml
22
version: "v1"
33
CRA_TARGETS:
4-
- CRA_TARGET: "solutions/standard" # Target directory for CRA scan. If not provided, the CRA Scan will not be run.
4+
- CRA_TARGET: "solutions/fully-configurable" # Target directory for CRA scan. If not provided, the CRA Scan will not be run.
55
CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json" # CRA Ignore file to use. If not provided, it checks the repo root directory for `cra-tf-validate-ignore-rules.json`
66
PROFILE_ID: "fe96bd4d-9b37-40f2-b39f-a62760e326a3" # SCC profile ID (currently set to 'IBM Cloud Framework for Financial Services' '1.7.0' profile).
77
CRA_ENVIRONMENT_VARIABLES:
8-
TF_VAR_resource_group_name: "test"
8+
TF_VAR_prefix: "test"
9+
TF_VAR_existing_resource_group_name: "Default"
910
TF_VAR_existing_kms_instance_crn: "crn:v1:bluemix:public:hs-crypto:us-south:a/abac0df06b644a9cabc6e44f55b3880e:e6dce284-e80f-46e1-a3c1-830f7adff7a9::"
1011
TF_VAR_kms_endpoint_url: "https://e6dce284-e80f-46e1-a3c1-830f7adff7a9.api.private.us-south.hs-crypto.appdomain.cloud"
12+
TF_VAR_existing_cos_instance_crn: "crn:v1:bluemix:public:cloud-object-storage:global:a/abac0df06b644a9cabc6e44f55b3880e:855ed836-05ce-4f39-98fa-508774f29323::"
1113
TF_VAR_cross_region_location: "us"
1214
TF_VAR_provider_visibility: "public"
15+
TF_VAR_kms_encryption_enabled: true
16+
TF_VAR_enable_collecting_failed_events: true

examples/fscloud/version.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.3.0"
2+
required_version = ">= 1.9.0"
33

44
# Ensure that there is always 1 example locked into the lowest provider version of the range defined in the main
55
# module's version.tf (usually a basic example), and 1 example that will always use the latest provider version.

0 commit comments

Comments
 (0)