Update workshopID to WORKSHOPID

Keith Halsall · Keith Halsall · commit cbaf3cc806fd · 2024-02-22T23:04:41.000-06:00
diff --git a/.github/workflows/create_studio_project.yml b/.github/workflows/create_studio_project.yml
@@ -24,7 +24,7 @@ jobs:
             --header 'content-type: application/json' \
             --header 'X-API-Key: ${{ secrets.APOLLO_USER_KEY }}' \
             --url 'https://graphql.api.apollographql.com/api/graphql' \
-            --data '{"query":"mutation Mutation($graphId: ID!, $name: String!, $description: String, $linkedVariants: [String!]) {\n  graph(id: $graphId) {\n    createPersistedQueryList(name: $name, description: $description, linkedVariants: $linkedVariants) {\n      ... on CreatePersistedQueryListResult {\n        persistedQueryList {\n          id\n    createdAt\n        }\n      }\n    }\n  }\n}","variables":{"graphId":"${{vars.ACTOR}}-${{vars.workshopID}}${{ env.GEN }}","name":"pq_list","description":"Our PQ List","linkedVariants":["current"]}}' -o pq.json
+            --data '{"query":"mutation Mutation($graphId: ID!, $name: String!, $description: String, $linkedVariants: [String!]) {\n  graph(id: $graphId) {\n    createPersistedQueryList(name: $name, description: $description, linkedVariants: $linkedVariants) {\n      ... on CreatePersistedQueryListResult {\n        persistedQueryList {\n          id\n    createdAt\n        }\n      }\n    }\n  }\n}","variables":{"graphId":"${{vars.ACTOR}}-${{vars.WORKSHOPID}}${{ env.GEN }}","name":"pq_list","description":"Our PQ List","linkedVariants":["current"]}}' -o pq.json
           cat pq.json
 
       - name: Set Env
@@ -40,7 +40,7 @@ jobs:
 
       - name: Publish PQ List          
         run: | 
-          rover persisted-queries publish --graph-id ${{vars.ACTOR}}-${{vars.workshopID}}${{env.GEN}} --list-id ${{env.PQ_ID}} \
+          rover persisted-queries publish --graph-id ${{vars.ACTOR}}-${{vars.WORKSHOPID}}${{env.GEN}} --list-id ${{env.PQ_ID}} \
             --manifest ./final/workshop-pq-manifest.json
 
   deploy:
@@ -58,19 +58,19 @@ jobs:
           credentials_json: ${{ secrets.GCP_CREDENTIALS }}
       - name: Get URL
         run: | 
-          gcloud run services describe ${{vars.ACTOR}}-${{vars.workshopID}}-router --region us-central1 --format 'value(status.url)' > url.json
+          gcloud run services describe ${{vars.ACTOR}}-${{vars.WORKSHOPID}}-router --region us-central1 --format 'value(status.url)' > url.json
           echo "URL=$(cat url.json)" >> $GITHUB_ENV
       - name: Set URL
         run: |
           curl --request POST \
             --header 'content-type: application/json' \
             --header 'X-API-Key: ${{ secrets.APOLLO_USER_KEY }}' \
             --url 'https://graphql.api.apollographql.com/api/graphql' \
-            --data '{"query":"mutation UpdateURL($name: String!, $graphId: ID!, $url: String) {\n  graph(id: $graphId) {\n    variant(name: $name) {\n      updateURL(url: $url) {\n        createdAt\n      }\n    }\n  }\n}","variables":{"name":"current","graphId":"${{vars.ACTOR}}-${{vars.workshopID}}${{ env.GEN }}","url":"${{ env.URL }}"}}'
+            --data '{"query":"mutation UpdateURL($name: String!, $graphId: ID!, $url: String) {\n  graph(id: $graphId) {\n    variant(name: $name) {\n      updateURL(url: $url) {\n        createdAt\n      }\n    }\n  }\n}","variables":{"name":"current","graphId":"${{vars.ACTOR}}-${{vars.WORKSHOPID}}${{ env.GEN }}","url":"${{ env.URL }}"}}'
 
       - name: Get Contract Router URL
         run: |
-          gcloud run services describe ${{vars.ACTOR}}-${{vars.workshopID}}-contractRouter --region us-central1 --format 'value(status.url)' > contractURL.json
+          gcloud run services describe ${{vars.ACTOR}}-${{vars.WORKSHOPID}}-contractRouter --region us-central1 --format 'value(status.url)' > contractURL.json
           echo "contractURL=$(cat contractURL.json)" >> $GITHUB_ENV
 
       - name: Set URL
