Replace catalog pre-validation with new SSH key replace feature (#794)

ocofaigh · web-flow · commit c49118f0e6d4 · 2024-05-21T13:08:27.000+01:00
diff --git a/.catalog-onboard-pipeline.yaml b/.catalog-onboard-pipeline.yaml
@@ -11,12 +11,10 @@ offerings:
         mark_ready: false
         install_type: fullstack
         validation_type: projects
-        pre_validation: "tests/scripts/pre-validation-generate-ssh-key.sh ssh_key patterns/vsi-quickstart"
       - name: standard
         mark_ready: false
         install_type: fullstack
         validation_type: projects
-        pre_validation: "tests/scripts/pre-validation-generate-ssh-key.sh ssh_public_key patterns/vsi"
         scc:
           instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
           region: us-south
diff --git a/patterns/vsi-quickstart/catalogValidationValues.json.template b/patterns/vsi-quickstart/catalogValidationValues.json.template
@@ -2,5 +2,6 @@
     "ibmcloud_api_key": $VALIDATION_APIKEY,
     "region": "eu-de",
     "resource_tags": $TAGS,
-    "prefix": $PREFIX
+    "prefix": $PREFIX,
+    "ssh_key": $SSH_PUB_KEY
 }
diff --git a/patterns/vsi/catalogValidationValues.json.template b/patterns/vsi/catalogValidationValues.json.template
@@ -4,5 +4,6 @@
   "tags": $TAGS,
   "prefix": $PREFIX,
   "enable_transit_gateway": false,
-  "add_atracker_route": false
+  "add_atracker_route": false,
+  "ssh_public_key": $SSH_PUB_KEY
 }
diff --git a/tests/scripts/pre-validation-generate-ssh-key.sh b/tests/scripts/pre-validation-generate-ssh-key.sh

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@`
`2`	`2`	`"ibmcloud_api_key": $VALIDATION_APIKEY,`
`3`	`3`	`"region": "eu-de",`
`4`	`4`	`"resource_tags": $TAGS,`
`5`		`- "prefix": $PREFIX`
	`5`	`+ "prefix": $PREFIX,`
	`6`	`+ "ssh_key": $SSH_PUB_KEY`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@`
`4`	`4`	`"tags": $TAGS,`
`5`	`5`	`"prefix": $PREFIX,`
`6`	`6`	`"enable_transit_gateway": false,`
`7`		`- "add_atracker_route": false`
	`7`	`+ "add_atracker_route": false,`
	`8`	`+ "ssh_public_key": $SSH_PUB_KEY`
`8`	`9`	`}`