Skip to content

Commit 75c67aa

Browse files
padraic-edwardspadraic-edwards
authored
fix: add vars and update version (#48)
* chore: add vars and update version * chore: fix plan * chore: fix required versions * chore: fix group default
1 parent e57c249 commit 75c67aa

File tree

3 files changed

+145
-69
lines changed

3 files changed

+145
-69
lines changed

‎ibm_catalog.json‎

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
"default_value": "us-south",
215215
"description": "The region in which the Security and Compliance Center instance is provisioned.",
216216
"display_name": "Region",
217-
"required": false,
217+
"required": true,
218218
"custom_config": {
219219
"type": "region",
220220
"grouping": "deployment",
@@ -236,7 +236,7 @@
236236
"default_value": "us-south",
237237
"description": "The region in which the Events Notification instance is created.",
238238
"display_name": "Region",
239-
"required": false,
239+
"required": true,
240240
"custom_config": {
241241
"type": "region",
242242
"grouping": "deployment",
@@ -257,9 +257,30 @@
257257
"type": "boolean",
258258
"default_value": false,
259259
"description": "Setting to `true` will treat the `resource_group_name` as an existing resource group. Setting `false` will provision a new resource group based on the value in `resource_group_name`.",
260-
"required": true
260+
"required": false
261261
},
262262
{
263+
"key": "app_repo_branch",
264+
"type": "string",
265+
"default_value": "main",
266+
"description": "This is the repository branch used by the default sample application. Alternatively if `app_repo_existing_url` is provided, then the branch must reflect the default branch for that repository. Typically these branches are `main` or `master`.",
267+
"required": false
268+
},
269+
{
270+
"key": "app_repo_existing_url",
271+
"type": "string",
272+
"default_value": "__NOTSET__",
273+
"description": "Bring your own existing application repository by providing the URL. This will create an integration for your application repository instead of cloning the default sample. Repositories existing in a different org will require the use of Git token. See `app_repo_git_token_secret_name` under optional variables. ",
274+
"required": true
275+
},
276+
{
277+
"key": "app_repo_git_token_secret_name",
278+
"type": "string",
279+
"default_value": "",
280+
"description": "Name of the Git token secret in the secret provider used for accessing the sample (or bring your own) application repository.",
281+
"required": false
282+
},
283+
{
263284
"key": "project_names",
264285
"required": false,
265286
"type": "array",
@@ -503,7 +524,7 @@
503524
"default_value": "us-south",
504525
"description": "The region in which the Security and Compliance Center instance is provisioned.",
505526
"display_name": "Region",
506-
"required": false,
527+
"required": true,
507528
"custom_config": {
508529
"type": "region",
509530
"grouping": "deployment",
@@ -525,7 +546,7 @@
525546
"default_value": "us-south",
526547
"description": "The region in which the Events Notification instance is created.",
527548
"display_name": "Region",
528-
"required": false,
549+
"required": true,
529550
"custom_config": {
530551
"type": "region",
531552
"grouping": "deployment",
@@ -544,10 +565,31 @@
544565
{
545566
"key": "use_existing_resource_group",
546567
"type": "boolean",
547-
"default_value": true,
568+
"default_value": false,
548569
"description": "Setting to `true` will treat the `resource_group_name` as an existing resource group. Setting `false` will provision a new resource group based on the value in `resource_group_name`.",
549-
"required": true
550-
}
570+
"required": false
571+
},
572+
{
573+
"key": "app_repo_branch",
574+
"type": "string",
575+
"default_value": "main",
576+
"description": "This is the repository branch used by the default sample application. Alternatively if `app_repo_existing_url` is provided, then the branch must reflect the default branch for that repository. Typically these branches are `main` or `master`.",
577+
"required": false
578+
},
579+
{
580+
"key": "app_repo_existing_url",
581+
"type": "string",
582+
"default_value": "__NOTSET__",
583+
"description": "Bring your own existing application repository by providing the URL. This will create an integration for your application repository instead of cloning the default sample. Repositories existing in a different org will require the use of Git token. See `app_repo_git_token_secret_name` under optional variables. ",
584+
"required": true
585+
},
586+
{
587+
"key": "app_repo_git_token_secret_name",
588+
"type": "string",
589+
"default_value": "",
590+
"description": "Name of the Git token secret in the secret provider used for accessing the sample (or bring your own) application repository.",
591+
"required": false
592+
}
551593
],
552594
"outputs": [
553595
{

‎kubernetes/stack_definition.json‎

Lines changed: 62 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
{
22
"inputs": [
3-
{
4-
"name": "resource_group_name",
5-
"required": true,
6-
"type": "string",
7-
"hidden": false,
8-
"default": "__NULL__",
9-
"custom_config": {}
10-
},
113
{
124
"name": "region",
135
"required": true,
@@ -32,11 +24,11 @@
3224
"custom_config": {}
3325
},
3426
{
35-
"name": "bucket_name",
36-
"required": true,
27+
"name": "app_repo_existing_url",
3728
"type": "string",
3829
"hidden": false,
39-
"default": ""
30+
"default": "__NOTSET__",
31+
"required": true
4032
},
4133
{
4234
"name": "cluster_name",
@@ -46,80 +38,95 @@
4638
"default": "mycluster"
4739
},
4840
{
49-
"name": "prefix",
41+
"name": "ci_cluster_resource_group",
5042
"required": false,
5143
"type": "string",
5244
"hidden": false,
53-
"default": "devsecops"
45+
"default": "ref:../../inputs/resource_group_name",
46+
"custom_config": {}
5447
},
5548
{
56-
"name": "use_existing_resource_group",
49+
"name": "ci_cluster_name",
5750
"required": false,
5851
"type": "string",
5952
"hidden": false,
60-
"default": ""
53+
"default": "ref:../../inputs/cluster_name",
54+
"custom_config": {}
6155
},
6256
{
63-
"name": "registry_namespace",
57+
"name": "ci_cluster_namespace",
6458
"required": false,
6559
"type": "string",
6660
"hidden": false,
67-
"default": "devsecops"
61+
"default": "dev",
62+
"custom_config": {}
6863
},
6964
{
70-
"name": "create_cd_instance",
65+
"name": "ci_cluster_region",
7166
"required": false,
72-
"type": "boolean",
67+
"type": "string",
7368
"hidden": false,
74-
"default": true,
69+
"default": "us-south",
7570
"custom_config": {}
7671
},
7772
{
78-
"name": "ci_cluster_name",
79-
"required": true,
73+
"name": "cd_cluster_name",
74+
"required": false,
8075
"type": "string",
8176
"hidden": false,
82-
"default": "",
77+
"default": "ref:../../inputs/cluster_name",
8378
"custom_config": {}
8479
},
8580
{
86-
"name": "ci_cluster_namespace",
87-
"required": true,
81+
"name": "cd_cluster_namespace",
82+
"required": false,
8883
"type": "string",
8984
"hidden": false,
90-
"default": "dev",
85+
"default": "prod",
9186
"custom_config": {}
9287
},
9388
{
94-
"name": "ci_cluster_region",
95-
"required": true,
89+
"name": "bucket_name",
90+
"required": false,
9691
"type": "string",
9792
"hidden": false,
98-
"default": "us-south",
99-
"custom_config": {}
93+
"default": "devsecops"
10094
},
10195
{
102-
"name": "ci_cluster_resource_group",
103-
"required": true,
96+
"name": "resource_group_name",
97+
"required": false,
10498
"type": "string",
10599
"hidden": false,
106-
"default": "",
100+
"default": "devsecops-rg",
107101
"custom_config": {}
108102
},
109103
{
110-
"name": "cd_cluster_name",
111-
"required": true,
104+
"name": "prefix",
105+
"required": false,
112106
"type": "string",
113107
"hidden": false,
114-
"default": "",
115-
"custom_config": {}
108+
"default": "devsecops"
116109
},
117110
{
118-
"name": "cd_cluster_namespace",
119-
"required": true,
111+
"name": "use_existing_resource_group",
112+
"required": false,
120113
"type": "string",
121114
"hidden": false,
122-
"default": "prod",
115+
"default": ""
116+
},
117+
{
118+
"name": "registry_namespace",
119+
"required": false,
120+
"type": "string",
121+
"hidden": false,
122+
"default": "devsecops"
123+
},
124+
{
125+
"name": "create_cd_instance",
126+
"required": false,
127+
"type": "boolean",
128+
"hidden": false,
129+
"default": true,
123130
"custom_config": {}
124131
},
125132
{
@@ -177,6 +184,20 @@
177184
"hidden": false,
178185
"default": "security-compliance-center-standard-plan",
179186
"custom_config": {}
187+
},
188+
{
189+
"name": "app_repo_branch",
190+
"type": "string",
191+
"hidden": false,
192+
"default": "main",
193+
"required": false
194+
},
195+
{
196+
"name": "app_repo_git_token_secret_name",
197+
"type": "string",
198+
"hidden": false,
199+
"default": "",
200+
"required": false
180201
}
181202
],
182203
"members": [
@@ -378,7 +399,7 @@
378399
},
379400
{
380401
"name": "7 - DevSecOps Toolchains",
381-
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.ed0ad70a-b46a-4142-a609-2e48f82d168e-global",
402+
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.e4198315-5847-4735-8fdf-75591c1e6587-global",
382403
"inputs": [
383404
{
384405
"name": "ibmcloud_api_key",

‎stack_definition.json‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
{
22
"inputs": [
3-
{
4-
"name": "resource_group_name",
5-
"required": true,
6-
"type": "string",
7-
"hidden": false,
8-
"default": "__NULL__",
9-
"custom_config": {}
10-
},
113
{
124
"name": "region",
135
"required": true,
@@ -31,12 +23,27 @@
3123
"default": "us-south",
3224
"custom_config": {}
3325
},
26+
{
27+
"name": "app_repo_existing_url",
28+
"type": "string",
29+
"hidden": false,
30+
"default": "__NOTSET__",
31+
"required": true
32+
},
33+
{
34+
"name": "resource_group_name",
35+
"required": false,
36+
"type": "string",
37+
"hidden": false,
38+
"default": "devsecops-rg",
39+
"custom_config": {}
40+
},
3441
{
3542
"name": "bucket_name",
36-
"required": true,
43+
"required": false,
3744
"type": "string",
3845
"hidden": false,
39-
"default": ""
46+
"default": "devsecops"
4047
},
4148
{
4249
"name": "prefix",
@@ -123,21 +130,27 @@
123130
"default": "security-compliance-center-standard-plan",
124131
"custom_config": {}
125132
},
126-
{
127-
"name": "scc_region",
128-
"required": false,
129-
"type": "string",
130-
"hidden": false,
131-
"default": "us-south",
132-
"custom_config": {}
133-
},
134133
{
135134
"name": "project_names",
136135
"required": false,
137136
"type": "array",
138137
"hidden": false,
139138
"default": "[\"CI_Project\",\"CD_Project\"]"
140-
}
139+
},
140+
{
141+
"name": "app_repo_branch",
142+
"type": "string",
143+
"hidden": false,
144+
"default": "main",
145+
"required": false
146+
},
147+
{
148+
"name": "app_repo_git_token_secret_name",
149+
"type": "string",
150+
"hidden": false,
151+
"default": "",
152+
"required": false
153+
}
141154
],
142155
"members": [
143156
{
@@ -360,7 +373,7 @@
360373
},
361374
{
362375
"name": "8 - DevSecOps Toolchains",
363-
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.40ed9a72-fc1e-4462-a943-17d276a02fee-global",
376+
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.e4198315-5847-4735-8fdf-75591c1e6587-global",
364377
"inputs": [
365378
{
366379
"name": "ibmcloud_api_key",

0 commit comments

Comments
 (0)