Merge pull request #12 from gohypergiant/develop

Fix issue with secrets and naming convention

.github/workflows/_deploy.yaml

@@ -12,19 +12,16 @@ on:
         required: false
 
 jobs:
-  set-fly-app-name:
-    uses: ./.github/workflows/set-fly-app-name.yaml
-    with:
-      ref: ${{ inputs.branch || github.head_ref || github.ref }} # Use the input if it's there, otherwise use the head ref, otherwise use the ref
-
   dev:
     concurrency: hg-sandbox
     if: github.ref == 'refs/heads/develop'
     uses: ./.github/workflows/deploy-to-fly.yaml
     secrets:
       fly_access_token: ${{ secrets.FLY_API_TOKEN }}
+      gloss_bot_slack_token: ${{ secrets.GLOSS_BOT_SLACK_TOKEN }}
+      slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}
     with:
-      app_name: glossary-bot-develop
+      app_name: hg-ops-glossarybot-develop
       environment: 'hg-sandbox'
 
   stable:
@@ -33,6 +30,8 @@ jobs:
     uses: ./.github/workflows/deploy-to-fly.yaml
     secrets:
       fly_access_token: ${{ secrets.FLY_API_TOKEN }}
+      gloss_bot_slack_token: ${{ secrets.GLOSS_BOT_SLACK_TOKEN }}
+      slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}
     with:
-      app_name: glossary-bot-stable
-      environment: 'Hypergiant'
+      app_name: hg-ops-glossarybot-stable
+      environment: 'Hypergiant'

.github/workflows/deploy-to-fly.yaml

@@ -16,6 +16,12 @@ on:
       fly_access_token:
         description: 'Fly access token'
         required: true
+      gloss_bot_slack_token:
+        description: 'Gloss Bot Slack Token'
+        required: true
+      slack_webhook_url:
+        description: 'Slack Webhook URL'
+        required: true
 
 concurrency:
   group: ${{ inputs.app_name }} # Only one deploy at a time per app
@@ -54,8 +60,8 @@ jobs:
           --reuse-app \
           $(printf "%s" "$ENV_PARAMS" | sed 's/^/-e /') \
           -e FLY_APP_NAME=${{ inputs.app_name }} \
-          -e SLACK_TOKEN=${{ secrets.GLOSS_BOT_SLACK_TOKEN }} \
-          -e SLACK_WEBHOOK_URL=${{ secrets.SLACK_WEBHOOK_URL }} \
+          -e SLACK_TOKEN=${{ secrets.gloss_bot_slack_token }} \
+          -e SLACK_WEBHOOK_URL=${{ secrets.slack_webhook_url }} \
   
   update-pr:
     runs-on: ubuntu-latest

fly.toml

@@ -3,7 +3,7 @@
 # See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 #
 
-app = "glossary-bot"
+app = "hg-ops-glossarybot"
 primary_region = "iad"
 
 [build]