Merge pull request #32 from wripley/master

wripley · web-flow · commit 8d1739c3bc17 · 2019-07-15T10:38:59.000-07:00
Updated Jenkinsfile to use env variable and removed flag from tf validate.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -35,7 +35,7 @@ metadata:
 spec:
   containers:
   - name: ${containerName}
-    image: gcr.io/pso-helmsman-cicd/jenkins-k8s-node:jenkins-cicd_images_builder-185
+    image: gcr.io/pso-helmsman-cicd/jenkins-k8s-node:${env.JENKINS_CONTAINER_VERSION}
     command: ['cat']
     tty: true
     volumeMounts:
diff --git a/test/make.sh b/test/make.sh
@@ -49,7 +49,7 @@ function docker() {
 function check_terraform() {
   echo "Running terraform validate"
   #shellcheck disable=SC2156
-  find . -name "*.tf" -exec bash -c 'terraform validate --check-variables=false $(dirname "{}")' \;
+  find . -name "*.tf" -exec bash -c 'terraform validate $(dirname "{}")' \;
 }
 
 # This function runs 'go fmt' and 'go vet' on eery file

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ function docker() {`
`49`	`49`	`function check_terraform() {`
`50`	`50`	`echo "Running terraform validate"`
`51`	`51`	`#shellcheck disable=SC2156`
`52`		`- find . -name "*.tf" -exec bash -c 'terraform validate --check-variables=false $(dirname "{}")' \;`
	`52`	`+ find . -name "*.tf" -exec bash -c 'terraform validate $(dirname "{}")' \;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`# This function runs 'go fmt' and 'go vet' on eery file`