From b99138309a9c4fddb67f68bf94eb1970a54351ff Mon Sep 17 00:00:00 2001 From: Jack Murdock Date: Mon, 9 Mar 2020 17:09:28 -0700 Subject: [PATCH 1/2] fix spruce config file --- deploy/packaging/tr1d1um_spruce.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/packaging/tr1d1um_spruce.yaml b/deploy/packaging/tr1d1um_spruce.yaml index b2917391..b2855840 100644 --- a/deploy/packaging/tr1d1um_spruce.yaml +++ b/deploy/packaging/tr1d1um_spruce.yaml @@ -165,7 +165,7 @@ aws: #AWS secret key secretKey: (( grab $AWS_SECRET_KEY || "" )) - env: (( grab $AWS_WEBHOOK_ENC || "local-dev" )) + env: (( grab $AWS_WEBHOOK_ENV || "local-dev" )) sns: # awsEndpoint is the AWS endpoint From 6e465f0f61cc754ce579fcc34efc96c3a8360196 Mon Sep 17 00:00:00 2001 From: Jack Murdock Date: Fri, 10 Apr 2020 08:57:50 -0700 Subject: [PATCH 2/2] fix authAcquirer for spruce --- deploy/packaging/tr1d1um_spruce.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/deploy/packaging/tr1d1um_spruce.yaml b/deploy/packaging/tr1d1um_spruce.yaml index b2855840..7e83b2e7 100644 --- a/deploy/packaging/tr1d1um_spruce.yaml +++ b/deploy/packaging/tr1d1um_spruce.yaml @@ -270,6 +270,9 @@ requestRetryInterval: "2s" # case of ephemeral errors requestMaxRetries: 2 +#authtoken used to make spruce work better for authAcquirer +authToken: (( grab $AUTH_TOKEN || "dXNlcjpwYXNz" )) + # authAcquirer enables configuring the JWT or Basic auth header value factory for outgoing # requests to XMiDT. If both types are configured, JWT will be preferred. # (Optional) @@ -290,4 +293,4 @@ authAcquirer: # buffer is the length of time before a token expires to get a new token. buffer: "2m" - Basic: "Basic dXNlcjpwYXNz" \ No newline at end of file + Basic: (( concat "Basic " authToken )) \ No newline at end of file