Skip to content

Commit c13eb5d

Browse files
surajsbharadwajsurajsbharadwaj
authored
chore: mandate cloud api key (#545)
1 parent 0ce1b7c commit c13eb5d

File tree

8 files changed

+61
-63
lines changed

8 files changed

+61
-63
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-06-24T11:44:19Z",
6+
"generated_at": "2023-06-25T08:16:27Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -100,7 +100,7 @@
100100
"hashed_secret": "3a16a2d2850bbe557924aebe9f1f1294199bfbab",
101101
"is_secret": false,
102102
"is_verified": false,
103-
"line_number": 713,
103+
"line_number": 715,
104104
"type": "Secret Keyword",
105105
"verified_result": null
106106
}

‎ibm_catalog.json‎

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@
205205
],
206206
"custom_config": {}
207207
},
208+
{
209+
"key": "external_access_ip",
210+
"required": true
211+
},
208212
{
209213
"key": "ssh_public_key",
210214
"type": "multiline_secure_value",
@@ -226,8 +230,14 @@
226230
}
227231
},
228232
{
229-
"key": "external_access_ip",
230-
"required": true
233+
"key": "ibmcloud_api_key",
234+
"type": "multiline_secure_value",
235+
"required": true,
236+
"custom_config": {
237+
"grouping": "deployment",
238+
"original_grouping": "deployment",
239+
"type": "multiline_secure_value"
240+
}
231241
},
232242
{
233243
"key": "configure_dns_forwarder"
@@ -255,15 +265,6 @@
255265
},
256266
{
257267
"key": "tags"
258-
},
259-
{
260-
"key": "ibmcloud_api_key",
261-
"type": "multiline_secure_value",
262-
"custom_config": {
263-
"grouping": "deployment",
264-
"original_grouping": "deployment",
265-
"type": "multiline_secure_value"
266-
}
267268
}
268269
],
269270
"outputs": [
@@ -557,23 +558,24 @@
557558
"key": "powervs_backup_network",
558559
"required": true
559560
},
560-
{
561-
"key": "cloud_connection"
562-
},
563-
{
564-
"key": "powervs_image_names"
565-
},
566-
{
567-
"key": "tags"
568-
},
569561
{
570562
"key": "ibmcloud_api_key",
571563
"type": "multiline_secure_value",
564+
"required": true,
572565
"custom_config": {
573566
"grouping": "deployment",
574567
"original_grouping": "deployment",
575568
"type": "multiline_secure_value"
576569
}
570+
},
571+
{
572+
"key": "cloud_connection"
573+
},
574+
{
575+
"key": "powervs_image_names"
576+
},
577+
{
578+
"key": "tags"
577579
}
578580
],
579581
"outputs": [
@@ -880,6 +882,10 @@
880882
],
881883
"custom_config": {}
882884
},
885+
{
886+
"key": "external_access_ip",
887+
"required": true
888+
},
883889
{
884890
"key": "ssh_public_key",
885891
"required": true,
@@ -901,8 +907,14 @@
901907
}
902908
},
903909
{
904-
"key": "external_access_ip",
905-
"required": true
910+
"key": "ibmcloud_api_key",
911+
"type": "multiline_secure_value",
912+
"required": true,
913+
"custom_config": {
914+
"grouping": "deployment",
915+
"original_grouping": "deployment",
916+
"type": "multiline_secure_value"
917+
}
906918
},
907919
{
908920
"key": "custom_profile_instance_boot_image",
@@ -997,15 +1009,6 @@
9971009
},
9981010
{
9991011
"key": "tags"
1000-
},
1001-
{
1002-
"key": "ibmcloud_api_key",
1003-
"type": "multiline_secure_value",
1004-
"custom_config": {
1005-
"grouping": "deployment",
1006-
"original_grouping": "deployment",
1007-
"type": "multiline_secure_value"
1008-
}
10091012
}
10101013
],
10111014
"outputs": [

‎solutions/extension/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ If you do not have a PowerVS infrastructure that is the full stack solution for
5454
|------|-------------|------|---------|:--------:|
5555
| <a name="input_IC_SCHEMATICS_WORKSPACE_ID"></a> [IC\_SCHEMATICS\_WORKSPACE\_ID](#input\_IC\_SCHEMATICS\_WORKSPACE\_ID) | leave blank if running locally. This variable will be automatically populated if running from an IBM Cloud Schematics workspace | `string` | `""` | no |
5656
| <a name="input_cloud_connection"></a> [cloud\_connection](#input\_cloud\_connection) | Cloud connection configuration: speed (50, 100, 200, 500, 1000, 2000, 5000, 10000 Mb/s), count (1 or 2 connections), global\_routing (true or false), metered (true or false) | <pre>object({<br> count = number<br> speed = number<br> global_routing = bool<br> metered = bool<br> })</pre> | <pre>{<br> "count": 2,<br> "global_routing": true,<br> "metered": true,<br> "speed": 5000<br>}</pre> | no |
57-
| <a name="input_ibmcloud_api_key"></a> [ibmcloud\_api\_key](#input\_ibmcloud\_api\_key) | The IBM Cloud platform API key needed to deploy IAM enabled resources. | `string` | `null` | no |
57+
| <a name="input_ibmcloud_api_key"></a> [ibmcloud\_api\_key](#input\_ibmcloud\_api\_key) | The IBM Cloud platform API key needed to deploy IAM enabled resources. | `string` | n/a | yes |
5858
| <a name="input_powervs_backup_network"></a> [powervs\_backup\_network](#input\_powervs\_backup\_network) | Name of the IBM Cloud PowerVS backup network and CIDR to create. | <pre>object({<br> name = string<br> cidr = string<br> })</pre> | <pre>{<br> "cidr": "10.62.0.0/24",<br> "name": "bkp_net"<br>}</pre> | no |
5959
| <a name="input_powervs_image_names"></a> [powervs\_image\_names](#input\_powervs\_image\_names) | List of Images to be imported into cloud account from catalog images | `list(string)` | <pre>[<br> "SLES15-SP3-SAP",<br> "SLES15-SP3-SAP-NETWEAVER",<br> "RHEL8-SP4-SAP",<br> "RHEL8-SP4-SAP-NETWEAVER"<br>]</pre> | no |
6060
| <a name="input_powervs_management_network"></a> [powervs\_management\_network](#input\_powervs\_management\_network) | Name of the IBM Cloud PowerVS management subnet and CIDR to create. | <pre>object({<br> name = string<br> cidr = string<br> })</pre> | <pre>{<br> "cidr": "10.61.0.0/24",<br> "name": "mgmt_net"<br>}</pre> | no |

‎solutions/extension/variables.tf‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ variable "powervs_backup_network" {
3737
}
3838
}
3939

40+
variable "ibmcloud_api_key" {
41+
description = "The IBM Cloud platform API key needed to deploy IAM enabled resources."
42+
type = string
43+
sensitive = true
44+
}
45+
4046
#####################################################
4147
# Optional Parameters
4248
#####################################################
@@ -70,13 +76,6 @@ variable "tags" {
7076
default = ["sap"]
7177
}
7278

73-
variable "ibmcloud_api_key" {
74-
description = "The IBM Cloud platform API key needed to deploy IAM enabled resources."
75-
type = string
76-
sensitive = true
77-
default = null
78-
}
79-
8079
#############################################################################
8180
# Schematics Output
8281
#############################################################################

‎solutions/full-stack/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ No resources.
5454
| <a name="input_configure_ntp_forwarder"></a> [configure\_ntp\_forwarder](#input\_configure\_ntp\_forwarder) | Specify if NTP forwarder will be configured. This will allow you to synchronize time between IBM PowerVS instances. NTP forwarder will be installed on the private-svs vsi. | `bool` | `true` | no |
5555
| <a name="input_dns_forwarder_config"></a> [dns\_forwarder\_config](#input\_dns\_forwarder\_config) | Configuration for the DNS forwarder to a DNS service that is not reachable directly from PowerVS. | <pre>object({<br> dns_servers = string<br> })</pre> | <pre>{<br> "dns_servers": "161.26.0.7; 161.26.0.8; 9.9.9.9;"<br>}</pre> | no |
5656
| <a name="input_external_access_ip"></a> [external\_access\_ip](#input\_external\_access\_ip) | Specify the IP address or CIDR to login through SSH to the environment after deployment. Access to this environment will be allowed only from this IP address. | `string` | n/a | yes |
57-
| <a name="input_ibmcloud_api_key"></a> [ibmcloud\_api\_key](#input\_ibmcloud\_api\_key) | The IBM Cloud platform API key needed to deploy IAM enabled resources. | `string` | `null` | no |
57+
| <a name="input_ibmcloud_api_key"></a> [ibmcloud\_api\_key](#input\_ibmcloud\_api\_key) | The IBM Cloud platform API key needed to deploy IAM enabled resources. | `string` | n/a | yes |
5858
| <a name="input_landing_zone_configuration"></a> [landing\_zone\_configuration](#input\_landing\_zone\_configuration) | VPC landing zone configuration. | `string` | n/a | yes |
5959
| <a name="input_powervs_backup_network"></a> [powervs\_backup\_network](#input\_powervs\_backup\_network) | Name of the IBM Cloud PowerVS backup network and CIDR to create. | <pre>object({<br> name = string<br> cidr = string<br> })</pre> | <pre>{<br> "cidr": "10.52.0.0/24",<br> "name": "bkp_net"<br>}</pre> | no |
6060
| <a name="input_powervs_image_names"></a> [powervs\_image\_names](#input\_powervs\_image\_names) | List of Images to be imported into cloud account from catalog images | `list(string)` | <pre>[<br> "SLES15-SP3-SAP",<br> "SLES15-SP3-SAP-NETWEAVER",<br> "RHEL8-SP4-SAP",<br> "RHEL8-SP4-SAP-NETWEAVER"<br>]</pre> | no |

‎solutions/full-stack/variables.tf‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ variable "landing_zone_configuration" {
2323
}
2424
}
2525

26+
variable "external_access_ip" {
27+
description = "Specify the IP address or CIDR to login through SSH to the environment after deployment. Access to this environment will be allowed only from this IP address."
28+
type = string
29+
}
30+
2631
variable "ssh_public_key" {
2732
description = "Public SSH Key for VSI creation. Must be an RSA key with a key size of either 2048 bits or 4096 bits (recommended). Must be a valid SSH key that does not already exist in the deployment region."
2833
type = string
@@ -34,9 +39,10 @@ variable "ssh_private_key" {
3439
sensitive = true
3540
}
3641

37-
variable "external_access_ip" {
38-
description = "Specify the IP address or CIDR to login through SSH to the environment after deployment. Access to this environment will be allowed only from this IP address."
42+
variable "ibmcloud_api_key" {
43+
description = "The IBM Cloud platform API key needed to deploy IAM enabled resources."
3944
type = string
45+
sensitive = true
4046
}
4147

4248
#####################################################
@@ -124,15 +130,6 @@ variable "tags" {
124130
default = ["sap"]
125131
}
126132

127-
128-
129-
variable "ibmcloud_api_key" {
130-
description = "The IBM Cloud platform API key needed to deploy IAM enabled resources."
131-
type = string
132-
sensitive = true
133-
default = null
134-
}
135-
136133
#############################################################################
137134
# Schematics Output
138135
#############################################################################

‎solutions/quickstart/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ No resources.
5959
| <a name="input_custom_profile_instance_boot_image"></a> [custom\_profile\_instance\_boot\_image](#input\_custom\_profile\_instance\_boot\_image) | Override the t-shirt size specs of PowerVS Workspace instance by selecting an image name and providing valid custom\_profile parameter. | `string` | `"RHEL8-SP4-SAP"` | no |
6060
| <a name="input_dns_forwarder_config"></a> [dns\_forwarder\_config](#input\_dns\_forwarder\_config) | Configuration for the DNS forwarder to a DNS service that is not reachable directly from PowerVS. | <pre>object({<br> dns_servers = string<br> })</pre> | <pre>{<br> "dns_servers": "161.26.0.7; 161.26.0.8; 9.9.9.9;"<br>}</pre> | no |
6161
| <a name="input_external_access_ip"></a> [external\_access\_ip](#input\_external\_access\_ip) | Specify the IP address or CIDR to login through SSH to the environment after deployment. Access to this environment will be allowed only from this IP address. | `string` | n/a | yes |
62-
| <a name="input_ibmcloud_api_key"></a> [ibmcloud\_api\_key](#input\_ibmcloud\_api\_key) | The IBM Cloud platform API key needed to deploy IAM enabled resources. | `string` | `null` | no |
62+
| <a name="input_ibmcloud_api_key"></a> [ibmcloud\_api\_key](#input\_ibmcloud\_api\_key) | The IBM Cloud platform API key needed to deploy IAM enabled resources. | `string` | n/a | yes |
6363
| <a name="input_powervs_backup_network"></a> [powervs\_backup\_network](#input\_powervs\_backup\_network) | Name of the IBM Cloud PowerVS backup network and CIDR to create. | <pre>object({<br> name = string<br> cidr = string<br> })</pre> | <pre>{<br> "cidr": "10.52.0.0/24",<br> "name": "bkp_net"<br>}</pre> | no |
6464
| <a name="input_powervs_image_names"></a> [powervs\_image\_names](#input\_powervs\_image\_names) | List of Images to be imported into cloud account from catalog images | `list(string)` | <pre>[<br> "IBMi-73-13-2924-1",<br> "7300-01-01",<br> "RHEL8-SP4-SAP"<br>]</pre> | no |
6565
| <a name="input_powervs_management_network"></a> [powervs\_management\_network](#input\_powervs\_management\_network) | Name of the IBM Cloud PowerVS management subnet and CIDR to create. | <pre>object({<br> name = string<br> cidr = string<br> })</pre> | <pre>{<br> "cidr": "10.51.0.0/24",<br> "name": "mgmt_net"<br>}</pre> | no |

‎solutions/quickstart/variables.tf‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ variable "tshirt_size" {
1919
}
2020
}
2121

22+
variable "external_access_ip" {
23+
description = "Specify the IP address or CIDR to login through SSH to the environment after deployment. Access to this environment will be allowed only from this IP address."
24+
type = string
25+
}
26+
2227
variable "ssh_public_key" {
2328
description = "Public SSH Key for VSI creation. Must be an RSA key with a key size of either 2048 bits or 4096 bits (recommended). Must be a valid SSH key that does not already exist in the deployment region."
2429
type = string
@@ -30,9 +35,10 @@ variable "ssh_private_key" {
3035
sensitive = true
3136
}
3237

33-
variable "external_access_ip" {
34-
description = "Specify the IP address or CIDR to login through SSH to the environment after deployment. Access to this environment will be allowed only from this IP address."
38+
variable "ibmcloud_api_key" {
39+
description = "The IBM Cloud platform API key needed to deploy IAM enabled resources."
3540
type = string
41+
sensitive = true
3642
}
3743

3844
#####################################################
@@ -158,13 +164,6 @@ variable "tags" {
158164
default = ["demo"]
159165
}
160166

161-
variable "ibmcloud_api_key" {
162-
description = "The IBM Cloud platform API key needed to deploy IAM enabled resources."
163-
type = string
164-
sensitive = true
165-
default = null
166-
}
167-
168167
#############################################################################
169168
# Schematics Output
170169
#############################################################################

0 commit comments

Comments
 (0)