Skip to content

Make Global bot primary and isolate legacy city bots - #84

Merged
escalopa merged 3 commits into
mainfrom
agent/global-first-readme-tests
Aug 27, 2026
Merged

escalopa merged 3 commits into
mainfrom
agent/global-first-readme-tests

Conversation

@escalopa

@escalopa escalopa commented Aug 27, 2026 •

Copy link
Copy Markdown
Owner

Summary

  • make the root README a Global-bot-first entry point
  • move all legacy city-bot source, modules, migrations, Terraform, scripts and supporting markdown into legacy/
  • add legacy/README.md as the dedicated maintenance guide for Kazan and Naples
  • update the legacy GitHub Actions workflow so tests, config output, Terraform, migrations, webhook setup and profile sync use legacy/... paths
  • add Mini App unit tests for occasion info-button wiring and mobile-only availability notices

Verification

  • workflow YAML parsing
  • terraform -chdir=legacy/infra/gcp fmt -check -recursive
  • legacy module replacement resolution for the root module and all three Cloud Function modules
  • git diff --check
  • local Go test execution remains unavailable because the installed Go 1.26.5 tool is paired with a Go 1.26.3 standard library; CI runs with a clean toolchain

@escalopa escalopa changed the title Make Global bot the repository entry point Make Global bot primary and isolate legacy city bots Aug 27, 2026
@github-actions

Copy link
Copy Markdown

Terraform Plan — dev

