feat: use the terraform-ibm-cos module to provision COS instance (#139)

Author: Aayush-Abhyarthi

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-04-29T00:18:57Z",
+  "generated_at": "2023-05-02T10:24:50Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"

README.md

@@ -135,12 +135,14 @@ Optionally, you need the following permissions to attach Access Management tags
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.49.0 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.51.0 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.2.1 |
 
 ## Modules
 
-No modules.
+| Name | Source | Version |
+|------|--------|---------|
+| <a name="module_cos_instance"></a> [cos\_instance](#module\_cos\_instance) | git::https://github.com/terraform-ibm-modules/terraform-ibm-cos.git | v6.1.0 |
 
 ## Resources
 
@@ -150,7 +152,6 @@ No modules.
 | [ibm_container_vpc_cluster.cluster](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/resources/container_vpc_cluster) | resource |
 | [ibm_container_vpc_worker_pool.autoscaling_pool](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/resources/container_vpc_worker_pool) | resource |
 | [ibm_container_vpc_worker_pool.pool](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/resources/container_vpc_worker_pool) | resource |
-| [ibm_resource_instance.cos_instance](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/resources/resource_instance) | resource |
 | [ibm_resource_tag.cluster_access_tag](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/resources/resource_tag) | resource |
 | [ibm_resource_tag.cos_access_tag](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/resources/resource_tag) | resource |
 | [null_resource.confirm_network_healthy](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |

examples/add_rules_to_sg/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Pin to the lowest provider version of the range defined in the main module to ensure lowest version still works
     ibm = {
       source  = "ibm-cloud/ibm"
-      version = "1.49.0"
+      version = "1.51.0"
     }
   }
 }

examples/apply_taints/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Pin to the lowest provider version of the range defined in the main module to ensure lowest version still works
     ibm = {
       source  = "ibm-cloud/ibm"
-      version = "1.49.0"
+      version = "1.51.0"
     }
   }
 }

examples/existing_cos/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Pin to the lowest provider version of the range defined in the main module to ensure lowest version still works
     ibm = {
       source  = "ibm-cloud/ibm"
-      version = "1.49.0"
+      version = "1.51.0"
     }
   }
 }

examples/multiple_mzr_clusters/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Pin to the lowest provider version of the range defined in the main module to ensure lowest version still works
     ibm = {
       source  = "ibm-cloud/ibm"
-      version = "1.49.0"
+      version = "1.51.0"
     }
     # The kubernetes provider is not actually required by the module itself, just this example, so OK to use ">=" here instead of locking into a version
     kubernetes = {

examples/single_zone_cluster/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Pin to the lowest provider version of the range defined in the main module to ensure lowest version still works
     ibm = {
       source  = "ibm-cloud/ibm"
-      version = "1.49.0"
+      version = "1.51.0"
     }
   }
 }

examples/standard/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Pin to the lowest provider version of the range defined in the main module to ensure lowest version still works
     ibm = {
       source  = "ibm-cloud/ibm"
-      version = "1.49.0"
+      version = "1.51.0"
     }
   }
 }

main.tf

@@ -16,7 +16,7 @@ locals {
   cos_name         = var.use_existing_cos == true || (var.use_existing_cos == false && var.cos_name != null) ? var.cos_name : "${var.cluster_name}_cos"
   cos_location     = "global"
   cos_plan         = "standard"
-  cos_instance_crn = var.use_existing_cos != false ? var.existing_cos_id : ibm_resource_instance.cos_instance[0].id
+  cos_instance_crn = var.use_existing_cos != false ? var.existing_cos_id : module.cos_instance[0].cos_instance_id
 
   # Validation approach based on https://stackoverflow.com/a/66682419
   validate_condition = var.use_existing_cos == true && var.existing_cos_id == null
@@ -37,19 +37,26 @@ data "ibm_container_cluster_versions" "cluster_versions" {
   region            = var.region
 }
 
-resource "ibm_resource_instance" "cos_instance" {
+module "cos_instance" {
   count = var.use_existing_cos ? 0 : 1
 
-  name              = local.cos_name
-  resource_group_id = var.resource_group_id
-  service           = "cloud-object-storage"
-  plan              = local.cos_plan
-  location          = local.cos_location
+  source             = "git::https://github.com/terraform-ibm-modules/terraform-ibm-cos.git?ref=v6.1.0"
+  cos_instance_name  = local.cos_name
+  resource_group_id  = var.resource_group_id
+  cos_plan           = local.cos_plan
+  cos_location       = local.cos_location
+  encryption_enabled = false
+  create_cos_bucket  = false
+}
+
+moved {
+  from = ibm_resource_instance.cos_instance[0]
+  to   = module.cos_instance[0].ibm_resource_instance.cos_instance[0]
 }
 
 resource "ibm_resource_tag" "cos_access_tag" {
   count       = var.use_existing_cos || length(var.access_tags) == 0 ? 0 : 1
-  resource_id = ibm_resource_instance.cos_instance[0].crn
+  resource_id = module.cos_instance[0].cos_instance_id
   tags        = var.access_tags
   tag_type    = "access"
 }