Add SECRET_ prefix to secret version.

.env.sample

@@ -1,14 +1,20 @@
-TYPE=abra-integration-test-recipe
+TYPE=abra-test-recipe
 
-DOMAIN=abra-integration-test-recipe.example.com
+DOMAIN=abra-test-recipe.example.com
 
 COMPOSE_FILE="compose.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.extra_env.yml"
 
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.{{ .Name }}.example.com`'
 
 LETS_ENCRYPT_ENV=production
 
+WITH_COMMENT=foo # should be removed
+
 SECRET_TEST_PASS_ONE_VERSION=v1
 SECRET_TEST_PASS_TWO_VERSION=v1 # length=10
 #SECRET_EXTRA_PASS_VERSION=v1
+
+NETWORK_WITH_COMMENT=BAZ # should be removed
+#SECRET_LONG_SECRET_VERSION=v1

README.md

@@ -1,6 +1,6 @@
-# `abra-integration-test-recipe`
+# `abra-test-recipe`
 
-Test recipe used in the Abra integration test suite.
+Simple app configuration used for the Abra test suite.
 
 <!-- metadata -->
 

abra.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+export OUTER_FOO=baz
+
 test_cmd(){
   echo "baz"
 }
@@ -11,3 +13,12 @@ test_cmd_arg(){
 test_cmd_args(){
   echo "$1 $2"
 }
+
+test_cmd_export(){
+  export INNER_FOO=bar
+}
+
+# NOTE(d1): ensure "export ()" doesn't match on parsing of abra.sh env vars
+test_cmd_export (){
+  export INNER_BAZ=bing
+}

compose.extra_env.yml

@@ -0,0 +1,7 @@
+---
+version: "3.8"
+
+services:
+  app:
+    environment:
+      - FOO=bar

compose.long_secret.yml

@@ -0,0 +1,12 @@
+---
+version: "3.8"
+
+services:
+  app:
+    secrets:
+      - long_secret
+
+secrets:
+  long_secret:
+    external: true
+    name: ${STACK_NAME}_long_secret1234567890_${SECRET_LONG_SECRET_VERSION}

compose.yml

@@ -4,8 +4,11 @@ version: "3.8"
 services:
   app:
     image: nginx:1.21.0
+    environment:
+      - TEST_ENV_STANZA=DING # should be removed
     networks:
       - proxy
+      - net_with_comment
     volumes:
       - test-volume:/var/www
     secrets:
@@ -42,7 +45,7 @@ services:
 secrets:
   test_pass_one:
     external: true
-    name: ${STACK_NAME}_test_pass_one_${SECRET_TEST_PASS_ONE_VERSION}
+    name: ${STACK_NAME}_test_pass_one_${SECRET_TEST_PASS_ONE_VERSION}  # should be removed
   test_pass_two:
     external: true
     name: ${STACK_NAME}_test_pass_two_${SECRET_TEST_PASS_TWO_VERSION}
@@ -53,3 +56,5 @@ volumes:
 networks:
   proxy:
     external: true
+  net_with_comment:
+    name: ${NETWORK_WITH_COMMENT}