Merge pull request #136 from julwrites/staging

Fixing build errors in deploy

Author: julwrites

.github/workflows/automation.yml

@@ -1,9 +1,5 @@
 name: Build Test Automation
 on: 
-  push:
-    branches:
-      - master
-      - staging
   pull_request:
     branches:
       - master

.github/workflows/deployment.yml

@@ -1,15 +1,11 @@
 name: Build, Stage and Deploy Automation
 on: 
-  workflow_run:
-    workflows: ["Build Test Automation"]
-    types:
-      - completed
+  push:
     branches:
       - master
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
     steps:
       - name: Install Go

Dockerfile

@@ -7,12 +7,12 @@ RUN go mod download
 RUN go mod verify
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o /go/bin/main main.go
 
-FROM alpine:latest as certificates
+FROM alpine:latest AS certificates
 
 RUN apk --no-cache add ca-certificates
 
-FROM scratch as runner
-# FROM ubuntu:latest as runner
+FROM scratch AS runner
+# FROM ubuntu:latest AS runner
 
 ARG GCLOUD_PROJECT_ID
 ENV GCLOUD_PROJECT_ID=$GCLOUD_PROJECT_ID

pkg/bot/sub.go

@@ -6,8 +6,9 @@ import (
 
 	"github.com/julwrites/BotPlatform/pkg/def"
 	"github.com/julwrites/BotPlatform/pkg/platform"
-	"github.com/julwrites/BotPlatform/pkg/secrets"
+	bpsecrets "github.com/julwrites/BotPlatform/pkg/secrets"
 	"github.com/julwrites/ScriptureBot/pkg/app"
+	"github.com/julwrites/ScriptureBot/pkg/secrets"
 	"github.com/julwrites/ScriptureBot/pkg/utils"
 )
 
@@ -53,10 +54,15 @@ func HandleSubscriptionPublish(env def.SessionData) def.SessionData {
 	return env
 }
 
-func SubscriptionHandler(secrets *secrets.SecretsData) {
+func SubscriptionHandler(localSecrets *secrets.SecretsData) {
 	env := def.SessionData{}
 
-	env.Secrets = *secrets
+	platformSecrets := bpsecrets.SecretsData{
+		TELEGRAM_ID: localSecrets.TELEGRAM_ID,
+		PROJECT_ID:  localSecrets.PROJECT_ID,
+	}
+
+	env.Secrets = platformSecrets
 	log.Printf("Loaded secrets...")
 
 	env.ResourcePath = "/go/bin/"