add Freeform and Defined Tags support

Fix: #10 #11 #12 #13 #18 #20

Author: kral2

CHANGELOG.adoc

@@ -14,6 +14,13 @@ Given a version number MAJOR.MINOR.PATCH:
 * MINOR version when adding functionality in a backwards compatible manner,
 * PATCH version when making backwards compatible bug fixes.
 
+== 2.2.0 - unreleased
+
+=== New features
+
+* Add support for freeform and defined for instances, vnics and block volumes (Fix #10, #11, #12, #13, #18, #20)
+* Add "module watermark" freeform tags: module defined and user defined freeform tags are merged on the final resource.
+
 == 2.1.0 - 2021-03-02
 
 === New features

examples/instances_fixed_shape/main.tf

@@ -22,6 +22,8 @@ module "instance_nonflex" {
   source = "oracle-terraform-modules/compute-instance/oci"
   # general oci parameters
   compartment_ocid = var.compartment_ocid
+  freeform_tags    = var.freeform_tags
+  defined_tags     = var.defined_tags
   # compute instance parameters
   ad_number             = var.instance_ad_number
   instance_count        = var.instance_count
@@ -49,6 +51,8 @@ module "instance_nonflex_custom" {
   source = "oracle-terraform-modules/compute-instance/oci"
   # general oci parameters
   compartment_ocid = var.compartment_ocid
+  freeform_tags    = var.freeform_tags
+  defined_tags     = var.defined_tags
   # compute instance parameters
   ad_number                   = var.instance_ad_number
   instance_count              = var.instance_count

examples/instances_fixed_shape/variables.tf

@@ -41,6 +41,18 @@ variable "compartment_ocid" {
   # no default value, asking user to explicitly set this variable's value. see codingconventions.adoc
 }
 
+variable "freeform_tags" {
+  description = "simple key-value pairs to tag the resources created using freeform tags."
+  type        = map(string)
+  default     = null
+}
+
+variable "defined_tags" {
+  description = "predefined and scoped to a namespace to tag the resources created using defined tags."
+  type        = map(string)
+  default     = null
+}
+
 # compute instance parameters
 
 variable "instance_ad_number" {

examples/instances_flex_shape/main.tf

@@ -23,6 +23,8 @@ module "instance_flex" {
   source = "oracle-terraform-modules/compute-instance/oci"
   # general oci parameters
   compartment_ocid = var.compartment_ocid
+  freeform_tags    = var.freeform_tags
+  defined_tags     = var.defined_tags
   # compute instance parameters
   ad_number             = var.instance_ad_number
   instance_count        = var.instance_count
@@ -49,6 +51,8 @@ module "instance_flex_custom" {
   source = "oracle-terraform-modules/compute-instance/oci"
   # general oci parameters
   compartment_ocid = var.compartment_ocid
+  freeform_tags    = var.freeform_tags
+  defined_tags     = var.defined_tags
   # compute instance parameters
   ad_number                   = null
   instance_count              = 4

examples/instances_flex_shape/variables.tf

@@ -41,6 +41,18 @@ variable "compartment_ocid" {
   # no default value, asking user to explicitly set this variable's value. see codingconventions.adoc
 }
 
+variable "freeform_tags" {
+  description = "simple key-value pairs to tag the resources created using freeform tags."
+  type        = map(string)
+  default     = null
+}
+
+variable "defined_tags" {
+  description = "predefined and scoped to a namespace to tag the resources created using defined tags."
+  type        = map(string)
+  default     = null
+}
+
 # compute instance parameters
 
 variable "instance_ad_number" {

main.tf

@@ -84,6 +84,9 @@ resource "oci_core_instance" "this" {
     skip_source_dest_check = var.skip_source_dest_check
     // Current implementation requires providing a list of subnets when using ad-specific subnets
     subnet_id = data.oci_core_subnet.this[count.index % length(data.oci_core_subnet.this.*.id)].id
+
+    freeform_tags = local.merged_freeform_tags
+    defined_tags  = var.defined_tags
   }
 
   metadata = {
@@ -97,6 +100,9 @@ resource "oci_core_instance" "this" {
     source_type             = var.source_type
   }
 
+  freeform_tags = local.merged_freeform_tags
+  defined_tags  = var.defined_tags
+
   timeouts {
     create = var.instance_timeout
   }
@@ -122,6 +128,8 @@ resource "oci_core_volume" "this" {
     var.block_storage_sizes_in_gbs,
     floor(count.index / var.instance_count),
   )
+  freeform_tags = local.merged_freeform_tags
+  defined_tags  = var.defined_tags
 }
 
 ####################

variables.tf

@@ -13,6 +13,27 @@ variable "instance_timeout" {
   default     = "25m"
 }
 
+variable "freeform_tags" {
+  description = "simple key-value pairs to tag the resources created using freeform tags."
+  type        = map(string)
+  default     = null
+}
+
+variable "defined_tags" {
+  description = "predefined and scoped to a namespace to tag the resources created using defined tags."
+  type        = map(string)
+  default     = null
+}
+
+locals {
+  default_freeform_tags = {
+    # * This list of freeform tags are added by default to user provided freeform tags (var.freeform_tags) if local.merged_freeform_tags is used
+    terraformed = "Please do not edit manually"
+    module      = "oracle-terraform-modules/compute-instance/oci"
+  }
+  merged_freeform_tags = merge(local.default_freeform_tags, var.freeform_tags)
+}
+
 # compute instance parameters
 
 variable "ad_number" {