Renamed pantel-prod.json to prime-service-account.json

ostelco · Feb 19, 2019 · 8a8b48f · 8a8b48f
1 parent 2ba5dfb
commit 8a8b48f
Show file tree

Hide file tree

Showing 34 changed files with 70 additions and 70 deletions.
diff --git a/.circleci/README.md b/.circleci/README.md
@@ -31,7 +31,7 @@ This phase contains the following jobs:
 | GOOGLE_DEV_ENDPOINTS_CREDENTIALS  |               |            |
 | GOOGLE_GCR_CREDENTIALS            |               |            |
 | GOOGLE_PROD_ENDPOINTS_CREDENTIALS |               |            |
-| PANTEL_SECRETS_FILE               |               |            |
+| GCP_SERVICE_ACCOUNT_SECRETS_FILE  |               |            |
 | PI_DEV_CLUSTER_CREDENTIALS        |               |            |
 | PI_PROD_CLUSTER_CREDENTIALS       |               |            |
 | PROD_PROJECT                      |               |            |

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -30,11 +30,11 @@ jobs:
             gsutil cp gs://pi-ostelco-core-gradle-cache/caches.tar.gz ~/caches.tar.gz
             mkdir -p ~/.gradle/caches/
             tar -xzvf ~/caches.tar.gz -C ~/.gradle/caches/ .
-      # Copying pantel prod secret to locations where it is needed for docker compose tests.
+      # Copying prime-service-account secret file to locations where it is needed for docker compose tests.
       - run:
-          name: Distribute pantel-prod.json secret from env var.
+          name: Distribute prime-service-account.json secret from env var.
           command: |
-            scripts/distribute-pantel-secrets.sh
+            scripts/distribute-prime-service-account-secrets.sh
       # run gradle build. Skipping neo4j tests as they fail
       - run:
           name: Build entire repo
@@ -234,7 +234,7 @@ jobs:
              -f .circleci/prime-dev-values.yaml \
              --set prime.env.STRIPE_API_KEY=${STRIPE_API_KEY} \
              --set prime.tag=${CIRCLE_SHA1:0:9} \
-             --set firebaseServiceAccount=${PANTEL_SECRETS_FILE}
+             --set firebaseServiceAccount=${PRIME_SERVICE_ACCOUNT_SECRETS_FILE}
        
       - run:
            name: notify slack on failure
@@ -313,7 +313,7 @@ jobs:
             helm upgrade prime ostelco/prime --version 0.3.1 --install --namespace prod \
              -f .circleci/prime-prod-values.yaml \
              --set prime.env.STRIPE_API_KEY=${STRIPE_API_KEY} \
-             --set firebaseServiceAccount=${PANTEL_SECRETS_FILE}
+             --set firebaseServiceAccount=${PRIME_SERVICE_ACCOUNT_SECRETS_FILE}
 
       - run:
            name: notify slack on failure

diff --git a/.gcloudignore b/.gcloudignore
@@ -5,4 +5,4 @@
 
 #!include:.gitignore
 
-pantel-prod.json
+prime-service-account.json
diff --git a/acceptance-tests/config/.gitignore b/acceptance-tests/config/.gitignore
@@ -1 +1 @@
-pantel-prod.json
+prime-service-account.json
diff --git a/auth-server/config/.gitignore b/auth-server/config/.gitignore
@@ -1 +1 @@
-pantel-prod.json
+prime-service-account.json
diff --git a/auth-server/config/config.yaml b/auth-server/config/config.yaml
@@ -1,4 +1,4 @@
-serviceAccountKey: /config/pantel-prod.json
+serviceAccountKey: /config/prime-service-account.json
 
 logging:
   level: INFO

diff --git a/auth-server/src/integration-test/resources/config.yaml b/auth-server/src/integration-test/resources/config.yaml
@@ -1,4 +1,4 @@
-serviceAccountKey: config/pantel-prod.json
+serviceAccountKey: config/prime-service-account.json
 
 logging:
   level: INFO

diff --git a/bq-metrics-extractor/Dockerfile.test b/bq-metrics-extractor/Dockerfile.test
@@ -7,7 +7,7 @@ LABEL maintainer="[email protected]"
 #
 
 COPY script/start.sh /start.sh
-COPY config/pantel-prod.json /secret/pantel-prod.json
+COPY config/prime-service-account.json /secret/prime-service-account.json
 COPY config/config.yaml /config/config.yaml
 COPY build/libs/bq-metrics-extractor-uber.jar /bq-metrics-extractor.jar
 

