From 5db553a3b3a813acdb793af13a04b42f20cba100 Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Sun, 27 Oct 2024 09:08:48 +0000 Subject: [PATCH 01/17] Create deploy-diagram.yml Added first pass but APi is unclear --- .github/workflows/deploy-diagram.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/deploy-diagram.yml diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml new file mode 100644 index 0000000..85c61a9 --- /dev/null +++ b/.github/workflows/deploy-diagram.yml @@ -0,0 +1,28 @@ +name: Deploy Diagram to Camunda SaaS + +on: + pull_request: + push: + branches: + - main + workflow_dispatch: + +jobs: + deploy-diagram: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Push diagram to Camunda SaaS + env: + CAMUNDA_API_URL: ${{ secrets.CAMUNDA_API_URL }} + CAMUNDA_API_KEY: ${{ secrets.CAMUNDA_API_KEY }} + run: | + curl -X POST "$CAMUNDA_API_URL/v2/deployments" \ + -H 'Content-Type: multipart/form-data' \ + -H 'Accept: application/json + -H "Authorization: Bearer $CAMUNDA_API_KEY" \ + -F "deployment-name=my-diagram-deployment" \ + -F "webinar8.6.bpmn=src/main/resources/webinar8.6.bpmn" From 64afd7a82435fd1c8b202535de276d6d710825d2 Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 10:59:36 +0000 Subject: [PATCH 02/17] Adding zbctl --- .github/workflows/deploy-diagram.yml | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index 85c61a9..230b768 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -5,6 +5,9 @@ on: push: branches: - main + paths: + - '**/*.bpmn' + workflow_dispatch: jobs: @@ -15,14 +18,18 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Push diagram to Camunda SaaS + - name: Set up zbctl + run: | + apk update + npm install -g zbctl + + - name: Deploy BPMN to Zeebe env: - CAMUNDA_API_URL: ${{ secrets.CAMUNDA_API_URL }} - CAMUNDA_API_KEY: ${{ secrets.CAMUNDA_API_KEY }} + ZEEBE_ADDRESS: ${{ secrets.ZEEBE_ADDRESS }} + ZEEBE_CLIENT_ID: ${{ secrets.ZEEBE_CLIENT_ID }} + ZEEBE_CLIENT_SECRET: ${{ secrets.ZEEBE_CLIENT_SECRET }} + ZEEBE_AUTHORIZATION_SERVER_URL: 'https://login.cloud.camunda.io/oauth/token' run: | - curl -X POST "$CAMUNDA_API_URL/v2/deployments" \ - -H 'Content-Type: multipart/form-data' \ - -H 'Accept: application/json - -H "Authorization: Bearer $CAMUNDA_API_KEY" \ - -F "deployment-name=my-diagram-deployment" \ - -F "webinar8.6.bpmn=src/main/resources/webinar8.6.bpmn" + zbctl status + zbctl deploy src/main/resources/webinar8.6.bpmn + From 9a2ec956f37b468cae66243bab7047136ef422c0 Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 11:02:12 +0000 Subject: [PATCH 03/17] fix apt --- .github/workflows/deploy-diagram.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index 230b768..1448e86 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -20,7 +20,7 @@ jobs: - name: Set up zbctl run: | - apk update + sudo apt-get update npm install -g zbctl - name: Deploy BPMN to Zeebe From 371528223bb60da8c35a20a025c35a44b18ac91a Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 11:22:03 +0000 Subject: [PATCH 04/17] adding status --- .github/workflows/deploy-diagram.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index 1448e86..f321bee 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -23,13 +23,21 @@ jobs: sudo apt-get update npm install -g zbctl - - name: Deploy BPMN to Zeebe + - name: Zeebe status env: ZEEBE_ADDRESS: ${{ secrets.ZEEBE_ADDRESS }} ZEEBE_CLIENT_ID: ${{ secrets.ZEEBE_CLIENT_ID }} ZEEBE_CLIENT_SECRET: ${{ secrets.ZEEBE_CLIENT_SECRET }} ZEEBE_AUTHORIZATION_SERVER_URL: 'https://login.cloud.camunda.io/oauth/token' run: | + echo ${{ secrets.ZEEBE_ADDRESS }} zbctl status + - name: Deploy BPMN to Zeebe + env: + ZEEBE_ADDRESS: ${{ secrets.ZEEBE_ADDRESS }} + ZEEBE_CLIENT_ID: ${{ secrets.ZEEBE_CLIENT_ID }} + ZEEBE_CLIENT_SECRET: ${{ secrets.ZEEBE_CLIENT_SECRET }} + ZEEBE_AUTHORIZATION_SERVER_URL: 'https://login.cloud.camunda.io/oauth/token' + run: | zbctl deploy src/main/resources/webinar8.6.bpmn From b803aae87dfff9cebeff9264adc388abac1c78df Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 11:26:19 +0000 Subject: [PATCH 05/17] adding permission --- .github/workflows/deploy-diagram.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index f321bee..7e33864 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -9,6 +9,10 @@ on: - '**/*.bpmn' workflow_dispatch: + +permissions: + contents: read + id-token: write jobs: deploy-diagram: From 8f530b42e19ae8125cdeaf17f4bf0e3abab94cf4 Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 11:29:41 +0000 Subject: [PATCH 06/17] debuggin --- .github/workflows/deploy-diagram.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index 7e33864..f20e0d8 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -9,7 +9,7 @@ on: - '**/*.bpmn' workflow_dispatch: - + permissions: contents: read id-token: write @@ -27,15 +27,21 @@ jobs: sudo apt-get update npm install -g zbctl - - name: Zeebe status + - name: Debug environment variables + run: | + echo "ZEEBE_CLIENT_ID is ${ZEEBE_CLIENT_ID:+"set"}" + echo "ZEEBE_CLIENT_SECRET is ${ZEEBE_CLIENT_SECRET:+"set"}" + + - name: Check zbctl status env: ZEEBE_ADDRESS: ${{ secrets.ZEEBE_ADDRESS }} ZEEBE_CLIENT_ID: ${{ secrets.ZEEBE_CLIENT_ID }} ZEEBE_CLIENT_SECRET: ${{ secrets.ZEEBE_CLIENT_SECRET }} - ZEEBE_AUTHORIZATION_SERVER_URL: 'https://login.cloud.camunda.io/oauth/token' + ZEEBE_AUTHORIZATION_SERVER_URL: ${{ secrets.ZEEBE_AUTHORIZATION_SERVER_URL }} run: | - echo ${{ secrets.ZEEBE_ADDRESS }} - zbctl status + zbctl status --address $ZEEBE_ADDRESS --insecure --clientId $ZEEBE_CLIENT_ID --clientSecret $ZEEBE_CLIENT_SECRET + + - name: Deploy BPMN to Zeebe env: ZEEBE_ADDRESS: ${{ secrets.ZEEBE_ADDRESS }} From 6cef5ee25b3a0bc739000ba5275610fbbdf5ea61 Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 11:37:30 +0000 Subject: [PATCH 07/17] updating to support all branches --- .github/workflows/deploy-diagram.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index f20e0d8..bdba253 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -3,8 +3,6 @@ name: Deploy Diagram to Camunda SaaS on: pull_request: push: - branches: - - main paths: - '**/*.bpmn' From a96383283f7400eed59fb4ee083e3b00e21837fb Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 13:48:38 +0000 Subject: [PATCH 08/17] updating secrets --- .github/workflows/deploy-diagram.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index bdba253..e86c3e0 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -32,9 +32,9 @@ jobs: - name: Check zbctl status env: - ZEEBE_ADDRESS: ${{ secrets.ZEEBE_ADDRESS }} - ZEEBE_CLIENT_ID: ${{ secrets.ZEEBE_CLIENT_ID }} - ZEEBE_CLIENT_SECRET: ${{ secrets.ZEEBE_CLIENT_SECRET }} + ZEEBE_ADDRESS: '9d44c38d-cb28-4346-971d-ace24dd4ed1b.bru-2.zeebe.camunda.io:443' + ZEEBE_CLIENT_ID: 'e_f8.cIz~6Kk~IUjOpW-f8yb-nKMEKMa' + ZEEBE_CLIENT_SECRET: 'nYO6kEtp9QHbjzh29N3iYBCyZG0pM6R8u4qOcv6ZDtvQU1aX3DZUrebjn748OWhU' ZEEBE_AUTHORIZATION_SERVER_URL: ${{ secrets.ZEEBE_AUTHORIZATION_SERVER_URL }} run: | zbctl status --address $ZEEBE_ADDRESS --insecure --clientId $ZEEBE_CLIENT_ID --clientSecret $ZEEBE_CLIENT_SECRET @@ -42,9 +42,9 @@ jobs: - name: Deploy BPMN to Zeebe env: - ZEEBE_ADDRESS: ${{ secrets.ZEEBE_ADDRESS }} - ZEEBE_CLIENT_ID: ${{ secrets.ZEEBE_CLIENT_ID }} - ZEEBE_CLIENT_SECRET: ${{ secrets.ZEEBE_CLIENT_SECRET }} + ZEEBE_ADDRESS: '9d44c38d-cb28-4346-971d-ace24dd4ed1b.bru-2.zeebe.camunda.io:443' + ZEEBE_CLIENT_ID: 'e_f8.cIz~6Kk~IUjOpW-f8yb-nKMEKMa' + ZEEBE_CLIENT_SECRET: 'nYO6kEtp9QHbjzh29N3iYBCyZG0pM6R8u4qOcv6ZDtvQU1aX3DZUrebjn748OWhU' ZEEBE_AUTHORIZATION_SERVER_URL: 'https://login.cloud.camunda.io/oauth/token' run: | zbctl deploy src/main/resources/webinar8.6.bpmn From 5b035e3c9746bfa00421ee247295529b2822a455 Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 13:54:07 +0000 Subject: [PATCH 09/17] small fix --- .github/workflows/deploy-diagram.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index e86c3e0..091c5a8 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -35,9 +35,9 @@ jobs: ZEEBE_ADDRESS: '9d44c38d-cb28-4346-971d-ace24dd4ed1b.bru-2.zeebe.camunda.io:443' ZEEBE_CLIENT_ID: 'e_f8.cIz~6Kk~IUjOpW-f8yb-nKMEKMa' ZEEBE_CLIENT_SECRET: 'nYO6kEtp9QHbjzh29N3iYBCyZG0pM6R8u4qOcv6ZDtvQU1aX3DZUrebjn748OWhU' - ZEEBE_AUTHORIZATION_SERVER_URL: ${{ secrets.ZEEBE_AUTHORIZATION_SERVER_URL }} + ZEEBE_AUTHORIZATION_SERVER_URL: 'https://login.cloud.camunda.io/oauth/token' run: | - zbctl status --address $ZEEBE_ADDRESS --insecure --clientId $ZEEBE_CLIENT_ID --clientSecret $ZEEBE_CLIENT_SECRET + zbctl status - name: Deploy BPMN to Zeebe From d83dc2ee7b46e88ba4e9e48ab1788c71417f6e3d Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 14:03:12 +0000 Subject: [PATCH 10/17] path update --- .github/workflows/deploy-diagram.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index 091c5a8..399c49f 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -47,5 +47,5 @@ jobs: ZEEBE_CLIENT_SECRET: 'nYO6kEtp9QHbjzh29N3iYBCyZG0pM6R8u4qOcv6ZDtvQU1aX3DZUrebjn748OWhU' ZEEBE_AUTHORIZATION_SERVER_URL: 'https://login.cloud.camunda.io/oauth/token' run: | - zbctl deploy src/main/resources/webinar8.6.bpmn + zbctl deploy ./src/main/resources/webinar8.6.bpmn From 7579cc5e527002b3a7465e7c3af6f35918f813b0 Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 14:06:13 +0000 Subject: [PATCH 11/17] small fix --- .github/workflows/deploy-diagram.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index 399c49f..bd28316 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -47,5 +47,5 @@ jobs: ZEEBE_CLIENT_SECRET: 'nYO6kEtp9QHbjzh29N3iYBCyZG0pM6R8u4qOcv6ZDtvQU1aX3DZUrebjn748OWhU' ZEEBE_AUTHORIZATION_SERVER_URL: 'https://login.cloud.camunda.io/oauth/token' run: | - zbctl deploy ./src/main/resources/webinar8.6.bpmn + zbctl deploy ../../src/main/resources/webinar8.6.bpmn From 07a0cd1a780187d88a628be097683a627d4332b2 Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 14:07:04 +0000 Subject: [PATCH 12/17] Updatign bpmn --- .github/workflows/deploy-diagram.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index bd28316..0731bfd 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -47,5 +47,5 @@ jobs: ZEEBE_CLIENT_SECRET: 'nYO6kEtp9QHbjzh29N3iYBCyZG0pM6R8u4qOcv6ZDtvQU1aX3DZUrebjn748OWhU' ZEEBE_AUTHORIZATION_SERVER_URL: 'https://login.cloud.camunda.io/oauth/token' run: | - zbctl deploy ../../src/main/resources/webinar8.6.bpmn + zbctl deploy '../../src/main/resources/bank loan origination and processing.bpmn' From c36effb2bf228f908039d07984f4aa45ee6cb339 Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 14:08:16 +0000 Subject: [PATCH 13/17] debug --- .github/workflows/deploy-diagram.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index 0731bfd..65ce66b 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -47,5 +47,6 @@ jobs: ZEEBE_CLIENT_SECRET: 'nYO6kEtp9QHbjzh29N3iYBCyZG0pM6R8u4qOcv6ZDtvQU1aX3DZUrebjn748OWhU' ZEEBE_AUTHORIZATION_SERVER_URL: 'https://login.cloud.camunda.io/oauth/token' run: | + ls ../../ zbctl deploy '../../src/main/resources/bank loan origination and processing.bpmn' From 45d8fd12720a4297ae48d619c40962aa9305c76f Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 14:09:17 +0000 Subject: [PATCH 14/17] update folder --- .github/workflows/deploy-diagram.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index 65ce66b..44027c0 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -48,5 +48,5 @@ jobs: ZEEBE_AUTHORIZATION_SERVER_URL: 'https://login.cloud.camunda.io/oauth/token' run: | ls ../../ - zbctl deploy '../../src/main/resources/bank loan origination and processing.bpmn' + zbctl deploy '../src/main/resources/bank loan origination and processing.bpmn' From 295dd91637be69c1c60286c7f2576652dc2596b2 Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 14:11:01 +0000 Subject: [PATCH 15/17] folder fix --- .github/workflows/deploy-diagram.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index 44027c0..12a0dac 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -47,6 +47,6 @@ jobs: ZEEBE_CLIENT_SECRET: 'nYO6kEtp9QHbjzh29N3iYBCyZG0pM6R8u4qOcv6ZDtvQU1aX3DZUrebjn748OWhU' ZEEBE_AUTHORIZATION_SERVER_URL: 'https://login.cloud.camunda.io/oauth/token' run: | - ls ../../ + ls ../ zbctl deploy '../src/main/resources/bank loan origination and processing.bpmn' From 09e8bd47d308e6ad8c1acbf7f67961a81c2163e1 Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 14:13:07 +0000 Subject: [PATCH 16/17] folder fix --- .github/workflows/deploy-diagram.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index 12a0dac..6934030 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -47,6 +47,6 @@ jobs: ZEEBE_CLIENT_SECRET: 'nYO6kEtp9QHbjzh29N3iYBCyZG0pM6R8u4qOcv6ZDtvQU1aX3DZUrebjn748OWhU' ZEEBE_AUTHORIZATION_SERVER_URL: 'https://login.cloud.camunda.io/oauth/token' run: | - ls ../ + ls ../Webinar-8.6 zbctl deploy '../src/main/resources/bank loan origination and processing.bpmn' From 1b0a03781b0ccf19088f51d74f9cd05f198728fd Mon Sep 17 00:00:00 2001 From: Andrey Belik Date: Tue, 29 Oct 2024 14:16:21 +0000 Subject: [PATCH 17/17] folder fix --- .github/workflows/deploy-diagram.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy-diagram.yml b/.github/workflows/deploy-diagram.yml index 6934030..a56716b 100644 --- a/.github/workflows/deploy-diagram.yml +++ b/.github/workflows/deploy-diagram.yml @@ -47,6 +47,5 @@ jobs: ZEEBE_CLIENT_SECRET: 'nYO6kEtp9QHbjzh29N3iYBCyZG0pM6R8u4qOcv6ZDtvQU1aX3DZUrebjn748OWhU' ZEEBE_AUTHORIZATION_SERVER_URL: 'https://login.cloud.camunda.io/oauth/token' run: | - ls ../Webinar-8.6 - zbctl deploy '../src/main/resources/bank loan origination and processing.bpmn' + zbctl deploy '../Webinar-8.6/src/main/resources/bank loan origination and processing.bpmn'