Remove address and port duplication (#59)

we define port and address in the spec. Signed-off-by: Bill Maxwell <[email protected]>
acorn-io · Sep 26, 2023 · 0237f59 · 0237f59
1 parent fe67964
commit 0237f59
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/rds/aurora/postgres/cluster/Acornfile b/rds/aurora/postgres/cluster/Acornfile
@@ -157,8 +157,8 @@ localData: info: """
 		ports: publish: ["8080/http"]
 	  env: {
 		  PGDATABASE: "@{@{service.}pg.data.dbName}"
-		  PGHOST: "@{@{service.}pg.data.address}"
-		  PGPORT: "@{@{service.}pg.data.port}"
+		  PGHOST: "@{@{service.}pg.address}"
+		  PGPORT: "@{@{service.}pg.ports.5432}"
 		  PGUSER: "@{@{service.}pg.secrets.admin.username}"
 		  PGPASSWORD: "@{@{service.}pg.secrets.admin.password}"
 		}

diff --git a/rds/aurora/postgres/cluster/examples/scratchpad/Acornfile b/rds/aurora/postgres/cluster/examples/scratchpad/Acornfile
@@ -8,8 +8,8 @@ containers: scratchpad: {
 	consumes: ["db"]
 	env: {
 		PGDATABASE: "@{service.db.data.dbName}"
-		PGHOST:     "@{service.db.data.address}"
-		PGPORT:     "@{service.db.data.port}"
+		PGHOST:     "@{service.db.address}"
+		PGPORT:     "@{service.db.ports.5432}"
 		PGUSER:     "@{service.db.secrets.admin.username}"
 		PGPASSWORD: "@{service.db.secrets.admin.password}"
 	}

diff --git a/rds/scripts/service.sh b/rds/scripts/service.sh
@@ -14,8 +14,6 @@ services: rds: {
   address: "${ADDRESS}"
   ports: [${PORT}]
   data: {
-    address: "${ADDRESS}"
-    port: "${PORT}"
     dbName: "${DB_NAME}"
   }
 }
@@ -33,4 +31,4 @@ if [ -z "${DB_USERNAME}" ]; then
   echo 'services: rds: secrets: ["admin"]' >> /run/secrets/output
 else
   echo 'services: rds: secrets: ["admin", "user"]' >> /run/secrets/output
-fi
+fi