Remove dollar var support

.gitignore

@@ -1,5 +1,6 @@
 node_modules/
 .build/
+build/
 package-lock.json
 dist/
 .testrun/

packages/deployer/package.json

@@ -49,13 +49,12 @@
     "typescript": "^3.7.3"
   },
   "scripts": {
-    "build-test-images": "cd src/integratedtest/testimages && ./build-test-images.sh",
     "start-postgres": "docker run --rm --name postgres -e POSTGRES_PASSWORD=mysecretpassword -d -p 5432:5432 postgres",
     "kill-postgres": "docker stop postgres",
     "specs": "mocha --exit --require ts-node/register --recursive 'src/**/*.spec.ts'",
     "coverage": "TS_NODE_COMPILER_OPTIONS='{\"removeComments\":false}' nyc mocha --require ts-node/register --require source-map-support/register --recursive 'src/**/*.spec.ts'",
     "tdd": "mocha --exit -R dot --require ts-node/register --recursive --watch-extensions ts --watch 'src/**/*.spec.ts'",
-    "integratedtest": "yarn build && yarn build-test-images && mocha --exit --recursive 'dist/integratedtest/**/*.integratedtest.js'",
+    "integratedtest": "yarn build && mocha --exit --recursive 'dist/integratedtest/**/*.integratedtest.js'",
     "compile-in-background": "tsc -w > /dev/null &",
     "itdd": "npm run compile-in-background && mocha --exit --require ts-node/register --recursive --watch-extensions ts,js,sh --watch 'src/**/*.integratedtest.ts'",
     "test": "yarn specs",

packages/deployer/src/deployment-actions/kubectl-action/expand-templates-in-image-archive-files.ts

@@ -2,16 +2,18 @@ import { TK8sDeploymentPlan, TShepherdMetadata } from "../../deployment-types"
 import { shepherdOptions } from "../../shepherd-options"
 import { kubeSupportedExtensions } from "./kube-supported-extensions"
 import * as path from "path"
-import { expandEnvAndMustacheVariablesInFile } from "./kubectl-deployment-action-factory"
+import { expandTemplate } from "@shepherdorg/hbs-template"
 import * as chalk from "chalk"
 
-export function expandTemplatesInImageArchiveFiles(imageInformation: TShepherdMetadata & { dockerLabels: { [p: string]: any } }, plan: TK8sDeploymentPlan) {
+export function expandTemplatesInImageArchiveFiles(
+  imageInformation: TShepherdMetadata & { dockerLabels: { [p: string]: any } },
+  plan: TK8sDeploymentPlan
+) {
   if (shepherdOptions.testRunMode()) {
     process.env.TPL_DOCKER_IMAGE = "fixed-for-testing-purposes"
   } else {
     process.env.TPL_DOCKER_IMAGE =
       imageInformation.imageDeclaration.image + ":" + imageInformation.imageDeclaration.imagetag
-
   }
 
   if (!plan.files) {
@@ -26,10 +28,12 @@ export function expandTemplatesInImageArchiveFiles(imageInformation: TShepherdMe
 
     try {
       if (archivedFile.content) {
-        archivedFile.content = expandEnvAndMustacheVariablesInFile(archivedFile.content)
+        archivedFile.content = expandTemplate(archivedFile.content)
       }
     } catch (e) {
-      let message = `When expanding templates in ${chalk.blueBright(imageInformation.imageDeclaration.image)} ${chalk.red(fileName)}:\n${e.message}`
+      let message = `When expanding templates in ${chalk.blueBright(
+        imageInformation.imageDeclaration.image
+      )} ${chalk.red(fileName)}:\n${e.message}`
       throw new Error(message)
     }
   })

packages/deployer/src/deployment-actions/kubectl-action/kubectl-deployment-action-factory.ts

@@ -9,7 +9,6 @@ import {
 import { newProgrammerOops, Oops } from "oops-error"
 import { expandEnv } from "../../template/expandenv"
 import { processLine } from "../../template/base64-env-subst"
-import { expandTemplate } from "@shepherdorg/hbs-template"
 import * as path from "path"
 import { writeFile } from "../../helpers/promisified"
 import { TK8sPartialDescriptor } from "./k8s-document-types"
@@ -58,10 +57,6 @@ function expandEnvVariables(lines: string[]) {
   return lines.join("\n")
 }
 
-export function expandEnvAndMustacheVariablesInFile(deploymentFileDescriptorContent: string) {
-  return expandTemplate(expandEnvVariables(deploymentFileDescriptorContent.split("\n")))
-}
-
 export interface ICreateKubectlDeploymentAction {
   executeKubectlDeploymentAction: (
     thisIsMe: IKubectlDeployAction,

packages/deployer/src/deployment-plan/deployment-plan-loading.spec.ts

@@ -309,7 +309,7 @@ describe("Docker image plan loader", function() {
       })
     })
 
-    describe("missing env variable", function() {
+    describe("missing env variable, #2", function() {
       let loadError: Error
       before(function() {
         delete process.env.EXPORT1
@@ -410,7 +410,7 @@ describe("Docker image plan loader", function() {
       })
     })
 
-    describe("missing env variable", function() {
+    xdescribe("missing env variable, $ is now obsolete", function() {
       let loadError: Error
       before(async function() {
         delete process.env.EXPORT1
@@ -436,7 +436,7 @@ describe("Docker image plan loader", function() {
       })
     })
 
-    describe("missing env variable for base64 decoding", function() {
+    xdescribe("missing env variable for base64 decoding, $ variable is obsolete, redesign this test", function() {
       let loadError: Error
       before(async function() {
         process.env.EXPORT1 = "qwerty"

packages/deployer/src/herd-loading/folder-loader/folder-action-factory.ts

@@ -1,10 +1,8 @@
 import * as fs from "fs"
 import * as path from "path"
 import { emptyArray } from "../../helpers/ts-functions"
-import {
-  expandEnvAndMustacheVariablesInFile,
-  ICreateKubectlDeploymentAction,
-} from "../../deployment-actions/kubectl-action/kubectl-deployment-action-factory"
+import { expandTemplate } from "@shepherdorg/hbs-template"
+import { ICreateKubectlDeploymentAction } from "../../deployment-actions/kubectl-action/kubectl-deployment-action-factory"
 import {
   IK8sDirDeploymentAction,
   IKubectlDeployAction,
@@ -136,7 +134,7 @@ export function createFolderActionFactory(
                   const kubeDeploymentRelativePath = path.relative(initialDir, resolvedPath)
 
                   try {
-                    data = expandEnvAndMustacheVariablesInFile(data)
+                    data = expandTemplate(data)
                     const deploymentAction: IKubectlDeployAction = injected.kubectlDeploymentActionFactory.createKubectlDeployAction(
                       kubeDeploymentRelativePath,
                       data,

packages/deployer/src/integratedtest/shepherd.integratedtest.ts

@@ -154,6 +154,9 @@ describe("running shepherd", function() {
           firstRun = script
             .execute(shepherdTestHarness, [], {
               env: _.extend(testEnv, process.env),
+              // stdoutLineHandler: (line: string) => {
+              //   console.log(`DEBUG ${line}`)
+              // },
             })
             .done(function(_stdout) {
               // console.log(`stdout`, stdout)

packages/deployer/src/test-tools/script-test.ts

@@ -101,6 +101,7 @@ export interface TScriptTestExecution {
   expectExitCode: (expectedExitCode: number) => TScriptTestExecution
   done: (callback: FExecutionCallback) => TScriptTestExecution
   checkExpectations: () => void
+  unexpectedError?: string
 }
 
 function emptyArray<T>(): Array<T> {
@@ -113,7 +114,6 @@ export type TExecuteOptions = {
 }
 
 export default {
-  // Pass in debug=true if you want to see output of subject under test.
   execute: function(command: string, args: string[], options: TExecuteOptions) {
     options.env = extend({}, options.env, { PATH: process.env.PATH })
 
@@ -132,19 +132,18 @@ export default {
           execution.checkExpectations()
           execution.callback && execution.callback(execError.stdout)
         } else {
-          console.error("Process error in test, error code:", execError.code, " stderr:", execError.stderr)
-          expect.fail(
+          console.error("Process error in test", execError)
+          execution.unexpectedError =
             "Error invoking : " +
-              command +
-              " with arguments " +
-              JSON.stringify(args) +
-              "\nStdout: \n" +
-              execError.stdout +
-              "\nError output:\n" +
-              execError.stderr +
-              "\n. ErrorCode:" +
-              execError.code
-          )
+            command +
+            " with arguments " +
+            JSON.stringify(args) +
+            "\nStdout: \n" +
+            execError.stdout +
+            "\nError output:\n" +
+            execError.stderr +
+            "\n. ErrorCode:" +
+            execError.code
         }
       })
 
@@ -220,6 +219,9 @@ export default {
         return execution
       },
       checkExpectations() {
+        if (execution.unexpectedError) {
+          expect.fail(execution.unexpectedError)
+        }
         if (execution.expectedExitCode) {
           expect(execution.actualExitCode).to.equal(execution.expectedExitCode, "Process exit code")
         }

packages/deployer/src/testdata/deployment-dirs/www-icelandair-com-deleted/www-icelandair-com.deployment.yml

@@ -16,7 +16,7 @@ spec:
       imagePullSecrets:
         - name: registry-pull-secret
       containers:
-        - image: ${TPL_DOCKER_IMAGE}
+        - image: {{TPL_DOCKER_IMAGE}}
           name: www-icelandair-com
           resources:
             limits:
@@ -43,7 +43,7 @@ spec:
             - name: RUNTIME_ENV2
               valueFrom:
                 configMapKeyRef:
-                  name: ${EXPORT2}
+                  name: {{EXPORT2}}
                   key: ENV
         - image: DOCKER_IMAGE_SSR
           name: www-icelandair-com-ssr

packages/deployer/src/testdata/deployment-dirs/www-icelandair-com/www-icelandair-com.deployment.yml

@@ -16,7 +16,7 @@ spec:
       imagePullSecrets:
         - name: registry-pull-secret
       containers:
-        - image: ${TPL_DOCKER_IMAGE}
+        - image: {{TPL_DOCKER_IMAGE}}
           secondaryImage: {{{ TPL_DOCKER_IMAGE }}}
           name: www-icelandair-com
           resources:
@@ -44,7 +44,7 @@ spec:
             - name: RUNTIME_ENV2
               valueFrom:
                 configMapKeyRef:
-                  name: ${EXPORT2}
+                  name: {{EXPORT2}}
                   key: ENV
             - name: RUNTIME_ENV_3
               value: {{BRANCH_NAME}}

packages/deployer/src/testdata/deployment-dirs/www-icelandair-com/www-icelandair-com.service.yml

@@ -6,8 +6,8 @@ metadata:
     service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
   labels:
     name: www-icelandair-com
-    subdomain: ${SUB_DOMAIN_PREFIX}beta
-    topdomain: ${PREFIXED_TOP_DOMAIN_NAME}
+    subdomain: {{SUB_DOMAIN_PREFIX}}beta
+    topdomain: {{PREFIXED_TOP_DOMAIN_NAME}}
     team: flip
 spec:
   type: LoadBalancer
@@ -30,8 +30,8 @@ metadata:
     service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
   labels:
     name: www-icelandair-com
-    subdomain: ${SUB_DOMAIN_PREFIX}beta
-    topdomain: ${PREFIXED_TOP_DOMAIN_NAME}
+    subdomain: {{SUB_DOMAIN_PREFIX}}beta
+    topdomain: {{PREFIXED_TOP_DOMAIN_NAME}}
     team: flip
 spec:
   type: LoadBalancer

packages/deployer/testbin/test-shepherd.sh

@@ -12,6 +12,7 @@ export PATH=$(pwd)/testbin:$(pwd)/bin:${PATH}
 if [ -z "${HERDFILE}" ]; then
 	export HERDFILE="$(pwd)/src/herd-loading/testdata/happypath/herd.yaml"
 fi
+  echo Using HERDFILE: ${HERDFILE}
 
 
 if [ -z "${DRYRUN_OUTPUT_FOLDER}" ]; then

packages/postgres-backend/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "bluebird": "^3.7.0",
     "lodash": "^4.17.15",
-    "pg": "^7.12.1"
+    "pg": "^8.7.3"
   },
   "peerDependencies": {
     "@shepherdorg/metadata": "^5.0.0",

packages/postgres-backend/src/index.ts

@@ -3,7 +3,7 @@ import { PGConnectionConfig } from "./pg-config"
 
 export { PgConfig } from "./pg-config"
 
-import {Client} from "pg"
+import { Client } from "pg"
 
 export interface IPostgresStorageBackend extends IStorageBackend {
   resetAllDeploymentStates()
@@ -31,14 +31,14 @@ const StoreClient = (client: Client) => ({
 export function PostgresStore(config: PGConnectionConfig): IPostgresStorageBackend {
   let client
 
-  const ensureDeploymentsTable= async function() {
+  const ensureDeploymentsTable = async function() {
     await client.query(
-      "CREATE TABLE IF NOT EXISTS deployments (identifier TEXT PRIMARY KEY, data JSONB, lastdeployment TIMESTAMP NOT NULL)",
+      "CREATE TABLE IF NOT EXISTS deployments (identifier TEXT PRIMARY KEY, data JSONB, lastdeployment TIMESTAMP NOT NULL)"
     )
   }
 
   return {
-     async connect() {
+    async connect() {
       client = StoreClient(new Client(config))
       await client.connect()
       if (config.schema) {

packages/storage-backend-tester/index.ts

@@ -6,6 +6,7 @@ export default (backendName: string, createBackend: () => IStorageBackend) => {
   describe(`${backendName} store backend`, function() {
     let store
 
+    this.timeout(70000)
     beforeEach(function() {
       store = createBackend()
     })

packages/deployer/src/integratedtest/testimages/build-test-images.sh → packages/test-images/integratedtest/testimages/build-test-images.sh

@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 THISDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
+
 set -eao pipefail
 unset DOCKER_REGISTRY_HOST
-export PATH=$PATH:${THISDIR}/node_modules/.bin
 export FORCE_REBUILD=true
 
+
 echo "Rebuilding test images"
 (cd ${THISDIR}/test-migration-image/ && ./build-docker.sh)
 (cd ${THISDIR}/test-image && ./build-docker.sh)

packages/deployer/src/integratedtest/testimages/test-image-json-metadata/kube.yaml → packages/test-images/integratedtest/testimages/test-image-json-metadata/kube.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  {{SECRET_KEY}}: {{Base64Encode:SECRET_TEXT}}
+  {{SECRET_KEY}}: {{Base64Encode SECRET_TEXT}}
 kind: Secret
 metadata:
   imagename: DOCKER_IMAGE

packages/deployer/src/integratedtest/testimages/test-image/deployment/www-icelandair-com.config.yml → packages/test-images/integratedtest/testimages/test-image/deployment/www-icelandair-com.config.yml

@@ -6,4 +6,4 @@ metadata:
     team: flip
 data:
   whitelist: |-
-    ${Base64Decode:WWW_ICELANDAIR_IP_WHITELIST}
+    {{Base64Decode WWW_ICELANDAIR_IP_WHITELIST}}

packages/deployer/src/integratedtest/testimages/test-image/deployment/www-icelandair-com.deployment.yml → packages/test-images/integratedtest/testimages/test-image/deployment/www-icelandair-com.deployment.yml

@@ -16,7 +16,7 @@ spec:
       imagePullSecrets:
         - name: registry-pull-secret
       containers:
-        - image: ${TPL_DOCKER_IMAGE}
+        - image: {{TPL_DOCKER_IMAGE}}
           name: www-icelandair-com
           resources:
             limits:
@@ -43,7 +43,7 @@ spec:
             - name: RUNTIME_ENVIRONMENT
               valueFrom:
                 configMapKeyRef:
-                  name: ${EXPORT1}
+                  name: {{EXPORT1}}
                   key: ENV
         - image: DOCKER_IMAGE_SSR
           name: www-icelandair-com-ssr

packages/deployer/src/integratedtest/testimages/test-image/deployment/www-icelandair-com.service.yml → packages/test-images/integratedtest/testimages/test-image/deployment/www-icelandair-com.service.yml

@@ -6,8 +6,8 @@ metadata:
     service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
   labels:
     name: www-icelandair-com
-    subdomain: '${SUB_DOMAIN_PREFIX}beta'
-    topdomain: ${PREFIXED_TOP_DOMAIN_NAME}
+    subdomain: '{{SUB_DOMAIN_PREFIX}}beta'
+    topdomain: {{PREFIXED_TOP_DOMAIN_NAME}}
     team: flip
 spec:
   type: LoadBalancer
@@ -30,8 +30,8 @@ metadata:
     service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
   labels:
     name: www-icelandair-com
-    subdomain: ${SUB_DOMAIN_PREFIX}beta
-    topdomain: ${PREFIXED_TOP_DOMAIN_NAME}
+    subdomain: {{SUB_DOMAIN_PREFIX}}beta
+    topdomain: {{PREFIXED_TOP_DOMAIN_NAME}}
     team: flip
 spec:
   type: LoadBalancer

packages/deployer/src/integratedtest/testimages/test-image3/deployment/image2.deployment.yml → packages/test-images/integratedtest/testimages/test-image2/deployment/image2.deployment.yml

@@ -16,7 +16,7 @@ spec:
       imagePullSecrets:
         - name: registry-pull-secret
       containers:
-        - image: ${TPL_DOCKER_IMAGE}
+        - image: {{TPL_DOCKER_IMAGE}}
           name: image2
           resources:
             limits:
@@ -43,7 +43,7 @@ spec:
             - name: RUNTIME_ENVIRONMENT
               valueFrom:
                 configMapKeyRef:
-                  name: ${EXPORT1}
+                  name: {{EXPORT1}}
                   key: ENV
         - image: DOCKER_IMAGE_SSR
           name: image2-ssr

packages/deployer/src/integratedtest/testimages/test-image3/deployment/image2.config.yml → packages/test-images/integratedtest/testimages/test-image3/deployment/image2.config.yml

@@ -6,4 +6,4 @@ metadata:
     team: flip
 data:
   whitelist: |-
-    ${Base64Decode:WWW_ICELANDAIR_IP_WHITELIST}
+    {{Base64Decode WWW_ICELANDAIR_IP_WHITELIST}}