From 012a2e5bf847a8aad02fe2fe3d1a690032867a82 Mon Sep 17 00:00:00 2001
From: James Hochadel <james.hochadel@gsa.gov>
Date: Mon, 9 Sep 2024 10:43:51 -0400
Subject: [PATCH] Add final tags, meeting parity with go tagging library

Resolves https://github.com/cloud-gov/product/issues/3107
---
 brokerpaks/cg-smtp/cg-smtp.yml                      | 12 ++++++++++++
 brokerpaks/cg-smtp/terraform/bind/provider.tf       |  4 ++--
 brokerpaks/cg-smtp/terraform/bind/variables.tf      | 10 ++++++++++
 brokerpaks/cg-smtp/terraform/provision/providers.tf |  8 ++++----
 brokerpaks/cg-smtp/terraform/provision/variables.tf | 10 ++++++++++
 5 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/brokerpaks/cg-smtp/cg-smtp.yml b/brokerpaks/cg-smtp/cg-smtp.yml
index 0b68c58..2e71fc5 100644
--- a/brokerpaks/cg-smtp/cg-smtp.yml
+++ b/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
diff --git a/brokerpaks/cg-smtp/terraform/bind/provider.tf b/brokerpaks/cg-smtp/terraform/bind/provider.tf
index 1e70070..a18e821 100644
--- a/brokerpaks/cg-smtp/terraform/bind/provider.tf
+++ b/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
     }
   }
 }
diff --git a/brokerpaks/cg-smtp/terraform/bind/variables.tf b/brokerpaks/cg-smtp/terraform/bind/variables.tf
index d2b1a71..19c89be 100644
--- a/brokerpaks/cg-smtp/terraform/bind/variables.tf
+++ b/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."
+}
diff --git a/brokerpaks/cg-smtp/terraform/provision/providers.tf b/brokerpaks/cg-smtp/terraform/provision/providers.tf
index 9688825..7de1096 100644
--- a/brokerpaks/cg-smtp/terraform/provision/providers.tf
+++ b/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
     }
   }
 }
diff --git a/brokerpaks/cg-smtp/terraform/provision/variables.tf b/brokerpaks/cg-smtp/terraform/provision/variables.tf
index 2aa67c7..4cedb0f 100644
--- a/brokerpaks/cg-smtp/terraform/provision/variables.tf
+++ b/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."
+}