@@ -79,7 +79,7 @@ jobs:
             --header 'content-type: application/json' \
             --header 'X-API-Key: ${{ secrets.APOLLO_USER_KEY }}' \
             --url 'https://graphql.api.apollographql.com/api/graphql' \
-            --data '{"query":"mutation UpdateURL($name: String!, $graphId: ID!, $url: String) {\n  graph(id: $graphId) {\n    variant(name: $name) {\n      updateURL(url: $url) {\n        createdAt\n      }\n    }\n  }\n}","variables":{"name":"public","graphId":"${{vars.ACTOR}}-${{vars.workshopID}}${{ env.GEN }}","url":"${{ env.URL }}"}}'
+            --data '{"query":"mutation UpdateURL($name: String!, $graphId: ID!, $url: String) {\n  graph(id: $graphId) {\n    variant(name: $name) {\n      updateURL(url: $url) {\n        createdAt\n      }\n    }\n  }\n}","variables":{"name":"public","graphId":"${{vars.ACTOR}}-${{vars.WORKSHOPID}}${{ env.GEN }}","url":"${{ env.URL }}"}}'
   
 
       - name: Set Subscription URL
@@ -88,7 +88,7 @@ jobs:
             --header 'content-type: application/json' \
             --header 'X-API-Key: ${{ secrets.APOLLO_USER_KEY }}' \
             --url 'https://graphql.api.apollographql.com/api/graphql' \
-            --data '{"query":"mutation Mutation($graphId: ID!, $name: String!, $subscriptionUrl: String) {\n  graph(id: $graphId) {\n    variant(name: $name) {\n      updateSubscriptionURL(subscriptionUrl: $subscriptionUrl) {\n        createdAt\n      }\n    }\n  }\n}","variables":{"graphId":"${{vars.ACTOR}}-${{vars.workshopID}}${{ env.GEN }}","name":"current","subscriptionUrl":"${{ env.URL }}"}}'
+            --data '{"query":"mutation Mutation($graphId: ID!, $name: String!, $subscriptionUrl: String) {\n  graph(id: $graphId) {\n    variant(name: $name) {\n      updateSubscriptionURL(subscriptionUrl: $subscriptionUrl) {\n        createdAt\n      }\n    }\n  }\n}","variables":{"graphId":"${{vars.ACTOR}}-${{vars.WORKSHOPID}}${{ env.GEN }}","name":"current","subscriptionUrl":"${{ env.URL }}"}}'
   
   preflightScript:
     needs: publish
@@ -100,4 +100,4 @@ jobs:
             --header 'content-type: application/json' \
             --header 'X-API-Key: ${{ secrets.APOLLO_USER_KEY }}' \
             --url 'https://graphql.api.apollographql.com/api/graphql' \
