Merge pull request #119 from julwrites/staging

Fix for GCLOUD_PROJECT_ID

Author: julwrites

.github/workflows/deployment.yml

@@ -43,22 +43,22 @@ jobs:
         env:
           TELEGRAM_ID: ${{secrets.TELEGRAM_ID}}
           ADMIN_ID: ${{secrets.TELEGRAM_ADMIN_ID}}
-          PROJECT_ID: ${{secrets.GCLOUD_PROJECT_ID}}
+          GCLOUD_PROJECT_ID: ${{secrets.GCLOUD_PROJECT_ID}}
           ARTIFACT_ID: ${{secrets.GCLOUD_ARTIFACT_REPOSITORY_ID}}
         run: |
-          printf "TELEGRAM_ID: \"$TELEGRAM_ID\"\nADMIN_ID: \"$ADMIN_ID\"\nPROJECT_ID: \"$PROJECT_ID\"\n" >> secrets.yaml
+          printf "TELEGRAM_ID: \"$TELEGRAM_ID\"\nADMIN_ID: \"$ADMIN_ID\"\nGCLOUD_PROJECT_ID: \"$GCLOUD_PROJECT_ID\"\n" >> secrets.yaml
           cat secrets.yaml
-          docker build -f Dockerfile -t ${{ secrets.GCLOUD_REGION }}-docker.pkg.dev/$PROJECT_ID/$ARTIFACT_ID/root:latest .
-          docker push ${{ secrets.GCLOUD_REGION }}-docker.pkg.dev/$PROJECT_ID/$ARTIFACT_ID/root:latest
+          docker build -f Dockerfile -t ${{ secrets.GCLOUD_REGION }}-docker.pkg.dev/$GCLOUD_PROJECT_ID/$ARTIFACT_ID/root:latest .
+          docker push ${{ secrets.GCLOUD_REGION }}-docker.pkg.dev/$GCLOUD_PROJECT_ID/$ARTIFACT_ID/root:latest
 
       - name: Deployment
         env:
-          PROJECT_ID: ${{secrets.GCLOUD_PROJECT_ID}}
+          GCLOUD_PROJECT_ID: ${{secrets.GCLOUD_PROJECT_ID}}
           ARTIFACT_ID: ${{secrets.GCLOUD_ARTIFACT_REPOSITORY_ID}}
           APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
           TELEGRAM_ID: ${{secrets.TELEGRAM_ID}}
         run: |
-          gcloud run deploy scripturebot --image ${{ secrets.GCLOUD_REGION }}-docker.pkg.dev/$PROJECT_ID/$ARTIFACT_ID/root:latest --region ${{ secrets.GCLOUD_REGION }} --allow-unauthenticated
+          gcloud run deploy scripturebot --image ${{ secrets.GCLOUD_REGION }}-docker.pkg.dev/$GCLOUD_PROJECT_ID/$ARTIFACT_ID/root:latest --region ${{ secrets.GCLOUD_REGION }} --allow-unauthenticated
           SERVICE_URL=$(gcloud run services describe scripturebot --region ${{ secrets.GCLOUD_REGION }} --format 'value(status.url)')
           echo "Setting webhook for $SERVICE_URL"
           go run cmd/webhook/main.go -url "$SERVICE_URL"

MIGRATION.md

@@ -48,7 +48,7 @@ gcloud auth application-default login
 Run the export command against the **Source Project**.
 
 ```bash
-go run cmd/migrate/main.go -mode export -project <SOURCE_PROJECT_ID> -file backup_users.json
+go run cmd/migrate/main.go -mode export -gcloud_project_id <SOURCE_GCLOUD_PROJECT_ID> -file backup_users.json
 ```
 *   This will fetch all users and save them to `backup_users.json`.
 *   Review the file to ensure data looks correct.
@@ -57,7 +57,7 @@ go run cmd/migrate/main.go -mode export -project <SOURCE_PROJECT_ID> -file backu
 Run the import command against the **Destination Project**.
 
 ```bash
-go run cmd/migrate/main.go -mode import -project <DESTINATION_PROJECT_ID> -file backup_users.json
+go run cmd/migrate/main.go -mode import -gcloud_project_id <DESTINATION_GCLOUD_PROJECT_ID> -file backup_users.json
 ```
 *   This will read `backup_users.json` and upload each user to the new Datastore.
 *   **Note**: Ensure the Destination Project has Datastore (Firestore in Datastore mode) enabled.

README.md

@@ -61,11 +61,11 @@ As such it requires [gcloud CLI](https://cloud.google.com/sdk/docs/quickstart) t
 The artifact repository is set to `us-central1`
 
 As such the docker container can be built using the following command
-`docker build -f Dockerfile -t us-central1-docker.pkg.dev/${PROJECT_ID}/scripturebot/root:latest .`
+`docker build -f Dockerfile -t us-central1-docker.pkg.dev/${GCLOUD_PROJECT_ID}/scripturebot/root:latest .`
 
 And then uploaded using
 
-`docker push docker build -f Dockerfile -t us-central1-docker.pkg.dev/${PROJECT_ID}/scripturebot/root:latest .`
+`docker push us-central1-docker.pkg.dev/${GCLOUD_PROJECT_ID}/scripturebot/root:latest`
 
 And finally deployed using
-`gcloud run deploy scripturebot --image us-central1-docker.pkg.dev/${PROJECT_ID}/scripturebot/root:latest --region us-central1`
+`gcloud run deploy scripturebot --image us-central1-docker.pkg.dev/${GCLOUD_PROJECT_ID}/scripturebot/root:latest --region us-central1`

cmd/migrate/main.go

@@ -15,13 +15,13 @@ import (
 
 func main() {
 	mode := flag.String("mode", "", "Mode of operation: 'export' or 'import'")
-	project := flag.String("project", "", "Google Cloud Project ID")
+	project := flag.String("gcloud_project_id", "", "Google Cloud Project ID")
 	file := flag.String("file", "users.json", "Path to the JSON file for export/import")
 
 	flag.Parse()
 
 	if *mode == "" || *project == "" {
-		fmt.Println("Usage: go run cmd/migrate/main.go -mode [export|import] -project [PROJECT_ID] -file [FILENAME]")
+		fmt.Println("Usage: go run cmd/migrate/main.go -mode [export|import] -gcloud_project_id [GCLOUD_PROJECT_ID] -file [FILENAME]")
 		flag.PrintDefaults()
 		os.Exit(1)
 	}