Adds support for common tags across resources (#97)

- Adds common_tags variable set to global scope in the metadata
- Concatenates common_tags and tags values when applied to object storage instance
- Updates resource_group dependency reference to new location

closes #96

Signed-off-by: Sean Sundberg <[email protected]>

Author: Sean Sundberg

.github/workflows/verify-pr.yaml

@@ -16,3 +16,10 @@ jobs:
 
   verifyMetadata:
     uses: cloud-native-toolkit/action-workflows/.github/workflows/verify-module-metadata.yaml@v1
+
+  verifyAll:
+    needs: [verify,verifyMetadata]
+    runs-on: ubuntu-latest
+
+    steps:
+      - run: echo "Success"

README.md

@@ -17,15 +17,15 @@ The module depends on the following software components:
 ### Terraform providers
 
 - IBM Cloud provider >= 1.18
-- Helm provider >= 1.1.1 (provided by Terraform)
 
 ## Module dependencies
 
 This module makes use of the output from other modules:
 
-- Object Storage - github.com/cloud-native-toolkit/terraform-ibm-object-storage.git
-- VPC - github.com/cloud-native-toolkit/terraform-ibm-vpc.git
-- Subnet - github.com/cloud-native-toolkit/terraform-ibm-vpc.git
+- Resource Group - github.com/terraform-ibm-modules/terraform-ibm-toolkit-resource-group
+- Subnet - github.com/terraform-ibm-modules/terraform-ibm-toolkit-vpc-subnets
+- Object Storage - github.com/terraform-ibm-modules/terraform-ibm-toolkit-object-storage
+- KMS Key - github.com/terraform-ibm-modules/terraform-ibm-toolkit-kms-key
 
 ## Example usage
 

main.tf

@@ -48,6 +48,7 @@ locals {
       zone = data.ibm_container_vpc_cluster_worker.workers[i].network_interfaces[0].subnet_id
     }
   ])
+  tags = distinct(concat(var.common_tags, var.tags))
 }
 
 data external dirs {
@@ -177,7 +178,7 @@ resource ibm_container_vpc_cluster cluster {
   disable_public_service_endpoint = var.disable_public_endpoint
   force_delete_storage = var.force_delete_storage
   wait_till         = "IngressReady"
-  tags              = var.tags
+  tags              = local.tags
 
   dynamic "zones" {
     for_each = local.vpc_subnets

module.yaml

@@ -18,19 +18,19 @@ versions:
   dependencies:
     - id: resource-group
       refs:
-        - source: github.com/cloud-native-toolkit/terraform-ibm-resource-group
+        - source: github.com/terraform-ibm-modules/terraform-ibm-toolkit-resource-group
           version: ">= 1.0.0"
     - id: cos
       refs:
         - source: github.com/cloud-native-toolkit/terraform-ibm-object-storage
           version: ">= 2.1.0"
     - id: subnets
       refs:
-        - source: github.com/cloud-native-toolkit/terraform-ibm-vpc-subnets
+        - source: github.com/terraform-ibm-modules/terraform-ibm-toolkit-vpc-subnets
           version: ">= 1.8.0"
     - id: kms_key
       refs:
-        - source: github.com/cloud-native-toolkit/terraform-ibm-kms-key
+        - source: github.com/terraform-ibm-modules/terraform-ibm-toolkit-kms-key
           version: ">= 1.0.0"
       optional: true
     - id: sync
@@ -89,3 +89,6 @@ versions:
       moduleRef:
         id: sync
         output: sync
+    - name: common_tags
+      scope: global
+      important: true

test/stages/stage1-cos.tf

@@ -1,7 +1,9 @@
 module "cos" {
-  source = "github.com/cloud-native-toolkit/terraform-ibm-object-storage"
+  source = "github.com/terraform-ibm-modules/terraform-ibm-toolkit-object-storage"
 
   provision = true
   resource_group_name = module.resource_group.name
   name_prefix = var.name_prefix
+  common_tags = var.common_tags
+  tags = ["cos"]
 }

test/stages/stage1-gateways.tf

@@ -4,4 +4,6 @@ module "gateways" {
   resource_group_id = module.resource_group.id
   region            = var.region
   vpc_name          = module.vpc.name
+  common_tags = var.common_tags
+  tags = ["gateway"]
 }

test/stages/stage1-resource-group.tf

@@ -1,5 +1,5 @@
 module "resource_group" {
-  source = "github.com/cloud-native-toolkit/terraform-ibm-resource-group.git"
+  source = "github.com/terraform-ibm-modules/terraform-ibm-toolkit-resource-group"
 
   resource_group_name = var.resource_group_name
   ibmcloud_api_key    = var.ibmcloud_api_key

test/stages/stage1-subnets.tf

@@ -1,10 +1,12 @@
 module "subnets" {
-  source = "github.com/cloud-native-toolkit/terraform-ibm-vpc-subnets.git"
+  source = "github.com/terraform-ibm-modules/terraform-ibm-toolkit-vpc-subnets"
 
   resource_group_name = module.resource_group.name
   region            = var.region
   vpc_name          = module.vpc.name
   gateways          = module.gateways.gateways
   _count            = 2
   label             = "bastion"
+  common_tags = var.common_tags
+  tags = ["subnet"]
 }

test/stages/stage1-vpc.tf

@@ -1,7 +1,9 @@
 module "vpc" {
-  source = "github.com/cloud-native-toolkit/terraform-ibm-vpc.git"
+  source = "github.com/terraform-ibm-modules/terraform-ibm-toolkit-vpc"
 
   resource_group_name = module.resource_group.name
   region              = var.region
   name_prefix         = var.name_prefix
+  common_tags = var.common_tags
+  tags = ["vpc"]
 }

test/stages/stage2-cluster.tf

@@ -13,6 +13,8 @@ module "cluster" {
   vpc_subnets         = module.subnets.subnets
   vpc_subnet_count    = module.subnets.count
   cos_id              = module.cos.id
+  common_tags = var.common_tags
+  tags = ["openshift"]
 }
 
 resource "local_file" "cluster_creds" {