Merge pull request #60 from koichiro/feature/extract-create-event-trigger

Separate Eventarc trigger and deployment into scripts

Author: koichiro

README.md

@@ -74,23 +74,33 @@ bundle exec rake test
 ```
 
 ### 4. Deployment
-Deploy using the provided `deploy.sh` or through a CI/CD pipeline like Cloud Build (see `cloudbuild.yaml`).
+Deploy the Cloud Run service with `deploy.sh` or through Cloud Build (`cloudbuild.yaml`). Create the Eventarc trigger separately with `scripts/create_trigger.sh`.
 
 ```bash
-chmod +x deploy.sh
+chmod +x deploy.sh scripts/create_trigger.sh
 
 SERVICE_NAME=airbnb-payouts-import \
-TRIGGER_NAME=airbnb-payouts-import-gcs-finalized \
 REGION=asia-northeast1 \
 PROJECT_ID=your-project-id \
-TRIGGER_BUCKET=your-bucket \
 SERVICE_ACCOUNT_EMAIL=etl-runner@your-project-id.iam.gserviceaccount.com \
 BQ_DATASET_ID=airbnb_management \
 BQ_TABLE_ID=earnings_cleaned \
 SLACK_WEBHOOK_URL=https://hooks.slack.com/services/... \
 ./deploy.sh
 ```
 
+Create or update the Eventarc trigger separately:
+
+```bash
+SERVICE_NAME=airbnb-payouts-import \
+TRIGGER_NAME=airbnb-payouts-import-gcs-finalized \
+REGION=asia-northeast1 \
+PROJECT_ID=your-project-id \
+TRIGGER_BUCKET=your-bucket \
+SERVICE_ACCOUNT_EMAIL=etl-runner@your-project-id.iam.gserviceaccount.com \
+./scripts/create_trigger.sh
+```
+
 ## 📊 Usage
 
 1. Export your **Transaction History** CSV from the Airbnb hosting dashboard.

cloudbuild.yaml

@@ -11,37 +11,6 @@ steps:
       - --source=.
       - --no-allow-unauthenticated
       - --update-env-vars=GCP_PROJECT_ID=${PROJECT_ID},BQ_DATASET_ID=${_BQ_DATASET_ID},BQ_TABLE_ID=${_BQ_TABLE_ID},SLACK_WEBHOOK_URL=${_SLACK_WEBHOOK_URL}
-  - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
-    entrypoint: bash
-    args:
-      - -c
-      - |
-        if gcloud eventarc triggers describe "${_TRIGGER_NAME}" --location="${_REGION}" >/dev/null 2>&1; then
-          gcloud eventarc triggers delete "${_TRIGGER_NAME}" --location="${_REGION}" --quiet
-        fi
-  - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
-    args:
-      - gcloud
-      - eventarc
-      - triggers
-      - create
-      - ${_TRIGGER_NAME}
-      - --location=${_REGION}
-      - --destination-run-service=${_SERVICE_NAME}
-      - --destination-run-region=${_REGION}
-      - --event-filters=type=google.cloud.storage.object.v1.finalized
-      - --event-filters=bucket=${_TRIGGER_BUCKET}
-      - --service-account=${_SERVICE_ACCOUNT_EMAIL}
-  - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
-    entrypoint: bash
-    args:
-      - -c
-      - |
-        _SUB=$(gcloud eventarc triggers describe "${_TRIGGER_NAME}" --location="${_REGION}" --format="value(transport.pubsub.subscription)" || echo "")
-        if [ ! -z "$${_SUB}" ]; then
-          echo "Updating subscription $${_SUB} ack-deadline to 600s"
-          gcloud pubsub subscriptions update "$${_SUB}" --ack-deadline=600
-        fi
 
 options:
   logging: CLOUD_LOGGING_ONLY
@@ -51,7 +20,5 @@ substitutions:
   _BQ_DATASET_ID: "REQUIRED_SET_IN_TRIGGER_UI"
   _BQ_TABLE_ID: "REQUIRED_SET_IN_TRIGGER_UI"
   _SERVICE_NAME: "airbnb-payouts-importer"
-  _TRIGGER_NAME: "airbnb-payouts-importer-trigger"
-  _TRIGGER_BUCKET: "REQUIRED_SET_IN_TRIGGER_UI"
   _SERVICE_ACCOUNT_EMAIL: "REQUIRED_SET_IN_TRIGGER_UI"
   _SLACK_WEBHOOK_URL: ""

deploy.sh

@@ -2,43 +2,6 @@
 
 set -euo pipefail
 
-SERVICE_NAME="${SERVICE_NAME:-airbnb-payouts-import}"
-TRIGGER_NAME="${TRIGGER_NAME:-${SERVICE_NAME}-gcs-finalized}"
-REGION="${REGION:-asia-northeast1}"
-TRIGGER_BUCKET="${TRIGGER_BUCKET:-YOUR_BUCKET_NAME}"
-PROJECT_ID="${PROJECT_ID:-YOUR_PROJECT_ID}"
-SERVICE_ACCOUNT_EMAIL="${SERVICE_ACCOUNT_EMAIL:-YOUR_SERVICE_ACCOUNT_EMAIL}"
-BQ_DATASET_ID="${BQ_DATASET_ID:-airbnb_management}"
-BQ_TABLE_ID="${BQ_TABLE_ID:-earnings_cleaned}"
-SLACK_WEBHOOK_URL="${SLACK_WEBHOOK_URL:-}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-echo "Deploying Cloud Run service ${SERVICE_NAME} to ${REGION}..."
-
-gcloud run deploy "${SERVICE_NAME}" \
-  --project "${PROJECT_ID}" \
-  --region "${REGION}" \
-  --source . \
-  --memory 512Mi \
-  --service-account "${SERVICE_ACCOUNT_EMAIL}" \
-  --no-allow-unauthenticated \
-  --set-env-vars "GCP_PROJECT_ID=${PROJECT_ID},BQ_DATASET_ID=${BQ_DATASET_ID},BQ_TABLE_ID=${BQ_TABLE_ID},SLACK_WEBHOOK_URL=${SLACK_WEBHOOK_URL}"
-
-echo "Creating or updating Eventarc trigger ${TRIGGER_NAME}..."
-
-if gcloud eventarc triggers describe "${TRIGGER_NAME}" --project "${PROJECT_ID}" --location "${REGION}" >/dev/null 2>&1; then
-  gcloud eventarc triggers delete "${TRIGGER_NAME}" \
-    --project "${PROJECT_ID}" \
-    --location "${REGION}" \
-    --quiet
-fi
-
-gcloud eventarc triggers create "${TRIGGER_NAME}" \
-  --project "${PROJECT_ID}" \
-  --location "${REGION}" \
-  --destination-run-service "${SERVICE_NAME}" \
-  --destination-run-region "${REGION}" \
-  --event-filters "type=google.cloud.storage.object.v1.finalized" \
-  --event-filters "bucket=${TRIGGER_BUCKET}" \
-  --service-account "${SERVICE_ACCOUNT_EMAIL}"
-
-echo "Deployment complete."
+exec "${SCRIPT_DIR}/scripts/deploy.sh" "$@"

plan/specification.md

@@ -161,10 +161,10 @@ Cloud Run サービスアカウント:
 
 ## Deployment Shape
 
-デプロイは `deploy.sh` と `cloudbuild.yaml` を基準にする。
+デプロイは `deploy.sh` / `scripts/deploy.sh` と `cloudbuild.yaml` を基準にする。
 
 - `gcloud run deploy --source .`
-- Eventarc trigger 作成
+- Eventarc trigger 作成は `scripts/create_trigger.sh` で別実行
 - Cloud Run 環境変数注入
 - 必要に応じて Slack webhook を設定
 

scripts/create_trigger.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -euo pipefail
+
+SERVICE_NAME="${SERVICE_NAME:-airbnb-payouts-import}"
+TRIGGER_NAME="${TRIGGER_NAME:-${SERVICE_NAME}-gcs-finalized}"
+REGION="${REGION:-asia-northeast1}"
+TRIGGER_BUCKET="${TRIGGER_BUCKET:-YOUR_BUCKET_NAME}"
+PROJECT_ID="${PROJECT_ID:-YOUR_PROJECT_ID}"
+SERVICE_ACCOUNT_EMAIL="${SERVICE_ACCOUNT_EMAIL:-YOUR_SERVICE_ACCOUNT_EMAIL}"
+
+echo "Creating or updating Eventarc trigger ${TRIGGER_NAME}..."
+
+if gcloud eventarc triggers describe "${TRIGGER_NAME}" --project "${PROJECT_ID}" --location "${REGION}" >/dev/null 2>&1; then
+  gcloud eventarc triggers delete "${TRIGGER_NAME}" \
+    --project "${PROJECT_ID}" \
+    --location "${REGION}" \
+    --quiet
+fi
+
+gcloud eventarc triggers create "${TRIGGER_NAME}" \
+  --project "${PROJECT_ID}" \
+  --location "${REGION}" \
+  --destination-run-service "${SERVICE_NAME}" \
+  --destination-run-region "${REGION}" \
+  --event-filters "type=google.cloud.storage.object.v1.finalized" \
+  --event-filters "bucket=${TRIGGER_BUCKET}" \
+  --service-account "${SERVICE_ACCOUNT_EMAIL}"
+
+SUBSCRIPTION="$(
+  gcloud eventarc triggers describe "${TRIGGER_NAME}" \
+    --project "${PROJECT_ID}" \
+    --location "${REGION}" \
+    --format="value(transport.pubsub.subscription)" || echo ""
+)"
+
+if [ -n "${SUBSCRIPTION}" ]; then
+  echo "Updating subscription ${SUBSCRIPTION} ack-deadline to 600s"
+  gcloud pubsub subscriptions update "${SUBSCRIPTION}" --ack-deadline=600
+fi
+
+echo "Eventarc trigger setup complete."

scripts/deploy.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -euo pipefail
+
+SERVICE_NAME="${SERVICE_NAME:-airbnb-payouts-import}"
+REGION="${REGION:-asia-northeast1}"
+PROJECT_ID="${PROJECT_ID:-YOUR_PROJECT_ID}"
+SERVICE_ACCOUNT_EMAIL="${SERVICE_ACCOUNT_EMAIL:-YOUR_SERVICE_ACCOUNT_EMAIL}"
+BQ_DATASET_ID="${BQ_DATASET_ID:-airbnb_management}"
+BQ_TABLE_ID="${BQ_TABLE_ID:-earnings_cleaned}"
+SLACK_WEBHOOK_URL="${SLACK_WEBHOOK_URL:-}"
+
+echo "Deploying Cloud Run service ${SERVICE_NAME} to ${REGION}..."
+
+gcloud run deploy "${SERVICE_NAME}" \
+  --project "${PROJECT_ID}" \
+  --region "${REGION}" \
+  --source . \
+  --memory 512Mi \
+  --service-account "${SERVICE_ACCOUNT_EMAIL}" \
+  --no-allow-unauthenticated \
+  --set-env-vars "GCP_PROJECT_ID=${PROJECT_ID},BQ_DATASET_ID=${BQ_DATASET_ID},BQ_TABLE_ID=${BQ_TABLE_ID},SLACK_WEBHOOK_URL=${SLACK_WEBHOOK_URL}"
+
+echo "Cloud Run deployment complete."