-            --data '{"query":"mutation Mutation($graphId: ID!, $name: String!, $preflightScript: String) {\n  graph(id: $graphId) {\n    variant(name: $name) {\n      updatePreflightScript(preflightScript: $preflightScript) {\n        createdAt\n      }\n    }\n  }\n}","variables":{"graphId":"${{vars.ACTOR}}-${{vars.workshopID}}${{ env.GEN }}","name":"current","preflightScript":"const API_KEY=\"AIzaSyBGEWuarfRs4vVIzbdPj7EU_h3tMAVO_e4\";console.log(\"fetching new token.....\");const getToken=async e=>{let o=await explorer.fetch(\"https:\/\/identitytoolkit.googleapis.com\/v1\/accounts:signInWithPassword?key=AIzaSyBGEWuarfRs4vVIzbdPj7EU_h3tMAVO_e4\",{method:\"POST\",header:{\"Content-Type\":\"application\/json\"},body:JSON.stringify({email:e,password:\"apolloworkshop\",returnSecureToken:!0})});return o.json()},authorizedCredentials=await getToken(\"yes@apolloworkshop.com\"),{idToken:authorizedToken}=authorizedCredentials;explorer.environment.set(\"authorizedToken\",authorizedToken),console.log(\"successfully set authorized token\");const unauthorizedCredentials=await getToken(\"no@apolloworkshop.com\"),{idToken:unauthorizedToken}=unauthorizedCredentials;explorer.environment.set(\"unauthorizedToken\",unauthorizedToken),console.log(\"successfully set token unauthorized token\");"}}'
+            --data '{"query":"mutation Mutation($graphId: ID!, $name: String!, $preflightScript: String) {\n  graph(id: $graphId) {\n    variant(name: $name) {\n      updatePreflightScript(preflightScript: $preflightScript) {\n        createdAt\n      }\n    }\n  }\n}","variables":{"graphId":"${{vars.ACTOR}}-${{vars.WORKSHOPID}}${{ env.GEN }}","name":"current","preflightScript":"const API_KEY=\"AIzaSyBGEWuarfRs4vVIzbdPj7EU_h3tMAVO_e4\";console.log(\"fetching new token.....\");const getToken=async e=>{let o=await explorer.fetch(\"https:\/\/identitytoolkit.googleapis.com\/v1\/accounts:signInWithPassword?key=AIzaSyBGEWuarfRs4vVIzbdPj7EU_h3tMAVO_e4\",{method:\"POST\",header:{\"Content-Type\":\"application\/json\"},body:JSON.stringify({email:e,password:\"apolloworkshop\",returnSecureToken:!0})});return o.json()},authorizedCredentials=await getToken(\"yes@apolloworkshop.com\"),{idToken:authorizedToken}=authorizedCredentials;explorer.environment.set(\"authorizedToken\",authorizedToken),console.log(\"successfully set authorized token\");const unauthorizedCredentials=await getToken(\"no@apolloworkshop.com\"),{idToken:unauthorizedToken}=unauthorizedCredentials;explorer.environment.set(\"unauthorizedToken\",unauthorizedToken),console.log(\"successfully set token unauthorized token\");"}}'
diff --git a/.github/workflows/deploy-orders.yml b/.github/workflows/deploy-orders.yml
@@ -30,30 +30,30 @@ jobs:
 
     - name: Build Order Subgraph Docker image
       run: |
-        docker build -t gcr.io/summit-enterprise-workshop/${{github.actor}}-${{vars.workshopID}}-orders:latest .
+        docker build -t gcr.io/summit-enterprise-workshop/${{github.actor}}-${{vars.WORKSHOPID}}-orders:latest .
         docker images
       working-directory: ./rest-orders
 
     - name: Push Docker image to Google Container Registry
       run: |
-        docker push gcr.io/summit-enterprise-workshop/${{github.actor}}-${{vars.workshopID}}-orders:latest
+        docker push gcr.io/summit-enterprise-workshop/${{github.actor}}-${{vars.WORKSHOPID}}-orders:latest
       working-directory: ./rest-orders
 
     - name: Deploy Orders subgraph to Cloud Run
       run: |
-        gcloud run deploy ${{github.actor}}-${{vars.workshopID}}-orders \
-          --image gcr.io/summit-enterprise-workshop/${{github.actor}}-${{vars.workshopID}}-orders:latest \
+        gcloud run deploy ${{github.actor}}-${{vars.WORKSHOPID}}-orders \
+          --image gcr.io/summit-enterprise-workshop/${{github.actor}}-${{vars.WORKSHOPID}}-orders:latest \
           --platform managed \
           --region us-central1 \
           --update-env-vars APOLLO_KEY=${{ secrets.APOLLO_KEY }},APOLLO_GRAPH_REF=${{ secrets.APOLLO_GRAPH_REF }} \
           --allow-unauthenticated
     - name: Get URL
       run: | 
-        gcloud run services describe ${{vars.ACTOR}}-${{vars.workshopID}}-orders --region us-central1 --format 'value(status.url)' > url.json
+        gcloud run services describe ${{vars.ACTOR}}-${{vars.WORKSHOPID}}-orders --region us-central1 --format 'value(status.url)' > url.json
             echo "URL=$(cat url.json)" >> $GITHUB_ENV
     - name: Rover Subgraph Publish Orders
       run: | 
-        rover subgraph publish ${{vars.ACTOR}}-${{vars.workshopID}}${{ env.GEN }}@current \
+        rover subgraph publish ${{vars.ACTOR}}-${{vars.WORKSHOPID}}${{ env.GEN }}@current \
           --name orders \
           --routing-url  ${{ env.URL }} \
           --schema ./rest-orders/schema.graphql
diff --git a/.github/workflows/deploy-router.yml b/.github/workflows/deploy-router.yml
@@ -32,14 +32,14 @@ jobs:
 
     - name: Depoy Apollo Router to Cloud Run
       run: |
