Skip to content

Commit 711bac5

Browse files
huayuenhhuayuenh
authored
Merge branch 'main' into renovate/dependencies
2 parents 3ade1ac + 66ecad7 commit 711bac5

File tree

4 files changed

+20
-187
lines changed

4 files changed

+20
-187
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ on:
55
issue_comment:
66
types:
77
- created
8+
89
jobs:
910
call-terraform-ci-pipeline:
1011
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.24.0
1112
secrets: inherit
12-
with:
13-
craSCCv2: true
14-
craConfigYamlFile: "cra-config.yaml"

‎cra-config.yaml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎cra-tf-validate-ignore-rules.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎ibm_catalog.json‎

Lines changed: 19 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -39,77 +39,6 @@
3939
"name": "devsecopsce",
4040
"index": 2,
4141
"working_directory": "solutions/code-engine",
42-
"compliance": {
43-
"authority": "scc-v3",
44-
"controls": [
45-
{
46-
"profile": {
47-
"id": "",
48-
"name": "IBM Cloud Framework for Financial Services",
49-
"version": "1.6.0"
50-
},
51-
"names": [
52-
"SA-3(a)",
53-
"CM-6(d)",
54-
"CM-7(b)",
55-
"RA-5(3)",
56-
"SA-3(d)",
57-
"SI-10",
58-
"SI-7",
59-
"SA-10(d)",
60-
"CM-3(g)",
61-
"CM-8(1)",
62-
"SA-15(a)",
63-
"CM-4",
64-
"CM-2(3)",
65-
"SI-2(d)",
66-
"CM-4(1)",
67-
"CM-9(c)",
68-
"CM-9(a)",
69-
"CM-2(1)(a)",
70-
"CM-2(1)(b)",
71-
"CM-3(b)",
72-
"RA-5(b)",
73-
"SI-2(2)",
74-
"RA-5(2)",
75-
"SA-10(1)",
76-
"SA-10(e)",
77-
"CM-6(1)",
78-
"CM-2(2)",
79-
"SA-10(c)",
80-
"CM-2",
81-
"SA-8",
82-
"CM-6(c)",
83-
"CM-2(1)(c)",
84-
"CM-8(b)",
85-
"CM-3(f)",
86-
"CM-8(2)",
87-
"RA-5(1)",
88-
"SI-2(b)",
89-
"CM-6(b)",
90-
"CM-9(d)",
91-
"SI-2(c)",
92-
"CM-8(a)",
93-
"CM-3(d)",
94-
"CM-9(b)",
95-
"SA-10(b)",
96-
"SA-10(a)",
97-
"CM-3(c)",
98-
"SI-2(a)",
99-
"CM-10(1)",
100-
"RA-5(a)",
101-
"CM-6(a)",
102-
"RA-5(c)",
103-
"RA-5(d)",
104-
"CM-7(1)(a)",
105-
"CM-3(2)",
106-
"CM-5",
107-
"CM-3(e)",
108-
"CM-3(a)"
109-
]
110-
}
111-
]
112-
},
11342
"architecture": {
11443
"features": [
11544
{
@@ -307,14 +236,14 @@
307236
"type": "string",
308237
"default_value": "",
309238
"description": "Set the name of your COS bucket. This applies the same COS bucket name for the CI, CD, and CC toolchains.",
310-
"required": false
239+
"required": true
311240
},
312241
{
313242
"key": "cos_endpoint",
314243
"type": "string",
315244
"default_value": "",
316245
"description": "The endpoint for the Cloud Object Storage instance containing the evidence bucket. The S£ direct endpoint for the bucket region should be provided. This setting sets the same endpoint for COS in the CI, CD, and CC toolchains. ",
317-
"required": false
246+
"required": true
318247
},
319248
{
320249
"key": "cos_instance_crn",
@@ -323,6 +252,13 @@
323252
"description": "The CRN of the Cloud Object Storage instance containing the required bucket. This value is required to generate the correct access policies if creating IAM service credentials.",
324253
"required": true
325254
},
255+
{
256+
"key": "cos_api_key_secret_name",
257+
"type": "string",
258+
"default_value": "",
259+
"description": "Name of the Cloud Object Storage API key secret in the secret provider for accessing the evidence COS bucket. In addition `cos_endpoint` and `cos_bucket_name` must be set. This setting sets the same API key for the COS settings in the CI, CD, and CC toolchains.",
260+
"required": true
261+
},
326262
{
327263
"key": "cc_pipeline_properties",
328264
"type": "string",
@@ -1269,13 +1205,6 @@
12691205
"description": "Secret group for the COS api key secret. Defaults to the value set in `sm_secret_group` if not set. Only used with `Secrets Manager`.",
12701206
"required": false
12711207
},
1272-
{
1273-
"key": "cos_api_key_secret_name",
1274-
"type": "string",
1275-
"default_value": "",
1276-
"description": "Name of the Cloud Object Storage API key secret in the secret provider for accessing the evidence COS bucket. In addition `cos_endpoint` and `cos_bucket_name` must be set. This setting sets the same API key for the COS settings in the CI, CD, and CC toolchains.",
1277-
"required": false
1278-
},
12791208
{
12801209
"key": "cos_api_key_secret_value",
12811210
"type": "string",
@@ -2230,77 +2159,6 @@
22302159
"name": "devsecops",
22312160
"index": 1,
22322161
"working_directory": "solutions/kubernetes",
2233-
"compliance": {
2234-
"authority": "scc-v3",
2235-
"controls": [
2236-
{
2237-
"profile": {
2238-
"id": "",
2239-
"name": "IBM Cloud Framework for Financial Services",
2240-
"version": "1.6.0"
2241-
},
2242-
"names": [
2243-
"RA-5(3)",
2244-
"SI-2(2)",
2245-
"CM-2(1)(a)",
2246-
"RA-5(b)",
2247-
"SA-15(a)",
2248-
"SA-10(a)",
2249-
"SI-2(d)",
2250-
"RA-5(1)",
2251-
"CM-6(1)",
2252-
"CM-6(b)",
2253-
"RA-5(2)",
2254-
"CM-3(b)",
2255-
"SA-10(1)",
2256-
"CM-2(1)(b)",
2257-
"RA-5(a)",
2258-
"SA-8",
2259-
"CM-8(b)",
2260-
"CM-10(1)",
2261-
"CM-7(1)(a)",
2262-
"CM-3(g)",
2263-
"RA-5(d)",
2264-
"SI-2(a)",
2265-
"CM-2(1)(c)",
2266-
"CM-6(c)",
2267-
"CM-2",
2268-
"CM-2(2)",
2269-
"CM-3(2)",
2270-
"CM-9(b)",
2271-
"SI-7",
2272-
"CM-8(a)",
2273-
"CM-4(1)",
2274-
"CM-2(3)",
2275-
"SA-10(d)",
2276-
"CM-8(2)",
2277-
"SA-3(d)",
2278-
"SA-10(e)",
2279-
"CM-6(a)",
2280-
"SA-3(a)",
2281-
"CM-3(a)",
2282-
"SI-2(c)",
2283-
"SA-10(b)",
2284-
"CM-6(d)",
2285-
"CM-3(f)",
2286-
"CM-9(a)",
2287-
"CM-5",
2288-
"CM-3(e)",
2289-
"CM-9(c)",
2290-
"CM-3(c)",
2291-
"SA-10(c)",
2292-
"CM-8(1)",
2293-
"CM-3(d)",
2294-
"SI-2(b)",
2295-
"CM-9(d)",
2296-
"RA-5(c)",
2297-
"CM-7(b)",
2298-
"CM-4",
2299-
"SI-10"
2300-
]
2301-
}
2302-
]
2303-
},
23042162
"architecture": {
23052163
"features": [
23062164
{
@@ -2491,21 +2349,28 @@
24912349
"type": "string",
24922350
"default_value": "",
24932351
"description": "Set the name of your COS bucket. This applies the same COS bucket name for the CI, CD, and CC toolchains.",
2494-
"required": false
2352+
"required": true
24952353
},
24962354
{
24972355
"key": "cos_endpoint",
24982356
"type": "string",
24992357
"default_value": "",
25002358
"description": "The endpoint for the Cloud Object Storage instance containing the evidence bucket. The S£ direct endpoint for the bucket region should be provided. This setting sets the same endpoint for COS in the CI, CD, and CC toolchains. ",
2501-
"required": false
2359+
"required": true
25022360
},
25032361
{
25042362
"key": "cos_instance_crn",
25052363
"type": "string",
25062364
"default_value": "",
25072365
"description": "The CRN of the Cloud Object Storage instance containing the required bucket. This value is required to generate the correct access policies if creating IAM service credentials.",
2508-
"required": false
2366+
"required": true
2367+
},
2368+
{
2369+
"key": "cos_api_key_secret_name",
2370+
"type": "string",
2371+
"default_value": "",
2372+
"description": "Name of the Cloud Object Storage API key secret in the secret provider for accessing the evidence COS bucket. In addition `cos_endpoint` and `cos_bucket_name` must be set. This setting sets the same API key for the COS settings in the CI, CD, and CC toolchains.",
2373+
"required": true
25092374
},
25102375
{
25112376
"key": "cc_pipeline_properties",
@@ -3453,13 +3318,6 @@
34533318
"description": "Secret group for the COS api key secret. Defaults to the value set in `sm_secret_group` if not set. Only used with `Secrets Manager`.",
34543319
"required": false
34553320
},
3456-
{
3457-
"key": "cos_api_key_secret_name",
3458-
"type": "string",
3459-
"default_value": "",
3460-
"description": "Name of the Cloud Object Storage API key secret in the secret provider for accessing the evidence COS bucket. In addition `cos_endpoint` and `cos_bucket_name` must be set. This setting sets the same API key for the COS settings in the CI, CD, and CC toolchains.",
3461-
"required": false
3462-
},
34633321
{
34643322
"key": "cos_api_key_secret_value",
34653323
"type": "string",

0 commit comments

Comments
 (0)