fix(action): 🚑 fix action url again

.forgejo/workflows/createaction.yaml

@@ -0,0 +1,47 @@
+name: createapp
+
+on:
+  workflow_dispatch:
+    inputs:
+      a_app_region:
+        type: string
+        description: "Application Region e.g. EU"
+        default: EU
+        required: true  
+      b_app_flavor:
+        type: string
+        description: "Application Flavor e.g. EU.small"
+        default: EU.small    
+        required: true  
+      c_cloudlet:
+        type: choice
+        options:
+          - Amsterdam-OTC
+          - Hamburg
+          - Leipzig
+          - Munich
+          - Berlin
+          - Frankfurt
+          - Magdeburg-OTC
+          - Bonn
+          - Magdeburg
+          - crm-vm-2
+        description: "Cloudlet location"
+        default: Munich
+        required: true  
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+
+    steps:
+      -
+        name: Deploy action
+        uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-action/deploy@main
+        id: deploy
+        with:
+          region: ${{ inputs.a_app_region }}
+          flavor: ${{ inputs.b_app_flavor }}
+          cloudlet: ${{ inputs.c_cloudlet }}
+          edgexr_platform_username: ${{ secrets.EDGEXR_PLATFORM_USERNAME }}
+          edgexr_platform_password: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }}

.forgejo/workflows/createapp.yaml

@@ -7,16 +7,35 @@ on:
         type: string
         description: "Application Region e.g. EU"
         default: EU
+        required: true  
       b_app_flavor:
         type: string
         description: "Application Flavor e.g. EU.small"
         default: EU.small    
+        required: true  
+      c_cloudlet:
+        type: choice
+        options:
+          - Amsterdam-OTC
+          - Hamburg
+          - Leipzig
+          - Munich
+          - Berlin
+          - Frankfurt
+          - Magdeburg-OTC
+          - Bonn
+          - Magdeburg
+          - crm-vm-2
+        description: "Cloudlet location"
+        default: Munich
+        required: true  
 
 env:
   EDGEXR_PLATFORM_USERNAME: ${{ secrets.EDGEXR_PLATFORM_USERNAME }}
   EDGEXR_PLATFORM_PASSWORD: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }}
   APP_REGION: ${{ inputs.a_app_region }}
   APP_FLAVOR: ${{ inputs.b_app_flavor }}
+  CLOUDLET: ${{ inputs.c_cloudlet }}
 
 jobs:
   build:
@@ -57,7 +76,7 @@ jobs:
             "region": "${APP_REGION}",
             "app": {
               "key": {
-                "organization": "edp-developer-framework",
+                "organization": "dev-framework",
                 "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')",
                 "version": "${{ steps.docker.outputs.version }}"
               },
@@ -79,4 +98,39 @@ jobs:
           echo $CREATEAPP_JSON
 
           echo create app
-          curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/CreateApp -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$CREATEAPP_JSON" --fail-with-body
+          curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/CreateApp -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$CREATEAPP_JSON" --fail-with-body
+      -
+        name: Create Edge Connect App Instance
+        run: |
+          set -e
+          EDGEXR_TOKEN="$(curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/login -H 'Content-Type: application/json' --data '{"password": "'${EDGEXR_PLATFORM_PASSWORD}'","username": "'${EDGEXR_PLATFORM_USERNAME}'"}' -sSf | jq -r .token)"
+
+          CREATEAPPINSTANCE_JSON=$(cat <<EOF
+          {
+            "region": "${APP_REGION}",
+            "appinst": {
+              "key": {
+                "organization": "dev-framework",
+                "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-instance",
+                "cloudlet_key": {
+                  "organization": "TelekomOP",
+                  "name": "${CLOUDLET}"
+                }
+              },
+              "app_key": {
+                "organization": "dev-framework",
+                "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')",
+                "version": "${{ steps.docker.outputs.version }}"
+              },
+              "flavor": {
+                "name": "${APP_FLAVOR}"
+              }
+            }
+          }
+          EOF
+          )
+
+          echo $CREATEAPPINSTANCE_JSON
+
+          echo create app instance
+          curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/CreateAppInst -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$CREATEAPPINSTANCE_JSON" --fail-with-body

.forgejo/workflows/deleteapp.yaml

@@ -7,11 +7,27 @@ on:
         type: string
         description: "Application Region e.g. EU"
         default: EU  
+      b_cloudlet:
+        type: choice
+        options:
+          - Amsterdam-OTC
+          - Hamburg
+          - Leipzig
+          - Munich
+          - Berlin
+          - Frankfurt
+          - Magdeburg-OTC
+          - Bonn
+          - Magdeburg
+        description: "Cloudlet e.g. EU.small"
+        default: Munich
+        required: true  
 
 env:
   EDGEXR_PLATFORM_USERNAME: ${{ secrets.EDGEXR_PLATFORM_USERNAME }}
   EDGEXR_PLATFORM_PASSWORD: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }}
   APP_REGION: ${{ inputs.a_app_region }}
+  CLOUDLET: ${{ inputs.b_cloudlet }}
 
 jobs:
   build:
@@ -40,6 +56,39 @@ jobs:
         run: |
           sudo apt update
           sudo apt install -y curl jq
+      -
+        name: Delete Edge Connect App Instance
+        run: |
+          set -e
+          echo login 
+          EDGEXR_TOKEN="$(curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/login -H 'Content-Type: application/json' --data '{"password": "'${EDGEXR_PLATFORM_PASSWORD}'","username": "'${EDGEXR_PLATFORM_USERNAME}'"}' -sSf | jq -r .token)"
+
+          DELETEAPPINSTANCE_JSON=$(cat <<EOF
+          {
+            "region": "${APP_REGION}",
+            "appinst": {
+              "key": {
+                "organization": "edp-developer-framework",
+                "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-instance",
+                "cloudlet_key": {
+                  "organization": "TelekomOP",
+                  "name": "${CLOUDLET}"
+                }
+              },
+              "app_key": {
+                "organization": "edp-developer-framework",
+                "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')",
+                "version": "${{ steps.docker.outputs.version }}"
+              }
+            }
+          }
+          EOF
+          )
+
+          echo $DELETEAPPINSTANCE_JSON
+
+          echo delete app instance
+          curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/DeleteAppInst -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$DELETEAPPINSTANCE_JSON" --fail-with-body || true
       -
         name: Delete Edge Connect App
         run: |
@@ -47,7 +96,7 @@ jobs:
           echo login 
           EDGEXR_TOKEN="$(curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/login -H 'Content-Type: application/json' --data '{"password": "'${EDGEXR_PLATFORM_PASSWORD}'","username": "'${EDGEXR_PLATFORM_USERNAME}'"}' -sSf | jq -r .token)"
 
-          CREATEAPP_JSON=$(cat <<EOF
+          DELETEAPP_JSON=$(cat <<EOF
           {
             "App": {
               "key": {
@@ -61,7 +110,7 @@ jobs:
           EOF
           )
 
-          echo $CREATEAPP_JSON
+          echo $DELETEAPP_JSON
 
-          echo create app
-          curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/DeleteApp -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$CREATEAPP_JSON" --fail-with-body
+          echo delete app
+          curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/DeleteApp -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$DELETEAPP_JSON" --fail-with-body