passwords as env var

intelops · Mar 12, 2024 · 2360a70 · 2360a70
1 parent 8da3b5b
commit 2360a70
Show file tree

Hide file tree

Showing 145 changed files with 243 additions and 1,336 deletions.
diff --git a/charts/quality-trace/charts/postgresql/templates/primary/statefulset.yaml b/charts/quality-trace/charts/postgresql/templates/primary/statefulset.yaml
@@ -236,6 +236,8 @@ spec:
             - name: POSTGRES_DB
               value: {{ (include "postgresql.database" .) | quote }}
             {{- end }}
+            - name: POSTGRES_PWD
+              value: "postgres"
             # Replication
             {{- if or (eq .Values.architecture "replication") .Values.primary.standby.enabled }}
             - name: POSTGRES_REPLICATION_MODE

diff --git a/charts/quality-trace/charts/postgresql/templates/read/statefulset.yaml b/charts/quality-trace/charts/postgresql/templates/read/statefulset.yaml
@@ -226,6 +226,8 @@ spec:
                   name: {{ include "postgresql.secretName" . }}
                   key: {{ include "postgresql.userPasswordKey" . }}
             {{- end }}
+            - name: POSTGRES_PWD
+              value: "postgres"
             # Replication
             - name: POSTGRES_REPLICATION_MODE
               value: "slave"

diff --git a/charts/quality-trace/templates/deployment.yaml b/charts/quality-trace/templates/deployment.yaml
@@ -35,6 +35,8 @@ spec:
           env:
           - name: TRACETEST_DEV
             value: "{{ .Values.env.tracetestDev }}"
+          - name: TRACETEST_PWD
+            value: "{{ .Values.auth.password }}"
           args:
           - --config
           - '/app/config/config.yaml'

diff --git a/cli/installer/docker_compose.go b/cli/installer/docker_compose.go
@@ -130,6 +130,7 @@ func getDockerComposeFileContents(ui cliUI.UI, config configuration) []byte {
 	sout := fixPortConfig(string(output))
 	sout = strings.ReplaceAll(sout, "$", "$$")
 	sout = strings.ReplaceAll(sout, "$${TRACETEST_DEV}", "${TRACETEST_DEV}")
+	sout += "\nTRACETEST_PWD: ${TRACETEST_PWD}"
 
 	return []byte(sout)
 }

