Skip to content

Commit 49a7e2b

Browse files
authored
feat: renamed DA flavor to standard and updated catalog.json (#208)
1 parent 5ad702b commit 49a7e2b

File tree

13 files changed

+32
-31
lines changed

13 files changed

+32
-31
lines changed

.catalog-onboard-pipeline.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ offerings:
66
catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
77
offering_id: 7ee5876d-6e30-49d1-be25-259a442085e8
88
variations:
9-
- name: secure
9+
- name: standard
1010
mark_ready: true
1111
install_type: fullstack
1212
scc:

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
call-terraform-ci-pipeline:
11-
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/[email protected].3
11+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/[email protected].4
1212
secrets: inherit
1313
with:
1414
craSCCv2: true

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ on:
88

99
jobs:
1010
call-terraform-release-pipeline:
11-
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/[email protected].3
11+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/[email protected].4
1212
secrets: inherit

.secrets.baseline

Lines changed: 1 addition & 11 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": "2024-03-12T06:36:39Z",
6+
"generated_at": "2024-06-28T12:56:39Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -86,16 +86,6 @@
8686
"type": "Secret Keyword",
8787
"verified_result": null
8888
}
89-
],
90-
"module-metadata.json": [
91-
{
92-
"hashed_secret": "99075eb0baa8cfda1cae029da06b57b93cc13a31",
93-
"is_secret": false,
94-
"is_verified": false,
95-
"line_number": 407,
96-
"type": "Secret Keyword",
97-
"verified_result": null
98-
}
9989
]
10090
},
10191
"version": "0.13.1+ibm.62.dss",

ibm_catalog.json

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"infrastructure as code",
1818
"terraform",
1919
"solution",
20-
"elasticsearch secure",
20+
"elasticsearch standard",
2121
"database",
2222
"nosql"
2323
],
@@ -46,10 +46,10 @@
4646
],
4747
"flavors": [
4848
{
49-
"label": "Secure",
50-
"name": "secure",
49+
"label": "Standard",
50+
"name": "standard",
5151
"install_type": "fullstack",
52-
"working_directory": "solutions/secure",
52+
"working_directory": "solutions/standard",
5353
"compliance": {
5454
"authority": "scc-v3",
5555
"profiles": [
@@ -90,7 +90,7 @@
9090
"key": "ibmcloud_api_key"
9191
},
9292
{
93-
"key": "existing_resource_group"
93+
"key": "use_existing_resource_group"
9494
},
9595
{
9696
"key": "resource_group_name"
@@ -170,7 +170,18 @@
170170
]
171171
},
172172
{
173-
"key": "elasticsearch_version"
173+
"key": "elasticsearch_version",
174+
"required": true,
175+
"options": [
176+
{
177+
"displayname": "8.12",
178+
"value": "8.12"
179+
},
180+
{
181+
"displayname": "8.10",
182+
"value": "8.10"
183+
}
184+
]
174185
},
175186
{
176187
"key": "access_tags"
File renamed without changes.

solutions/secure/catalogValidationValues.json.template renamed to solutions/standard/catalogValidationValues.json.template

File renamed without changes.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ locals {
2020
module "resource_group" {
2121
source = "terraform-ibm-modules/resource-group/ibm"
2222
version = "1.1.6"
23-
resource_group_name = var.existing_resource_group == false ? (var.prefix != null ? "${var.prefix}-${var.resource_group_name}" : var.resource_group_name) : null
24-
existing_resource_group_name = var.existing_resource_group == true ? var.resource_group_name : null
23+
resource_group_name = var.use_existing_resource_group == false ? (var.prefix != null ? "${var.prefix}-${var.resource_group_name}" : var.resource_group_name) : null
24+
existing_resource_group_name = var.use_existing_resource_group == true ? var.resource_group_name : null
2525
}
2626

2727
#######################################################################################################################

0 commit comments

Comments
 (0)