From 019e8df4d6bef87c9a45b6dc8d84fd9a0169f768 Mon Sep 17 00:00:00 2001
From: Evan Fletcher <no-reply@epf.im>
Date: Thu, 4 Mar 2021 22:21:07 -0700
Subject: [PATCH] Disable AWS X-Ray in resource-api until it's needed.

---
 resource-api/infra/helm-v2/templates/deployment.yaml | 4 +++-
 resource-api/infra/helm-v2/values.yaml               | 1 +
 resource-api/infra/helm-v3/templates/deployment.yaml | 4 +++-
 resource-api/infra/helm-v3/values.development.yaml   | 5 ++++-
 resource-api/infra/helm-v3/values.prod.yaml          | 5 ++++-
 resource-api/infra/helm/templates/deployment.yaml    | 4 +++-
 resource-api/infra/helm/values.yaml                  | 1 +
 7 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/resource-api/infra/helm-v2/templates/deployment.yaml b/resource-api/infra/helm-v2/templates/deployment.yaml
index 3b8516b9..cbe51adf 100644
--- a/resource-api/infra/helm-v2/templates/deployment.yaml
+++ b/resource-api/infra/helm-v2/templates/deployment.yaml
@@ -33,7 +33,9 @@ spec:
             - name: DYNAMODB_TABLE 
               value: {{ .Release.Namespace }}-resources
             - name: AWS_DEFAULT_REGION
-              value: {{ .Values.aws.region}}
+              value: {{ .Values.aws.region }}
+            - name: AWS_XRAY_SDK_ENABLED
+              value: "{{ .Values.aws.xray_enabled }}"
           resources:
 {{ toYaml .Values.resources | indent 12 }}
     {{- with .Values.nodeSelector }}
diff --git a/resource-api/infra/helm-v2/values.yaml b/resource-api/infra/helm-v2/values.yaml
index e36b0b73..bce3feee 100644
--- a/resource-api/infra/helm-v2/values.yaml
+++ b/resource-api/infra/helm-v2/values.yaml
@@ -16,6 +16,7 @@ service:
 
 aws:
   region: us-east-2
+  xray_enabled: "false"
 
 resources: {}
   # limits:
diff --git a/resource-api/infra/helm-v3/templates/deployment.yaml b/resource-api/infra/helm-v3/templates/deployment.yaml
index 3b8516b9..cbe51adf 100644
--- a/resource-api/infra/helm-v3/templates/deployment.yaml
+++ b/resource-api/infra/helm-v3/templates/deployment.yaml
@@ -33,7 +33,9 @@ spec:
             - name: DYNAMODB_TABLE 
               value: {{ .Release.Namespace }}-resources
             - name: AWS_DEFAULT_REGION
-              value: {{ .Values.aws.region}}
+              value: {{ .Values.aws.region }}
+            - name: AWS_XRAY_SDK_ENABLED
+              value: "{{ .Values.aws.xray_enabled }}"
           resources:
 {{ toYaml .Values.resources | indent 12 }}
     {{- with .Values.nodeSelector }}
diff --git a/resource-api/infra/helm-v3/values.development.yaml b/resource-api/infra/helm-v3/values.development.yaml
index 02f7d912..57385cf3 100644
--- a/resource-api/infra/helm-v3/values.development.yaml
+++ b/resource-api/infra/helm-v3/values.development.yaml
@@ -1,3 +1,6 @@
 image:
   repository: 750796802028.dkr.ecr.us-east-2.amazonaws.com/bookstore.resources-api
-  tag: latest
\ No newline at end of file
+  tag: latest
+
+aws:
+  xray_enabled: "true"
diff --git a/resource-api/infra/helm-v3/values.prod.yaml b/resource-api/infra/helm-v3/values.prod.yaml
index 02f7d912..f952c061 100644
--- a/resource-api/infra/helm-v3/values.prod.yaml
+++ b/resource-api/infra/helm-v3/values.prod.yaml
@@ -1,3 +1,6 @@
 image:
   repository: 750796802028.dkr.ecr.us-east-2.amazonaws.com/bookstore.resources-api
-  tag: latest
\ No newline at end of file
+  tag: latest
+
+aws:
+  xray_enabled: "false"
diff --git a/resource-api/infra/helm/templates/deployment.yaml b/resource-api/infra/helm/templates/deployment.yaml
index fc8536d9..1e22c2d2 100644
--- a/resource-api/infra/helm/templates/deployment.yaml
+++ b/resource-api/infra/helm/templates/deployment.yaml
@@ -32,7 +32,9 @@ spec:
             - name: DYNAMODB_TABLE 
               value: {{ .Release.Namespace }}-resources
             - name: AWS_DEFAULT_REGION
-              value: {{ .Values.aws.region}}
+              value: {{ .Values.aws.region }}
+            - name: AWS_XRAY_SDK_ENABLED
+              value: "{{ .Values.aws.xray_enabled }}"
           resources:
 {{ toYaml .Values.resources | indent 12 }}
     {{- with .Values.nodeSelector }}
diff --git a/resource-api/infra/helm/values.yaml b/resource-api/infra/helm/values.yaml
index 58bb3272..9682b2c9 100644
--- a/resource-api/infra/helm/values.yaml
+++ b/resource-api/infra/helm/values.yaml
@@ -16,6 +16,7 @@ service:
 
 aws:
   region: us-east-2
+  xray_enabled: "false"
 
 resources: {}
   # limits: