Skip to content

Commit

Permalink
feat: remove the force_delete variable as this feature has been dep…
Browse files Browse the repository at this point in the history
…recated (#632)
  • Loading branch information
MatthewLemmond authored Oct 4, 2024
1 parent 751e0dd commit 7331a0a
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 16 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ You need the following permissions to run this module.
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.58.0, < 2.0.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.69.0, < 2.0.0 |

### Modules

Expand All @@ -67,7 +67,6 @@ No modules.
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_endpoint_type"></a> [endpoint\_type](#input\_endpoint\_type) | The type of endpoint to be used for creating keys. Accepts 'public' or 'private' | `string` | `"public"` | no |
| <a name="input_force_delete"></a> [force\_delete](#input\_force\_delete) | Set to `true` if you wish to force delete the kms key rings, else `false`. | `bool` | `false` | no |
| <a name="input_instance_id"></a> [instance\_id](#input\_instance\_id) | The KMS instance GUID | `string` | n/a | yes |
| <a name="input_key_ring_id"></a> [key\_ring\_id](#input\_key\_ring\_id) | The ID that identifies the Key Ring. Each ID is unique within the given KMS instance but is not reserved across the KMS service | `string` | n/a | yes |

Expand Down
7 changes: 3 additions & 4 deletions examples/basic/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
##############################################################################

module "kms_key_ring" {
source = "../.."
instance_id = var.existing_kms_instance_guid
key_ring_id = "${var.prefix}-key-ring"
force_delete = true # Setting it to true for testing purpose
source = "../.."
instance_id = var.existing_kms_instance_guid
key_ring_id = "${var.prefix}-key-ring"
}
2 changes: 1 addition & 1 deletion examples/basic/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,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.58.0"
version = "1.69.0"
}
}
}
2 changes: 1 addition & 1 deletion examples/complete/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,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.58.0"
version = ">= 1.69.0"
}
}
}
1 change: 0 additions & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ resource "ibm_kms_key_rings" "key_ring" {
endpoint_type = var.endpoint_type
instance_id = var.instance_id
key_ring_id = var.key_ring_id
force_delete = var.force_delete
}
6 changes: 0 additions & 6 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ variable "instance_id" {
description = "The KMS instance GUID"
}

variable "force_delete" {
type = bool
description = "Set to `true` if you wish to force delete the kms key rings, else `false`."
default = false
}

variable "key_ring_id" {
type = string
description = "The ID that identifies the Key Ring. Each ID is unique within the given KMS instance but is not reserved across the KMS service"
Expand Down
2 changes: 1 addition & 1 deletion version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
# Use "greater than or equal to" range in modules
ibm = {
source = "IBM-Cloud/ibm"
version = ">= 1.58.0, < 2.0.0"
version = ">= 1.69.0, < 2.0.0"
}
}
}

0 comments on commit 7331a0a

Please sign in to comment.