Skip to content

Commit 33ee18a

Browse files
terraform-ibm-modules-opsrenovate-botocofaigh
authored
chore(deps): update ci dependencies (#206)
* chore(deps): update ci dependencies * latest * docs * Delete Brewfile --------- Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: ocofaigh <[email protected]>
1 parent ec7e12a commit 33ee18a

File tree

8 files changed

+65
-77
lines changed

8 files changed

+65
-77
lines changed

.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].0
11+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/[email protected].9
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].0
11+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/[email protected].9
1212
secrets: inherit

Brewfile

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

common-dev-assets

Submodule common-dev-assets updated 41 files

module-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
"line": 22
220220
},
221221
"immutable": true,
222-
"options": "standard, enterprise"
222+
"options": "standard, enterprise, enterprise-sharding"
223223
},
224224
"plan_validation": {
225225
"name": "plan_validation",

profiles/fscloud/README.md

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,17 @@ The IBM Cloud Framework for Financial Services mandates the application of an in
1616
| Name | Version |
1717
|------|---------|
1818
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
19-
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.56.1, < 2.0.0 |
20-
| <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.9.1 |
19+
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.56.1 |
2120

2221
### Modules
2322

2423
| Name | Source | Version |
2524
|------|--------|---------|
26-
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.9.0 |
25+
| <a name="module_mongodb"></a> [mongodb](#module\_mongodb) | ../../ | n/a |
2726

2827
### Resources
2928

30-
| Name | Type |
31-
|------|------|
32-
| [ibm_database.mongodb](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/database) | resource |
33-
| [ibm_iam_authorization_policy.kms_policy](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/iam_authorization_policy) | resource |
34-
| [ibm_resource_key.service_credentials](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/resource_key) | resource |
35-
| [ibm_resource_tag.mongodb_tag](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/resource_tag) | resource |
36-
| [time_sleep.wait_for_authorization_policy](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) | resource |
37-
| [ibm_database_connection.database_connection](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/data-sources/database_connection) | data source |
29+
No resources.
3830

3931
### Inputs
4032

@@ -43,25 +35,21 @@ The IBM Cloud Framework for Financial Services mandates the application of an in
4335
| <a name="input_access_tags"></a> [access\_tags](#input\_access\_tags) | A list of access tags to apply to the MongoDB instance created by the module, see https://cloud.ibm.com/docs/account?topic=account-access-tags-tutorial for more details | `list(string)` | `[]` | no |
4436
| <a name="input_admin_pass"></a> [admin\_pass](#input\_admin\_pass) | The password for the database administrator. If the admin password is null then the admin user ID cannot be accessed. More users can be specified in a user block. The admin password must be in the range of 10-32 characters. | `string` | `null` | no |
4537
| <a name="input_auto_scaling"></a> [auto\_scaling](#input\_auto\_scaling) | Optional rules to allow the database to increase resources in response to usage. Only a single autoscaling block is allowed. Make sure you understand the effects of autoscaling, especially for production environments. See https://cloud.ibm.com/docs/databases-for-mongodb?topic=databases-for-mongodb-autoscaling&interface=cli#autoscaling-considerations in the IBM Cloud Docs. | <pre>object({<br> disk = object({<br> capacity_enabled = optional(bool, false)<br> free_space_less_than_percent = optional(number, 10)<br> io_above_percent = optional(number, 90)<br> io_enabled = optional(bool, false)<br> io_over_period = optional(string, "15m")<br> rate_increase_percent = optional(number, 10)<br> rate_limit_mb_per_member = optional(number, 3670016)<br> rate_period_seconds = optional(number, 900)<br> rate_units = optional(string, "mb")<br> })<br> memory = object({<br> io_above_percent = optional(number, 90)<br> io_enabled = optional(bool, false)<br> io_over_period = optional(string, "15m")<br> rate_increase_percent = optional(number, 10)<br> rate_limit_mb_per_member = optional(number, 114688)<br> rate_period_seconds = optional(number, 900)<br> rate_units = optional(string, "mb")<br> })<br> })</pre> | `null` | no |
46-
| <a name="input_backup_encryption_key_crn"></a> [backup\_encryption\_key\_crn](#input\_backup\_encryption\_key\_crn) | The CRN of a Key Protect key that you want to use for encrypting the disk that holds deployment backups. Only used if var.kms\_encryption\_enabled is set to true. BYOK for backups is available only in US regions us-south and us-east, and in eu-de. Only keys in the us-south and eu-de are durable to region failures. To ensure that your backups are available even if a region failure occurs, use a key from us-south or eu-de. Hyper Protect Crypto Services for IBM Cloud Databases backups is not currently supported. If no value is passed here, the value passed for the 'kms\_key\_crn' variable is used. And if a HPCS value is passed for var.kms\_key\_crn, the database backup encryption uses the default encryption keys. | `string` | `null` | no |
4738
| <a name="input_cbr_rules"></a> [cbr\_rules](#input\_cbr\_rules) | (Optional, list) List of CBR rules to create | <pre>list(object({<br> description = string<br> account_id = string<br> rule_contexts = list(object({<br> attributes = optional(list(object({<br> name = string<br> value = string<br> }))) }))<br> enforcement_mode = string<br> }))</pre> | `[]` | no |
4839
| <a name="input_configuration"></a> [configuration](#input\_configuration) | Database Configuration. | <pre>object({<br> maxmemory = optional(number)<br> maxmemory-policy = optional(string)<br> appendonly = optional(string)<br> maxmemory-samples = optional(number)<br> stop-writes-on-bgsave-error = optional(string)<br> })</pre> | `null` | no |
49-
| <a name="input_cpu_count"></a> [cpu\_count](#input\_cpu\_count) | Allocated dedicated CPU per member. For shared CPU, set to 0. For more information, see https://cloud.ibm.com/docs/databases-for-mongodb?topic=databases-for-mongodb-pricing#mongodb-scale-member | `number` | `0` | no |
50-
| <a name="input_disk_mb"></a> [disk\_mb](#input\_disk\_mb) | Allocated disk per member. For more information, see https://cloud.ibm.com/docs/databases-for-mongodb?topic=databases-for-mongodb-pricing#mongodb-scale-member | `number` | `10240` | no |
51-
| <a name="input_endpoints"></a> [endpoints](#input\_endpoints) | Specify whether you want to enable the public, private, or both service endpoints. Supported values are 'public', 'private', or 'public-and-private'. | `string` | `"private"` | no |
52-
| <a name="input_existing_kms_instance_guid"></a> [existing\_kms\_instance\_guid](#input\_existing\_kms\_instance\_guid) | The GUID of the Hyper Protect Crypto Services or Key Protect instance in which the key specified in var.kms\_key\_crn and var.backup\_encryption\_key\_crn is coming from. Required only if var.kms\_encryption\_enabled is set to true, var.skip\_iam\_authorization\_policy is set to false, and you pass a value for var.kms\_key\_crn, var.backup\_encryption\_key\_crn, or both. | `string` | `null` | no |
53-
| <a name="input_instance_name"></a> [instance\_name](#input\_instance\_name) | The name to give the MongoDB instance. | `string` | n/a | yes |
54-
| <a name="input_kms_encryption_enabled"></a> [kms\_encryption\_enabled](#input\_kms\_encryption\_enabled) | Set this to true to control the encryption keys used to encrypt the data that you store in IBM Cloud® Databases. If set to false, the data is encrypted by using randomly generated keys. For more info on Key Protect integration, see https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-key-protect. For more info on HPCS integration, see https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hpcs | `bool` | `false` | no |
55-
| <a name="input_kms_key_crn"></a> [kms\_key\_crn](#input\_kms\_key\_crn) | The root key CRN of a Key Management Services like Key Protect or Hyper Protect Crypto Services (HPCS) that you want to use for disk encryption. Only used if var.kms\_encryption\_enabled is set to true. | `string` | `null` | no |
40+
| <a name="input_cpu_count"></a> [cpu\_count](#input\_cpu\_count) | Allocated dedicated CPU per member. For shared CPU, set to 0. For more information, see https://cloud.ibm.com/docs/databases-for-mongodb?topic=databases-for-mongodb-pricing#mongodb-scale-member | `number` | `6` | no |
41+
| <a name="input_disk_mb"></a> [disk\_mb](#input\_disk\_mb) | Allocated disk per member. For more information, see https://cloud.ibm.com/docs/databases-for-mongodb?topic=databases-for-mongodb-pricing#mongodb-scale-member | `number` | `20480` | no |
42+
| <a name="input_existing_kms_instance_guid"></a> [existing\_kms\_instance\_guid](#input\_existing\_kms\_instance\_guid) | The GUID of the Hyper Protect Crypto Services instance. | `string` | n/a | yes |
43+
| <a name="input_instance_name"></a> [instance\_name](#input\_instance\_name) | Name of the mongodb instance | `string` | n/a | yes |
44+
| <a name="input_kms_key_crn"></a> [kms\_key\_crn](#input\_kms\_key\_crn) | The root key CRN of the Hyper Protect Crypto Service (HPCS) to use for disk encryption. | `string` | n/a | yes |
5645
| <a name="input_members"></a> [members](#input\_members) | Allocated number of members | `number` | `3` | no |
57-
| <a name="input_memory_mb"></a> [memory\_mb](#input\_memory\_mb) | Allocated memory per member. For more information, see https://cloud.ibm.com/docs/databases-for-mongodb?topic=databases-for-mongodb-pricing#mongodb-scale-member | `number` | `1024` | no |
58-
| <a name="input_mongodb_version"></a> [mongodb\_version](#input\_mongodb\_version) | The version of the MongoDB to provision. If no value passed, the current ICD preferred version is used. | `string` | `null` | no |
59-
| <a name="input_plan"></a> [plan](#input\_plan) | The name of the service plan that you choose for your MongoDB instance | `string` | `"standard"` | no |
60-
| <a name="input_plan_validation"></a> [plan\_validation](#input\_plan\_validation) | Enable or disable validating the database parameters for MongoDB during the plan phase. | `bool` | `true` | no |
61-
| <a name="input_region"></a> [region](#input\_region) | The region where you want to deploy your instance. | `string` | `"us-south"` | no |
46+
| <a name="input_memory_mb"></a> [memory\_mb](#input\_memory\_mb) | Allocated memory per member. For more information, see https://cloud.ibm.com/docs/databases-for-mongodb?topic=databases-for-mongodb-pricing#mongodb-scale-member | `number` | `14336` | no |
47+
| <a name="input_mongodb_version"></a> [mongodb\_version](#input\_mongodb\_version) | Version of the MongoDB instance. If no value is passed, the current preferred version of IBM Cloud Databases is used. | `string` | `null` | no |
48+
| <a name="input_plan"></a> [plan](#input\_plan) | The name of the service plan that you choose for your MongoDB instance | `string` | `"enterprise"` | no |
49+
| <a name="input_region"></a> [region](#input\_region) | The region where you want to deploy your instance. Must be the same region as the Hyper Protect Crypto Services instance. | `string` | `"us-south"` | no |
6250
| <a name="input_resource_group_id"></a> [resource\_group\_id](#input\_resource\_group\_id) | The resource group ID where the MongoDB instance will be created. | `string` | n/a | yes |
6351
| <a name="input_service_credential_names"></a> [service\_credential\_names](#input\_service\_credential\_names) | Map of name, role for service credentials that you want to create for the database | `map(string)` | `{}` | no |
64-
| <a name="input_skip_iam_authorization_policy"></a> [skip\_iam\_authorization\_policy](#input\_skip\_iam\_authorization\_policy) | Set to true to skip the creation of an IAM authorization policy that permits all MongoDB database instances in the resource group to read the encryption key from the KMS instance. If set to false, pass in a value for the KMS instance in the existing\_kms\_instance\_guid variable. In addition, no policy is created if var.kms\_encryption\_enabled is set to false. | `bool` | `false` | no |
52+
| <a name="input_skip_iam_authorization_policy"></a> [skip\_iam\_authorization\_policy](#input\_skip\_iam\_authorization\_policy) | Set to true to skip the creation of an IAM authorization policy that permits all MongoDB database instances in the resource group to read the encryption key from the Hyper Protect Crypto Services instance. The HPCS instance is passed in through the var.existing\_kms\_instance\_guid variable. | `bool` | `false` | no |
6553
| <a name="input_tags"></a> [tags](#input\_tags) | Optional list of tags to be added to the MongoDB instance. | `list(any)` | `[]` | no |
6654
| <a name="input_users"></a> [users](#input\_users) | A list of users that you want to create on the database. Multiple blocks are allowed. The user password must be in the range of 10-32 characters. Be warned that in most case using IAM service credentials (via the var.service\_credential\_names) is sufficient to control access to the MongoDB instance. This blocks creates native MongoDB database users, more info on that can be found here https://cloud.ibm.com/docs/databases-for-mongodb?topic=databases-for-mongodb-user-management&interface=ui | <pre>list(object({<br> name = string<br> password = string # pragma: allowlist secret<br> type = string # "type" is required to generate the connection string for the outputs.<br> role = optional(string)<br> }))</pre> | `[]` | no |
6755

@@ -72,9 +60,9 @@ The IBM Cloud Framework for Financial Services mandates the application of an in
7260
| <a name="output_cbr_rule_ids"></a> [cbr\_rule\_ids](#output\_cbr\_rule\_ids) | CBR rule ids created to restrict MongoDB |
7361
| <a name="output_crn"></a> [crn](#output\_crn) | MongoDB instance crn |
7462
| <a name="output_guid"></a> [guid](#output\_guid) | MongoDB instance guid |
75-
| <a name="output_hostname"></a> [hostname](#output\_hostname) | Database hostname. Only contains value when var.service\_credential\_names or var.users are set. |
76-
| <a name="output_id"></a> [id](#output\_id) | MongoDB instance ID |
77-
| <a name="output_port"></a> [port](#output\_port) | Database port. Only contains value when var.service\_credential\_names or var.users are set. |
63+
| <a name="output_hostname"></a> [hostname](#output\_hostname) | MongoDB instance hostname |
64+
| <a name="output_id"></a> [id](#output\_id) | MongoDB instance id |
65+
| <a name="output_port"></a> [port](#output\_port) | MongoDB instance port |
7866
| <a name="output_service_credentials_json"></a> [service\_credentials\_json](#output\_service\_credentials\_json) | Service credentials json map |
7967
| <a name="output_service_credentials_object"></a> [service\_credentials\_object](#output\_service\_credentials\_object) | Service credentials object |
8068
| <a name="output_version"></a> [version](#output\_version) | MongoDB instance version |

tests/go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/terraform-ibm-modules/terraform-ibm-icd-mongodb
33
go 1.20
44

55
require (
6-
github.com/gruntwork-io/terratest v0.43.8
6+
github.com/gruntwork-io/terratest v0.43.13
77
github.com/stretchr/testify v1.8.4
8-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.10.11
8+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.21.5
99
)
1010

1111
require (
@@ -14,13 +14,14 @@ require (
1414
cloud.google.com/go/compute/metadata v0.2.3 // indirect
1515
cloud.google.com/go/iam v1.1.0 // indirect
1616
cloud.google.com/go/storage v1.30.1 // indirect
17+
dario.cat/mergo v1.0.0 // indirect
1718
github.com/IBM-Cloud/bluemix-go v0.0.0-20230616121711-b838ccdcd2fb // indirect
18-
github.com/IBM-Cloud/power-go-client v1.2.4 // indirect
19-
github.com/IBM/go-sdk-core/v5 v5.13.4 // indirect
20-
github.com/IBM/platform-services-go-sdk v0.40.0 // indirect
19+
github.com/IBM-Cloud/power-go-client v1.3.1 // indirect
20+
github.com/IBM/go-sdk-core/v5 v5.14.1 // indirect
21+
github.com/IBM/platform-services-go-sdk v0.48.1 // indirect
2122
github.com/IBM/vpc-go-sdk v1.0.2 // indirect
2223
github.com/Microsoft/go-winio v0.6.1 // indirect
23-
github.com/ProtonMail/go-crypto v0.0.0-20230528122434-6f98819771a1 // indirect
24+
github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
2425
github.com/acomagu/bufpipe v1.0.4 // indirect
2526
github.com/agext/levenshtein v1.2.3 // indirect
2627
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
@@ -33,7 +34,7 @@ require (
3334
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
3435
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
3536
github.com/go-git/go-billy/v5 v5.4.1 // indirect
36-
github.com/go-git/go-git/v5 v5.7.0 // indirect
37+
github.com/go-git/go-git/v5 v5.8.1 // indirect
3738
github.com/go-logr/logr v1.2.4 // indirect
3839
github.com/go-logr/stdr v1.2.2 // indirect
3940
github.com/go-openapi/analysis v0.21.4 // indirect
@@ -65,9 +66,8 @@ require (
6566
github.com/hashicorp/go-version v1.6.0 // indirect
6667
github.com/hashicorp/hcl/v2 v2.17.0 // indirect
6768
github.com/hashicorp/terraform-json v0.17.0 // indirect
68-
github.com/imdario/mergo v0.3.16 // indirect
6969
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
70-
github.com/jinzhu/copier v0.3.5 // indirect
70+
github.com/jinzhu/copier v0.4.0 // indirect
7171
github.com/jmespath/go-jmespath v0.4.0 // indirect
7272
github.com/josharian/intern v1.0.0 // indirect
7373
github.com/kevinburke/ssh_config v1.2.0 // indirect
@@ -84,7 +84,7 @@ require (
8484
github.com/pjbgf/sha1cd v0.3.0 // indirect
8585
github.com/pmezard/go-difflib v1.0.0 // indirect
8686
github.com/sergi/go-diff v1.3.1 // indirect
87-
github.com/skeema/knownhosts v1.1.1 // indirect
87+
github.com/skeema/knownhosts v1.2.0 // indirect
8888
github.com/tmccombs/hcl2json v0.5.0 // indirect
8989
github.com/ulikunitz/xz v0.5.11 // indirect
9090
github.com/xanzy/ssh-agent v0.3.3 // indirect
@@ -94,12 +94,12 @@ require (
9494
go.opentelemetry.io/otel v1.16.0 // indirect
9595
go.opentelemetry.io/otel/metric v1.16.0 // indirect
9696
go.opentelemetry.io/otel/trace v1.16.0 // indirect
97-
golang.org/x/crypto v0.11.0 // indirect
97+
golang.org/x/crypto v0.13.0 // indirect
9898
golang.org/x/mod v0.10.0 // indirect
99-
golang.org/x/net v0.10.0 // indirect
99+
golang.org/x/net v0.12.0 // indirect
100100
golang.org/x/oauth2 v0.8.0 // indirect
101-
golang.org/x/sys v0.10.0 // indirect
102-
golang.org/x/text v0.11.0 // indirect
101+
golang.org/x/sys v0.12.0 // indirect
102+
golang.org/x/text v0.13.0 // indirect
103103
golang.org/x/tools v0.9.3 // indirect
104104
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
105105
google.golang.org/api v0.127.0 // indirect

0 commit comments

Comments
 (0)