Update env variable names

gchristov · Aug 27, 2023 · c5bd547 · c5bd547
1 parent 28532e5
commit c5bd547
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 50 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -10,12 +10,9 @@ env:
   JAVA_DISTRIBUTION: "zulu"
   # Required for build
   GCP_SA_KEY_PUBSUB: ${{ secrets.GCP_SA_KEY_PUBSUB }}
-  FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY }}
-  FIREBASE_AUTH_DOMAIN: ${{ secrets.FIREBASE_AUTH_DOMAIN }}
-  FIREBASE_PROJECT_ID: ${{ secrets.FIREBASE_PROJECT_ID }}
-  FIREBASE_STORAGE_BUCKET: ${{ secrets.FIREBASE_STORAGE_BUCKET }}
-  FIREBASE_GCM_SENDER_ID: ${{ secrets.FIREBASE_GCM_SENDER_ID }}
-  FIREBASE_APPLICATION_ID: ${{ secrets.FIREBASE_APPLICATION_ID }}
+  GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
+  GCP_FIREBASE_API_KEY: ${{ secrets.GCP_FIREBASE_API_KEY }}
+  GCP_FIREBASE_APPLICATION_ID: ${{ secrets.GCP_FIREBASE_APPLICATION_ID }}
   SLACK_SIGNING_SECRET: ${{ secrets.SLACK_SIGNING_SECRET }}
   SLACK_REQUEST_VERIFICATION_ENABLED: ${{ secrets.SLACK_REQUEST_VERIFICATION_ENABLED }}
   SLACK_CLIENT_ID: ${{ secrets.SLACK_CLIENT_ID }}

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -8,7 +8,6 @@ env:
   # Required for CI workflow
   JAVA_VERSION: "15"
   JAVA_DISTRIBUTION: "zulu"
-  GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT }}
   GCP_SERVICE: cloudrun-test
   GCP_REGION: us-west1
   GCP_REPOSITORY: cloudrun-test-repo
@@ -17,12 +16,9 @@ env:
   GCP_SA_KEY_DEPLOY: ${{ secrets.GCP_SA_KEY_DEPLOY }}
   # Required for build
   GCP_SA_KEY_PUBSUB: ${{ secrets.GCP_SA_KEY_PUBSUB }}
-  FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY }}
-  FIREBASE_AUTH_DOMAIN: ${{ secrets.FIREBASE_AUTH_DOMAIN }}
-  FIREBASE_PROJECT_ID: ${{ secrets.FIREBASE_PROJECT_ID }}
-  FIREBASE_STORAGE_BUCKET: ${{ secrets.FIREBASE_STORAGE_BUCKET }}
-  FIREBASE_GCM_SENDER_ID: ${{ secrets.FIREBASE_GCM_SENDER_ID }}
-  FIREBASE_APPLICATION_ID: ${{ secrets.FIREBASE_APPLICATION_ID }}
+  GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT }}
+  GCP_FIREBASE_API_KEY: ${{ secrets.GCP_FIREBASE_API_KEY }}
+  GCP_FIREBASE_APPLICATION_ID: ${{ secrets.GCP_FIREBASE_APPLICATION_ID }}
   SLACK_SIGNING_SECRET: ${{ secrets.SLACK_SIGNING_SECRET }}
   SLACK_REQUEST_VERIFICATION_ENABLED: ${{ secrets.SLACK_REQUEST_VERIFICATION_ENABLED }}
   SLACK_CLIENT_ID: ${{ secrets.SLACK_CLIENT_ID }}

diff --git a/README.md b/README.md
@@ -28,10 +28,24 @@ The project is configured to be deployed and run on Google Cloud.
     - `Cloud Run Admin`
 3. Create a second Service Account with these permissions for PubSub
     - `Pub/Sub Admin`
-4. Create `local.properties` file with the following contents
-    - WIP
-5. Create `local-credentials-pubsub.json` file with the following contents
-    - WIP
+4. Create a `local.properties` file with the following contents
+```
+GCP_PROJECT_ID=
+GCP_FIREBASE_API_KEY=
+GCP_FIREBASE_APPLICATION_ID=
+SLACK_SIGNING_SECRET=
+SLACK_REQUEST_VERIFICATION_ENABLED=
+SLACK_CLIENT_ID=
+SLACK_CLIENT_SECRET=
+SLACK_INTERACTIVITY_PUBSUB_TOPIC=
+SLACK_SLASH_COMMAND_PUBSUB_TOPIC=
+APP_LOG_LEVEL=
+APP_NETWORK_HTML_LOG_LEVEL=
+APP_NETWORK_JSON_LOG_LEVEL=
+APP_PUBLIC_URL=
+SEARCH_PRELOAD_PUBSUB_TOPIC=
+```
+5. Create a `local-credentials-pubsub.json` file with the contents of the JSON API key for the PubSub service account.
 
 # Run
 

diff --git a/scripts/env.sh b/scripts/env.sh
@@ -1,12 +1,9 @@
 # Exports required CI environment secrets to local environment files so that the project can use them
 set -e
 echo "$GCP_SA_KEY_PUBSUB" >> ./local-credentials-pubsub.json
