From 816f489375b96f132afa46492d248abbafcea079 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Wed, 18 Oct 2023 09:49:13 -0700
Subject: [PATCH 01/31] add orchestration chart to terraform deployments

---
 terraform/implementation/main.tf | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index f9f78ec8..8fe84e6a 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -25,6 +25,7 @@ locals {
     "ingestion",
     "ingress",
     "message-parser",
+    "orchestration",
     "validation",
   ])
 }
@@ -349,6 +350,26 @@ resource "helm_release" "building_blocks" {
     name  = "ingressHostname"
     value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com"
   }
+
+  set {
+    name  = "fhir-converter-url"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter"
+  }
+
+  set {
+    name  = "ingestion-url"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion"
+  }
+
+  set {
+    name  = "message-parser-url"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser"
+  }
+
+  set {
+    name  = "validation-url"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
+  }
 }
 
 # Metrics Dashboard

From 8da39f6caa638fc25afeb8ec34400527147637d4 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 26 Oct 2023 09:55:38 -0700
Subject: [PATCH 02/31] temp change to use 'orchestration' instead of
 'orchestration-chart'

---
 terraform/implementation/main.tf | 33 ++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 8fe84e6a..344cc01c 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -372,6 +372,39 @@ resource "helm_release" "building_blocks" {
   }
 }
 
+resource "helm_release" "orchestration_service" {
+  repository    = "https://cdcgov.github.io/phdi-charts/"
+  name          = "phdi-playground-${terraform.workspace}-orchestration"
+  chart         = "orchestration"
+  recreate_pods = true
+  depends_on    = [helm_release.agic]
+
+  set {
+    name  = "image.tag"
+    value = "latest"
+  }
+
+  set {
+    name  = "fhir-converter-url"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter"
+  }
+
+  set {
+    name  = "ingestion-url"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion"
+  }
+
+  set {
+    name  = "message-parser-url"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser"
+  }
+
+  set {
+    name  = "validation-url"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
+  }
+}
+
 # Metrics Dashboard
 
 resource "azurerm_portal_dashboard" "pipeline_metrics" {

From 1477ec9eca59e8ce630147a49ef915b813f38de7 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 26 Oct 2023 09:58:03 -0700
Subject: [PATCH 03/31] remove orchestration from foreach

---
 terraform/implementation/main.tf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 344cc01c..38e9c68c 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -25,7 +25,6 @@ locals {
     "ingestion",
     "ingress",
     "message-parser",
-    "orchestration",
     "validation",
   ])
 }

From cd66ff3aef2ec2e63a8e7edce64e7ee2eabe509d Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Fri, 27 Oct 2023 15:33:25 -0700
Subject: [PATCH 04/31] add release specific to ingress

---
 terraform/implementation/main.tf | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 38e9c68c..ec92299e 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -23,7 +23,6 @@ locals {
   services = toset([
     "fhir-converter",
     "ingestion",
-    "ingress",
     "message-parser",
     "validation",
   ])
@@ -371,6 +370,26 @@ resource "helm_release" "building_blocks" {
   }
 }
 
