Merge pull request #99 from kbst/testcredentials

pst · web-flow · commit d33dd6c49876 · 2020-04-17T12:20:59.000+02:00
Testcredentials
diff --git a/cloudbuild-cleanup.yaml b/cloudbuild-cleanup.yaml
@@ -1,6 +1,9 @@
 substitutions:
     _HOME: /workspace/tests/.user
     _TF_IN_AUTOMATION: "1"
+    _KBST_AUTH_AWS: ""
+    _KBST_AUTH_AZ: ""
+    _KBST_AUTH_GCLOUD: ""
 
 steps:
 - id: docker build
@@ -12,6 +15,16 @@ steps:
   - kbst-infra-automation:bootstrap
   - ci-cd/
 
+- id: authenticate
+  name: 'kbst-infra-automation:bootstrap'
+  dir: tests
+  env:
+  - HOME=$_HOME
+  - TF_IN_AUTOMATION=$_TF_IN_AUTOMATION
+  - KBST_AUTH_AWS=$_KBST_AUTH_AWS
+  - KBST_AUTH_AZ=$_KBST_AUTH_AZ
+  - KBST_AUTH_GCLOUD=$_KBST_AUTH_GCLOUD
+
 - id: terraform init
   name: 'kbst-infra-automation:bootstrap'
   dir: tests
diff --git a/cloudbuild-graph.yaml b/cloudbuild-graph.yaml
@@ -1,6 +1,9 @@
 substitutions:
     _HOME: /workspace/tests/.user
     _TF_IN_AUTOMATION: "1"
+    _KBST_AUTH_AWS: ""
+    _KBST_AUTH_AZ: ""
+    _KBST_AUTH_GCLOUD: ""
 
 steps:
 - id: docker build
@@ -12,6 +15,16 @@ steps:
   - kbst-infra-automation:bootstrap
   - ci-cd/
 
+- id: authenticate
+  name: 'kbst-infra-automation:bootstrap'
+  dir: tests
+  env:
+  - HOME=$_HOME
+  - TF_IN_AUTOMATION=$_TF_IN_AUTOMATION
+  - KBST_AUTH_AWS=$_KBST_AUTH_AWS
+  - KBST_AUTH_AZ=$_KBST_AUTH_AZ
+  - KBST_AUTH_GCLOUD=$_KBST_AUTH_GCLOUD
+
 - id: terraform init
   name: 'kbst-infra-automation:bootstrap'
   dir: tests
diff --git a/cloudbuild-providers.yaml b/cloudbuild-providers.yaml
@@ -1,6 +1,9 @@
 substitutions:
     _HOME: /workspace/tests/.user
     _TF_IN_AUTOMATION: "1"
+    _KBST_AUTH_AWS: ""
+    _KBST_AUTH_AZ: ""
+    _KBST_AUTH_GCLOUD: ""
 
 steps:
 - id: docker build
@@ -12,6 +15,16 @@ steps:
   - kbst-infra-automation:bootstrap
   - ci-cd/
 
+- id: authenticate
+  name: 'kbst-infra-automation:bootstrap'
+  dir: tests
+  env:
+  - HOME=$_HOME
+  - TF_IN_AUTOMATION=$_TF_IN_AUTOMATION
+  - KBST_AUTH_AWS=$_KBST_AUTH_AWS
+  - KBST_AUTH_AZ=$_KBST_AUTH_AZ
+  - KBST_AUTH_GCLOUD=$_KBST_AUTH_GCLOUD
+
 - id: terraform init
   name: 'kbst-infra-automation:bootstrap'
   dir: tests
diff --git a/cloudbuild-test.yaml b/cloudbuild-test.yaml
@@ -1,6 +1,9 @@
 substitutions:
     _HOME: /workspace/tests/.user
     _TF_IN_AUTOMATION: "1"
+    _KBST_AUTH_AWS: ""
+    _KBST_AUTH_AZ: ""
+    _KBST_AUTH_GCLOUD: ""
 
 steps:
 - id: docker build
@@ -12,12 +15,23 @@ steps:
   - kbst-infra-automation:bootstrap
   - ci-cd/
 
+- id: authenticate
+  name: 'kbst-infra-automation:bootstrap'
+  dir: tests
+  env:
+  - HOME=$_HOME
+  - TF_IN_AUTOMATION=$_TF_IN_AUTOMATION
+  - KBST_AUTH_AWS=$_KBST_AUTH_AWS
+  - KBST_AUTH_AZ=$_KBST_AUTH_AZ
+  - KBST_AUTH_GCLOUD=$_KBST_AUTH_GCLOUD
+
 - id: terraform init
   name: 'kbst-infra-automation:bootstrap'
   dir: tests
   env:
   - HOME=$_HOME
   - TF_IN_AUTOMATION=$_TF_IN_AUTOMATION