diff --git a/cli/installer/kubernetes.go b/cli/installer/kubernetes.go
@@ -139,7 +139,7 @@ func installOtelCollector(conf configuration, ui cliUI.UI) {
 }
 
 func fixTracetestConfiguration(conf configuration, ui cliUI.UI) {
-	c := getTracetestConfigFileContents("tracetest-postgresql", "tracetest", "not-secure-database-password", ui, conf)
+	c := getTracetestConfigFileContents("tracetest-postgresql", "tracetest", "${TRACETEST_PWD}", ui, conf)
 	ttc := createTmpFile("tracetest-config", string(c), ui)
 	defer os.Remove(ttc.Name())
 
@@ -171,6 +171,11 @@ func installTracetestChart(conf configuration, ui cliUI.UI) {
 	if os.Getenv("TRACETEST_DEV") != "" {
 		cmd = append(cmd, "--set env.tracetestDev=true")
 	}
+	// Set TRACETEST_PWD as an environment variable if it's not already set
+	tracetestPwd := os.Getenv("TRACETEST_PWD")
+	if tracetestPwd == "" {
+    	os.Setenv("TRACETEST_PWD", "not-secure-database-password")
+	}
 
 	execCmd(helmCmd(conf, cmd...), ui)
 }

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -27,11 +27,12 @@ services:
         condition: service_healthy
     environment:
       TRACETEST_DEV: ${TRACETEST_DEV}
+      TRACETEST_PWD: ${TRACETEST_PWD}
 
   postgres:
     image: postgres:14
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     ports:
       - 5432:5432

diff --git a/docs/docs/ci-cd-automation/github-actions-pipeline.md b/docs/docs/ci-cd-automation/github-actions-pipeline.md
@@ -284,11 +284,12 @@ services:
       retries: 60
     environment:
       TRACETEST_DEV: ${TRACETEST_DEV}
+      TRACETEST_PWD: ${TRACETEST_PWD}
 
   postgres:
     image: postgres:14
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     healthcheck:
       test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
@@ -313,7 +314,7 @@ The `tracetest-config.yaml` file contains the basic setup of connecting Tracetes
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/docs/docs/configuration/server.md b/docs/docs/configuration/server.md
@@ -10,7 +10,7 @@ This is an example of a `tracetest.yaml` file:
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/docs/docs/deployment/overview.md b/docs/docs/deployment/overview.md
@@ -40,7 +40,7 @@ Tracetest can be configured via a configuration file:
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/...orials/recipes/running-python-app-with-opentelemetry-collector-and-tracetest.md b/...orials/recipes/running-python-app-with-opentelemetry-collector-and-tracetest.md
@@ -155,11 +155,12 @@ services:
       retries: 60
     environment:
       TRACETEST_DEV: ${TRACETEST_DEV}
+      TRACETEST_PWD: ${TRACETEST_PWD}
 
   postgres:
     image: postgres:14
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     healthcheck:
       test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
@@ -185,7 +186,7 @@ The `tracetest-config.yaml` file contains the basic setup of connecting Tracetes
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/docs/docs/examples-tutorials/recipes/running-tracetest-with-aws-x-ray-adot.md b/docs/docs/examples-tutorials/recipes/running-tracetest-with-aws-x-ray-adot.md
@@ -127,7 +127,7 @@ services:
   postgres:
     image: postgres:14
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     healthcheck:
       test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
@@ -162,7 +162,7 @@ The `tracetest.config.yaml` file contains the basic setup of connecting Tracetes
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/docs/docs/examples-tutorials/recipes/running-tracetest-with-aws-x-ray-pokeshop.md b/docs/docs/examples-tutorials/recipes/running-tracetest-with-aws-x-ray-pokeshop.md
@@ -243,7 +243,7 @@ services:
   postgres:
     image: postgres:14
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     healthcheck:
       test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
@@ -278,7 +278,7 @@ The `tracetest.config.yaml` file contains the basic setup of connecting Tracetes
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/docs/docs/examples-tutorials/recipes/running-tracetest-with-aws-x-ray.md b/docs/docs/examples-tutorials/recipes/running-tracetest-with-aws-x-ray.md
@@ -127,7 +127,7 @@ services:
   postgres:
     image: postgres:14
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     healthcheck:
       test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
@@ -156,7 +156,7 @@ The `tracetest.config.yaml` file contains the basic setup of connecting Tracetes
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/...amples-tutorials/recipes/running-tracetest-with-azure-app-insights-collector.md b/...amples-tutorials/recipes/running-tracetest-with-azure-app-insights-collector.md
@@ -93,7 +93,7 @@ The `docker-compose.yaml` includes three other services.
 services:
   postgres:
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     healthcheck:
       test:
@@ -118,6 +118,7 @@ services:
         condition: service_healthy
     environment:
       TRACETEST_DEV: ${TRACETEST_DEV}
+      TRACETEST_PWD: ${TRACETEST_PWD}
     extra_hosts:
       host.docker.internal: host-gateway
     healthcheck:
@@ -168,7 +169,7 @@ The `tracetest.config.yaml` file contains the basic setup of connecting Tracetes
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/...xamples-tutorials/recipes/running-tracetest-with-azure-app-insights-pokeshop.md b/...xamples-tutorials/recipes/running-tracetest-with-azure-app-insights-pokeshop.md
@@ -248,7 +248,7 @@ services:
   postgres:
     image: postgres:14
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     healthcheck:
       test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
@@ -279,7 +279,7 @@ The `tracetest.config.yaml` file contains the basic setup of connecting Tracetes
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/docs/docs/examples-tutorials/recipes/running-tracetest-with-azure-app-insights.md b/docs/docs/examples-tutorials/recipes/running-tracetest-with-azure-app-insights.md
@@ -97,7 +97,7 @@ The `docker-compose.yaml` includes two other services.
 services:
   postgres:
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     healthcheck:
       test:
@@ -117,6 +117,7 @@ services:
         condition: service_healthy
     environment:
       TRACETEST_DEV: ${TRACETEST_DEV}
+      TRACETEST_PWD: ${TRACETEST_PWD}
     extra_hosts:
       host.docker.internal: host-gateway
     healthcheck:
@@ -156,7 +157,7 @@ The `tracetest.config.yaml` file contains the basic setup of connecting Tracetes
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/docs/docs/examples-tutorials/recipes/running-tracetest-with-datadog.md b/docs/docs/examples-tutorials/recipes/running-tracetest-with-datadog.md
@@ -99,12 +99,13 @@ services:
         condition: service_started
     environment:
       TRACETEST_DEV: ${TRACETEST_DEV}
+      TRACETEST_PWD: ${TRACETEST_PWD}
 
   tt-postgres:
     image: postgres:14
     container_name: tt-postgres
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     healthcheck:
       test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
@@ -141,7 +142,7 @@ The `tracetest-config.yaml` file contains the basic setup of connecting Tracetes
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/docs/docs/examples-tutorials/recipes/running-tracetest-with-dynatrace.md b/docs/docs/examples-tutorials/recipes/running-tracetest-with-dynatrace.md
@@ -98,12 +98,13 @@ services:
         condition: service_started
     environment:
       TRACETEST_DEV: ${TRACETEST_DEV}
+      TRACETEST_PWD: ${TRACETEST_PWD}
 
   tt-postgres:
     image: postgres:14
     container_name: tt-postgres
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     healthcheck:
       test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
@@ -139,7 +140,7 @@ The `tracetest-config.yaml` file contains the basic setup of connecting Tracetes
 postgres:
   host: tt-postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/docs/docs/examples-tutorials/recipes/running-tracetest-with-honeycomb.md b/docs/docs/examples-tutorials/recipes/running-tracetest-with-honeycomb.md
@@ -159,11 +159,12 @@ services:
         condition: service_started
     environment:
       TRACETEST_DEV: ${TRACETEST_DEV}
+      TRACETEST_PWD: ${TRACETEST_PWD}
 
   postgres:
     image: postgres:14
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     healthcheck:
       test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
@@ -199,7 +200,7 @@ The `tracetest-config.yaml` file contains the basic setup of connecting Tracetes
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/docs/docs/examples-tutorials/recipes/running-tracetest-with-jaeger.md b/docs/docs/examples-tutorials/recipes/running-tracetest-with-jaeger.md
@@ -163,11 +163,12 @@ services:
       retries: 60
     environment:
       TRACETEST_DEV: ${TRACETEST_DEV}
+      TRACETEST_PWD: ${TRACETEST_PWD}
 
   postgres:
     image: postgres:14
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     healthcheck:
       test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
@@ -209,7 +210,7 @@ The `tracetest-config.yaml` file contains the basic setup of connecting Tracetes
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/docs/docs/examples-tutorials/recipes/running-tracetest-with-lightstep.md b/docs/docs/examples-tutorials/recipes/running-tracetest-with-lightstep.md
@@ -92,11 +92,12 @@ services:
         condition: service_started
     environment:
       TRACETEST_DEV: ${TRACETEST_DEV}
+      TRACETEST_PWD: ${TRACETEST_PWD}
 
   postgres:
     image: postgres:14
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     healthcheck:
       test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
@@ -132,7 +133,7 @@ The `tracetest-config.yaml` file contains the basic setup of connecting Tracetes
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable

diff --git a/docs/docs/examples-tutorials/recipes/running-tracetest-with-new-relic.md b/docs/docs/examples-tutorials/recipes/running-tracetest-with-new-relic.md
@@ -92,11 +92,12 @@ services:
         condition: service_started
     environment:
       TRACETEST_DEV: ${TRACETEST_DEV}
+      TRACETEST_PWD: ${TRACETEST_PWD}
 
   postgres:
     image: postgres:14
     environment:
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PWD}
       POSTGRES_USER: postgres
     healthcheck:
       test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
@@ -129,7 +130,7 @@ The `tracetest-config.yaml` file contains the basic setup of connecting Tracetes
 postgres:
   host: postgres
   user: postgres
-  password: postgres
+  password: ${POSTGRES_PWD}
   port: 5432
   dbname: postgres
   params: sslmode=disable