Add final tags, meeting parity with go tagging library

Resolves cloud-gov/product#3107

brokerpaks/cg-smtp/cg-smtp.yml

@@ -71,6 +71,12 @@ provision:
     # Inputs used for tagging resources
     - name: context
       default: ${request.context}
+    - name: service_offering_name
+      type: string
+      default: cg-smtp
+    - name: service_plan_name
+      type: string
+      default: base
   outputs:
     - field_name: region
       type: string
@@ -166,6 +172,12 @@ bind:
     # Inputs used for tagging resources
     - name: context
       default: ${request.context}
+    - name: service_offering_name
+      type: string
+      default: cg-smtp
+    - name: service_plan_name
+      type: string
+      default: base
   outputs:
     - field_name: smtp_server
       type: string

brokerpaks/cg-smtp/terraform/bind/provider.tf

@@ -20,8 +20,8 @@ provider "aws" {
       "Organization name"     = local.organization_name
       "Space name"            = local.space_name
       "Space GUID"            = local.space_guid
-      "Service offering name" = "" # todo
-      "Service plan name"     = "" # todo
+      "Service offering name" = var.service_offering_name
+      "Service plan name"     = var.service_plan_name
     }
   }
 }

brokerpaks/cg-smtp/terraform/bind/variables.tf

@@ -65,3 +65,13 @@ variable "context" {
   type        = any
   description = "Cloud Foundry context object from provision call. Useful for tagging resources."
 }
+
+variable "service_offering_name" {
+  type        = string
+  description = "Name of the Cloud Foundry service offering. Used for tagging."
+}
+
+variable "service_plan_name" {
+  type        = string
+  description = "Name of the Cloud Foundry service plan. Used for tagging."
+}

brokerpaks/cg-smtp/terraform/provision/providers.tf

@@ -22,8 +22,8 @@ provider "aws" {
       "Organization name"     = local.organization_name
       "Space name"            = local.space_name
       "Space GUID"            = local.space_guid
-      "Service offering name" = "" # todo
-      "Service plan name"     = "" # todo
+      "Service offering name" = var.service_offering_name
+      "Service plan name"     = var.service_plan_name
     }
   }
 }
@@ -48,8 +48,8 @@ provider "aws" {
       "Organization name"     = local.organization_name
       "Space name"            = local.space_name
       "Space GUID"            = local.space_guid
-      "Service offering name" = "" # todo
-      "Service plan name"     = "" # todo
+      "Service offering name" = var.service_offering_name
+      "Service plan name"     = var.service_plan_name
     }
   }
 }

brokerpaks/cg-smtp/terraform/provision/variables.tf

@@ -74,3 +74,13 @@ variable "context" {
   type        = any
   description = "Cloud Foundry context object from provision call. Useful for tagging resources."
 }
+
+variable "service_offering_name" {
+  type        = string
+  description = "Name of the Cloud Foundry service offering. Used for tagging."
+}
+
+variable "service_plan_name" {
+  type        = string
+  description = "Name of the Cloud Foundry service plan. Used for tagging."
+}