diff --git a/bq-metrics-extractor/config/.gitignore b/bq-metrics-extractor/config/.gitignore
@@ -1 +1 @@
-pantel-prod.json
+prime-service-account.json
diff --git a/bq-metrics-extractor/docker-compose.yml b/bq-metrics-extractor/docker-compose.yml
@@ -18,7 +18,7 @@ services:
     depends_on:
     - pushgateway
     environment:
-    - GOOGLE_APPLICATION_CREDENTIALS=/secret/pantel-prod.json
+    - GOOGLE_APPLICATION_CREDENTIALS=/secret/prime-service-account.json
 
   emulator:
     container_name: emulator

diff --git a/dataflow-pipelines/README.md b/dataflow-pipelines/README.md
@@ -3,7 +3,7 @@
 ## Setup
 
 1. In Google Cloud Platform, need to setup a project with PubSubIO, Dataflow and BigQueryIO.
-2. Keep the `pantel-prod.json` auth file in config folder.
+2. Keep the `prime-service-account.json` auth file in config folder.
 
 ## Package
 

diff --git a/dataflow-pipelines/config/.gitignore b/dataflow-pipelines/config/.gitignore
@@ -1 +1 @@
-pantel-prod.json
+prime-service-account.json
diff --git a/dataflow-pipelines/docker-compose-dev.yaml b/dataflow-pipelines/docker-compose-dev.yaml
@@ -5,7 +5,7 @@ services:
     container_name: dataflow-pipelines
     build: .
     environment:
-      - GOOGLE_APPLICATION_CREDENTIALS=/config/pantel-prod.json
+      - GOOGLE_APPLICATION_CREDENTIALS=/config/prime-service-account.json
       - PROJECT=${GCP_PROJECT_ID}
       - JOB_NAME=data-traffic-dev
       - PUBSUB_TOPIC=data-traffic-dev

diff --git a/dataflow-pipelines/docker-compose.yaml b/dataflow-pipelines/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
     container_name: dataflow-pipelines
     build: .
     environment:
-      - GOOGLE_APPLICATION_CREDENTIALS=/config/pantel-prod.json
+      - GOOGLE_APPLICATION_CREDENTIALS=/config/prime-service-account.json
       - PROJECT=${GCP_PROJECT_ID}
       - JOB_NAME=data-traffic
       - PUBSUB_TOPIC=data-traffic

diff --git a/docker-compose.seagull.yaml b/docker-compose.seagull.yaml
@@ -46,7 +46,7 @@ services:
       --http2_port=80
       --ssl_port=443
       --backend=grpc://172.16.238.5:8082
-      --service_account_key=/esp/pantel-prod.json
+      --service_account_key=/esp/prime-service-account.json
     networks:
       net:
         aliases:
@@ -66,7 +66,7 @@ services:
       --http2_port=80
       --ssl_port=443
       --backend=grpc://172.16.238.5:8083
-      --service_account_key=/esp/pantel-prod.json
+      --service_account_key=/esp/prime-service-account.json
     networks:
       net:
         aliases:
@@ -83,7 +83,7 @@ services:
     environment:
     - OCS_GRPC_SERVER=ocs.dev.ostelco.org
     - METRICS_GRPC_SERVER=metrics.dev.ostelco.org
-    - SERVICE_FILE=pantel-prod.json
+    - SERVICE_FILE=prime-service-account.json
     - GOOGLE_CLOUD_PROJECT=${GCP_PROJECT_ID}
     - DIAMETER_CONFIG_FILE=server-jdiameter-config.xml
     - OCS_DATASOURCE_TYPE=Local

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -46,7 +46,7 @@ services:
       --http2_port=80
       --ssl_port=443
       --backend=grpc://172.16.238.5:8082
-      --service_account_key=/esp/pantel-prod.json
+      --service_account_key=/esp/prime-service-account.json
     networks:
       net:
         aliases:
@@ -66,7 +66,7 @@ services:
       --http2_port=80
       --ssl_port=443
       --backend=grpc://172.16.238.5:8083
-      --service_account_key=/esp/pantel-prod.json
+      --service_account_key=/esp/prime-service-account.json
     networks:
       net:
         aliases:
@@ -83,7 +83,7 @@ services:
     environment:
     - OCS_GRPC_SERVER=ocs.dev.ostelco.org
     - METRICS_GRPC_SERVER=metrics.dev.ostelco.org
-    - SERVICE_FILE=pantel-prod.json
+    - SERVICE_FILE=prime-service-account.json
     - GOOGLE_CLOUD_PROJECT=${GCP_PROJECT_ID}
     volumes:
     - ./ocsgw/cert:/cert/