-echo FIREBASE_API_KEY="$FIREBASE_API_KEY" >> ./local.properties
-echo FIREBASE_AUTH_DOMAIN="$FIREBASE_AUTH_DOMAIN" >> ./local.properties
-echo FIREBASE_PROJECT_ID="$FIREBASE_PROJECT_ID" >> ./local.properties
-echo FIREBASE_STORAGE_BUCKET="$FIREBASE_STORAGE_BUCKET" >> ./local.properties
-echo FIREBASE_GCM_SENDER_ID="$FIREBASE_GCM_SENDER_ID" >> ./local.properties
-echo FIREBASE_APPLICATION_ID="$FIREBASE_APPLICATION_ID" >> ./local.properties
+echo GCP_PROJECT_ID="$GCP_PROJECT_ID" >> ./local.properties
+echo GCP_FIREBASE_API_KEY="$GCP_FIREBASE_API_KEY" >> ./local.properties
+echo GCP_FIREBASE_APPLICATION_ID="$GCP_FIREBASE_APPLICATION_ID" >> ./local.properties
 echo SLACK_SIGNING_SECRET="$SLACK_SIGNING_SECRET" >> ./local.properties
 echo SLACK_REQUEST_VERIFICATION_ENABLED="$SLACK_REQUEST_VERIFICATION_ENABLED" >> ./local.properties
 echo SLACK_CLIENT_ID="$SLACK_CLIENT_ID" >> ./local.properties

diff --git a/...ommonMain/kotlin/com/gchristov/thecodinglove/kmpcommonfirebase/KmpCommonFirebaseModule.kt b/...ommonMain/kotlin/com/gchristov/thecodinglove/kmpcommonfirebase/KmpCommonFirebaseModule.kt
@@ -23,12 +23,9 @@ object KmpCommonFirebaseModule : DiModule() {
     }
 
     private fun provideFirebaseOptions(): FirebaseOptions = FirebaseOptions(
-        apiKey = BuildConfig.FIREBASE_API_KEY,
-        authDomain = BuildConfig.FIREBASE_AUTH_DOMAIN,
-        projectId = BuildConfig.FIREBASE_PROJECT_ID,
-        storageBucket = BuildConfig.FIREBASE_STORAGE_BUCKET,
-        gcmSenderId = BuildConfig.FIREBASE_GCM_SENDER_ID,
-        applicationId = BuildConfig.FIREBASE_APPLICATION_ID
+        applicationId = BuildConfig.GCP_FIREBASE_APPLICATION_ID,
+        apiKey = BuildConfig.GCP_FIREBASE_API_KEY,
+        projectId = BuildConfig.GCP_PROJECT_ID,
     )
 
     private fun provideFirestore(app: FirebaseApp): FirebaseFirestore = Firebase.firestore(app)

diff --git a/shared/kmp-common-kotlin/build.gradle.kts b/shared/kmp-common-kotlin/build.gradle.kts
@@ -33,33 +33,18 @@ buildkonfig {
     defaultConfigs {
         buildConfigField(
             type = com.codingfeline.buildkonfig.compiler.FieldSpec.Type.STRING,
-            name = "FIREBASE_API_KEY",
-            value = getLocalSecret(rootProject, "FIREBASE_API_KEY")
+            name = "GCP_PROJECT_ID",
+            value = getLocalSecret(rootProject, "GCP_PROJECT_ID")
         )
         buildConfigField(
             type = com.codingfeline.buildkonfig.compiler.FieldSpec.Type.STRING,
-            name = "FIREBASE_AUTH_DOMAIN",
-            value = getLocalSecret(rootProject, "FIREBASE_AUTH_DOMAIN")
+            name = "GCP_FIREBASE_API_KEY",
+            value = getLocalSecret(rootProject, "GCP_FIREBASE_API_KEY")
         )
         buildConfigField(
             type = com.codingfeline.buildkonfig.compiler.FieldSpec.Type.STRING,
-            name = "FIREBASE_PROJECT_ID",
-            value = getLocalSecret(rootProject, "FIREBASE_PROJECT_ID")
-        )
-        buildConfigField(
-            type = com.codingfeline.buildkonfig.compiler.FieldSpec.Type.STRING,
-            name = "FIREBASE_STORAGE_BUCKET",
-            value = getLocalSecret(rootProject, "FIREBASE_STORAGE_BUCKET")
-        )
-        buildConfigField(
-            type = com.codingfeline.buildkonfig.compiler.FieldSpec.Type.STRING,
-            name = "FIREBASE_GCM_SENDER_ID",
-            value = getLocalSecret(rootProject, "FIREBASE_GCM_SENDER_ID")
-        )
-        buildConfigField(
-            type = com.codingfeline.buildkonfig.compiler.FieldSpec.Type.STRING,
-            name = "FIREBASE_APPLICATION_ID",
-            value = getLocalSecret(rootProject, "FIREBASE_APPLICATION_ID")
+            name = "GCP_FIREBASE_APPLICATION_ID",
+            value = getLocalSecret(rootProject, "GCP_FIREBASE_APPLICATION_ID")
         )
         buildConfigField(
             type = com.codingfeline.buildkonfig.compiler.FieldSpec.Type.STRING,