+resource "helm_release" "ingress_controller" {
+  repository    = "https://cdcgov.github.io/phdi-charts/"
+  name          = "phdi-playground-${terraform.workspace}-ingress"
+  chart         = "ingress-chart"
+  recreate_pods = true
+  version       = "0.1.7"
+  depends_on    = [helm_release.agic]
+
+  set {
+    name  = "image.tag"
+    value = "latest"
+  }
+
+  set {
+    name  = "ingressHostname"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com"
+  }
+}
+
+
 resource "helm_release" "orchestration_service" {
   repository    = "https://cdcgov.github.io/phdi-charts/"
   name          = "phdi-playground-${terraform.workspace}-orchestration"

From 022ac4fac720791cd4914be0f974cddeec07151f Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Fri, 27 Oct 2023 15:44:50 -0700
Subject: [PATCH 05/31] change chart name

---
 terraform/implementation/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index ec92299e..b1a48152 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -372,7 +372,7 @@ resource "helm_release" "building_blocks" {
 
 resource "helm_release" "ingress_controller" {
   repository    = "https://cdcgov.github.io/phdi-charts/"
-  name          = "phdi-playground-${terraform.workspace}-ingress"
+  name          = "phdi-playground-${terraform.workspace}-ingress-temp"
   chart         = "ingress-chart"
   recreate_pods = true
   version       = "0.1.7"

From 6de683e2f86bbe112c622bd10c041480c4d2364f Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Fri, 27 Oct 2023 16:21:31 -0700
Subject: [PATCH 06/31] update ingress release

---
 terraform/implementation/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index b1a48152..5755ce22 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -375,7 +375,7 @@ resource "helm_release" "ingress_controller" {
   name          = "phdi-playground-${terraform.workspace}-ingress-temp"
   chart         = "ingress-chart"
   recreate_pods = true
-  version       = "0.1.7"
+  version       = "0.1.8"
   depends_on    = [helm_release.agic]
 
   set {

From 7eb73930aeba588499afa0c18dc4ff41eb3a4e23 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Mon, 30 Oct 2023 14:50:48 -0700
Subject: [PATCH 07/31] change value names for URLS

---
 terraform/implementation/main.tf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 5755ce22..582ebe70 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -403,23 +403,23 @@ resource "helm_release" "orchestration_service" {
   }
 
   set {
-    name  = "fhir-converter-url"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter"
+    name  = "fhirConverterUrl"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter/"
   }
 
   set {
-    name  = "ingestion-url"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion"
+    name  = "ingestionUrl"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion/"
   }
 
   set {
-    name  = "message-parser-url"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser"
+    name  = "messageParserUrl"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser/"
   }
 
   set {
-    name  = "validation-url"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
+    name  = "validationUrl"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation/"
   }
 }
 

From 3833064dbb79571997fc91977b4112b4e5f98427 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Mon, 30 Oct 2023 15:48:10 -0700
Subject: [PATCH 08/31] remove quotes around secret values

---
 .../implementation/TEMP_orchestration-0.1.6.tgz  | Bin 0 -> 1380 bytes
 terraform/implementation/main.tf                 |   3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 terraform/implementation/TEMP_orchestration-0.1.6.tgz

diff --git a/terraform/implementation/TEMP_orchestration-0.1.6.tgz b/terraform/implementation/TEMP_orchestration-0.1.6.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..10c81d72cad29c335a67b70053e00be086c4e73a
GIT binary patch
literal 1380
zcmV-q1)KUGiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PI=aZrivL&NZK6PIG{s6Rc?|cH%;JUdL^XdK1G=a~sgoL}o*g
zEJ?ZRb+gaDkmNtfakD^!#EbP@DCW;M<VZ8aZy06530h~E<4V>$6J{Kpu|ym_qj;X@
zoj05LU(fTZf4x)BJMx=nr=HjFJ@53$^P677I|A=HH?d1n>zFz6etNB{asLoun%|(Y
zT*&~Yr-W&}YWmbaryhyWhK6gG_qE|8iUh*UPvA}&_>_*(NOWk4WC;dPawy_v8UtWj
z3mz6d)1`Wk`t+Q<w*CKhDaZemi4^T~CxEBo|J>h-|I=3E5dSYBwOWlB%)_&zQt1Nl
z3E>HgF(3c{2DP%>DKiToo`i;SRS%;uR@1tkM7&-O_Y9#^AqGnDa27!C?ozpdL5tGm
zgO0@kOnvH6ze$KiGv(o8C9RAL;GOr*BZLVw&VDu`fd8(3le-Bw9VMq|9GYUV+C{jG
z(Pn!o#y6YUm_ch-BZ~$}&{`JbfEl~gTkRqSLuH~qm-j5jVotS-I5tiNTQ6Q}lPMEC
z+88ahUo8)o<KJPT1#@WY5o)1k3Cd@n15d<%qt!aE#DB|gogU)<B_xagO%A}cw)Lq`
z?zxNtxLA1sNzk!~IhF-$aniq;&*=~aGK=(*B?u1>wURs4nAUFyfM8=3wuo}3b%i5j
zvxwCgW)l{v$ObT<)0^Tn+DuOm4+OxXz|bjEXiS(3C;g2jb}j<2^zQ|7!=xN0rE>Z7
zl_pWr`vc7YOA|856X+lnVuYbVw^9%)=@^%2HdNLYuX8@91^v$6Wp3wEigf&R`VHoD
zSiZCzLmi7@Th(AAL$6<Rfmmnn5-v;58++clZ}<+*q%s7*S;Ci$ALN;Sz4GE1pxGiN
z6w2x2YqtB{;q~bD^RQo8BPTHLjY@*bK;|{sr}%`kA>M6|?sDoapDxtcH;-tz$5{Zy
zaaBu=cy#CQKlX;VovX{6?(n)h+)E3xGqn~j57nKP^e#ViN7ucp%e^#Wb@1=p|8L#V
zsQsaPJ7^C_d-^37ETpD$8nV-pVYhQNytwW6E<a@k?V}|HSE`AEEbX-9y8Y|tetU17
zYE9^NT5!|u_b&F=f;H*PE!fTf7K)yw6nujJ`ChA8;eY4NX6wNJUP7w;Z$<qI=0eIG
zsqn(Lf71)!F0OyBH2az&vCeQAU#yg^Ps)r8teDHH-h=P(HB}Cm3}*XWD&eZ7U=?0E
z5lYC-BJmMaRwh1%S(J}e#CFmy0jrf|6~3J*OYmyZS%sHVR0&!tN2|DUVkqHCh3Y2m
zwSD&>KQFuUf5FLLApd)froWZ{8;AS97m*+2|J(r{sr#$BzL>Wxe~Xmg5vg@(dIM6b
z9cznQz9(uw$4rcFu)Yv1y0uYGg-Qf)-5G4%1MDcxU;72`xs>CdPEaH~mdfBWuJKg-
zpEb_5?*GpY|NnatIfemq4vn<n6cnExzD-cVIOQVZG6v1UjBHp+j^TR3E!b4&F%5Qt
zLO?9kxVVMmGX4b&W+Y>ZpqZO&^fMWeV~`l<t_J_p2JiUq7{NF0Ch(vCQ@E0121@40
zY)hcgfZ!4-p%<guky8fAF?3XtC<!;65k%ZrLSydg`LozQq2oVHJ%27cCUHG`ESq*J
z>uW`07T%{C?zlipPN@B+$q5~^dvZculKobO$K>Qsatt@jaFtr<U34v>+NduWIzoAb
mtX@nv>I<P$8>$HFhum|JgB)a^<*xt$0RR7&wRj5vBme-~ajEP8

literal 0
HcmV?d00001

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 582ebe70..72bc2f54 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -391,9 +391,8 @@ resource "helm_release" "ingress_controller" {
 
 
 resource "helm_release" "orchestration_service" {
-  repository    = "https://cdcgov.github.io/phdi-charts/"
   name          = "phdi-playground-${terraform.workspace}-orchestration"
-  chart         = "orchestration"
+  chart         = "./TEMP_orchestration-0.1.6.tgz"
   recreate_pods = true
   depends_on    = [helm_release.agic]
 

From 7cebbbd488714ea9dac895cad1bbe6087926a257 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Mon, 30 Oct 2023 15:48:30 -0700
Subject: [PATCH 09/31] remove trailing slash

---
 terraform/implementation/main.tf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 72bc2f54..a87aece5 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -403,22 +403,22 @@ resource "helm_release" "orchestration_service" {
 
   set {
     name  = "fhirConverterUrl"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter/"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter"
   }
 
   set {
     name  = "ingestionUrl"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion/"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion"
   }
 
   set {
     name  = "messageParserUrl"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser/"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser"
   }
 
   set {
     name  = "validationUrl"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation/"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
   }
 }
 

From 26845c2e216d1fdfddd5b6e20be967895a86e2f3 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Mon, 30 Oct 2023 15:57:04 -0700
Subject: [PATCH 10/31] add full URL path (https)

---
 terraform/implementation/main.tf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index a87aece5..e846aaea 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -403,22 +403,22 @@ resource "helm_release" "orchestration_service" {
 
   set {
     name  = "fhirConverterUrl"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter"
+    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter"
   }
 
   set {
     name  = "ingestionUrl"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion"
+    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion"
   }
 
   set {
     name  = "messageParserUrl"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser"
+    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser"
   }
 
   set {
     name  = "validationUrl"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
+    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
   }
 }
 

From bf682a66ba02d70979691b7db47567f8bb1f1e18 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Mon, 30 Oct 2023 16:57:39 -0700
Subject: [PATCH 11/31] add message parsing block

---
 terraform/implementation/main.tf | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index e846aaea..e7685b3a 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -23,7 +23,6 @@ locals {
   services = toset([
     "fhir-converter",
     "ingestion",
-    "message-parser",
     "validation",
   ])
 }
@@ -370,6 +369,19 @@ resource "helm_release" "building_blocks" {
   }
 }
 
+resource "helm_release" "message_parser_release" {
+  repository    = "https://cdcgov.github.io/phdi-charts/"
+  name          = "phdi-playground-${terraform.workspace}-message-parser"
+  chart         = "message-parser-chart"
+  recreate_pods = true
+  depends_on    = [helm_release.agic]
+
+  set {
+    name  = "image.tag"
+    value = "v1.1.1"
+  }
+}
+
 resource "helm_release" "ingress_controller" {
   repository    = "https://cdcgov.github.io/phdi-charts/"
   name          = "phdi-playground-${terraform.workspace}-ingress-temp"

From 0a6d214a6606113fef2d7c6c4c3cffc5658497d1 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Mon, 30 Oct 2023 17:00:16 -0700
Subject: [PATCH 12/31] update name

---
 terraform/implementation/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index e7685b3a..a533df24 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -369,7 +369,7 @@ resource "helm_release" "building_blocks" {
   }
 }
 
-resource "helm_release" "message_parser_release" {
+resource "helm_release" "emma_special_parsing_release" {
   repository    = "https://cdcgov.github.io/phdi-charts/"
   name          = "phdi-playground-${terraform.workspace}-message-parser"
   chart         = "message-parser-chart"

From e874ac5d78f52a8be4f4070c96d636c250ff2222 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 2 Nov 2023 10:01:26 -0700
Subject: [PATCH 13/31] wip

---
 terraform/implementation/main.tf | 83 ++++++++++++++++++++++++--------
 1 file changed, 64 insertions(+), 19 deletions(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index a533df24..1a9af69b 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -25,8 +25,44 @@ locals {
     "ingestion",
     "validation",
   ])
+
+  # what would be nice to do in this file
+  # - Figure out if there's a way to make a standard "DIBBs Release" resource
+  # - That would have some standard values (repo to install from, name of service) but
+  #  would allow us to just list out the charts/installation values individually
+  # - Automatically update to the latest image version AND the latest chart version
+  # (helm_release doesn't seem to do this by itself)
+
+  services_to_autoscale = toset([
+    "fhir-converter",
+    "ingestion",
+    "ingress",
+    "message-parser",
+    "orchestration",
+    "validation"
+  ])
 }
 
+# validation-chart
+# orchestration
+# message-parser-chart
+# ingress-chart
+# ingestion-chart
+# fhir-converter-chart
+
+variable "services_to_chart" {
+  type = map(string)
+  default = {
+    fhir-converter = "fhir-converter-chart",
+    ingestion      = "ingestion-chart",
+    ingress        = "ingress-chart",
+    message-parser = "message-parser-chart",
+    orchestration  = "orchestration",
+    validation     = "validation-chart"
+  }
+}
+
+
 # Service Principal
 resource "azuread_application" "aks" {
   display_name = "phdi-playground-${terraform.workspace}-aks"
@@ -320,13 +356,22 @@ YAML
 
 # Helm Releases
 
+# validation-chart
+# orchestration
+# message-parser-chart
+# ingress-chart
+# ingestion-chart
+# fhir-converter-chart
+
 resource "helm_release" "building_blocks" {
-  for_each      = local.services
-  repository    = "https://cdcgov.github.io/phdi-charts/"
-  name          = "phdi-playground-${terraform.workspace}-${each.key}"
-  chart         = "${each.key}-chart"
-  recreate_pods = true
-  depends_on    = [helm_release.agic]
+  for_each        = services_to_chart
+  repository      = "https://cdcgov.github.io/phdi-charts/"
+  name            = "phdi-playground-${terraform.workspace}-${each.key}"
+  chart           = each.value
+  depends_on      = [helm_release.agic]
+  force_update    = true
+  recreate_pods   = true
+  cleanup_on_fail = true
 
   set {
     name  = "image.tag"
@@ -369,18 +414,18 @@ resource "helm_release" "building_blocks" {
   }
 }
 
-resource "helm_release" "emma_special_parsing_release" {
-  repository    = "https://cdcgov.github.io/phdi-charts/"
-  name          = "phdi-playground-${terraform.workspace}-message-parser"
-  chart         = "message-parser-chart"
-  recreate_pods = true
-  depends_on    = [helm_release.agic]
-
-  set {
-    name  = "image.tag"
-    value = "v1.1.1"
-  }
-}
+#resource "helm_release" "emma_special_parsing_release" {
+#  repository    = "https://cdcgov.github.io/phdi-charts/"
+#  name          = "phdi-playground-${terraform.workspace}-message-parser"
+#  chart         = "message-parser-chart"
+#  recreate_pods = true
+#  depends_on    = [helm_release.agic]
+#
+#  set {
+#    name  = "image.tag"
+#    value = "v1.1.1"
+#  }
+#}
 
 resource "helm_release" "ingress_controller" {
   repository    = "https://cdcgov.github.io/phdi-charts/"
@@ -471,7 +516,7 @@ resource "kubectl_manifest" "keda_trigger" {
 }
 
 resource "kubectl_manifest" "keda_scaled_object" {
-  for_each   = local.services
+  for_each   = local.services_to_autoscale
   depends_on = [kubectl_manifest.keda_trigger]
   yaml_body  = data.kubectl_path_documents.keda_scaled_object[each.key].documents[0]
 }

From 8f2c341814278a3a84c1b89ae2ef5f9fdc798153 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 2 Nov 2023 10:23:03 -0700
Subject: [PATCH 14/31] update services_to_chart map

---
 terraform/implementation/data.tf |  2 +-
 terraform/implementation/main.tf | 44 +++++++++++++++++---------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/terraform/implementation/data.tf b/terraform/implementation/data.tf
index 0da14c0d..769e292d 100644
--- a/terraform/implementation/data.tf
+++ b/terraform/implementation/data.tf
@@ -31,7 +31,7 @@ data "kubectl_path_documents" "keda_trigger" {
 }
 
 data "kubectl_path_documents" "keda_scaled_object" {
-  for_each = local.services
+  for_each = var.services_to_chart
   pattern  = "./manifests/kedaScaledObject.yaml"
   vars = {
     subscriptionId         = "${var.subscription_id}"
diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 1a9af69b..f8a52e40 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -50,6 +50,9 @@ locals {
 # ingestion-chart
 # fhir-converter-chart
 
+#    orchestration  = "orchestration",
+
+
 variable "services_to_chart" {
   type = map(string)
   default = {
@@ -57,7 +60,6 @@ variable "services_to_chart" {
     ingestion      = "ingestion-chart",
     ingress        = "ingress-chart",
     message-parser = "message-parser-chart",
-    orchestration  = "orchestration",
     validation     = "validation-chart"
   }
 }
@@ -364,7 +366,7 @@ YAML
 # fhir-converter-chart
 
 resource "helm_release" "building_blocks" {
-  for_each        = services_to_chart
+  for_each        = var.services_to_chart
   repository      = "https://cdcgov.github.io/phdi-charts/"
   name            = "phdi-playground-${terraform.workspace}-${each.key}"
   chart           = each.value
@@ -427,24 +429,24 @@ resource "helm_release" "building_blocks" {
 #  }
 #}
 
-resource "helm_release" "ingress_controller" {
-  repository    = "https://cdcgov.github.io/phdi-charts/"
-  name          = "phdi-playground-${terraform.workspace}-ingress-temp"
-  chart         = "ingress-chart"
-  recreate_pods = true
-  version       = "0.1.8"
-  depends_on    = [helm_release.agic]
-
-  set {
-    name  = "image.tag"
-    value = "latest"
-  }
-
-  set {
-    name  = "ingressHostname"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com"
-  }
-}
+#resource "helm_release" "ingress_controller" {
+#  repository    = "https://cdcgov.github.io/phdi-charts/"
+#  name          = "phdi-playground-${terraform.workspace}-ingress-temp"
+#  chart         = "ingress-chart"
+#  recreate_pods = true
+#  version       = "0.1.8"
+#  depends_on    = [helm_release.agic]
+#
+#  set {
+#    name  = "image.tag"
+#    value = "latest"
+#  }
+#
+#  set {
+#    name  = "ingressHostname"
+#    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com"
+#  }
+#}
 
 
 resource "helm_release" "orchestration_service" {
@@ -516,7 +518,7 @@ resource "kubectl_manifest" "keda_trigger" {
 }
 
 resource "kubectl_manifest" "keda_scaled_object" {
-  for_each   = local.services_to_autoscale
+  for_each   = var.services_to_chart
   depends_on = [kubectl_manifest.keda_trigger]
   yaml_body  = data.kubectl_path_documents.keda_scaled_object[each.key].documents[0]
 }

From 60614b740fdfc1e8f69fa590190af03e989e5bcc Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 2 Nov 2023 13:18:03 -0700
Subject: [PATCH 15/31] change release name

---
 terraform/implementation/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index f8a52e40..61bd6059 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -368,7 +368,7 @@ YAML
 resource "helm_release" "building_blocks" {
   for_each        = var.services_to_chart
   repository      = "https://cdcgov.github.io/phdi-charts/"
-  name            = "phdi-playground-${terraform.workspace}-${each.key}"
+  name            = "phdi-playground-${terraform.workspace}-${each.key}-newRelease"
   chart           = each.value
   depends_on      = [helm_release.agic]
   force_update    = true

From 81bf00f258bd1909b8fbe01325d0d80daa73d9b8 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 2 Nov 2023 13:22:02 -0700
Subject: [PATCH 16/31] update release name

---
 terraform/implementation/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 61bd6059..781ccb11 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -368,7 +368,7 @@ YAML
 resource "helm_release" "building_blocks" {
   for_each        = var.services_to_chart
   repository      = "https://cdcgov.github.io/phdi-charts/"
-  name            = "phdi-playground-${terraform.workspace}-${each.key}-newRelease"
+  name            = "phdi-playground-${terraform.workspace}-${each.key}-new"
   chart           = each.value
   depends_on      = [helm_release.agic]
   force_update    = true

From dcc0bef71bedfe4be8317e36525aab5a9ff056b2 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 2 Nov 2023 13:32:02 -0700
Subject: [PATCH 17/31] add orchestration chart to main release

---
 terraform/implementation/main.tf | 81 ++++++++++++++++----------------
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 781ccb11..1773bb9a 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -60,6 +60,7 @@ variable "services_to_chart" {
     ingestion      = "ingestion-chart",
     ingress        = "ingress-chart",
     message-parser = "message-parser-chart",
+    orchestration  = "orchestration",
     validation     = "validation-chart"
   }
 }
@@ -377,7 +378,7 @@ resource "helm_release" "building_blocks" {
 
   set {
     name  = "image.tag"
-    value = "latest"
+    value = "v1.1.1"
   }
 
   set {
@@ -396,23 +397,23 @@ resource "helm_release" "building_blocks" {
   }
 
   set {
-    name  = "fhir-converter-url"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter"
+    name  = "fhirConverterUrl"
+    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter"
   }
 
   set {
-    name  = "ingestion-url"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion"
+    name  = "ingestionUrl"
+    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion"
   }
 
   set {
-    name  = "message-parser-url"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser"
+    name  = "messageParserUrl"
+    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser"
   }
 
   set {
-    name  = "validation-url"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
+    name  = "validationUrl"
+    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
   }
 }
 
@@ -449,37 +450,37 @@ resource "helm_release" "building_blocks" {
 #}
 
 
-resource "helm_release" "orchestration_service" {
-  name          = "phdi-playground-${terraform.workspace}-orchestration"
-  chart         = "./TEMP_orchestration-0.1.6.tgz"
-  recreate_pods = true
-  depends_on    = [helm_release.agic]
-
-  set {
-    name  = "image.tag"
-    value = "latest"
-  }
-
-  set {
-    name  = "fhirConverterUrl"
-    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter"
-  }
-
-  set {
-    name  = "ingestionUrl"
-    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion"
-  }
-
-  set {
-    name  = "messageParserUrl"
-    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser"
-  }
-
-  set {
-    name  = "validationUrl"
-    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
-  }
-}
+#resource "helm_release" "orchestration_service" {
+#  name          = "phdi-playground-${terraform.workspace}-orchestration"
+#  chart         = "./TEMP_orchestration-0.1.6.tgz"
+#  recreate_pods = true
+#  depends_on    = [helm_release.agic]
+#
+#  set {
+#    name  = "image.tag"
+#    value = "latest"
+#  }
+#
+#  set {
+#    name  = "fhirConverterUrl"
+#    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter"
+#  }
+#
+#  set {
+#    name  = "ingestionUrl"
+#    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion"
+#  }
+#
+#  set {
+#    name  = "messageParserUrl"
+#    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser"
+#  }
+#
+#  set {
+#    name  = "validationUrl"
+#    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
+#  }
+#}
 
 # Metrics Dashboard
 

From fa54cf24940b7b054b1a0cb2579865b5f185cca5 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 2 Nov 2023 14:02:01 -0700
Subject: [PATCH 18/31] remove new

---
 terraform/implementation/main.tf | 77 +-------------------------------
 1 file changed, 2 insertions(+), 75 deletions(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 1773bb9a..b4b5e5bb 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -357,19 +357,11 @@ spec:
 YAML
 }
 
-# Helm Releases
-
-# validation-chart
-# orchestration
-# message-parser-chart
-# ingress-chart
-# ingestion-chart
-# fhir-converter-chart
 
 resource "helm_release" "building_blocks" {
   for_each        = var.services_to_chart
   repository      = "https://cdcgov.github.io/phdi-charts/"
-  name            = "phdi-playground-${terraform.workspace}-${each.key}-new"
+  name            = "phdi-playground-${terraform.workspace}-${each.key}"
   chart           = each.value
   depends_on      = [helm_release.agic]
   force_update    = true
@@ -393,7 +385,7 @@ resource "helm_release" "building_blocks" {
 
   set {
     name  = "ingressHostname"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com"
+    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com"
   }
 
   set {
@@ -417,71 +409,6 @@ resource "helm_release" "building_blocks" {
   }
 }
 
-#resource "helm_release" "emma_special_parsing_release" {
-#  repository    = "https://cdcgov.github.io/phdi-charts/"
-#  name          = "phdi-playground-${terraform.workspace}-message-parser"
-#  chart         = "message-parser-chart"
-#  recreate_pods = true
-#  depends_on    = [helm_release.agic]
-#
-#  set {
-#    name  = "image.tag"
-#    value = "v1.1.1"
-#  }
-#}
-
-#resource "helm_release" "ingress_controller" {
-#  repository    = "https://cdcgov.github.io/phdi-charts/"
-#  name          = "phdi-playground-${terraform.workspace}-ingress-temp"
-#  chart         = "ingress-chart"
-#  recreate_pods = true
-#  version       = "0.1.8"
-#  depends_on    = [helm_release.agic]
-#
-#  set {
-#    name  = "image.tag"
-#    value = "latest"
-#  }
-#
-#  set {
-#    name  = "ingressHostname"
-#    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com"
-#  }
-#}
-
-
-#resource "helm_release" "orchestration_service" {
-#  name          = "phdi-playground-${terraform.workspace}-orchestration"
-#  chart         = "./TEMP_orchestration-0.1.6.tgz"
-#  recreate_pods = true
-#  depends_on    = [helm_release.agic]
-#
-#  set {
-#    name  = "image.tag"
-#    value = "latest"
-#  }
-#
-#  set {
-#    name  = "fhirConverterUrl"
-#    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter"
-#  }
-#
-#  set {
-#    name  = "ingestionUrl"
-#    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion"
-#  }
-#
-#  set {
-#    name  = "messageParserUrl"
-#    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser"
-#  }
-#
-#  set {
-#    name  = "validationUrl"
-#    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
-#  }
-#}
-
 # Metrics Dashboard
 
 resource "azurerm_portal_dashboard" "pipeline_metrics" {

From 5c64cf4eb75f1375e79562f57729dfd552a7ac63 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 2 Nov 2023 14:04:46 -0700
Subject: [PATCH 19/31] remove https for hostname

---
 terraform/implementation/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index b4b5e5bb..dcfcedb9 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -385,7 +385,7 @@ resource "helm_release" "building_blocks" {
 
   set {
     name  = "ingressHostname"
-    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com"
   }
 
   set {

From f8180357bc8b184a356981991382a5de2fb69770 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 2 Nov 2023 14:24:19 -0700
Subject: [PATCH 20/31] update ingress locally - temp

---
 terraform/implementation/main.tf | 40 ++++++--------------------------
 1 file changed, 7 insertions(+), 33 deletions(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index dcfcedb9..a4738000 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -19,46 +19,13 @@ locals {
     resource_group_name = var.resource_group_name,
     subscription_id     = var.subscription_id,
   }))
-
-  services = toset([
-    "fhir-converter",
-    "ingestion",
-    "validation",
-  ])
-
-  # what would be nice to do in this file
-  # - Figure out if there's a way to make a standard "DIBBs Release" resource
-  # - That would have some standard values (repo to install from, name of service) but
-  #  would allow us to just list out the charts/installation values individually
-  # - Automatically update to the latest image version AND the latest chart version
-  # (helm_release doesn't seem to do this by itself)
-
-  services_to_autoscale = toset([
-    "fhir-converter",
-    "ingestion",
-    "ingress",
-    "message-parser",
-    "orchestration",
-    "validation"
-  ])
 }
 
-# validation-chart
-# orchestration
-# message-parser-chart
-# ingress-chart
-# ingestion-chart
-# fhir-converter-chart
-
-#    orchestration  = "orchestration",
-
-
 variable "services_to_chart" {
   type = map(string)
   default = {
     fhir-converter = "fhir-converter-chart",
     ingestion      = "ingestion-chart",
-    ingress        = "ingress-chart",
     message-parser = "message-parser-chart",
     orchestration  = "orchestration",
     validation     = "validation-chart"
@@ -409,6 +376,13 @@ resource "helm_release" "building_blocks" {
   }
 }
 
+resource "helm_release" "ingress" {
+  name          = "phdi-playground-${terraform.workspace}-ingress"
+  chart         = "./ingress-chart-0.1.10.tgz"
+  recreate_pods = true
+  depends_on    = [helm_release.agic]
+}
+
 # Metrics Dashboard
 
 resource "azurerm_portal_dashboard" "pipeline_metrics" {

From 4cad8ebd316cc95856e71213918a34bc5441c271 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 2 Nov 2023 14:24:36 -0700
Subject: [PATCH 21/31] update ingress locally

---
 terraform/implementation/ingress-chart-0.1.10.tgz | Bin 0 -> 980 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 terraform/implementation/ingress-chart-0.1.10.tgz

diff --git a/terraform/implementation/ingress-chart-0.1.10.tgz b/terraform/implementation/ingress-chart-0.1.10.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..02d18ceee735f49df417d293369579fcdf17aa6f
GIT binary patch
literal 980
zcmV;_11tO=iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PI-NZ`-yL&NKgt`ymhgEtn|Dak9W~Lpq?vfUa1IybfpSBC)1O
z;z-$ZgYIu1DA|tfq{)D#vD^83prZ?U{P^+iNJ*KB$@`?JkwbbJTRF!@A3Y<oEX&S^
z!|pfBvhCk&kYz{t@NAH0d44(=9A)|GPlNmjvgai6CA2;uA7%e~uI<HrBS5FFiM_IB
z1k-^)=T?uo%w;Z0@&zjwI@8bahI9j6u)vLF__ZAq8w%uw!G=b#5l<q_9gP5;)2hJe
zLQI$5v*<k&yI%i)9h><-MctBr?gH>s{%6Cpt^6P6=jVs~e+eW>A{H_5#`@4FvB$<~
zlJ&xHNYd{YoB1E8aT){pbYXv%Qt(9npACoG=l}WX@br-XFM*i<>vsS{VP<)vOeH55
zUMibTb1_k-9KqW@Bt%02OAI&?000}uerG{rZ0JsV-*<_atS$=C=Q6qqjoyy{KebHh
z+BG4mFwhL=tKsNeHIvI>o6g2qOvsdp!%!!V=|=rIf^;>sAPz}`1}oy&z0j=>#EJ60
zB_4sM;K>v`cOh|XOW_?AJ@KH|R**ofhiitV`Sw;`_vhwTA^rS$t*@toDZJ~{a&@T^
zr*U4fZB4nLl3-ET)`Vn2{ldA`bdSL3AI?{Y;I_F&h3+k&cOCyVg19l{;|`=J4|MB2
zeCRH9?>nI%?6laBhbCHT!BbVxmpi~JuwLEX%HK&7dXn$DH6|;L$->X8NBua<;qjTe
z+1h3tqv0aE$Q~02HF5BJtWHmG7t-9+ij%^cDRCg)V~IA2?n0`DyvK?XhwS%Ss!gK1
zkcz3WTqatX30AbnQf(65g;W8@t;RjC-ghK-A<-1ID)(KYJCeJQ$Z}DW54`UxZSeeR
zLhbr~{<X3B{wHhFjjD`gdd4}P`u=lvdjI>+@bLZjMQ{x7F$7}cAz0|Q9%eNe7`IB7
z%2eR6h$ott;ut>E%7brR%p?!KCas~;b_@-MqE@E*5tw3mpHf#O*6e6XaSVp4E@9#S
z{hJz<FjJw1|NS80H>2lZO*b-90!Iv58InT2zWU=TSSE1{m$qrFf$PgFC>47lD;3hN
z?dc0S{={k5E)8{+#%B5GrzX8~6zf#$;6`ck;zatH6DM+v6LBI#6aTiXDsl3cIEHIv
zWm^w#U;pBTbZkFT5rkAFVcK_R`%%cLFKkKacV9dXIN*S98h-}>0RR6NV}Y>%9smG3
CD(!~=

literal 0
HcmV?d00001


From 5fedc60b010fd3501104c01406fc47dd30657239 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 2 Nov 2023 14:26:12 -0700
Subject: [PATCH 22/31] change ingress name to temp

---
 terraform/implementation/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index a4738000..3e517655 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -376,7 +376,7 @@ resource "helm_release" "building_blocks" {
   }
 }
 
-resource "helm_release" "ingress" {
+resource "helm_release" "ingress-temp" {
   name          = "phdi-playground-${terraform.workspace}-ingress"
   chart         = "./ingress-chart-0.1.10.tgz"
   recreate_pods = true

From 554f968ebbfd1bdcd93122c642b672d9ab6377bb Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 2 Nov 2023 14:29:32 -0700
Subject: [PATCH 23/31] update chart

---
 .../implementation/ingress-chart-0.1.10.tgz     | Bin 980 -> 979 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/terraform/implementation/ingress-chart-0.1.10.tgz b/terraform/implementation/ingress-chart-0.1.10.tgz
index 02d18ceee735f49df417d293369579fcdf17aa6f..00bea2940720652d649a66d2161c8b169d8dc239 100644
GIT binary patch
delta 887
zcmV--1Bm?82h#_TOam!#(veRge|fRH`g@?_3wiwb@$N`TnTpB#q^OZYdKFta!$u!%
z5m}aH7lT3f%(86rnVn|YQ9d|7&9nS8f1Mv?`Pu8!!4YKJB=I%0J|G`u|9Gy=#eE|{
zr*4S7vStXAQ-RJcf95imxhTmOtX$|!Kfznl4RpZ*x0d0Tc0_C_kQW9Ue;UGCJc%%K
zGz4@`s{*47F<E%eqW4Vfdi~!!*7JXYx+TBu0`Oe^XM^*N{2#=}A^%?hNs@?p47{~I
z^hxZoahha3Hyo1mzl-(!57an~fqXi*Z>1DGlmF*~{9+^jFV4;n`Trt_`M-JxFchYi
z$I4W4eCegK=_D6pWy&GEf9pd+G!(GJfI|TQuy*Ws7Bt3&?zH!Pmx%H5q7Z#9qN~v8
z{SfeT%apEM6Osx8O>wpyj?Pt6xfr(YY=p&_Oqn<gb>f(A)gMDhmqQEUkThtpB97e)
z-TFYBDDPY1A!rJoOu;i3634a_-civL4|-(<3B-E1Vpy2(?&M8>e{OCR(l1|D`g$su
z!uw7wSC=Yr8fO*T)|7K92^NKIO-RPnFPvLV4+sqZ=6rPsZj)<N=)nSd*YRINh#Nyb
z?m&9-NVnd@$L>=1p%ePiPV)_UY@&r0JW&OGy#p)*>($+z{EalBC;7fxW3uF!%>BH2
z(vPzoo}Q_jt!+jze;O{c%j_wEP!k8g$LjP1cOlJftvD&HnGgr!J(g&l=q{vc$a}0P
zamaqJrCKMt3#ph2%VnaK8Dm9zEY&*ET}Tyh)N0)G>U~dg7ZOcSt8(8Zx+l2{i7Xd2
z`M~?7(i*FOO_p8X#$O)m?|-r;-Kfe~rY+9#-1ndJvxnb*e+Gx|zb}Gg_<$i08xO%k
zzx6P!$-t;px>TkDhebTmycEaqu~r^@>tb$s@HJ@-m9`^jFch^i)sMgw%lm}7BC%pe
zQ;K6SRCOr~|L@<_sD!BsHT>@f3BMXW18cgGkrFs!(8`b$^3C<{*TFK0W4N+SV-4I~
zT|=qZ3t6d<X?AT-U&zsCPP=wtsH-$Ki=TdC(tAg-PPGnhl_oDvq@Ox*B1bqDCo(kg
zZ_BC@Cx41#xItF7_3-Y^&t6E!_7fFBNL3Q1eRsB>gq--omXv;n<>Y_^4)})fR{#J2
N|Npo}V_*Ot002YpxWxbf

delta 888
zcmV-;1Bd+62h<0UOasYrvXM_Af2Fb8`Fo(F3wiwb@$N`TnTpB#q^OZYdKp_e$3`DL
zBeE>Z&WFS9H_Ni^-)xX&NBQt<kY{;*Iv5;f`RPxC{0Oq=B=IG*J|G`u|9Y<N#eE|{
zr>=>;vStL+fk5Y0kGafcE=uwRD;GM`&+vwH16{Ddjb-??9TOW0<b}b8e@3toPa@16
zjR2j~s=(+%OqbrX=sgp=UjKg`oB2OQ-I9Oq0`OG+XT!6t{2%7$=ZE}%2_#7(7BTR~
z`p_q_$Hr-r^}=vS((f0W`5&lp8Uy)sVSkoV@I?Nf4Tsz3|M}_g^pO8Aftdg6cK}0S
zW_hAaB_|hNDw|GoF;S)*f5F>6Bt%02OAI&?000}uerG{rZ0JsV-*<_atS$=C=Q6qq
zjoyy{KebHh+BG4mFwhL=tKsNeHIvI>o6g2qOvsdp!%!!V=|=rIf^;>sAPz}`1}oy&
zz0j=>#EJ60B_4sM;K>v`cOh|XOW_?AJ@KH|R**ofhiitV`Sw;`fA{C+Rw4cTd9AOf
zf+@V~)N*yH5~p!qv29Jcppsxw*w%z(LjA(I)pU=*=pW8khv2rkMuqMzpm!brHG;S?
z<l_#cCl7S%J$&dcb?-Z&AMCW)kcTE(YQa-g(3d;FDzIMN-pb!e6MB;Gx-}*%j>*E$
zt4IAf%i-~vy4l)he;lLXBD=^Q69_eN@O!LIPjDB~+|-Jb!kQ^@Al_q%Hi_;+s)oGB
ziV}zH_gbn=qPviasjyroTA2w}w8v6y65WMV0mrSzJ+Iz(BzGav6tyb%U7|aZyO79o
zQIik6?<#HZ{Axn&`hNbkvHAWdYtoIXjAeSpIiC9db9Q?FfBVny@cs8ia18G;1Y+YM
zSm?JNW;GcYw@R1FRN%0PCz_Yy7(Ud>gKu5TBoDqOt)bF(3=M{&R;Kz9m|}UKQdcC_
z>}X1H42G&MVd4M%n;MlcQ=x|c{UG5tqvv2vH!@NJM+{mSl0v?|`r|5CCUFdxwrQ+^
z>&q)B6?-8oY8BG1?dc0S{={k5E)8{+#%B5GrzX8~6zf#$;6`ck;zatH6DM+v6LBI#
z6aTiXDsl3cIEHIvWm^w#U;pBTbZkFT5rkAFVcK_R`%%cLFKkKacV9dXIN*S98h-}>
O0RR6NV}Y>%9smGDsK|f-


From e10b6aa12759b7ff50621cad3042870333eb5999 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Wed, 8 Nov 2023 15:31:27 -0800
Subject: [PATCH 24/31] make ingress service names dynamic

---
 .../implementation/ingress-chart-0.1.10.tgz   | Bin 979 -> 1056 bytes
 terraform/implementation/main.tf              |  21 ++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/terraform/implementation/ingress-chart-0.1.10.tgz b/terraform/implementation/ingress-chart-0.1.10.tgz
index 00bea2940720652d649a66d2161c8b169d8dc239..7640e4207b4f625f080c96cabb2942c76bf3b1aa 100644
GIT binary patch
delta 1010
zcmV<O0}cGs2cQU$Jb%q@<2De^nNKlAE^SazRO0-=w<23$7cJTVS>#&K)I{Q%A_<a`
z>kYQgUQn_X%Rid}O&u5OImq_#8<O*BW;nFeg+uQXQF0g3+xVn&Ua6B;6vi048jadd
z#@PBNJ7?@98(p4Xu<Vkt?1W_(*XP*@u-DwgE~$Os?u7m8wSU%~`=1E6@&TQfMvtL6
zC*0cpXGSxcksQ5n(uP*`6TC-NK^rXaXdL`fPta)$=!xbPj$sf_B+M<2fm^Gj;BgAl
zEN5qNc1GUX|8HG}`QLC=qkruJ@KXL?vFo+`A7$6)$Nb-iBuPRRG4S5_&?T|wl~qW~
zg@Qx``k24>=zkh1@V8~IciO~vYQhz|;0K^i)gvBD>28f~&;@h@U>r%ra;P_`(0g9s
z9d~}sU@?-|cBnUSD2&U0m3qnx92j&XiRy-WgTN=X;v3#Qt9xX_mCQGh&*~m&oG8%;
zw+SAM^!PV>|HJ$bSXspb`gEaxl~V9R{$GyR<y!t<U4M*5$Nb-i#Qb0F0W^l0aZ{-a
zI=%5!nzYHtRO);TAG(kr6$YO3z{dmtU~ufW8m_eoZFu_*5@p&q3USV5bP2`19|Qkf
zJ4{#FgrwjBXMEn9b8CwkU78Iin{Y8johO!uGO-RH<)33ndsBffBo)`ZKo{Xc)jk#&
z>3xlE41WrPM=jjkhQvCP6K_#;8xLy5g9KtdTv065PfzrrJ2%$~>6b4nSdYSC=xTs1
zbD3Dh=Y=!1&KFxrxDck+A(>+5xT_UzY+(Ek*DFJ?>wAq1Z8*?P9f!t{_9Z<%+XCxm
z_}DgecP-IdL5ml%ZJ{L>ZPnWifIhIEo?yk>jekQ320m}uuW{k)%d|_?)g*?(4ZC4q
zW2ZaI4v?CSb9cYI43F*u<Y!mcv0s{o4a))2w5!+JFHOTX?Eq=o)nV?Jrsw|j04dtq
zQ}36b=dSz!`Pq7t*e^eWi^u^|wCf7>AF%Y+P52wi@cu_jRFy2WarlaBy!8Li<;D8_
zZ-11Hj{pDeMNZ+4hk#Cd2nM=W53>?AOlqlesSB`N#DmULata?y>A}}FCYc9cqEb*O
zGl7Z+QA%C>2o7W6Z?G*MD|)VTata!YHlgAB?xu!0%w#CxyB{e0uGJijZY|@Mz@h^s
zHBv&~-T!ePj6-q?x2CF$hKJjG$ffgy7Hcx3?X%lHp_9)pZJ$d;S)}o?{OKE=K2H?u
zS8d@@D)i)x`k5tXbi$|PjD{+HH%=Dh>@RW(58O#pd-(9~XHTeg<`arQsLYY49o(5u
ggf?E79Mf;Pt{mkkM>%}?I{*Ox{{%K@NdO)I0FU?lDF6Tf

delta 933
zcmV;W16ur`2-63UJb%$|+qM(VGyjVFArJj6m?$Z6(!g&+I-tdXu2_n^4rl2iv8G7k
zNZE6P?r$F`*^cd`$$)vWyZU>e;tP5F`0?&YNtuet`=qFmLwXfkIm1RDZ4p_PWfy}%
z_sp_v^O>Dy*-<_?Kh3lJG=H5RW%=3b)4>sB+a&Qdv_2poWq<#8uFb`LBS5Eah`q9A
z2$NHR&MklDGMBk1$rr3#=uAJsTha}5!2-9I;g@zqY$%Wy1{)f}T0Ds`b2J2WPOAc=
z3o%)E&!YEC?0Ws*JJ$1mg1RNY?E>&z{%3>pjr<?P$07e;07;UFc?`U@KJ-cKv2mJY
zJvSVZ^uLSs{C^MBIE{gPI=6476g-pv=Y#xWBmXbX&JX$jB8d6FdIvBRrk2ObRC0Xj
zrLyTH7h`40A-wBDLNpYx#DGHq0I+uKcNR3phVHcYeV2&w@}dxZE~2Z@==~7zbIX*j
zToaNC15I(Z9FERaQ@I$n?rem`m`s^C40Ym|Zq*+{NPm|@3*wM8Xs{xV-3#6NK%6M=
zTjC*T3Z6{CGZzxawiMn`(Gw4PWd#Yudbna(nD6f7O@D4~6w)tWR{DA>n8N!`EmxN+
zaT;e8+t!qGDhU>aZB0nV)GwS{O%DhR|K@yk2yT;WROrD1de`w^Lx>wgKJGwz@<_Md
z!^iGY_kW=i`q57F4S8&$g%&(f1%15(ECcJ+-JSf6G@&Q?zFT9m<e1F;yn51)vmBnD
zshh2BMll*Lv&-x$flw0%zsKtI1a~3LZLK&dteFr8;yspVo#-y4YRG%6C~?SsuccZi
zx(lh83d?1pl^J72do0yD(OpOtaMWtt^Xh$1a(@>RO;D?H-zB;yxeJLb7d837`=!zv
ztA9<FUEjuE9_#OavL@ZA%2=i?&hgy$pYyYa-+u;&@4qjCWB7m}5E~D{LcjGet;xWs
zRk~EB0*6IB(YzGL@Ud1NeCuLvdGIx94VAVdXfPDDGS!d36wCXBx+1Y+M^lPpFjRFZ
z41fRc-_)ptsR}jx?*|FL8a)GRx{;9*IAYMskQDOG_3zigGKpijvQ1+R++1Blsn`oy
zsgQPUPhZH<XHL6zVW_J#HjAHrV$yp@u}-xPZj~l4PNbhYaUw@J7AG<^@o&qj5+{F(
zW4J+9w)ODt&Cgy)$MzEyK}b~+rhRv|pB{vq_`;Tyeuw4cfCCQrhVWMa00960xJ6@N
H03HAU>3q@;

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 3e517655..7036ed14 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -374,6 +374,27 @@ resource "helm_release" "building_blocks" {
     name  = "validationUrl"
     value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
   }
+
+  set {
+    name  = "ingestionServiceName"
+    value = "phdi-playground-${terraform.workspace}-ingestion-ingestion-service"
+  }
+
+  set {
+    name  = "fhirConverterServiceName"
+    value = "phdi-playground-${terraform.workspace}-fhir-converter-fhir-converter-service"
+  }
+
+  set {
+    name  = "messageParserServiceName"
+    value = "phdi-playground-${terraform.workspace}-message-parser-message-parser-service"
+  }
+
+  set {
+    name  = "validationServiceName"
+    value = "phdi-playground-${terraform.workspace}-validation-validation-service"
+  }
+
 }
 
 resource "helm_release" "ingress-temp" {

From 1a136f1f92ceec5a4fbd79c7cf9439caf8c74829 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Wed, 8 Nov 2023 15:39:11 -0800
Subject: [PATCH 25/31] update the right values block

---
 terraform/implementation/main.tf | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 7036ed14..efd71d24 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -374,6 +374,13 @@ resource "helm_release" "building_blocks" {
     name  = "validationUrl"
     value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
   }
+}
+
+resource "helm_release" "ingress-temp" {
+  name          = "phdi-playground-${terraform.workspace}-ingress"
+  chart         = "./ingress-chart-0.1.10.tgz"
+  recreate_pods = true
+  depends_on    = [helm_release.agic]
 
   set {
     name  = "ingestionServiceName"
@@ -394,14 +401,6 @@ resource "helm_release" "building_blocks" {
     name  = "validationServiceName"
     value = "phdi-playground-${terraform.workspace}-validation-validation-service"
   }
-
-}
-
-resource "helm_release" "ingress-temp" {
-  name          = "phdi-playground-${terraform.workspace}-ingress"
-  chart         = "./ingress-chart-0.1.10.tgz"
-  recreate_pods = true
-  depends_on    = [helm_release.agic]
 }
 
 # Metrics Dashboard

From 096fa5659a7d72a57ed415c69c17f171a4ccbcba Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Wed, 8 Nov 2023 15:48:36 -0800
Subject: [PATCH 26/31] update ingress hostname

---
 terraform/implementation/main.tf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index efd71d24..24e35bd3 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -382,6 +382,11 @@ resource "helm_release" "ingress-temp" {
   recreate_pods = true
   depends_on    = [helm_release.agic]
 
+  set {
+    name  = "ingressHostname"
+    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com"
+  }
+
   set {
     name  = "ingestionServiceName"
     value = "phdi-playground-${terraform.workspace}-ingestion-ingestion-service"

From 4b521b57f56959ba4d93c16a09f5ce8cef66a8bd Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 9 Nov 2023 10:55:08 -0800
Subject: [PATCH 27/31] add ingress back to regular chart installation

---
 terraform/implementation/main.tf | 47 +++++++++++++++-----------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 24e35bd3..d4288f1e 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -26,6 +26,7 @@ variable "services_to_chart" {
   default = {
     fhir-converter = "fhir-converter-chart",
     ingestion      = "ingestion-chart",
+    ingress        = "ingress-chart",
     message-parser = "message-parser-chart",
     orchestration  = "orchestration",
     validation     = "validation-chart"
@@ -355,59 +356,55 @@ resource "helm_release" "building_blocks" {
     value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com"
   }
 
+  #  Service names needed for ingress routes
   set {
-    name  = "fhirConverterUrl"
-    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter"
+    name  = "ingestionServiceName"
+    value = "phdi-playground-${terraform.workspace}-ingestion-ingestion-service"
   }
 
   set {
-    name  = "ingestionUrl"
-    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion"
+    name  = "fhirConverterServiceName"
+    value = "phdi-playground-${terraform.workspace}-fhir-converter-fhir-converter-service"
   }
 
   set {
-    name  = "messageParserUrl"
-    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser"
+    name  = "messageParserServiceName"
+    value = "phdi-playground-${terraform.workspace}-message-parser-message-parser-service"
   }
 
   set {
-    name  = "validationUrl"
-    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
+    name  = "validationServiceName"
+    value = "phdi-playground-${terraform.workspace}-validation-validation-service"
   }
-}
-
-resource "helm_release" "ingress-temp" {
-  name          = "phdi-playground-${terraform.workspace}-ingress"
-  chart         = "./ingress-chart-0.1.10.tgz"
-  recreate_pods = true
-  depends_on    = [helm_release.agic]
 
   set {
-    name  = "ingressHostname"
-    value = "${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com"
+    name  = "orchestrationServiceName"
+    value = "phdi-playground-${terraform.workspace}-orchestration-orchestration-service"
   }
 
+  #  Values needed for orchestration service
   set {
-    name  = "ingestionServiceName"
-    value = "phdi-playground-${terraform.workspace}-ingestion-ingestion-service"
+    name  = "fhirConverterUrl"
+    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/fhir-converter"
   }
 
   set {
-    name  = "fhirConverterServiceName"
-    value = "phdi-playground-${terraform.workspace}-fhir-converter-fhir-converter-service"
+    name  = "ingestionUrl"
+    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/ingestion"
   }
 
   set {
-    name  = "messageParserServiceName"
-    value = "phdi-playground-${terraform.workspace}-message-parser-message-parser-service"
+    name  = "messageParserUrl"
+    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/message-parser"
   }
 
   set {
-    name  = "validationServiceName"
-    value = "phdi-playground-${terraform.workspace}-validation-validation-service"
+    name  = "validationUrl"
+    value = "https://${var.resource_group_name}-${terraform.workspace}.${var.location}.cloudapp.azure.com/validation"
   }
 }
 
+
 # Metrics Dashboard
 
 resource "azurerm_portal_dashboard" "pipeline_metrics" {

From 02ae93baf1b8efb479cb2bbad6da3e2139efd995 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 9 Nov 2023 11:00:02 -0800
Subject: [PATCH 28/31] temp remove ingress to make deployment happy

---
 terraform/implementation/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index d4288f1e..3e45f2c9 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -26,7 +26,7 @@ variable "services_to_chart" {
   default = {
     fhir-converter = "fhir-converter-chart",
     ingestion      = "ingestion-chart",
-    ingress        = "ingress-chart",
+    #    ingress        = "ingress-chart",
     message-parser = "message-parser-chart",
     orchestration  = "orchestration",
     validation     = "validation-chart"

From 04cb66191187cf73484321c7ebfb8d9341b6d177 Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 9 Nov 2023 11:04:23 -0800
Subject: [PATCH 29/31] ingress is back

---
 terraform/implementation/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 3e45f2c9..d4288f1e 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -26,7 +26,7 @@ variable "services_to_chart" {
   default = {
     fhir-converter = "fhir-converter-chart",
     ingestion      = "ingestion-chart",
-    #    ingress        = "ingress-chart",
+    ingress        = "ingress-chart",
     message-parser = "message-parser-chart",
     orchestration  = "orchestration",
     validation     = "validation-chart"

From 70121c070165b83d81390270d433c1a41a34d54a Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 9 Nov 2023 11:26:29 -0800
Subject: [PATCH 30/31] temp remove orchestration chart

---
 terraform/implementation/main.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index d4288f1e..621a9c78 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -28,8 +28,8 @@ variable "services_to_chart" {
     ingestion      = "ingestion-chart",
     ingress        = "ingress-chart",
     message-parser = "message-parser-chart",
-    orchestration  = "orchestration",
-    validation     = "validation-chart"
+    #    orchestration  = "orchestration",
+    validation = "validation-chart"
   }
 }
 

From 05e48b96fb01e6e653739f1d4c23bedb5cdc8ade Mon Sep 17 00:00:00 2001
From: emmastephenson <emma.stephenson.24@gmail.com>
Date: Thu, 9 Nov 2023 11:29:00 -0800
Subject: [PATCH 31/31] add orchestration back

---
 terraform/implementation/main.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/terraform/implementation/main.tf b/terraform/implementation/main.tf
index 621a9c78..d4288f1e 100644
--- a/terraform/implementation/main.tf
+++ b/terraform/implementation/main.tf
@@ -28,8 +28,8 @@ variable "services_to_chart" {
     ingestion      = "ingestion-chart",
     ingress        = "ingress-chart",
     message-parser = "message-parser-chart",
-    #    orchestration  = "orchestration",
-    validation = "validation-chart"
+    orchestration  = "orchestration",
+    validation     = "validation-chart"
   }
 }