@@ -105,7 +105,7 @@ services:
     - PRIME_SOCKET=prime:8080
     - OCS_SOCKET=prime:8082
     - STRIPE_API_KEY=${STRIPE_API_KEY}
-    - GOOGLE_APPLICATION_CREDENTIALS=/secret/pantel-prod.json
+    - GOOGLE_APPLICATION_CREDENTIALS=/secret/prime-service-account.json
     networks:
       net:
         ipv4_address: 172.16.238.2

diff --git a/docs/EXPERIMENTAL_AGENTS_LIFECYCLE.md b/docs/EXPERIMENTAL_AGENTS_LIFECYCLE.md
@@ -234,7 +234,7 @@ Notes
 Make a certificate https://console.cloud.google.com/apis/credentials
 To authenticate
 
-     export GOOGLE_APPLICATION_CREDENTIALS=/some/path/pantel-credentials.json
+     export GOOGLE_APPLICATION_CREDENTIALS=/some/path/prime-service-account.json
 
 then
 
@@ -255,7 +255,7 @@ To authenticvate Authenticate
 
 Set your project:
 
-   gcloud config set project pantel
+   gcloud config set project GCP_PROJECT_ID
 
 .. or some other project
 

diff --git a/docs/TEST.md b/docs/TEST.md
@@ -4,11 +4,11 @@
 
  * Configure firebase project - `GCP_PROJECT_ID`
 
- * Save `pantel-prod.json` in all folders where this file is added in `.gitignore`.  You can find these directories by
+ * Save `prime-service-account.json` in all folders where this file is added in `.gitignore`.  You can find these directories by
    executing the command:
 
 ```bash
-grep -i pantel $(find . -name '.gitignore') | awk -F: '{print $1}' | sort | uniq | sed 's/.gitignore//g'
+grep -i prime-service-account $(find . -name '.gitignore') | awk -F: '{print $1}' | sort | uniq | sed 's/.gitignore//g'
 ```     
 
  * Create self-signed certificate for nginx with domain as `ocs.dev.ostelco.org` and place them at following location:

diff --git a/ocsgw/config/.gitignore b/ocsgw/config/.gitignore
@@ -1 +1 @@
-pantel-prod.json
+prime-service-account.json
diff --git a/prime/Dockerfile.test b/prime/Dockerfile.test
@@ -15,7 +15,7 @@ COPY script/start.sh /start.sh
 COPY script/wait.sh /wait.sh
 
 # test.yaml is copied as config.yaml for AT.
-COPY config/pantel-prod.json /secret/pantel-prod.json
+COPY config/prime-service-account.json /secret/prime-service-account.json
 COPY config/testDb.csv /config-data/imeiDb.csv
 COPY config/subscriber.graphqls /config/subscriber.graphqls
 COPY config/test.yaml /config/config.yaml

diff --git a/prime/build.gradle b/prime/build.gradle
@@ -18,7 +18,7 @@ sourceSets {
   }
 }
 
