Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update ibm provider to 1.48 #212

Merged
merged 3 commits into from
Dec 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ statement instead the previous block.
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.45.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.48.0 |
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.4.2 |

## Modules
Expand Down Expand Up @@ -970,7 +970,7 @@ statement instead the previous block.
| <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_resource_groups"></a> [resource\_groups](#input\_resource\_groups) | Object describing resource groups to create or reference | <pre>list(<br> object({<br> name = string<br> create = optional(bool)<br> use_prefix = optional(bool)<br> })<br> )</pre> | n/a | yes |
| <a name="input_secrets_manager"></a> [secrets\_manager](#input\_secrets\_manager) | Map describing an optional secrets manager deployment | <pre>object({<br> use_secrets_manager = bool<br> name = optional(string)<br> kms_key_name = optional(string)<br> resource_group = optional(string)<br> })</pre> | <pre>{<br> "use_secrets_manager": false<br>}</pre> | no |
| <a name="input_security_compliance_center"></a> [security\_compliance\_center](#input\_security\_compliance\_center) | Security and Compliance Center Variables | <pre>object({<br> enable_scc = bool<br> location_id = optional(string)<br> is_public = optional(bool)<br> collector_passphrase = optional(string)<br> collector_description = optional(string)<br> credential_id = optional(string)<br> scope_name = optional(string)<br> scope_description = optional(string)<br> })</pre> | <pre>{<br> "enable_scc": false<br>}</pre> | no |
| <a name="input_security_compliance_center"></a> [security\_compliance\_center](#input\_security\_compliance\_center) | Security and Compliance Center Variables | <pre>object({<br> enable_scc = bool<br> location_id = optional(string)<br> is_public = optional(bool)<br> collector_description = optional(string)<br> credential_id = optional(string)<br> scope_name = optional(string)<br> scope_description = optional(string)<br> })</pre> | <pre>{<br> "enable_scc": false<br>}</pre> | no |
| <a name="input_security_groups"></a> [security\_groups](#input\_security\_groups) | Security groups for VPC | <pre>list(<br> object({<br> name = string<br> vpc_name = string<br> resource_group = optional(string)<br> rules = list(<br> object({<br> name = string<br> direction = string<br> source = string<br> tcp = optional(<br> object({<br> port_max = number<br> port_min = number<br> })<br> )<br> udp = optional(<br> object({<br> port_max = number<br> port_min = number<br> })<br> )<br> icmp = optional(<br> object({<br> type = number<br> code = number<br> })<br> )<br> })<br> )<br> })<br> )</pre> | `[]` | no |
| <a name="input_service_endpoints"></a> [service\_endpoints](#input\_service\_endpoints) | Service endpoints. Can be `public`, `private`, or `public-and-private` | `string` | `"private"` | no |
| <a name="input_ssh_keys"></a> [ssh\_keys](#input\_ssh\_keys) | SSH keys to use to provision a VSI. Must be an RSA key with a key size of either 2048 bits or 4096 bits (recommended). If `public_key` is not provided, the named key will be looked up from data. If a resource group name is added, it must be included in `var.resource_groups`. See https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys. | <pre>list(<br> object({<br> name = string<br> public_key = optional(string)<br> resource_group = optional(string)<br> })<br> )</pre> | n/a | yes |
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ terraform {
# Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
ibm = {
source = "IBM-Cloud/ibm"
version = "1.45.1"
version = "1.48.0"
}
}
}
2 changes: 1 addition & 1 deletion examples/no-compute-example/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ terraform {
# Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
ibm = {
source = "IBM-Cloud/ibm"
version = "1.45.1"
version = "1.48.0"
}
}
}
2 changes: 1 addition & 1 deletion examples/one-vpc-one-vsi/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ terraform {
# Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
ibm = {
source = "IBM-Cloud/ibm"
version = "1.45.1"
version = "1.48.0"
}
}
}
2 changes: 1 addition & 1 deletion examples/override-example/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ terraform {
# Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
ibm = {
source = "IBM-Cloud/ibm"
version = "1.45.1"
version = "1.48.0"
}
}
}
2 changes: 1 addition & 1 deletion examples/quickstart/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ terraform {
# Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
ibm = {
source = "IBM-Cloud/ibm"
version = "1.45.1"
version = "1.48.0"
}
}
}
8 changes: 4 additions & 4 deletions module-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
],
"pos": {
"filename": "variables.tf",
"line": 1513
"line": 1512
}
},
"appid": {
Expand Down Expand Up @@ -300,7 +300,7 @@
},
"security_compliance_center": {
"name": "security_compliance_center",
"type": "object({\n enable_scc = bool\n location_id = optional(string)\n is_public = optional(bool)\n collector_passphrase = optional(string)\n collector_description = optional(string)\n credential_id = optional(string)\n scope_name = optional(string)\n scope_description = optional(string)\n })",
"type": "object({\n enable_scc = bool\n location_id = optional(string)\n is_public = optional(bool)\n collector_description = optional(string)\n credential_id = optional(string)\n scope_name = optional(string)\n scope_description = optional(string)\n })",
"description": "Security and Compliance Center Variables",
"default": {
"enable_scc": false
Expand Down Expand Up @@ -475,7 +475,7 @@
],
"pos": {
"filename": "variables.tf",
"line": 1481
"line": 1480
}
},
"vpcs": {
Expand Down Expand Up @@ -732,7 +732,7 @@
"ibm": {
"source": "IBM-Cloud/ibm",
"version_constraints": [
"\u003e= 1.45.0"
"\u003e= 1.48.0"
]
},
"random": {
Expand Down
1 change: 0 additions & 1 deletion patterns/mixed/config.tf
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,6 @@ locals {
enable_scc = var.enable_scc
is_public = false
location_id = lookup(local.scc_region_map, var.region)
collector_passphrase = var.scc_group_passphrase
collector_description = var.scc_collector_description
scope_name = var.scc_scope_name
scope_description = var.scc_scope_description
Expand Down
4 changes: 0 additions & 4 deletions patterns/mixed/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ resource "ibm_scc_posture_credential" "credentials" {
ibm_api_key = var.ibmcloud_api_key
}
enabled = true
group {
id = var.scc_group_id
passphrase = var.scc_group_passphrase
}
name = var.scc_cred_name
purpose = "discovery_fact_collection_remediation"
type = "ibm_cloud"
Expand Down
23 changes: 0 additions & 23 deletions patterns/mixed/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -550,29 +550,6 @@ variable "scc_cred_name" {
}
}

variable "scc_group_id" {
description = "Group ID of SCC Credential"
type = string
default = null

validation {
error_message = "SCC Credential Group ID must only contain numbers. Group ID must be 50 or fewer characters."
condition = var.scc_group_id == null ? true : can(regex("^[0-9]*$", var.scc_group_id)) && length(var.scc_group_id) <= 50
}
}

variable "scc_group_passphrase" {
description = "Group Passphrase of SCC Credential"
type = string
sensitive = true
default = null

validation {
error_message = "SCC Credential Group ID must be 255 or fewer characters."
condition = var.scc_group_passphrase == null ? true : can(regex("^[a-zA-Z0-9-\\.\\*,_\\s]*$", var.scc_group_passphrase)) && length(var.scc_group_passphrase) <= 255
}
}

variable "scc_cred_description" {
description = "Description of SCC Credential"
type = string
Expand Down
2 changes: 1 addition & 1 deletion patterns/mixed/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
ibm = {
source = "IBM-Cloud/ibm"
# Atracker needs to have the v2 API
version = "1.45.1"
version = "1.48.0"
}
external = {
source = "hashicorp/external"
Expand Down
1 change: 0 additions & 1 deletion patterns/roks/config.tf
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,6 @@ locals {
enable_scc = var.enable_scc
is_public = false
location_id = lookup(local.scc_region_map, var.region)
collector_passphrase = var.scc_group_passphrase
collector_description = var.scc_collector_description
scope_name = var.scc_scope_name
scope_description = var.scc_scope_description
Expand Down
4 changes: 0 additions & 4 deletions patterns/roks/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ resource "ibm_scc_posture_credential" "credentials" {
ibm_api_key = var.ibmcloud_api_key
}
enabled = true
group {
id = var.scc_group_id
passphrase = var.scc_group_passphrase
}
name = var.scc_cred_name
purpose = "discovery_fact_collection_remediation"
type = "ibm_cloud"
Expand Down
23 changes: 0 additions & 23 deletions patterns/roks/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -524,29 +524,6 @@ variable "scc_cred_name" {
}
}

variable "scc_group_id" {
description = "Group ID of SCC Credential"
type = string
default = null

validation {
error_message = "SCC Credential Group ID must only contain numbers. Group ID must be 50 or fewer characters."
condition = var.scc_group_id == null ? true : can(regex("^[0-9]*$", var.scc_group_id)) && length(var.scc_group_id) <= 50
}
}

variable "scc_group_passphrase" {
description = "Group Passphrase of SCC Credential"
type = string
sensitive = true
default = null

validation {
error_message = "SCC Credential Group ID must be 255 or fewer characters."
condition = var.scc_group_passphrase == null ? true : can(regex("^[a-zA-Z0-9-\\.\\*,_\\s]*$", var.scc_group_passphrase)) && length(var.scc_group_passphrase) <= 255
}
}

variable "scc_cred_description" {
description = "Description of SCC Credential"
type = string
Expand Down
2 changes: 1 addition & 1 deletion patterns/roks/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
ibm = {
source = "IBM-Cloud/ibm"
# Atracker needs to have the v2 API
version = "1.45.1"
version = "1.48.0"
}
external = {
source = "hashicorp/external"
Expand Down
1 change: 0 additions & 1 deletion patterns/vsi/config.tf
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ locals {
enable_scc = var.enable_scc
is_public = false
location_id = lookup(local.scc_region_map, var.region)
collector_passphrase = var.scc_group_passphrase
collector_description = var.scc_collector_description
scope_name = var.scc_scope_name
scope_description = var.scc_scope_description
Expand Down
4 changes: 0 additions & 4 deletions patterns/vsi/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ resource "ibm_scc_posture_credential" "credentials" {
ibm_api_key = var.ibmcloud_api_key
}
enabled = true
group {
id = var.scc_group_id
passphrase = var.scc_group_passphrase
}
name = var.scc_cred_name
purpose = "discovery_fact_collection_remediation"
type = "ibm_cloud"
Expand Down
23 changes: 0 additions & 23 deletions patterns/vsi/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -487,29 +487,6 @@ variable "scc_cred_name" {
}
}

variable "scc_group_id" {
description = "Group ID of SCC Credential"
type = string
default = null

validation {
error_message = "SCC Credential Group ID must only contain numbers. Group ID must be 50 or fewer characters."
condition = var.scc_group_id == null ? true : can(regex("^[0-9]*$", var.scc_group_id)) && length(var.scc_group_id) <= 50
}
}

variable "scc_group_passphrase" {
description = "Group Passphrase of SCC Credential"
type = string
sensitive = true
default = null

validation {
error_message = "SCC Credential Group passphrase must be 255 or fewer characters."
condition = var.scc_group_passphrase == null ? true : can(regex("^[a-zA-Z0-9-\\.\\*,_\\s]*$", var.scc_group_passphrase)) && length(var.scc_group_passphrase) <= 255
}
}

variable "scc_cred_description" {
description = "Description of SCC Credential"
type = string
Expand Down
2 changes: 1 addition & 1 deletion patterns/vsi/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
ibm = {
source = "IBM-Cloud/ibm"
# Atracker needs to have the v2 API
version = "1.45.1"
version = "1.48.0"
}
external = {
source = "hashicorp/external"
Expand Down
1 change: 0 additions & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -1424,7 +1424,6 @@ variable "security_compliance_center" {
enable_scc = bool
location_id = optional(string)
is_public = optional(bool)
collector_passphrase = optional(string)
collector_description = optional(string)
credential_id = optional(string)
scope_name = optional(string)
Expand Down
2 changes: 1 addition & 1 deletion version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
ibm = {
source = "IBM-Cloud/ibm"
# Atracker needs to have the v2 API
version = ">= 1.45.0"
version = ">= 1.48.0"
}
random = {
source = "hashicorp/random"
Expand Down