[ci][fix] Publish docker-compose.yaml without RESOTOWORKER_OVERRIDE e…

…nv (#1664)
someengineering · Jun 15, 2023 · 0dc32d0 · 0dc32d0
1 parent af08bd8
commit 0dc32d0
Showing 1 changed file with 13 additions and 29 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -33,13 +33,7 @@ jobs:
       - name: Update resotocore API YAML
         shell: bash
         run: |
-          cp resotocore/resotocore/static/api-doc.yaml resoto.com/openapi/resotocore-edge.yml
-
-      - name: Modify resotocore API YAML
-        uses: mikefarah/yq@master
-        with:
-          cmd: |
-            yq e -i '.servers[0].url = "https://{host}:{port}" | .servers[0].variables.host.default="localhost" | .servers[0].variables.port.default="8900" | del(.servers[0].description)' resoto.com/openapi/resotocore-edge.yml
+          yq '.servers[0].url = "https://{host}:{port}" | .servers[0].variables.host.default="localhost" | .servers[0].variables.port.default="8900" | del(.servers[0].description)' resotocore/resotocore/static/api-doc.yaml > resoto.com/openapi/resotocore-edge.yml
 
       - name: Regenerate API docs
         working-directory: ./resoto.com
@@ -77,11 +71,6 @@ jobs:
           wget -qO resoto_access.json https://cdn.some.engineering/resoto/gcp/edge/resoto_access.json
           wget -qO resoto_mutate.json https://cdn.some.engineering/resoto/gcp/edge/resoto_mutate.json
 
-      - name: Modify Docker Compose YAML
-        shell: bash
-        run: |
-          yq -i '(.services.resotoworker.environment += "RESOTOWORKER_OVERRIDE=resotoworker.collector=example")' docker-compose.yaml
-
       - name: Clean existing Kroki images
         if: github.event_name == 'workflow_dispatch' # only when triggered manually
         shell: bash
@@ -101,7 +90,8 @@ jobs:
         continue-on-error: true
         shell: bash
         run: |
-          PSK= RESOTOCORE_ANALYTICS_OPT_OUT=true docker-compose up -d
+          yq '.services.resotoworker.environment += "RESOTOWORKER_OVERRIDE=resotoworker.collector=example"' docker-compose.yaml > docker-compose-model-gen.yaml
+          PSK= RESOTOCORE_ANALYTICS_OPT_OUT=true docker-compose -f docker-compose-model-gen.yaml up -d
           cd ${{ github.workspace }}/resoto.com/docs/reference/unified-data-model
           python3 ${{ github.workspace }}/resoto.com/tools/export_models.py
 
@@ -208,14 +198,7 @@ jobs:
         if: steps.release.outputs.prerelease == 'false'
         shell: bash
         run: |
-          cp resotocore/resotocore/static/api-doc.yaml resoto.com/openapi/resotocore-${{ steps.release.outputs.docsVersion }}.yml
-
-      - name: Modify resotocore API YAML
-        if: steps.release.outputs.prerelease == 'false'
-        uses: mikefarah/yq@master
-        with:
-          cmd: |
-            yq e -i '.servers[0].url = "https://{host}:{port}" | .servers[0].variables.host.default="localhost" | .servers[0].variables.port.default="8900" | del(.servers[0].description)' resoto.com/openapi/resotocore-${{ steps.release.outputs.docsVersion }}.yml
+          yq '.servers[0].url = "https://{host}:{port}" | .servers[0].variables.host.default="localhost" | .servers[0].variables.port.default="8900" | del(.servers[0].description)' resotocore/resotocore/static/api-doc.yaml > resoto.com/openapi/resotocore-${{ steps.release.outputs.docsVersion }}.yml
 
       - name: Regenerate API docs
         if: steps.release.outputs.prerelease == 'false'
@@ -260,7 +243,7 @@ jobs:
         if: steps.release.outputs.prerelease == 'false'
         shell: bash
         run: |
-          yq -i '(.services.[].image |= sub(":edge", ":${{ steps.release.outputs.tag }}")) | (.services.resotoworker.environment += "RESOTOWORKER_OVERRIDE=resotoworker.collector=example")' docker-compose.yaml
+          yq -i '.services.[].image |= sub(":edge", ":${{ steps.release.outputs.tag }}")' docker-compose.yaml
 
       - name: Clean existing Kroki images
         if: steps.release.outputs.prerelease == 'false'
@@ -282,7 +265,8 @@ jobs:
         continue-on-error: true
         shell: bash
         run: |
-          PSK= RESOTOCORE_ANALYTICS_OPT_OUT=true docker-compose up -d
+          yq '.services.resotoworker.environment += "RESOTOWORKER_OVERRIDE=resotoworker.collector=example"' docker-compose.yaml > docker-compose-model-gen.yaml
+          PSK= RESOTOCORE_ANALYTICS_OPT_OUT=true docker-compose -f docker-compose-model-gen.yaml up -d
           cd ${{ github.workspace }}/resoto.com/versioned_docs/version-${{ steps.release.outputs.docsVersion }}/reference/unified-data-model
           python3 ${{ github.workspace }}/resoto.com/tools/export_models.py
 
@@ -350,9 +334,9 @@ jobs:
       - name: Get current chart version
         if: steps.release.outputs.prerelease == 'false'
         id: current_chart_version
-        uses: mikefarah/yq@master
-        with:
-          cmd: yq '.version' helm-charts/someengineering/resoto/Chart.yaml
+        shell: bash
+        run: |
+          yq '.version' helm-charts/someengineering/resoto/Chart.yaml
 
       - name: Get new chart version
         if: steps.release.outputs.prerelease == 'false'
@@ -363,9 +347,9 @@ jobs:
 
       - name: Update appVersion and bump chart version
         if: steps.release.outputs.prerelease == 'false'
-        uses: mikefarah/yq@master
-        with:
-          cmd: yq e -i '.version = "${{ steps.new_chart_version.outputs.patch }}" | .appVersion = "${{ steps.release.outputs.tag }}"' helm-charts/someengineering/resoto/Chart.yaml
+        shell: bash
+        run: |
+          yq -i '.version = "${{ steps.new_chart_version.outputs.patch }}" | .appVersion = "${{ steps.release.outputs.tag }}"' helm-charts/someengineering/resoto/Chart.yaml
 
       - name: Set up Helm
         if: steps.release.outputs.prerelease == 'false'