pass through consumer and provider vars to cdc container

springernature · Jul 14, 2021 · 5f95fae · 5f95fae
1 parent c0781a5
commit 5f95fae
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 1 deletion.
diff --git a/e2e/actions/consumer-integration-test/workflowExpected.yml b/e2e/actions/consumer-integration-test/workflowExpected.yml
@@ -58,13 +58,18 @@ jobs:
           --entrypoint "${CONSUMER_SCRIPT}" \
           -e DEPENDENCY_NAME=${PROVIDER_NAME} \
           -e ${PROVIDER_HOST_KEY}=${PROVIDER_HOST} \
+          -e CDC_CONSUMER_NAME=${CONSUMER_NAME} \
+          -e CDC_CONSUMER_VERSION=${REVISION} \
+          -e CDC_PROVIDER_NAME=${PROVIDER_NAME} \
+          -e CDC_PROVIDER_VERSION=${GIT_REVISION} \
           -e K -e K1 \
            \
           ${DOCKER_COMPOSE_SERVICE:-code}
       env:
         CONSUMER_GIT_KEY: ${{ secrets.EE_GITHUB_PRIVATE_KEY }}
         CONSUMER_GIT_URI: git@github.com:springernature/c-consumer
         CONSUMER_HOST: c-host
+        CONSUMER_NAME: c-consumer
         CONSUMER_PATH: ""
         CONSUMER_SCRIPT: c-script
         DOCKER_COMPOSE_SERVICE: potato

diff --git a/e2e/actions/deploy-cf/workflowExpected.yml b/e2e/actions/deploy-cf/workflowExpected.yml
@@ -252,13 +252,18 @@ jobs:
           --entrypoint "${CONSUMER_SCRIPT}" \
           -e DEPENDENCY_NAME=${PROVIDER_NAME} \
           -e ${PROVIDER_HOST_KEY}=${PROVIDER_HOST} \
+          -e CDC_CONSUMER_NAME=${CONSUMER_NAME} \
+          -e CDC_CONSUMER_VERSION=${REVISION} \
+          -e CDC_PROVIDER_NAME=${PROVIDER_NAME} \
+          -e CDC_PROVIDER_VERSION=${GIT_REVISION} \
           -e TEST_ROUTE \
            \
           ${DOCKER_COMPOSE_SERVICE:-code}
       env:
         CONSUMER_GIT_KEY: ${{ secrets.EE_GITHUB_PRIVATE_KEY }}
         CONSUMER_GIT_URI: git@github.com:springernature/repo
         CONSUMER_HOST: consumer.host
+        CONSUMER_NAME: repo/app
         CONSUMER_PATH: app
         CONSUMER_SCRIPT: ci/run-external-and-cdcs-dev
         DOCKER_COMPOSE_SERVICE: ""

diff --git a/e2e/concourse/consumer-integration-test/pipelineExpected.yml b/e2e/concourse/consumer-integration-test/pipelineExpected.yml
@@ -30,6 +30,7 @@ jobs:
         CONSUMER_GIT_KEY: ((halfpipe-github.private_key))
         CONSUMER_GIT_URI: git@github.com:springernature/c-consumer
         CONSUMER_HOST: c-host
+        CONSUMER_NAME: c-consumer
         CONSUMER_PATH: ""
         CONSUMER_SCRIPT: c-script
         DOCKER_COMPOSE_SERVICE: potato
@@ -88,6 +89,10 @@ jobs:
             --entrypoint "${CONSUMER_SCRIPT}" \
             -e DEPENDENCY_NAME=${PROVIDER_NAME} \
             -e ${PROVIDER_HOST_KEY}=${PROVIDER_HOST} \
+            -e CDC_CONSUMER_NAME=${CONSUMER_NAME} \
+            -e CDC_CONSUMER_VERSION=${REVISION} \
+            -e CDC_PROVIDER_NAME=${PROVIDER_NAME} \
+            -e CDC_PROVIDER_VERSION=${GIT_REVISION} \
             -e ARTIFACTORY_PASSWORD -e ARTIFACTORY_URL -e ARTIFACTORY_USERNAME -e K -e K1 -e RUNNING_IN_CI \
             -v /var/halfpipe/cache:/var/halfpipe/cache -v /var/halfpipe/shared-cache:/var/halfpipe/shared-cache \
             ${DOCKER_COMPOSE_SERVICE:-code}
@@ -112,4 +117,3 @@ resources:
     private_key: ((halfpipe-github.private_key))
     uri: git@github.com:springernature/halfpipe.git
   type: git
-
diff --git a/renderers/actions/consumer_integration_tests.go b/renderers/actions/consumer_integration_tests.go
@@ -38,6 +38,7 @@ func convertConsumerIntegrationTestToRunTask(task manifest.ConsumerIntegrationTe
 			"CONSUMER_SCRIPT":        task.Script,
 			"CONSUMER_GIT_KEY":       githubSecrets.GitHubPrivateKey,
 			"CONSUMER_HOST":          task.ConsumerHost,
+			"CONSUMER_NAME":          task.Consumer,
 			"PROVIDER_NAME":          providerName,
 			"PROVIDER_HOST_KEY":      providerHostKey,
 			"PROVIDER_HOST":          task.ProviderHost,

diff --git a/renderers/concourse/consumer_integration_tests.go b/renderers/concourse/consumer_integration_tests.go
@@ -40,6 +40,7 @@ func convertConsumerIntegrationTestToRunTask(task manifest.ConsumerIntegrationTe
 		Privileged: true,
 		Vars: manifest.Vars{
 			"CONSUMER_GIT_URI":       consumerGitURI,
+			"CONSUMER_NAME":          task.Consumer,
 			"CONSUMER_PATH":          consumerGitPath,
 			"CONSUMER_SCRIPT":        task.Script,
 			"CONSUMER_GIT_KEY":       "((halfpipe-github.private_key))",

diff --git a/renderers/shared/consumer_integration_tests.go b/renderers/shared/consumer_integration_tests.go
@@ -51,6 +51,10 @@ docker-compose run --no-deps \
   --entrypoint "${CONSUMER_SCRIPT}" \
   -e DEPENDENCY_NAME=${PROVIDER_NAME} \
   -e ${PROVIDER_HOST_KEY}=${PROVIDER_HOST} \
+  -e CDC_CONSUMER_NAME=${CONSUMER_NAME} \
+  -e CDC_CONSUMER_VERSION=${REVISION} \
+  -e CDC_PROVIDER_NAME=${PROVIDER_NAME} \
+  -e CDC_PROVIDER_VERSION=${GIT_REVISION} \
   %s \
   %s \
   ${DOCKER_COMPOSE_SERVICE:-code}