+  - TF_LOG=debug
   args:
   - terraform
   - init
diff --git a/quickstart/src/ci-cd/entrypoint b/quickstart/src/ci-cd/entrypoint
@@ -1,9 +1,13 @@
 #!/bin/sh
 set -e
 
-mkdir -p /infra/.user
+# home may be modified from multiple sources
+# try to normalize before using it in paths below
+REALHOME=$(realpath $HOME)
 
-echo "kbst:x:$(id -u):$(id -g):Kubestack User:/infra/.user:/bin/sh" > /tmp/passwd
+mkdir -p $REALHOME
+
+echo "kbst:x:$(id -u):$(id -g):Kubestack User:${REALHOME}:/bin/sh" > /tmp/passwd
 
 export LD_PRELOAD=libnss_wrapper.so
 export NSS_WRAPPER_PASSWD=/tmp/passwd
@@ -12,7 +16,7 @@ export NSS_WRAPPER_GROUP=/etc/group
 #
 #
 # AWS auth
-AWS_CONFIG_PATH=/infra/.user/.aws
+AWS_CONFIG_PATH=$REALHOME/.aws
 mkdir -p $AWS_CONFIG_PATH
 
 # handle base64 encoded AWS crendentials
@@ -25,7 +29,7 @@ fi
 #
 #
 # Azure auth
-AZ_CONFIG_PATH=/infra/.user/.azure
+AZ_CONFIG_PATH=$REALHOME/.azure
 mkdir -p $AZ_CONFIG_PATH
 touch $AZ_CONFIG_PATH/KBST_AUTH_AZ
 
@@ -49,7 +53,7 @@ export ARM_TENANT_ID
 #
 #
 # Gcloud auth
-GCLOUD_CONFIG_PATH=/infra/.user/.config/gcloud
+GCLOUD_CONFIG_PATH=$REALHOME/.config/gcloud
 mkdir -p $GCLOUD_CONFIG_PATH
 
 # handle base64 encoded GCLOUD crendentials

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,13 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`	`set -e`
`3`	`3`
`4`		`-mkdir -p /infra/.user`
	`4`	`+# home may be modified from multiple sources`
	`5`	`+# try to normalize before using it in paths below`
	`6`	`+REALHOME=$(realpath $HOME)`
`5`	`7`
`6`		`-echo "kbst:x:$(id -u):$(id -g):Kubestack User:/infra/.user:/bin/sh" > /tmp/passwd`
	`8`	`+mkdir -p $REALHOME`
	`9`	`+`
	`10`	`+echo "kbst:x:$(id -u):$(id -g):Kubestack User:${REALHOME}:/bin/sh" > /tmp/passwd`
`7`	`11`
`8`	`12`	`export LD_PRELOAD=libnss_wrapper.so`
`9`	`13`	`export NSS_WRAPPER_PASSWD=/tmp/passwd`
`@@ -12,7 +16,7 @@ export NSS_WRAPPER_GROUP=/etc/group`
`12`	`16`	`#`
`13`	`17`	`#`
`14`	`18`	`# AWS auth`
`15`		`-AWS_CONFIG_PATH=/infra/.user/.aws`
	`19`	`+AWS_CONFIG_PATH=$REALHOME/.aws`
`16`	`20`	`mkdir -p $AWS_CONFIG_PATH`
`17`	`21`
`18`	`22`	`# handle base64 encoded AWS crendentials`
`@@ -25,7 +29,7 @@ fi`
`25`	`29`	`#`
`26`	`30`	`#`
`27`	`31`	`# Azure auth`
`28`		`-AZ_CONFIG_PATH=/infra/.user/.azure`
	`32`	`+AZ_CONFIG_PATH=$REALHOME/.azure`
`29`	`33`	`mkdir -p $AZ_CONFIG_PATH`
`30`	`34`	`touch $AZ_CONFIG_PATH/KBST_AUTH_AZ`
`31`	`35`
`@@ -49,7 +53,7 @@ export ARM_TENANT_ID`
`49`	`53`	`#`
`50`	`54`	`#`
`51`	`55`	`# Gcloud auth`
`52`		`-GCLOUD_CONFIG_PATH=/infra/.user/.config/gcloud`
	`56`	`+GCLOUD_CONFIG_PATH=$REALHOME/.config/gcloud`
`53`	`57`	`mkdir -p $GCLOUD_CONFIG_PATH`
`54`	`58`
`55`	`59`	`# handle base64 encoded GCLOUD crendentials`