send test email

ocadotechnology · Dec 29, 2023 · d923343 · d923343
1 parent 44a81ed
commit d923343
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/.github/actions/python/send-email/__main__.py b/.github/actions/python/send-email/__main__.py
@@ -25,9 +25,8 @@ def get_settings():
         A tuple with the values (region, auth, timeout).
     """
 
-    region = json.loads(os.getenv("REGION", ""))
+    region = os.getenv("REGION", "")
     assert region != "", "Region path parameter not set."
-    raise Exception(region)
 
     auth = os.getenv("AUTH", "")
     assert auth != "", "Authorization header not set."
@@ -48,13 +47,20 @@ def get_json_body() -> JsonBody:
 
     body: JsonBody = {}
 
-    def set_value(env_key: str, body_key: str, required: bool):
+    def set_value(
+        env_key: str,
+        body_key: str,
+        required: bool,
+        json_loads: bool = True,
+    ):
         """Helper to parse environment variables into body parameters.
 
         Args:
             env_key: The key of the environment variable.
             body_key: The key of the body parameter.
             required: If this value is required in the request.
+            json_loads: If the value should be parsed as a JSON object. Strings
+                don't need to be parsed as JSON.
         """
 
         raw_value = os.getenv(env_key, "")
@@ -63,7 +69,7 @@ def set_value(env_key: str, body_key: str, required: bool):
             assert raw_value != "", f'"{env_key}" environment variable not set.'
 
         if raw_value != "":
-            body[body_key] = json.loads(raw_value)
+            body[body_key] = json.loads(raw_value) if json_loads else raw_value
 
     set_value(
         env_key="TO_ADDRESSES",
@@ -84,6 +90,7 @@ def set_value(env_key: str, body_key: str, required: bool):
         env_key="FROM_ADDRESS",
         body_key="fromAddress",
         required=False,
+        json_loads=False,
     )
     set_value(
         env_key="CAMPAIGN_ID",
@@ -99,6 +106,7 @@ def set_value(env_key: str, body_key: str, required: bool):
         env_key="METADATA",
         body_key="metadata",
         required=False,
+        json_loads=False,
     )
     set_value(
         env_key="ATTACHMENTS",

diff --git a/.github/actions/python/send-email/action.yaml b/.github/actions/python/send-email/action.yaml
@@ -49,14 +49,14 @@ runs:
       working-directory: ${{ github.action_path }}
       run: pipenv run python .
       env:
-        REGION: '"${{ inputs.region }}"'
+        REGION: ${{ inputs.region }}
         AUTH: ${{ inputs.auth }}
         TIMEOUT: ${{ inputs.timeout }}
         TO_ADDRESSES: ${{ inputs.to-addresses }}
         CC_ADDRESSES: ${{ inputs.cc-addresses }}
         BCC_ADDRESSES: ${{ inputs.bcc-addresses }}
-        FROM_ADDRESS: "${{ inputs.from-address }}"
+        FROM_ADDRESS: ${{ inputs.from-address }}
         CAMPAIGN_ID: ${{ inputs.campaign-id }}
         PERSONALIZATION_VALUES: ${{ inputs.personalization-values }}
-        METADATA: "${{ inputs.metadata }}"
+        METADATA: ${{ inputs.metadata }}
         ATTACHMENTS: ${{ inputs.attachments }}
diff --git a/.github/workflows/contributing.yaml b/.github/workflows/contributing.yaml
@@ -35,6 +35,7 @@ jobs:
       - name: 📧 Send Email
         uses: ocadotechnology/codeforlife-workspace/.github/actions/python/send-email@new_contributor_validations # TODO: use @main
         with:
-          auth: ""
-          to-addresses: ""
-          campaign-id: 123
+          auth: ${{ secrets.DOTDIGITAL_API_USER_AUTH }}
+          to-addresses: '["stefan.kairinos@ocado.com"]' #${{ env.TO_ADDRESSES }}
+          campaign-id: 1506387
+          personalization-values: '[{"name": "PR_URL", "value": "https://www.codeforlife.education/"}]'