-        gcloud run deploy ${{vars.ACTOR}}-${{vars.workshopID}}-router --image gcr.io/summit-enterprise-workshop/jesse-apollo-router:latest \
+        gcloud run deploy ${{vars.ACTOR}}-${{vars.WORKSHOPID}}-router --image gcr.io/summit-enterprise-workshop/jesse-apollo-router:latest \
           --set-secrets=/dist/config/router.yaml=${{vars.ACTOR}}:latest \
-          --set-env-vars "APOLLO_ROUTER_HOT_RELOAD=true,APOLLO_KEY=${{ vars.TOKEN }},APOLLO_GRAPH_REF=${{vars.ACTOR}}-${{vars.workshopID}}${{env.GEN}}@current" --platform managed --region us-central1 \
+          --set-env-vars "APOLLO_ROUTER_HOT_RELOAD=true,APOLLO_KEY=${{ vars.TOKEN }},APOLLO_GRAPH_REF=${{vars.ACTOR}}-${{vars.WORKSHOPID}}${{env.GEN}}@current" --platform managed --region us-central1 \
           --allow-unauthenticated
 
     - name: Deploy contract router to Cloud Run
       run: |
         gcloud run deploy ${{vars.ACTOR}}-contractRouter --image gcr.io/summit-enterprise-workshop/jesse-apollo-router:latest \
         --set-secrets=/dist/config/router.yaml=${{vars.ACTOR}}:latest \
-        --set-env-vars "APOLLO_ROUTER_HOT_RELOAD=true,APOLLO_KEY=${{ vars.TOKEN }},APOLLO_GRAPH_REF=${{vars.ACTOR}}-${{vars.workshopID}}${{env.GEN}}@public" --platform managed --region us-central1 \
+        --set-env-vars "APOLLO_ROUTER_HOT_RELOAD=true,APOLLO_KEY=${{ vars.TOKEN }},APOLLO_GRAPH_REF=${{vars.ACTOR}}-${{vars.WORKSHOPID}}${{env.GEN}}@public" --platform managed --region us-central1 \
         --allow-unauthenticated
diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/deploy-website.yml
@@ -29,31 +29,31 @@ jobs:
 
     - name: Build Website Docker image
       run: |
-        docker build -t gcr.io/summit-enterprise-workshop/${{github.actor}}-${{vars.workshopID}}-website:latest .
+        docker build -t gcr.io/summit-enterprise-workshop/${{github.actor}}-${{vars.WORKSHOPID}}-website:latest .
         docker images
       working-directory: .final/website
 
     - name: Push Docker image to Google Container Registry
       run: |
-        docker push gcr.io/summit-enterprise-workshop/${{github.actor}}-${{vars.workshopID}}-website:latest
+        docker push gcr.io/summit-enterprise-workshop/${{github.actor}}-${{vars.WORKSHOPID}}-website:latest
       working-directory: ./final/website
 
     - name: Get Router URL
       run: | 
-        gcloud run services describe ${{vars.ACTOR}}-${{vars.workshopID}}-router --region us-central1 --format 'value(status.url)' > url.json
+        gcloud run services describe ${{vars.ACTOR}}-${{vars.WORKSHOPID}}-router --region us-central1 --format 'value(status.url)' > url.json
         echo "URL=$(cat url.json)" >> $GITHUB_ENV
 
     - name: Deploy Website to Cloud Run
       run: |
-        gcloud run deploy ${{github.actor}}-${{vars.workshopID}}-website \
-          --image gcr.io/summit-enterprise-workshop/${{github.actor}}-${{vars.workshopID}}-website:latest \
+        gcloud run deploy ${{github.actor}}-${{vars.WORKSHOPID}}-website \
+          --image gcr.io/summit-enterprise-workshop/${{github.actor}}-${{vars.WORKSHOPID}}-website:latest \
           --platform managed \
           --region us-central1 \
           --update-env-vars APOLLO_KEY=${{ secrets.APOLLO_KEY }},APOLLO_GRAPH_REF=${{ secrets.APOLLO_GRAPH_REF }}, ROUTER_URL=${{env.url}} \
           --allow-unauthenticated
     - name: Get URL
       run: | 
-        gcloud run services describe ${{vars.ACTOR}}-${{vars.workshopID}}-website --region us-central1 --format 'value(status.url)' > url.json
+        gcloud run services describe ${{vars.ACTOR}}-${{vars.WORKSHOPID}}-website --region us-central1 --format 'value(status.url)' > url.json
             echo "webURL=$(cat url.json)" >> $GITHUB_ENV
     
     - name: Get current README to update
