Skip to content

Commit

Permalink
chore(deps): update ci dependencies (#204)
Browse files Browse the repository at this point in the history
  • Loading branch information
@terraform-ibm-modules-ops
terraform-ibm-modules-ops authored Sep 28, 2024
1 parent 5f8924d commit 464bb39
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 34 deletions.
2 changes: 1 addition & 1 deletion common-dev-assets
Submodule common-dev-assets updated 7 files
+7 −6 common-go-assets/common-permanent-resources.yaml
+1 −1 module-assets/.pre-commit-config.yaml
+4 −32 module-assets/ci/install-deps.sh
+2 −1 module-assets/ci/run-tests.sh
+6 −0 renovate.json
+2 −2 stack-assets/stack-updater/requirements.txt
+26 −0 stack-assets/stack-updater/update_stack_definition.py
4 changes: 2 additions & 2 deletions solutions/quickstart/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ To view your current configuration, run the `terraform refresh` command.

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_data_volume_names"></a> [data\_volume\_names](#input\_data\_volume\_names) | Enter the details of Data Volume creation. Refer https://github.com/terraform-ibm-modules/terraform-ibm-zvsi/tree/main/solutions/quickstart/README.md for input value | <pre>list(object({<br> name = string<br> capacity = number<br> volume_name = string<br> }))</pre> | `[]` | no |
| <a name="input_data_volume_names"></a> [data\_volume\_names](#input\_data\_volume\_names) | Enter the details of Data Volume creation. Refer https://github.com/terraform-ibm-modules/terraform-ibm-zvsi/tree/main/solutions/quickstart/README.md for input value | <pre>list(object({<br/> name = string<br/> capacity = number<br/> volume_name = string<br/> }))</pre> | `[]` | no |
| <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 |
| <a name="input_image_name"></a> [image\_name](#input\_image\_name) | Enter a valid image name for Wazi VSI | `string` | `"ibm-zos-3-1-s390x-dev-test-wazi-1"` | no |
| <a name="input_machine_type"></a> [machine\_type](#input\_machine\_type) | input machine type: valid values are: bz2-4x16, bz2-8x32, bz2-16x64, cz2-8x16, cz2-16x32, mz2-2x16, mz2-4x32, mz2-8x64, mz2-16x128 | `string` | `"mz2-2x16"` | no |
| <a name="input_override_json_string"></a> [override\_json\_string](#input\_override\_json\_string) | Override default values with custom JSON. Any value here other than an empty string will override all other configuration changes. | `string` | `"{\n \"atracker\": {\n \"collector_bucket_name\": \"\",\n \"receive_global_events\": false,\n \"resource_group\": \"\",\n \"add_route\": false\n },\n \"clusters\": [],\n \"cos\": [],\n \"enable_transit_gateway\": false,\n \"transit_gateway_global\": false,\n \"key_management\": {\n \"keys\": [\n ],\n \"name\": null,\n \"resource_group\": null,\n \"use_hs_crypto\": false,\n \"use_data\": false\n },\n \"network_cidr\": \"10.0.0.0/8\",\n \"resource_groups\": [\n {\n \"create\": true,\n \"name\": \"workload-rg\",\n \"use_prefix\": true\n }\n ],\n \"security_groups\": [],\n \"transit_gateway_connections\": [],\n \"transit_gateway_resource_group\": \"\",\n \"virtual_private_endpoints\": [],\n \"vpcs\": [\n {\n \"default_security_group_name\": \"workload-vpc-sg\",\n \"default_security_group_rules\": [\n\t {\n \"direction\": \"inbound\",\n \"name\": \"allow-ibm-inbound\",\n \"remote\": \"0.0.0.0/0\",\n \"tcp\": {\n \"port_max\": 22,\n \"port_min\": 22\n }\n\t },\n\t {\n \"direction\": \"inbound\",\n \"name\": \"allow-ibm-inbound-1\",\n \"remote\": \"0.0.0.0/0\",\n \"icmp\": {\n \"type\": 8\n }\n },\n\t {\n \"direction\": \"inbound\",\n \"name\": \"allow-ibm-inbound-2\",\n \"remote\": \"0.0.0.0/0\",\n \"udp\": {\n \"port_max\": 443,\n \"port_min\": 443\n }\n }\n\t ],\n \"clean_default_sg_acl\": false,\n \"flow_logs_bucket_name\": null,\n \"network_acls\": [\n {\n \"add_cluster_rules\": false,\n \"name\": \"workload-acl\",\n \"rules\": [\n {\n \"action\": \"allow\",\n \"destination\": \"10.0.0.0/8\",\n \"direction\": \"inbound\",\n \"name\": \"allow-ibm-inbound\",\n \"source\": \"161.26.0.0/16\"\n },\n {\n \"action\": \"allow\",\n \"destination\": \"10.0.0.0/8\",\n \"direction\": \"inbound\",\n \"name\": \"allow-all-network-inbound\",\n \"source\": \"10.0.0.0/8\"\n },\n {\n \"action\": \"allow\",\n \"destination\": \"0.0.0.0/0\",\n \"direction\": \"inbound\",\n \"name\": \"allow-all-network-inbound-1\",\n \"source\": \"0.0.0.0/0\",\n \"icmp\": {\n \"type\": 8\n }\n },\n {\n \"action\": \"allow\",\n \"destination\": \"0.0.0.0/0\",\n \"direction\": \"inbound\",\n \"name\": \"allow-all-network-inbound-2\",\n \"source\": \"0.0.0.0/0\",\n \"udp\": {\n\t\t\t \"source_port_max\": 65535,\n\t\t\t \"source_port_min\": 1,\n \"port_max\": 443,\n \"port_min\": 443\n }\n\t\t },\n {\n \"action\": \"allow\",\n \"destination\": \"0.0.0.0/0\",\n \"direction\": \"inbound\",\n \"name\": \"allow-all-network-inbound-3\",\n \"source\": \"0.0.0.0/0\",\n \"tcp\": {\n \"source_port_max\": 65535,\n \"source_port_min\": 1,\n \"port_max\": 992,\n \"port_min\": 992\n }\n },\n {\n \"action\": \"allow\",\n \"destination\": \"0.0.0.0/0\",\n \"direction\": \"inbound\",\n \"name\": \"allow-all-network-inbound-4\",\n \"source\": \"0.0.0.0/0\",\n \"tcp\": {\n \"source_port_max\": 65535,\n \"source_port_min\": 1,\n \"port_max\": 22,\n \"port_min\": 22\n }\n },\n {\n \"action\": \"allow\",\n \"destination\": \"0.0.0.0/0\",\n \"direction\": \"inbound\",\n \"name\": \"allow-all-network-inbound-5\",\n \"source\": \"0.0.0.0/0\",\n \"tcp\": {\n \"source_port_max\": 65535,\n \"source_port_min\": 1,\n \"port_max\": 10443,\n \"port_min\": 10443\n }\n },\n {\n \"action\": \"allow\",\n \"destination\": \"0.0.0.0/0\",\n \"direction\": \"outbound\",\n \"name\": \"allow-all-outbound\",\n \"source\": \"0.0.0.0/0\"\n }\n ]\n }\n ],\n \"prefix\": \"workload\",\n \"resource_group\": \"workload-rg\",\n \"subnets\": {\n \"zone-1\": [\n {\n \"acl_name\": \"workload-acl\",\n \"cidr\": \"10.40.10.0/24\",\n \"name\": \"vsi-zone-1\",\n \"public_gateway\": false\n }\n ],\n \"zone-2\": [],\n \"zone-3\": []\n },\n \"use_public_gateways\": {\n \"zone-1\": false,\n \"zone-2\": false,\n \"zone-3\": false\n },\n \"address_prefixes\": {\n \"zone-1\": [],\n \"zone-2\": [],\n \"zone-3\": []\n }\n }\n ],\n \"vpn_gateways\": [],\n \"vsi\": [\n {\n \"boot_volume_encryption_key_name\": null,\n \"image_name\": \"ibm-zos-3-1-s390x-dev-test-wazi-1\",\n \"machine_type\": \"mz2o-2x16\",\n \"name\": \"workload-server\",\n \"resource_group\": \"workload-rg\",\n \"security_group\": {\n \"name\": \"workload-sg\",\n \"rules\": [\n {\n \"direction\": \"inbound\",\n \"name\": \"allow-ibm-inbound\",\n \"source\": \"161.26.0.0/16\"\n },\n {\n \"direction\": \"inbound\",\n \"name\": \"allow-vpc-inbound\",\n \"source\": \"10.0.0.0/8\"\n },\n {\n \"direction\": \"inbound\",\n \"name\": \"allow-all-inbound\",\n \"source\": \"0.0.0.0/0\",\n\t \"tcp\": {\n \"port_max\": 22,\n \"port_min\": 22\n }\n },\n {\n \"direction\": \"inbound\",\n \"name\": \"allow-all-inbound-3\",\n \"source\": \"0.0.0.0/0\",\n \"icmp\": {\n \"type\": 8,\n \"code\": 0\n }\n },\n {\n \"direction\": \"outbound\",\n \"name\": \"allow-all-outbound\",\n \"source\": \"0.0.0.0/0\"\n }\n ]\n },\n \"ssh_keys\": [\n \"ssh-key\"\n ],\n \"subnet_names\": [\n \"vsi-zone-1\"\n ],\n \"vpc_name\": \"workload\",\n \"vsi_per_subnet\": 1,\n \"enable_floating_ip\": true\n }\n ]\n}\n"` | no |
| <a name="input_ports"></a> [ports](#input\_ports) | Enter the list of ports to open for Wazi VSI SG. For example : [992,10443] | `list(number)` | <pre>[<br> 21,<br> 992,<br> 9443,<br> 10443,<br> 8101,<br> 8102,<br> 8120,<br> 8121,<br> 8150,<br> 8153,<br> 8154,<br> 8155,<br> 8180,<br> 8135,<br> 8191,<br> 8192,<br> 8194,<br> 8137,<br> 8138,<br> 8139,<br> 8115,<br> 8195,<br> 12000,<br> 12001,<br> 12002,<br> 12003,<br> 12004,<br> 12005,<br> 12006,<br> 12007,<br> 12008,<br> 12009,<br> 12010,<br> 12011,<br> 12012,<br> 12013,<br> 12014,<br> 12015,<br> 12016,<br> 12017,<br> 12018,<br> 12019,<br> 12020,<br> 12021,<br> 12022,<br> 12023,<br> 12024,<br> 12025,<br> 12026,<br> 12027,<br> 12028,<br> 12029<br>]</pre> | no |
| <a name="input_ports"></a> [ports](#input\_ports) | Enter the list of ports to open for Wazi VSI SG. For example : [992,10443] | `list(number)` | <pre>[<br/> 21,<br/> 992,<br/> 9443,<br/> 10443,<br/> 8101,<br/> 8102,<br/> 8120,<br/> 8121,<br/> 8150,<br/> 8153,<br/> 8154,<br/> 8155,<br/> 8180,<br/> 8135,<br/> 8191,<br/> 8192,<br/> 8194,<br/> 8137,<br/> 8138,<br/> 8139,<br/> 8115,<br/> 8195,<br/> 12000,<br/> 12001,<br/> 12002,<br/> 12003,<br/> 12004,<br/> 12005,<br/> 12006,<br/> 12007,<br/> 12008,<br/> 12009,<br/> 12010,<br/> 12011,<br/> 12012,<br/> 12013,<br/> 12014,<br/> 12015,<br/> 12016,<br/> 12017,<br/> 12018,<br/> 12019,<br/> 12020,<br/> 12021,<br/> 12022,<br/> 12023,<br/> 12024,<br/> 12025,<br/> 12026,<br/> 12027,<br/> 12028,<br/> 12029<br/>]</pre> | no |
| <a name="input_prefix"></a> [prefix](#input\_prefix) | A unique identifier for resources. Must begin with a lowercase letter and end with a lowerccase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters. | `string` | n/a | yes |
| <a name="input_region"></a> [region](#input\_region) | Region where VPC will be created. To find your VPC region, use `ibmcloud is regions` command to find available regions. | `string` | n/a | yes |
| <a name="input_ssh_key"></a> [ssh\_key](#input\_ssh\_key) | A public SSH Key for VSI creation which does not already exist in the deployment region. Must be an RSA key with a key size of either 2048 bits or 4096 bits (recommended) - See https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys. | `string` | n/a | yes |
Expand Down
6 changes: 3 additions & 3 deletions solutions/standard/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ The `override.json` file does not need to contain all elements. For example,
| <a name="input_cert_common_name"></a> [cert\_common\_name](#input\_cert\_common\_name) | Fully qualified domain name or host domain name for the private certificate to be created | `string` | n/a | yes |
| <a name="input_certificate_template_name"></a> [certificate\_template\_name](#input\_certificate\_template\_name) | Name of the Certificate Template to create for a private\_cert secret engine. When var.existing\_sm\_instance\_guid is true, then it has to be the existing template name that exists in the private cert engine. | `string` | `"my-template-1"` | no |
| <a name="input_create_policy"></a> [create\_policy](#input\_create\_policy) | Set to true to create a new access group (using the value of var.access\_group\_name) with a VPN Client role | `bool` | `true` | no |
| <a name="input_data_volume_names"></a> [data\_volume\_names](#input\_data\_volume\_names) | Enter the details of Data Volume creation. Refer https://github.com/terraform-ibm-modules/terraform-ibm-zvsi/tree/main/solutions/standard/README.md for input value | <pre>list(object({<br> name = string<br> capacity = number<br> volume_name = string<br> }))</pre> | `[]` | no |
| <a name="input_data_volume_names"></a> [data\_volume\_names](#input\_data\_volume\_names) | Enter the details of Data Volume creation. Refer https://github.com/terraform-ibm-modules/terraform-ibm-zvsi/tree/main/solutions/standard/README.md for input value | <pre>list(object({<br/> name = string<br/> capacity = number<br/> volume_name = string<br/> }))</pre> | `[]` | no |
| <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 |
| <a name="input_image_name"></a> [image\_name](#input\_image\_name) | Enter a valid image name for Wazi VSI | `string` | `"ibm-zos-3-1-s390x-dev-test-wazi-1"` | no |
| <a name="input_intermediate_ca_name"></a> [intermediate\_ca\_name](#input\_intermediate\_ca\_name) | Name of the Intermediate CA to create for a private\_cert secret engine. Only used when var.existing\_sm\_instance\_guid is false | `string` | `"intermediate-ca-1"` | no |
| <a name="input_machine_type"></a> [machine\_type](#input\_machine\_type) | input machine type: valid values are: bz2-4x16, bz2-8x32, bz2-16x64, cz2-8x16, cz2-16x32, mz2-2x16, mz2-4x32, mz2-8x64, mz2-16x128 | `string` | `"mz2-2x16"` | no |
| <a name="input_override"></a> [override](#input\_override) | Override default values with custom JSON template. This uses the file `override.json` to allow users to create a fully customized environment. | `bool` | `true` | no |
| <a name="input_ports"></a> [ports](#input\_ports) | Enter the list of ports to open for Wazi VSI SG. | `list(number)` | <pre>[<br> 21,<br> 992,<br> 9443,<br> 10443,<br> 8101,<br> 8102,<br> 8120,<br> 8121,<br> 8150,<br> 8153,<br> 8154,<br> 8155,<br> 8180,<br> 8135,<br> 8191,<br> 8192,<br> 8194,<br> 8137,<br> 8138,<br> 8139,<br> 8115,<br> 8195,<br> 12000,<br> 12001,<br> 12002,<br> 12003,<br> 12004,<br> 12005,<br> 12006,<br> 12007,<br> 12008,<br> 12009,<br> 12010,<br> 12011,<br> 12012,<br> 12013,<br> 12014,<br> 12015,<br> 12016,<br> 12017,<br> 12018,<br> 12019,<br> 12020,<br> 12021,<br> 12022,<br> 12023,<br> 12024,<br> 12025,<br> 12026,<br> 12027,<br> 12028,<br> 12029<br>]</pre> | no |
| <a name="input_ports"></a> [ports](#input\_ports) | Enter the list of ports to open for Wazi VSI SG. | `list(number)` | <pre>[<br/> 21,<br/> 992,<br/> 9443,<br/> 10443,<br/> 8101,<br/> 8102,<br/> 8120,<br/> 8121,<br/> 8150,<br/> 8153,<br/> 8154,<br/> 8155,<br/> 8180,<br/> 8135,<br/> 8191,<br/> 8192,<br/> 8194,<br/> 8137,<br/> 8138,<br/> 8139,<br/> 8115,<br/> 8195,<br/> 12000,<br/> 12001,<br/> 12002,<br/> 12003,<br/> 12004,<br/> 12005,<br/> 12006,<br/> 12007,<br/> 12008,<br/> 12009,<br/> 12010,<br/> 12011,<br/> 12012,<br/> 12013,<br/> 12014,<br/> 12015,<br/> 12016,<br/> 12017,<br/> 12018,<br/> 12019,<br/> 12020,<br/> 12021,<br/> 12022,<br/> 12023,<br/> 12024,<br/> 12025,<br/> 12026,<br/> 12027,<br/> 12028,<br/> 12029<br/>]</pre> | no |
| <a name="input_prefix"></a> [prefix](#input\_prefix) | A unique identifier for resources. Must begin with a lowercase letter and end with a lowerccase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters. | `string` | n/a | yes |
| <a name="input_region"></a> [region](#input\_region) | Region where all the resources will be created. Use `ibmcloud is regions` command to find available regions. | `string` | n/a | yes |
| <a name="input_root_ca_common_name"></a> [root\_ca\_common\_name](#input\_root\_ca\_common\_name) | Fully qualified domain name or host domain name for the certificate to be created | `string` | `"root-ca-da"` | no |
Expand All @@ -107,7 +107,7 @@ The `override.json` file does not need to contain all elements. For example,
| <a name="input_sm_service_plan"></a> [sm\_service\_plan](#input\_sm\_service\_plan) | Type of service plan to use to provision Secrets Manager if not using an existing one. | `string` | `"trial"` | no |
| <a name="input_ssh_public_key"></a> [ssh\_public\_key](#input\_ssh\_public\_key) | A public SSH Key for VSI creation which does not already exist in the deployment region. Must be an RSA key with a key size of either 2048 bits or 4096 bits (recommended) - See https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys. To use an existing key, enter a value for the variable 'existing\_ssh\_key\_name' instead. | `string` | n/a | yes |
| <a name="input_vpn_client_access_group_users"></a> [vpn\_client\_access\_group\_users](#input\_vpn\_client\_access\_group\_users) | List of users in the Client to Site VPN Access Group | `list(string)` | `[]` | no |
| <a name="input_vpn_server_routes"></a> [vpn\_server\_routes](#input\_vpn\_server\_routes) | Map of server routes to be added to created VPN server. | <pre>map(object({<br> destination = string<br> action = string<br> }))</pre> | <pre>{<br> "route-vpn-2-dns": {<br> "action": "translate",<br> "destination": "161.26.0.0/24"<br> },<br> "route-vpn-2-services": {<br> "action": "translate",<br> "destination": "166.9.0.0/16"<br> },<br> "vpn-ibm-network": {<br> "action": "translate",<br> "destination": "10.0.0.0/8"<br> }<br>}</pre> | no |
| <a name="input_vpn_server_routes"></a> [vpn\_server\_routes](#input\_vpn\_server\_routes) | Map of server routes to be added to created VPN server. | <pre>map(object({<br/> destination = string<br/> action = string<br/> }))</pre> | <pre>{<br/> "route-vpn-2-dns": {<br/> "action": "translate",<br/> "destination": "161.26.0.0/24"<br/> },<br/> "route-vpn-2-services": {<br/> "action": "translate",<br/> "destination": "166.9.0.0/16"<br/> },<br/> "vpn-ibm-network": {<br/> "action": "translate",<br/> "destination": "10.0.0.0/8"<br/> }<br/>}</pre> | no |

### Outputs

Expand Down
Loading

0 comments on commit 464bb39

Please sign in to comment.