Skip to content

Commit 6dbdc7c

Browse files
ocofaighocofaigh
authored
fix: set ssh_keys to empty list in pvc pattern override json (#391)
1 parent 8cd5660 commit 6dbdc7c

File tree

5 files changed

+214
-19
lines changed

5 files changed

+214
-19
lines changed

‎.secrets.baseline‎

Lines changed: 2 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-04-06T14:59:53Z",
6+
"generated_at": "2023-04-12T18:47:14Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -82,7 +82,7 @@
8282
"hashed_secret": "83b1c425484475e97934007eccb2277e9bdbd203",
8383
"is_secret": false,
8484
"is_verified": false,
85-
"line_number": 1135,
85+
"line_number": 1336,
8686
"type": "Secret Keyword",
8787
"verified_result": null
8888
}

‎examples/no-compute-example/catalogValidationValues.json.template‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎ibm_catalog.json‎

Lines changed: 210 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -786,8 +786,8 @@
786786
"label": "Standard",
787787
"name": "standard",
788788
"install_type": "fullstack",
789-
"working_directory": "examples/no-compute-example",
790-
"usage_template": "module \"landing-zone-vpc\" {\n source = \"https://cm.globalcatalog.cloud.ibm.com/api/v1-beta/offering/source//${{workingDirectory}}?archive=tgz&flavor=${{flavor}}&kind=terraform&name=${{name}}&version=${{version}}\"\n ibmcloud_api_key = var.ibmcloud_api_key\n ssh_public_key = var.ssh_public_key\n region = \"us-south\"\n prefix = \"slz-vpc\"\n}\n\n",
789+
"working_directory": "patterns/vpc",
790+
"usage_template": "module \"landing-zone-vpc\" {\n source = \"https://cm.globalcatalog.cloud.ibm.com/api/v1-beta/offering/source//${{workingDirectory}}?archive=tgz&flavor=${{flavor}}&kind=terraform&name=${{name}}&version=${{version}}\"\n ibmcloud_api_key = var.ibmcloud_api_key\n region = \"us-south\"\n prefix = \"slz-vpc\"\n}\n\n",
791791
"compliance": {
792792
"controls": [
793793
{
@@ -973,13 +973,6 @@
973973
]
974974
},
975975
"configuration": [
976-
{
977-
"key": "ssh_key",
978-
"required": true
979-
},
980-
{
981-
"key": "resource_tags"
982-
},
983976
{
984977
"key": "ibmcloud_api_key",
985978
"required": true,
@@ -1000,6 +993,214 @@
1000993
},
1001994
"key": "region",
1002995
"required": true
996+
},
997+
{
998+
"key": "hs_crypto_instance_name",
999+
"hidden": true
1000+
},
1001+
{
1002+
"key": "create_f5_network_on_management_vpc",
1003+
"hidden": true
1004+
},
1005+
{
1006+
"key": "provision_teleport_in_f5",
1007+
"hidden": true
1008+
},
1009+
{
1010+
"key": "vpn_firewall_type",
1011+
"hidden": true
1012+
},
1013+
{
1014+
"key": "ssh_public_key",
1015+
"hidden": true
1016+
},
1017+
{
1018+
"key": "f5_image_name",
1019+
"hidden": true
1020+
},
1021+
{
1022+
"key": "f5_instance_profile",
1023+
"hidden": true
1024+
},
1025+
{
1026+
"key": "hostname",
1027+
"hidden": true
1028+
},
1029+
{
1030+
"key": "domain",
1031+
"hidden": true
1032+
},
1033+
{
1034+
"key": "tmos_admin_password",
1035+
"hidden": true
1036+
},
1037+
{
1038+
"key": "license_type",
1039+
"hidden": true
1040+
},
1041+
{
1042+
"key": "byol_license_basekey",
1043+
"hidden": true
1044+
},
1045+
{
1046+
"key": "license_host",
1047+
"hidden": true
1048+
},
1049+
{
1050+
"key": "license_username",
1051+
"hidden": true
1052+
},
1053+
{
1054+
"key": "license_password",
1055+
"hidden": true
1056+
},
1057+
{
1058+
"key": "license_pool",
1059+
"hidden": true
1060+
},
1061+
{
1062+
"key": "license_sku_keyword_1",
1063+
"hidden": true
1064+
},
1065+
{
1066+
"key": "license_sku_keyword_2",
1067+
"hidden": true
1068+
},
1069+
{
1070+
"key": "license_unit_of_measure",
1071+
"hidden": true
1072+
},
1073+
{
1074+
"key": "do_declaration_url",
1075+
"hidden": true
1076+
},
1077+
{
1078+
"key": "as3_declaration_url",
1079+
"hidden": true
1080+
},
1081+
{
1082+
"key": "ts_declaration_url",
1083+
"hidden": true
1084+
},
1085+
{
1086+
"key": "phone_home_url",
1087+
"hidden": true
1088+
},
1089+
{
1090+
"key": "template_source",
1091+
"hidden": true
1092+
},
1093+
{
1094+
"key": "template_version",
1095+
"hidden": true
1096+
},
1097+
{
1098+
"key": "app_id",
1099+
"hidden": true
1100+
},
1101+
{
1102+
"key": "tgactive_url",
1103+
"hidden": true
1104+
},
1105+
{
1106+
"key": "tgstandby_url",
1107+
"hidden": true
1108+
},
1109+
{
1110+
"key": "tgrefresh_url",
1111+
"hidden": true
1112+
},
1113+
{
1114+
"key": "enable_f5_management_fip",
1115+
"hidden": true
1116+
},
1117+
{
1118+
"key": "enable_f5_external_fip",
1119+
"hidden": true
1120+
},
1121+
{
1122+
"key": "use_existing_appid",
1123+
"hidden": true
1124+
},
1125+
{
1126+
"key": "appid_name",
1127+
"hidden": true
1128+
},
1129+
{
1130+
"key": "appid_resource_group",
1131+
"hidden": true
1132+
},
1133+
{
1134+
"key": "teleport_instance_profile",
1135+
"hidden": true
1136+
},
1137+
{
1138+
"key": "teleport_vsi_image_name",
1139+
"hidden": true
1140+
},
1141+
{
1142+
"key": "teleport_license",
1143+
"hidden": true
1144+
},
1145+
{
1146+
"key": "https_cert",
1147+
"hidden": true
1148+
},
1149+
{
1150+
"key": "https_key",
1151+
"hidden": true
1152+
},
1153+
{
1154+
"key": "teleport_hostname",
1155+
"hidden": true
1156+
},
1157+
{
1158+
"key": "teleport_domain",
1159+
"hidden": true
1160+
},
1161+
{
1162+
"key": "teleport_version",
1163+
"hidden": true
1164+
},
1165+
{
1166+
"key": "message_of_the_day",
1167+
"hidden": true
1168+
},
1169+
{
1170+
"key": "teleport_admin_email",
1171+
"hidden": true
1172+
},
1173+
{
1174+
"key": "create_secrets_manager",
1175+
"hidden": true
1176+
},
1177+
{
1178+
"key": "enable_scc",
1179+
"hidden": true
1180+
},
1181+
{
1182+
"key": "scc_cred_name",
1183+
"hidden": true
1184+
},
1185+
{
1186+
"key": "scc_cred_description",
1187+
"hidden": true
1188+
},
1189+
{
1190+
"key": "scc_collector_description",
1191+
"hidden": true
1192+
},
1193+
{
1194+
"key": "scc_scope_description",
1195+
"hidden": true
1196+
},
1197+
{
1198+
"key": "scc_scope_name",
1199+
"hidden": true
1200+
},
1201+
{
1202+
"key": "override",
1203+
"hidden": true
10031204
}
10041205
],
10051206
"iam_permissions": [

‎patterns/vpc/catalogValidationValues.json.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"ibmcloud_api_key": $VALIDATION_APIKEY, "region": "us-south", "resource_tags": $TAGS, "prefix": $PREFIX}
1+
{"ibmcloud_api_key": $VALIDATION_APIKEY, "region": "us-south", "tags": $TAGS, "prefix": $PREFIX}

‎patterns/vpc/override.json‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,7 @@
9999
},
100100
"security_groups": [],
101101
"service_endpoints": "private",
102-
"ssh_keys": [
103-
{
104-
"name": "slz-ssh-key",
105-
"public_key": "<user ssh key value>"
106-
}
107-
],
102+
"ssh_keys": [],
108103
"transit_gateway_connections": [
109104
"management",
110105
"workload"

0 commit comments

Comments
 (0)