separate infra and app code workflows

Author: vuolen

.github/workflows/pull_request_app.yml

@@ -0,0 +1,25 @@
+name: Pulumi
+on:
+  pull_request:
+    paths-ignore:
+      - infra/**
+      - .github/workflows/pull_request_infra.yml
+jobs:
+  preview:
+    name: Pulumi Preview
+    runs-on: ubuntu-latest
+    permissions:
+      contents: "read"
+      id-token: "write"
+    steps:
+      - uses: actions/checkout@v4
+      - uses: "google-github-actions/auth@v2"
+        with:
+          project_id: "osakunta"
+          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+      - run: pip install -r requirements.txt
+      - uses: pulumi/actions@v6
+        with:
+          command: preview
+          stack-name: prod
+          cloud-url: ${{ secrets.PULUMI_CLOUD_URL }}

.github/workflows/pull_request.yml renamed to .github/workflows/pull_request_infra.yml

@@ -1,6 +1,9 @@
 name: Pulumi
 on:
-  - pull_request
+  pull_request:
+    paths:
+      - infra/**
+      - .github/workflows/pull_request_infra.yml
 jobs:
   preview:
     name: Pulumi Preview

README.md

@@ -1,5 +1,4 @@
-SatO Telegram Bot
-=================
+# SatO Telegram Bot
 
 This bot has some useful functionality for Satakuntalainen Osakunta. It can be found on Telegram as `@osakuntabot`.
 
@@ -10,9 +9,27 @@ Available commands:
     /ruokalista
     /tjviisi
 
+## Development
 
-Development
------------
+⚠️⚠️ Read the entirety of this section before making changes to the repository ⚠️⚠️
+
+### Development flow
+
+1. Always create a new branch for whatever you are working on
+2. When you're done, create a pull request
+3. Check the preview for what changes will be done upon deployment
+4. If everything looks good, merge the pull request and the changes will be automatically done
+
+### Warnings
+
+The code in the `master` branch is automatically deployed. Therefore you should be careful as to what you merge to this branch.
+
+Changes to the `infra/` directory modify the resources that are deployed on the cloud. These can incur extra cost if you are not careful.
+Changes to the application source code (`main.py`, `telegram_bot/`) can also incur costs if they run for long or consume a lot of resources (processor time, bandwidth)
+
+Be mindful to the changes you make. You can ask for help and comments on your pull request before merging. After large changes, monitor the costs incurred manually on the cloud dashboard.
+
+### Local development
 
 Get `pipenv` from [here](https://pipenv.pypa.io/en/latest/)
 
@@ -30,5 +47,4 @@ You can test the commands on commandline by:
 
     python main.py /command [args]
 
-The bot is hosted in Google Cloud Functions and CircleCI is used to continuously deploy new versions of the bot to GCP.
-NB! If you add dependencies to the project, remember to generate a new requirements.txt with `pipenv lock -r` and push it to the repo. Pipfile is not supported by Google Cloud Functions.
+NB! If you add dependencies to the project, remember to generate a new requirements.txt with `pipenv requirements > requirements.txt` and push it to the repo. Pipfile is not supported by Google Cloud Functions.

infra/__main__.py

@@ -1,29 +1,14 @@
-"""A Python Pulumi program"""
-
 import pulumi
 import pulumi_gcp as gcp
-import tarfile
-import hashlib
-
-# create .tar.gz source
-
-# SOURCE_TAR_NAME = "source.tar.gz"
-
-# tarfile_hash = None
-# with tarfile.open(SOURCE_TAR_NAME, "w|gz") as tar:
-#     tar.add("../telegram_bot", arcname="telegram_bot")
-#     tar.add("../main.py", arcname="main.py")
-#     tar.add("../requirements.txt", arcname="requirements.txt")
-#     last_modified = max([member.mtime for member in tar.getmembers()])
-#     tarfile_hash = hashlib.sha256(str(last_modified).encode()).hexdigest()
 
+# Be careful editing this file, if you are unfamiliar with Pulumi or the Google Cloud Platform.
+# Make sure you read the README.md in the root of this repository first.
 
 # setup infrastructure
 
 PROJECT_ID = "osakunta-telegram-bot"
 LOCATION = "europe-north1"
 
-
 # Set up secret to hold the Telegram API token
 telegram_bot_token = gcp.secretmanager.Secret("telegram-bot-token",
     secret_id="telegram-bot-token",
@@ -102,5 +87,4 @@
     name=function.name,
     role="roles/run.invoker",
     member="allUsers"
-)
-
+)