-version = "1.22.1"
+version = "1.22.2"
 
 repositories {
   maven {
@@ -68,7 +68,7 @@ configurations {
 }
 
 task integration(type: Test, description: 'Runs the integration tests.', group: 'Verification') {
-  environment("GOOGLE_APPLICATION_CREDENTIALS", "config/pantel-prod.json")
+  environment("GOOGLE_APPLICATION_CREDENTIALS", "config/prime-service-account.json")
   testClassesDirs = sourceSets.integration.output.classesDirs
   classpath = sourceSets.integration.runtimeClasspath
 }

diff --git a/prime/config/.gitignore b/prime/config/.gitignore
@@ -1 +1 @@
-pantel-prod.json
+prime-service-account.json
diff --git a/prime/config/config.yaml b/prime/config/config.yaml
@@ -17,7 +17,7 @@ modules:
     csvFile: /config-data/imeiDb.csv
 - type: firebase
   config:
-    configFile: /secret/pantel-prod.json
+    configFile: /secret/prime-service-account.json
     rootPath: ${FIREBASE_ROOT_PATH}
 - type: neo4j
   config:
@@ -39,7 +39,7 @@ modules:
 - type: stripe-payment-processor
 - type: firebase-app-notifier
   config:
-    configFile: /secret/pantel-prod.json
+    configFile: /secret/prime-service-account.json
 - type: admin
 - type: graphql
 - type: scaninfo-store

diff --git a/prime/config/test.yaml b/prime/config/test.yaml
@@ -9,7 +9,7 @@ modules:
       connectionRequestTimeout: 1s
 - type: firebase
   config:
-    configFile: /secret/pantel-prod.json
+    configFile: /secret/prime-service-account.json
     rootPath: test
 - type: Imei-lookup
   config:
@@ -34,7 +34,7 @@ modules:
 - type: stripe-payment-processor
 - type: firebase-app-notifier
   config:
-    configFile: /secret/pantel-prod.json
+    configFile: /secret/prime-service-account.json
 - type: admin
 - type: graphql
 - type: scaninfo-store

diff --git a/prime/infra/README.md b/prime/infra/README.md
@@ -70,7 +70,7 @@ gcloud container builds submit \
 ## Secrets
 
 ```bash
-kubectl create secret generic pantel-prod.json --from-file prime/config/pantel-prod.json
+kubectl create secret generic prime-service-account.json --from-file prime/config/prime-service-account.json
 kubectl create secret generic imeiDb.csv.zip --from-file imeiDb.csv.zip
 ```
 
@@ -202,7 +202,7 @@ gcloud container node-pools delete default-pool \
  * Create k8s secrets
 
 ```bash
-kubectl create secret generic pantel-prod.json --from-file prime/config/pantel-prod.json
+kubectl create secret generic prime-service-account.json --from-file prime/config/prime-service-account.json
 ```
 
 Note: To update the secrets defined using yaml, delete and created them again. They are not updated.

diff --git a/prime/infra/dev/prime.yaml b/prime/infra/dev/prime.yaml
@@ -278,7 +278,7 @@ spec:
               name: jumio-secrets
               key: apiSecret
         - name: GOOGLE_APPLICATION_CREDENTIALS
-          value: /secret/pantel-prod.json
+          value: /secret/prime-service-account.json
         - name: GCP_PROJECT_ID
           value: _GCP_PROJECT_ID
         volumeMounts:
@@ -299,7 +299,7 @@ spec:
       volumes:
       - name: secret-config
         secret:
-          secretName: pantel-prod.json
+          secretName: prime-service-account.json
       - name: api-ostelco-ssl
         secret:
           secretName: api-ostelco-ssl

diff --git a/prime/infra/prod/prime.yaml b/prime/infra/prod/prime.yaml
@@ -194,7 +194,7 @@ spec:
       volumes:
       - name: secret-config
         secret:
-          secretName: pantel-prod.json
+          secretName: prime-service-account.json
       - name: api-ostelco-ssl
         secret:
           secretName: api-ostelco-ssl

diff --git a/prime/src/integration-tests/kotlin/org/ostelco/prime/storage/firebase/FbConfigSetup.kt b/prime/src/integration-tests/kotlin/org/ostelco/prime/storage/firebase/FbConfigSetup.kt
@@ -2,6 +2,6 @@ package org.ostelco.prime.storage.firebase
 
 fun initFirebaseConfigRegistry() {
     FirebaseConfigRegistry.firebaseConfig = FirebaseConfig(
-            configFile = "config/pantel-prod.json",
+            configFile = "config/prime-service-account.json",
             rootPath = "test")
 }
diff --git a/prime/src/integration-tests/resources/config.yaml b/prime/src/integration-tests/resources/config.yaml
@@ -6,7 +6,7 @@ modules:
       timeout: 3s
 - type: firebase
   config:
-    configFile: config/pantel-prod.json
+    configFile: config/prime-service-account.json
     rootPath: test
 - type: neo4j
   config:
@@ -26,7 +26,7 @@ modules:
 - type: stripe-payment-processor
 - type: firebase-app-notifier
   config:
-    configFile: config/pantel-prod.json
+    configFile: config/prime-service-account.json
 - type: admin
 - type: scaninfo-store
   config:

diff --git a/scaninfo-shredder/Dockerfile.test b/scaninfo-shredder/Dockerfile.test
@@ -7,7 +7,7 @@ LABEL maintainer="[email protected]"
 #
 
 COPY script/start.sh /start.sh
-COPY config/pantel-prod.json /secret/pantel-prod.json
+COPY config/prime-service-account.json /secret/prime-service-account.json
 COPY config/config.yaml /config/config.yaml
 COPY build/libs/bq-metrics-extractor-uber.jar /scaninfo-shredder.jar
 

diff --git a/scaninfo-shredder/config/.gitignore b/scaninfo-shredder/config/.gitignore
@@ -1 +1 @@
-pantel-prod.json
+prime-service-account.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,4 @@

		#!include:.gitignore

		pantel-prod.json
		prime-service-account.json