fix(deps): update terraform-module (#23)

* fix(deps): update terraform-module

* remove activity_tracker_crn since activity tracker is deprecated. see terraform-ibm-modules/terraform-ibm-cos#738

---------

Co-authored-by: Chris Waddington <104161708+chrisw-ibm@users.noreply.github.com>

Author: terraform-ibm-modules-ops

README.md

@@ -121,8 +121,7 @@ statement instead the previous block.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_access_tags"></a> [access\_tags](#input\_access\_tags) | A list of access tags to apply to the cos instance created by the module, see https://cloud.ibm.com/docs/account?topic=account-access-tags-tutorial for more details | `list(string)` | `[]` | no |
-| <a name="input_activity_tracker_crn"></a> [activity\_tracker\_crn](#input\_activity\_tracker\_crn) | The CRN of an Activity Tracker instance to send Object Storage bucket events to. If no value passed, events are sent to the instance associated to the container's location unless otherwise specified in the Activity Tracker Event Routing service configuration. | `string` | `null` | no |
-| <a name="input_activity_tracker_management_events"></a> [activity\_tracker\_management\_events](#input\_activity\_tracker\_management\_events) | If set to true, all Object Storage management events will be sent to Activity Tracker. Only applies if `activity_tracker_crn` is not populated. | `bool` | `true` | no |
+| <a name="input_activity_tracker_management_events"></a> [activity\_tracker\_management\_events](#input\_activity\_tracker\_management\_events) | If set to true, all Object Storage management events will be sent to Activity Tracker. | `bool` | `true` | no |
 | <a name="input_activity_tracker_read_data_events"></a> [activity\_tracker\_read\_data\_events](#input\_activity\_tracker\_read\_data\_events) | If set to true, all Object Storage bucket read events (i.e. downloads) will be sent to Activity Tracker. | `bool` | `true` | no |
 | <a name="input_activity_tracker_write_data_events"></a> [activity\_tracker\_write\_data\_events](#input\_activity\_tracker\_write\_data\_events) | If set to true, all Object Storage bucket write events (i.e. uploads) will be sent to Activity Tracker. | `bool` | `true` | no |
 | <a name="input_add_bucket_name_suffix"></a> [add\_bucket\_name\_suffix](#input\_add\_bucket\_name\_suffix) | Add random generated suffix (4 characters long) to the newly provisioned COS bucket name (Optional). | `bool` | `true` | no |

ibm_catalog.json

@@ -244,13 +244,6 @@
 							"description": "The name of a new or existing resource group where resources will be created",
 							"required": false
 						},
-						{
-							"key": "activity_tracker_crn",
-							"type": "string",
-							"default_value": "__NULL__",
-							"description": "The CRN of an Activity Tracker instance to send Object Storage bucket events to. If no value passed, events are sent to the instance associated to the container's location unless otherwise specified in the Activity Tracker Event Routing service configuration.",
-							"required": false
-						},
 						{
 							"key": "activity_tracker_read_data_events",
 							"type": "boolean",
@@ -269,7 +262,7 @@
 							"key": "activity_tracker_management_events",
 							"type": "boolean",
 							"default_value": "true",
-							"description": "If set to true, all Object Storage management events will be sent to Activity Tracker. Only applies if `activity_tracker_crn` is not populated.",
+							"description": "If set to true, all Object Storage management events will be sent to Activity Tracker.",
 							"required": false
 						},
 						{

main.tf

@@ -58,7 +58,6 @@ module "cos_bucket" {
   archive_days                        = var.archive_days
   archive_type                        = var.archive_type
   expire_days                         = var.expire_days
-  activity_tracker_crn                = var.activity_tracker_crn
   activity_tracker_read_data_events   = var.activity_tracker_read_data_events
   activity_tracker_write_data_events  = var.activity_tracker_write_data_events
   activity_tracker_management_events  = var.activity_tracker_management_events

modules/encrypted_cos_bucket/README.md

@@ -71,8 +71,8 @@ statement instead the previous block.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_cos_bucket"></a> [cos\_bucket](#module\_cos\_bucket) | terraform-ibm-modules/cos/ibm | 8.11.14 |
-| <a name="module_key_protect_all_inclusive"></a> [key\_protect\_all\_inclusive](#module\_key\_protect\_all\_inclusive) | terraform-ibm-modules/kms-all-inclusive/ibm | 4.15.13 |
+| <a name="module_cos_bucket"></a> [cos\_bucket](#module\_cos\_bucket) | terraform-ibm-modules/cos/ibm | 8.13.2 |
+| <a name="module_key_protect_all_inclusive"></a> [key\_protect\_all\_inclusive](#module\_key\_protect\_all\_inclusive) | terraform-ibm-modules/kms-all-inclusive/ibm | 4.16.4 |
 
 ### Resources
 
@@ -83,8 +83,7 @@ No resources.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_access_tags"></a> [access\_tags](#input\_access\_tags) | A list of access tags to apply to the cos instance created by the module, see https://cloud.ibm.com/docs/account?topic=account-access-tags-tutorial for more details | `list(string)` | `[]` | no |
-| <a name="input_activity_tracker_crn"></a> [activity\_tracker\_crn](#input\_activity\_tracker\_crn) | The CRN of an Activity Tracker instance to send Object Storage bucket events to. If no value passed, events are sent to the instance associated to the container's location unless otherwise specified in the Activity Tracker Event Routing service configuration. Bucket management events are always enabled if a value is passed, regardless of the value of `activity_tracker_management_events`. | `string` | `null` | no |
-| <a name="input_activity_tracker_management_events"></a> [activity\_tracker\_management\_events](#input\_activity\_tracker\_management\_events) | If set to true, all Object Storage management events will be sent to Activity Tracker. Only applies if `activity_tracker_crn` is not populated. | `bool` | `true` | no |
+| <a name="input_activity_tracker_management_events"></a> [activity\_tracker\_management\_events](#input\_activity\_tracker\_management\_events) | If set to true, all Object Storage management events will be sent to Activity Tracker. | `bool` | `true` | no |
 | <a name="input_activity_tracker_read_data_events"></a> [activity\_tracker\_read\_data\_events](#input\_activity\_tracker\_read\_data\_events) | If set to true, all Object Storage bucket read events (i.e. downloads) will be sent to Activity Tracker. | `bool` | `true` | no |
 | <a name="input_activity_tracker_write_data_events"></a> [activity\_tracker\_write\_data\_events](#input\_activity\_tracker\_write\_data\_events) | If set to true, all Object Storage bucket write events (i.e. uploads) will be sent to Activity Tracker. | `bool` | `true` | no |
 | <a name="input_add_bucket_name_suffix"></a> [add\_bucket\_name\_suffix](#input\_add\_bucket\_name\_suffix) | Add random generated suffix (4 characters long) to the newly provisioned COS bucket name (Optional). | `bool` | `false` | no |

modules/encrypted_cos_bucket/main.tf

@@ -22,7 +22,7 @@ module "key_protect_all_inclusive" {
   }
   count                     = var.create_key_protect_instance ? 1 : 0
   source                    = "terraform-ibm-modules/kms-all-inclusive/ibm"
-  version                   = "4.15.13"
+  version                   = "4.16.4"
   key_protect_instance_name = var.key_protect_instance_name
   resource_group_id         = var.resource_group_id
   enable_metrics            = true
@@ -60,7 +60,7 @@ module "cos_bucket" {
     ibm = ibm
   }
   source                              = "terraform-ibm-modules/cos/ibm"
-  version                             = "8.11.14"
+  version                             = "8.13.2"
   bucket_name                         = var.bucket_name
   add_bucket_name_suffix              = var.add_bucket_name_suffix
   management_endpoint_type_for_bucket = var.management_endpoint_type_for_bucket
@@ -75,7 +75,6 @@ module "cos_bucket" {
   archive_days                        = var.archive_days
   archive_type                        = var.archive_type
   monitoring_crn                      = var.monitoring_crn
-  activity_tracker_crn                = var.activity_tracker_crn
   activity_tracker_read_data_events   = var.activity_tracker_read_data_events
   activity_tracker_write_data_events  = var.activity_tracker_write_data_events
   activity_tracker_management_events  = var.activity_tracker_management_events

modules/encrypted_cos_bucket/variables.tf

@@ -219,12 +219,6 @@ variable "expire_days" {
   default     = null
 }
 
-variable "activity_tracker_crn" {
-  type        = string
-  description = "The CRN of an Activity Tracker instance to send Object Storage bucket events to. If no value passed, events are sent to the instance associated to the container's location unless otherwise specified in the Activity Tracker Event Routing service configuration. Bucket management events are always enabled if a value is passed, regardless of the value of `activity_tracker_management_events`."
-  default     = null
-}
-
 variable "activity_tracker_read_data_events" {
   type        = bool
   description = "If set to true, all Object Storage bucket read events (i.e. downloads) will be sent to Activity Tracker."
@@ -239,7 +233,7 @@ variable "activity_tracker_write_data_events" {
 
 variable "activity_tracker_management_events" {
   type        = bool
-  description = "If set to true, all Object Storage management events will be sent to Activity Tracker. Only applies if `activity_tracker_crn` is not populated."
+  description = "If set to true, all Object Storage management events will be sent to Activity Tracker."
   default     = true
 }
 

variables.tf

@@ -303,16 +303,6 @@ variable "expire_days" {
   default     = null
 }
 
-variable "activity_tracker_crn" {
-  type        = string
-  description = "The CRN of an Activity Tracker instance to send Object Storage bucket events to. If no value passed, events are sent to the instance associated to the container's location unless otherwise specified in the Activity Tracker Event Routing service configuration."
-  default     = null
-  validation {
-    condition     = var.activity_tracker_crn != null ? can(regex("crn:v1:bluemix:public:logdnaat:(in-che|jp-tok|jp-osa|ca-tor|br-sao|au-syd|eu-gb|eu-es|us-south|eu-de|us-east):a/[0-9a-f]{32}:[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}::", var.activity_tracker_crn)) : true
-    error_message = "Must be a valid activity tracker crn"
-  }
-}
-
 variable "activity_tracker_read_data_events" {
   type        = bool
   description = "If set to true, all Object Storage bucket read events (i.e. downloads) will be sent to Activity Tracker."
@@ -327,7 +317,7 @@ variable "activity_tracker_write_data_events" {
 
 variable "activity_tracker_management_events" {
   type        = bool
-  description = "If set to true, all Object Storage management events will be sent to Activity Tracker. Only applies if `activity_tracker_crn` is not populated."
+  description = "If set to true, all Object Storage management events will be sent to Activity Tracker."
   default     = true
 }