data.archive_file.reminder_zip: Reading...
data.archive_file.dispatcher_zip: Reading...
data.archive_file.loader_zip: Reading...
google_project_service.required["eventarc.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/eventarc.googleapis.com]
google_project_iam_member.deploy_pubsub_admin[0]: Refreshing state... [id=prayer-bot-infra/roles/pubsub.admin/serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com]
google_project_iam_member.deploy_eventarc_admin[0]: Refreshing state... [id=prayer-bot-infra/roles/eventarc.admin/serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com]
google_project_service.required["iam.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/iam.googleapis.com]
google_project_iam_member.deploy_cloudscheduler_admin[0]: Refreshing state... [id=prayer-bot-infra/roles/cloudscheduler.admin/serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com]
google_project_service.required["artifactregistry.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/artifactregistry.googleapis.com]
google_project_service.required["cloudresourcemanager.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/cloudresourcemanager.googleapis.com]
data.archive_file.dispatcher_zip: Read complete after 0s [id=2f4c927a5b2cf29a6b9d8cf6e42ed42554014d6d]
google_project_service.required["cloudscheduler.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/cloudscheduler.googleapis.com]
data.archive_file.reminder_zip: Read complete after 0s [id=7f7d4baebca7d12d4c74d87f72626b31eb403f6c]
google_project_service.required["run.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/run.googleapis.com]
google_project_service.required["pubsub.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/pubsub.googleapis.com]
google_project_service.required["cloudbuild.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/cloudbuild.googleapis.com]
google_project_service.required["storage.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/storage.googleapis.com]
data.archive_file.loader_zip: Read complete after 1s [id=b0465788382709e76d30efffab1a5ef5dd8ece30]
google_project_service.required["cloudfunctions.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/cloudfunctions.googleapis.com]
google_project_service.required["serviceusage.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/serviceusage.googleapis.com]
data.google_storage_project_service_account.gcs_account: Reading...
google_service_account.scheduler: Refreshing state... [id=projects/prayer-bot-infra/serviceAccounts/prayer-bot-scheduler-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_service_account.runtime: Refreshing state... [id=projects/prayer-bot-infra/serviceAccounts/prayer-bot-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_storage_bucket.source: Refreshing state... [id=prayer-bot-infra-prayer-bot-src-dev]
google_storage_bucket.data: Refreshing state... [id=prayer-bot-data-dev]
data.google_storage_project_service_account.gcs_account: Read complete after 0s [id=service-832489372636@gs-project-accounts.iam.gserviceaccount.com]
google_project_iam_member.gcs_pubsub_publisher: Refreshing state... [id=prayer-bot-infra/roles/pubsub.publisher/serviceAccount:service-832489372636@gs-project-accounts.iam.gserviceaccount.com]
google_project_iam_member.runtime_storage: Refreshing state... [id=prayer-bot-infra/roles/storage.objectViewer/serviceAccount:prayer-bot-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_project_iam_member.runtime_eventarc_receiver[0]: Refreshing state... [id=prayer-bot-infra/roles/eventarc.eventReceiver/serviceAccount:prayer-bot-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_project_iam_member.runtime_logging: Refreshing state... [id=prayer-bot-infra/roles/logging.logWriter/serviceAccount:prayer-bot-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_storage_bucket_iam_member.runtime_data_admin: Refreshing state... [id=b/prayer-bot-data-dev/roles/storage.objectAdmin/serviceAccount:prayer-bot-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_storage_bucket_object.dispatcher_zip: Refreshing state... [id=prayer-bot-infra-prayer-bot-src-dev-dispatcher-5260c68fe2bb85634a89dc460eeeac1f.zip]
google_storage_bucket_object.loader_zip: Refreshing state... [id=prayer-bot-infra-prayer-bot-src-dev-loader-0a6a5504d2b5ee5466450ee7d471545e.zip]
google_storage_bucket_object.reminder_zip: Refreshing state... [id=prayer-bot-infra-prayer-bot-src-dev-reminder-cbc44996afc9446be5c340ab35d00509.zip]
google_cloudfunctions2_function.dispatcher: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/functions/prayer-bot-dispatcher-dev]
google_cloudfunctions2_function.reminder: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/functions/prayer-bot-reminder-dev]
google_cloudfunctions2_function.loader: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/functions/prayer-bot-loader-dev]
google_cloud_run_v2_service_iam_member.reminder_scheduler[0]: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/services/prayer-bot-reminder-dev/roles/run.invoker/serviceAccount:prayer-bot-scheduler-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_cloud_run_v2_service_iam_member.dispatcher_public: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/services/prayer-bot-dispatcher-dev/roles/run.invoker/allUsers]
google_cloud_run_v2_service_iam_member.loader_eventarc[0]: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/services/prayer-bot-loader-dev/roles/run.invoker/serviceAccount:prayer-bot-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_cloud_scheduler_job.reminder[0]: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/jobs/prayer-bot-reminder-dev]
google_eventarc_trigger.loader[0]: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/triggers/prayer-bot-loader-dev]

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
  ~ update in-place
  - destroy
-/+ destroy and then create replacement

Terraform will perform the following actions:

  # google_cloud_scheduler_job.reminder[0] will be updated in-place
  ~ resource "google_cloud_scheduler_job" "reminder" {
        id               = "projects/prayer-bot-infra/locations/europe-west1/jobs/prayer-bot-reminder-dev"
        name             = "prayer-bot-reminder-dev"
        # (8 unchanged attributes hidden)

      ~ http_target {
            # (3 unchanged attributes hidden)

          ~ oidc_token {
              - audience              = "https://prayer-bot-reminder-dev-wsgaovlfla-ew.a.run.app/" -> null
                # (1 unchanged attribute hidden)
            }
        }
    }

  # google_cloudfunctions2_function.dispatcher will be updated in-place
  ~ resource "google_cloudfunctions2_function" "dispatcher" {
        id               = "projects/prayer-bot-infra/locations/europe-west1/functions/prayer-bot-dispatcher-dev"
        name             = "prayer-bot-dispatcher-dev"
        # (10 unchanged attributes hidden)

      ~ build_config {
            # (6 unchanged attributes hidden)

          ~ source {
              ~ storage_source {
                  ~ object     = "dispatcher-5260c68fe2bb85634a89dc460eeeac1f.zip" -> "dispatcher-56eb1bda3131fc18808d56ec6c646e9e.zip"
                    # (2 unchanged attributes hidden)
                }
            }

            # (1 unchanged block hidden)
        }

        # (1 unchanged block hidden)
    }

  # google_cloudfunctions2_function.loader will be updated in-place
  ~ resource "google_cloudfunctions2_function" "loader" {
        id               = "projects/prayer-bot-infra/locations/europe-west1/functions/prayer-bot-loader-dev"
        name             = "prayer-bot-loader-dev"
        # (10 unchanged attributes hidden)

      ~ build_config {
            # (6 unchanged attributes hidden)

          ~ source {
              ~ storage_source {
                  ~ object     = "loader-0a6a5504d2b5ee5466450ee7d471545e.zip" -> "loader-4ddefc387d4feb091d2d4360e2245483.zip"
                    # (2 unchanged attributes hidden)
                }
            }

            # (1 unchanged block hidden)
        }

        # (1 unchanged block hidden)
    }

  # google_cloudfunctions2_function.reminder will be updated in-place
  ~ resource "google_cloudfunctions2_function" "reminder" {
        id               = "projects/prayer-bot-infra/locations/europe-west1/functions/prayer-bot-reminder-dev"
        name             = "prayer-bot-reminder-dev"
        # (10 unchanged attributes hidden)

      ~ build_config {
            # (6 unchanged attributes hidden)

          ~ source {
              ~ storage_source {
                  ~ object     = "reminder-cbc44996afc9446be5c340ab35d00509.zip" -> "reminder-7d24df8c41378448f3a62e2dd5ca1adb.zip"
                    # (2 unchanged attributes hidden)
                }
            }

            # (1 unchanged block hidden)
        }

        # (1 unchanged block hidden)
    }

  # google_project_iam_member.deploy_cloudscheduler_admin[0] will be destroyed
  # (because index [0] is out of range for count)
  - resource "google_project_iam_member" "deploy_cloudscheduler_admin" {
      - etag    = "BwZZg1bceUg=" -> null
      - id      = "prayer-bot-infra/roles/cloudscheduler.admin/serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com" -> null
      - member  = "serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com" -> null
      - project = "prayer-bot-infra" -> null
      - role    = "roles/cloudscheduler.admin" -> null
    }

  # google_project_iam_member.deploy_eventarc_admin[0] will be destroyed
  # (because index [0] is out of range for count)
  - resource "google_project_iam_member" "deploy_eventarc_admin" {
      - etag    = "BwZZg1bceUg=" -> null
      - id      = "prayer-bot-infra/roles/eventarc.admin/serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com" -> null
      - member  = "serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com" -> null
      - project = "prayer-bot-infra" -> null
      - role    = "roles/eventarc.admin" -> null
    }

  # google_project_iam_member.deploy_pubsub_admin[0] will be destroyed
  # (because index [0] is out of range for count)
  - resource "google_project_iam_member" "deploy_pubsub_admin" {
      - etag    = "BwZZg1bceUg=" -> null
      - id      = "prayer-bot-infra/roles/pubsub.admin/serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com" -> null
      - member  = "serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com" -> null
      - project = "prayer-bot-infra" -> null
      - role    = "roles/pubsub.admin" -> null
    }

  # google_storage_bucket_object.dispatcher_zip must be replaced
-/+ resource "google_storage_bucket_object" "dispatcher_zip" {
      + content          = (sensitive value)
      ~ content_type     = "application/zip" -> (known after apply)
      ~ crc32c           = "N2iKHA==" -> (known after apply)
      ~ detect_md5hash   = "UmDGj+K7hWNKidxGDu6sHw==" -> "different hash"
      - event_based_hold = false -> null
      ~ generation       = 1784297087445207 -> (known after apply)
      ~ id               = "prayer-bot-infra-prayer-bot-src-dev-dispatcher-5260c68fe2bb85634a89dc460eeeac1f.zip" -> (known after apply)
      + kms_key_name     = (known after apply)
      ~ md5hash          = "UmDGj+K7hWNKidxGDu6sHw==" -> (known after apply)
      ~ md5hexhash       = "5260c68fe2bb85634a89dc460eeeac1f" -> (known after apply)
      ~ media_link       = "https://storage.googleapis.com/download/storage/v1/b/prayer-bot-infra-prayer-bot-src-dev/o/dispatcher-5260c68fe2bb85634a89dc460eeeac1f.zip?generation=1784297087445207&alt=media" -> (known after apply)
      - metadata         = {} -> null
      ~ name             = "dispatcher-5260c68fe2bb85634a89dc460eeeac1f.zip" -> "dispatcher-56eb1bda3131fc18808d56ec6c646e9e.zip" # forces replacement
      ~ output_name      = "dispatcher-5260c68fe2bb85634a89dc460eeeac1f.zip" -> (known after apply)
      ~ self_link        = "https://www.googleapis.com/storage/v1/b/prayer-bot-infra-prayer-bot-src-dev/o/dispatcher-5260c68fe2bb85634a89dc460eeeac1f.zip" -> (known after apply)
      ~ storage_class    = "STANDARD" -> (known after apply)
      - temporary_hold   = false -> null
        # (3 unchanged attributes hidden)
    }

  # google_storage_bucket_object.loader_zip must be replaced
-/+ resource "google_storage_bucket_object" "loader_zip" {
      + content          = (sensitive value)
      ~ content_type     = "application/zip" -> (known after apply)
      ~ crc32c           = "09EvYg==" -> (known after apply)
      ~ detect_md5hash   = "CmpVBNK17lRmRQ7n1HFUXg==" -> "different hash"
      - event_based_hold = false -> null
      ~ generation       = 1783351528718968 -> (known after apply)
      ~ id               = "prayer-bot-infra-prayer-bot-src-dev-loader-0a6a5504d2b5ee5466450ee7d471545e.zip" -> (known after apply)
      + kms_key_name     = (known after apply)
      ~ md5hash          = "CmpVBNK17lRmRQ7n1HFUXg==" -> (known after apply)
      ~ md5hexhash       = "0a6a5504d2b5ee5466450ee7d471545e" -> (known after apply)
      ~ media_link       = "https://storage.googleapis.com/download/storage/v1/b/prayer-bot-infra-prayer-bot-src-dev/o/loader-0a6a5504d2b5ee5466450ee7d471545e.zip?generation=1783351528718968&alt=media" -> (known after apply)
      - metadata         = {} -> null
      ~ name             = "loader-0a6a5504d2b5ee5466450ee7d471545e.zip" -> "loader-4ddefc387d4feb091d2d4360e2245483.zip" # forces replacement
      ~ output_name      = "loader-0a6a5504d2b5ee5466450ee7d471545e.zip" -> (known after apply)
      ~ self_link        = "https://www.googleapis.com/storage/v1/b/prayer-bot-infra-prayer-bot-src-dev/o/loader-0a6a5504d2b5ee5466450ee7d471545e.zip" -> (known after apply)
      ~ storage_class    = "STANDARD" -> (known after apply)
      - temporary_hold   = false -> null
        # (3 unchanged attributes hidden)
    }

  # google_storage_bucket_object.reminder_zip must be replaced
-/+ resource "google_storage_bucket_object" "reminder_zip" {
      + content          = (sensitive value)
      ~ content_type     = "application/zip" -> (known after apply)
      ~ crc32c           = "Qlgpkw==" -> (known after apply)
      ~ detect_md5hash   = "y8RJlq/JRGvlw0CrNdAFCQ==" -> "different hash"
      - event_based_hold = false -> null
      ~ generation       = 1783351528018543 -> (known after apply)
      ~ id               = "prayer-bot-infra-prayer-bot-src-dev-reminder-cbc44996afc9446be5c340ab35d00509.zip" -> (known after apply)
      + kms_key_name     = (known after apply)
      ~ md5hash          = "y8RJlq/JRGvlw0CrNdAFCQ==" -> (known after apply)
      ~ md5hexhash       = "cbc44996afc9446be5c340ab35d00509" -> (known after apply)
      ~ media_link       = "https://storage.googleapis.com/download/storage/v1/b/prayer-bot-infra-prayer-bot-src-dev/o/reminder-cbc44996afc9446be5c340ab35d00509.zip?generation=1783351528018543&alt=media" -> (known after apply)
      - metadata         = {} -> null
      ~ name             = "reminder-cbc44996afc9446be5c340ab35d00509.zip" -> "reminder-7d24df8c41378448f3a62e2dd5ca1adb.zip" # forces replacement
      ~ output_name      = "reminder-cbc44996afc9446be5c340ab35d00509.zip" -> (known after apply)
      ~ self_link        = "https://www.googleapis.com/storage/v1/b/prayer-bot-infra-prayer-bot-src-dev/o/reminder-cbc44996afc9446be5c340ab35d00509.zip" -> (known after apply)
      ~ storage_class    = "STANDARD" -> (known after apply)
      - temporary_hold   = false -> null
        # (3 unchanged attributes hidden)
    }

Plan: 3 to add, 4 to change, 6 to destroy.

─────────────────────────────────────────────────────────────────────────────

Note: You didn't use the -out option to save this plan, so Terraform can't
guarantee to take exactly these actions if you run "terraform apply" now.

@escalopa
escalopa merged commit a082157 into main Aug 27, 2026
13 checks passed

This branch was successfully deployed

1 active deployment
dev — 8fe2790b Deployed Aug 27, 2026 by escalopa via Sync Telegram Profiles #239
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant