fix variable and sewcret handling

Author: Tom McLaughlin

.github/workflows/branch.yaml

@@ -122,7 +122,8 @@ jobs:
 #          template_file: packaged-stacksets-shipper-template.yaml
 #          stack_name: "${{ env.GITHUB_REPOSITORY_NAME_PART_SLUG_URL }}-${{ env.GITHUB_EVENT_REF_SLUG_URL }}-shipper"
 #          cfn_capabilities: CAPABILITY_NAMED_IAM,CAPABILITY_AUTO_EXPAND
-#          env_json: ${{ toJson(vars) }}
+#          env_json: ${{ toJson(env) }}
+#          vars_json: ${{ toJson(vars) }}
 #          secrets_json: ${{ toJson(secrets) }}
 
   deploy_shipping_stackset:
@@ -159,7 +160,8 @@ jobs:
 #          template_file: packaged-stacksets-shipping-template.yaml
 #          stack_name: "${{ env.GITHUB_REPOSITORY_NAME_PART_SLUG_URL }}-${{ env.GITHUB_EVENT_REF_SLUG_URL }}-shipping"
 #          cfn_capabilities: CAPABILITY_NAMED_IAM,CAPABILITY_AUTO_EXPAND
-#          env_json: ${{ toJson(vars) }}
+#          env_json: ${{ toJson(env) }}
+#          vars_json: ${{ toJson(vars) }}
 #          secrets_json: ${{ toJson(secrets) }}
 
   deploy_management:
@@ -196,5 +198,6 @@ jobs:
 #          template_file: packaged-template.yaml
 #          stack_name: "${{ env.GITHUB_REPOSITORY_NAME_PART_SLUG_URL }}-${{ env.GITHUB_EVENT_REF_SLUG_URL }}-management"
 #          cfn_capabilities: CAPABILITY_NAMED_IAM,CAPABILITY_AUTO_EXPAND
-#          env_json: ${{ toJson(vars) }}
+#          env_json: ${{ toJson(env) }}
+#          vars_json: ${{ toJson(vars) }}
 #          secrets_json: ${{ toJson(secrets) }}

.github/workflows/main.yaml

@@ -160,7 +160,8 @@ jobs:
           template_file: packaged-stacksets-shipping-template.yaml
           stack_name: "${{ env.GITHUB_REPOSITORY_NAME_PART_SLUG_URL }}-${{ env.GITHUB_EVENT_REF_SLUG_URL }}-shipping"
           cfn_capabilities: CAPABILITY_NAMED_IAM,CAPABILITY_AUTO_EXPAND
-          env_json: ${{ toJson(vars) }}
+          env_json: ${{ toJson(env) }}
+          vars_json: ${{ toJson(vars) }}
           secrets_json: ${{ toJson(secrets) }}
 
   deploy_management:
@@ -197,5 +198,6 @@ jobs:
           template_file: packaged-template.yaml
           stack_name: "${{ env.GITHUB_REPOSITORY_NAME_PART_SLUG_URL }}-${{ env.GITHUB_EVENT_REF_SLUG_URL }}-management"
           cfn_capabilities: CAPABILITY_NAMED_IAM,CAPABILITY_AUTO_EXPAND
-          env_json: ${{ toJson(vars) }}
+          env_json: ${{ toJson(env) }}
+          vars_json: ${{ toJson(vars) }}
           secrets_json: ${{ toJson(secrets) }}