@@ -62,7 +62,7 @@ jobs:
         --header 'content-type: application/json' \
         --header 'X-API-Key: user:fp.d88ba77d-487c-4b97-9780-f1e4c5352a22:ftuXT6T7OktKoMaUZhQwSw' \
         --url 'https://graphql.api.apollographql.com/api/graphql' \
-        --data '{"query":"query Query($ref: ID!) {\n  variant(ref: $ref) {\n    ... on GraphVariant {\n      readme {\n        content\n      }\n    }\n  }\n}","variables":{"ref":"${{vars.ACTOR}}-${{vars.workshopID}}${{env.GEN}}"}}' -o readme.json
+        --data '{"query":"query Query($ref: ID!) {\n  variant(ref: $ref) {\n    ... on GraphVariant {\n      readme {\n        content\n      }\n    }\n  }\n}","variables":{"ref":"${{vars.ACTOR}}-${{vars.WORKSHOPID}}${{env.GEN}}"}}' -o readme.json
 
     - name: Set Env
       run: echo "CONTENT=$(cat readme.json | jq .data.variant.readme.content)" >> $GITHUB_ENV
@@ -73,4 +73,4 @@ jobs:
        --header 'content-type: application/json' \
        --header 'X-API-Key: user:fp.d88ba77d-487c-4b97-9780-f1e4c5352a22:ftuXT6T7OktKoMaUZhQwSw' \
        --url 'https://graphql.api.apollographql.com/api/graphql' \
-       --data '{"query":"mutation Mutation($graphId: ID!, $name: String!, $readme: String!) {\n  graph(id: $graphId) {\n    variant(name: $name) {\n      updateVariantReadme(readme: $readme) {\n        readme {\n          content\n        }\n      }\n    }\n  }\n}","variables":{"graphId":"${{vars.ACTOR}}-${{vars.workshopID}}${{env.GEN}}","name":"current","readme":"${{env.CONTENT}} \n###WEBSITE URL \n ${{env.webURL}}"}}'
+       --data '{"query":"mutation Mutation($graphId: ID!, $name: String!, $readme: String!) {\n  graph(id: $graphId) {\n    variant(name: $name) {\n      updateVariantReadme(readme: $readme) {\n        readme {\n          content\n        }\n      }\n    }\n  }\n}","variables":{"graphId":"${{vars.ACTOR}}-${{vars.WORKSHOPID}}${{env.GEN}}","name":"current","readme":"${{env.CONTENT}} \n###WEBSITE URL \n ${{env.webURL}}"}}'
diff --git a/.github/workflows/publish-subgraph.yml b/.github/workflows/publish-subgraph.yml
@@ -23,22 +23,22 @@ jobs:
 
     - name: Rover Subgraph Publish Products
       run: | 
-        rover subgraph publish ${{vars.ACTOR}}-${{vars.workshopID}}${{ env.GEN }}@current \
+        rover subgraph publish ${{vars.ACTOR}}-${{vars.WORKSHOPID}}${{ env.GEN }}@current \
           --name products \
           --convert \
           --routing-url https://subgraph-products-j3nprurqka-ue.a.run.app \
           --schema ./final/nosql-products/schema.graphql
 
     - name: Rover Subgraph Publish Orders
       run: | 
-        rover subgraph publish ${{vars.ACTOR}}-${{vars.workshopID}}${{ env.GEN }}@current \
+        rover subgraph publish ${{vars.ACTOR}}-${{vars.WORKSHOPID}}${{ env.GEN }}@current \
           --name orders \
           --routing-url https://subgraph-orders-j3nprurqka-ue.a.run.app \
           --schema ./final/rest-orders/schema.graphql
 
     - name: Rover Subgraph Publish Customers
       run: |
-        rover subgraph publish ${{vars.ACTOR}}-${{vars.workshopID}}${{ env.GEN }}@current \
+        rover subgraph publish ${{vars.ACTOR}}-${{vars.WORKSHOPID}}${{ env.GEN }}@current \
           --name customers \
           --routing-url https://subgraph-customers-j3nprurqka-ue.a.run.app \
           --schema ./final/sql-customers/schema.graphql
diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml
diff --git a/.github/workflows/subgraph-check.yml b/.github/workflows/subgraph-check.yml
