fix(action): 🚑 fix action url again

fix(action): 🚚 Use correct action default url
fix(action): 🐛 fix action path
2025-09-23 15:31:32 +02:00 · 2025-09-23 15:29:03 +02:00 · 2025-09-23 15:22:40 +02:00 · 2025-09-23 15:17:09 +02:00 · 2025-09-15 15:24:19 +00:00 · 2025-08-29 09:25:36 +00:00
5 changed files with 161 additions and 98 deletions
--- a/.forgejo/workflows/createaction.yaml
+++ b/.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 }}
--- a/.forgejo/workflows/createapp.yaml
+++ b/.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:
@ -41,12 +60,12 @@ jobs:
        with:
          images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }}
      - 
-        name: Install Curl
+        name: Install Dependencies
        run: |
          sudo apt update
          sudo apt install -y curl jq
      -
-        name: Create edgeXR App
+        name: Create Edge Connect App
        run: |
          set -e
          echo login 
@ -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
--- a/.forgejo/workflows/deleteapp.yaml
+++ b/.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:
@ -36,18 +52,51 @@ jobs:
        with:
          images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }}
      - 
-        name: Install Curl
+        name: Install Dependencies
        run: |
          sudo apt update
          sudo apt install -y curl jq
      -
-        name: Delete edgeXR App
+        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)"

-          CREATEAPP_JSON=$(cat <<EOF
+          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: |
+          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)"
+
+          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
--- a/hacks/edge-calls.REST
+++ b/hacks/edge-calls.REST
@ -1,87 +0,0 @@
-POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/login HTTP/1.1
-content-type: application/json
-
-{
-  "password": "password",
-  "username": "email"
-}
-
-###
-
-POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/org/create HTTP/1.1
-Authorization: Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTQ0ODMyNzcsImlhdCI6MTc1NDM5Njg3NywidXNlcm5hbWUiOiJyaXJlIiwiZW1haWwiOiJyaWNoYXJkLXJvYmVydC5yZWl0ekB0ZWxla29tLmRlIiwia2lkIjoxLCJmaXJzdGlhdCI6MTc1NDM5Njg3NywiYXV0aHR5cGUiOiJwYXNzd29yZGF1dGgiLCJhcGlrZXl1c2VybmFtZSI6IiIsIm9iamVjdHJlc3RyaWN0aW9uIjoiIiwib3JncmVzdHJpY3Rpb24iOiIiLCJpc3N1ZWRBdFByZWNpc2UiOiIyMDI1LTA4LTA1VDEyOjI3OjU3LjUwODEwOTE3OVoifQ.30GbJmvAFYEYadVBslDZeG9Cg8QwQodSxLXxKruRS9sgSfWTmrXR2DgielNGq6gEm-3qXUxmLffNV3MsX-3hAg
-content-type: application/json
-
-{
-  "Address": "edp-developer-framework address",
-  "Name": "edp-developer-framework",
-  "Phone": "01234567890",
-  "Type": "developer"
-}
-
-###
-
-POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/org/show HTTP/1.1
-Authorization: Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTQ0ODMyNzcsImlhdCI6MTc1NDM5Njg3NywidXNlcm5hbWUiOiJyaXJlIiwiZW1haWwiOiJyaWNoYXJkLXJvYmVydC5yZWl0ekB0ZWxla29tLmRlIiwia2lkIjoxLCJmaXJzdGlhdCI6MTc1NDM5Njg3NywiYXV0aHR5cGUiOiJwYXNzd29yZGF1dGgiLCJhcGlrZXl1c2VybmFtZSI6IiIsIm9iamVjdHJlc3RyaWN0aW9uIjoiIiwib3JncmVzdHJpY3Rpb24iOiIiLCJpc3N1ZWRBdFByZWNpc2UiOiIyMDI1LTA4LTA1VDEyOjI3OjU3LjUwODEwOTE3OVoifQ.30GbJmvAFYEYadVBslDZeG9Cg8QwQodSxLXxKruRS9sgSfWTmrXR2DgielNGq6gEm-3qXUxmLffNV3MsX-3hAg
-
-###
-
-POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/user/show HTTP/1.1
-Authorization: Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTQ0ODMyNzcsImlhdCI6MTc1NDM5Njg3NywidXNlcm5hbWUiOiJyaXJlIiwiZW1haWwiOiJyaWNoYXJkLXJvYmVydC5yZWl0ekB0ZWxla29tLmRlIiwia2lkIjoxLCJmaXJzdGlhdCI6MTc1NDM5Njg3NywiYXV0aHR5cGUiOiJwYXNzd29yZGF1dGgiLCJhcGlrZXl1c2VybmFtZSI6IiIsIm9iamVjdHJlc3RyaWN0aW9uIjoiIiwib3JncmVzdHJpY3Rpb24iOiIiLCJpc3N1ZWRBdFByZWNpc2UiOiIyMDI1LTA4LTA1VDEyOjI3OjU3LjUwODEwOTE3OVoifQ.30GbJmvAFYEYadVBslDZeG9Cg8QwQodSxLXxKruRS9sgSfWTmrXR2DgielNGq6gEm-3qXUxmLffNV3MsX-3hAg
-
-###
-
-POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/ShowApp HTTP/1.1
-Authorization: Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTQ0ODMyNzcsImlhdCI6MTc1NDM5Njg3NywidXNlcm5hbWUiOiJyaXJlIiwiZW1haWwiOiJyaWNoYXJkLXJvYmVydC5yZWl0ekB0ZWxla29tLmRlIiwia2lkIjoxLCJmaXJzdGlhdCI6MTc1NDM5Njg3NywiYXV0aHR5cGUiOiJwYXNzd29yZGF1dGgiLCJhcGlrZXl1c2VybmFtZSI6IiIsIm9iamVjdHJlc3RyaWN0aW9uIjoiIiwib3JncmVzdHJpY3Rpb24iOiIiLCJpc3N1ZWRBdFByZWNpc2UiOiIyMDI1LTA4LTA1VDEyOjI3OjU3LjUwODEwOTE3OVoifQ.30GbJmvAFYEYadVBslDZeG9Cg8QwQodSxLXxKruRS9sgSfWTmrXR2DgielNGq6gEm-3qXUxmLffNV3MsX-3hAg
-
-{
-  "App": {
-    "key": {
-      "organization": "edp-developer-framework",
-      "name": "HelloWorldAuto",
-      "version": "1.0"
-    }
-  },
-  "Region": "EU"
-}
-
-###
-
-POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/CreateApp HTTP/1.1
-Authorization: Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTQ0ODMyNzcsImlhdCI6MTc1NDM5Njg3NywidXNlcm5hbWUiOiJyaXJlIiwiZW1haWwiOiJyaWNoYXJkLXJvYmVydC5yZWl0ekB0ZWxla29tLmRlIiwia2lkIjoxLCJmaXJzdGlhdCI6MTc1NDM5Njg3NywiYXV0aHR5cGUiOiJwYXNzd29yZGF1dGgiLCJhcGlrZXl1c2VybmFtZSI6IiIsIm9iamVjdHJlc3RyaWN0aW9uIjoiIiwib3JncmVzdHJpY3Rpb24iOiIiLCJpc3N1ZWRBdFByZWNpc2UiOiIyMDI1LTA4LTA1VDEyOjI3OjU3LjUwODEwOTE3OVoifQ.30GbJmvAFYEYadVBslDZeG9Cg8QwQodSxLXxKruRS9sgSfWTmrXR2DgielNGq6gEm-3qXUxmLffNV3MsX-3hAg
-content-type: application/json
-
-{
-  "App": {
-    "key": {
-      "organization": "edp-developer-framework",
-      "name": "HelloWorldAuto",
-      "version": "1.0"
-    },
-    "image_path": "edp.buildth.ing/devfw-cicd/fibonacci_pipeline:development",
-    "image_type": "Docker",
-    "access_ports": "tcp:80",
-    "default_flavor": {
-      "name": "EU.small"
-    },
-    "deployment": "docker",
-    "required_outbound_connections": null
-  },
-  "Region": "EU"
-}
-
-###
-
-POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/DeleteApp HTTP/1.1
-Authorization: Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTQ0ODMyNzcsImlhdCI6MTc1NDM5Njg3NywidXNlcm5hbWUiOiJyaXJlIiwiZW1haWwiOiJyaWNoYXJkLXJvYmVydC5yZWl0ekB0ZWxla29tLmRlIiwia2lkIjoxLCJmaXJzdGlhdCI6MTc1NDM5Njg3NywiYXV0aHR5cGUiOiJwYXNzd29yZGF1dGgiLCJhcGlrZXl1c2VybmFtZSI6IiIsIm9iamVjdHJlc3RyaWN0aW9uIjoiIiwib3JncmVzdHJpY3Rpb24iOiIiLCJpc3N1ZWRBdFByZWNpc2UiOiIyMDI1LTA4LTA1VDEyOjI3OjU3LjUwODEwOTE3OVoifQ.30GbJmvAFYEYadVBslDZeG9Cg8QwQodSxLXxKruRS9sgSfWTmrXR2DgielNGq6gEm-3qXUxmLffNV3MsX-3hAg
-
-{
-  "App": {
-    "key": {
-      "organization": "edp-developer-framework",
-      "name": "HelloWorldAuto",
-      "version": "1.0"
-    }
-  },
-  "Region": "EU"
-}
--- a/index.html
+++ b/index.html
@ -3,7 +3,7 @@
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Centered Text with Image</title>
+    <title>EDP meets Edge Connect</title>
    <!--
      The following script loads Tailwind CSS, which is used for rapid styling.
      The CSS below uses basic selectors to demonstrate how to achieve the
Author	SHA1	Message	Date
Daniel Sy	11e8511b64	fix(action): 🚑 fix action url again All checks were successful build / build (push) Successful in 14s Details	2025-09-23 15:31:32 +02:00
Daniel Sy	ef0335bda0	fix(action): 🚚 Use correct action default url All checks were successful build / build (push) Successful in 15s Details	2025-09-23 15:29:03 +02:00
Daniel Sy	6279a296bf	fix(action): 🐛 fix action path All checks were successful build / build (push) Successful in 23s Details	2025-09-23 15:22:40 +02:00
Daniel Sy	b1afc10922	feat(action): ✨ Use deploy action All checks were successful build / build (push) Successful in 15s Details	2025-09-23 15:17:09 +02:00
Daniel.Sy	84a4576935	.forgejo/workflows/createapp.yaml aktualisiert All checks were successful build / build (push) Successful in 17s Details	2025-09-15 15:24:19 +00:00
richardrobertreitz	1291e72b6f	Update .forgejo/workflows/createapp.yaml All checks were successful build / build (push) Successful in 15s Details	2025-08-29 09:25:36 +00:00
richardrobertreitz	6d8d7548bc	Update .forgejo/workflows/createapp.yaml All checks were successful build / build (push) Successful in 14s Details	2025-08-29 09:23:31 +00:00
richardrobertreitz	223952c127	Update .forgejo/workflows/createapp.yaml All checks were successful build / build (push) Successful in 15s Details	2025-08-29 09:09:36 +00:00
richardrobertreitz	223bfe40af	Update .forgejo/workflows/deleteapp.yaml All checks were successful build / build (push) Successful in 17s Details	2025-08-27 08:09:33 +00:00
richardrobertreitz	b61fb484e9	Update .forgejo/workflows/deleteapp.yaml All checks were successful build / build (push) Successful in 21s Details	2025-08-27 08:02:00 +00:00
richardrobertreitz	e8d23dad45	feat(DeleteAppInst added) All checks were successful build / build (push) Successful in 20s Details	2025-08-27 07:48:53 +00:00
richardrobertreitz	47d7d845d2	Update .forgejo/workflows/createapp.yaml All checks were successful build / build (push) Successful in 29s Details	2025-08-27 07:35:26 +00:00
richardrobertreitz	ddc53df250	feat(AppInst added) All checks were successful build / build (push) Successful in 25s Details	2025-08-27 07:33:45 +00:00
richardrobertreitz	a067d8eb23	Update .forgejo/workflows/createapp.yaml All checks were successful build / build (push) Successful in 28s Details	2025-08-21 12:30:29 +00:00
richardrobertreitz	5462ea92a2	Update .forgejo/workflows/deleteapp.yaml All checks were successful build / build (push) Successful in 20s Details	2025-08-21 12:30:00 +00:00
richardrobertreitz	b32609f513	Update index.html All checks were successful build / build (push) Successful in 23s Details	2025-08-21 12:29:02 +00:00
richardrobertreitz	f3367e9881	Delete hacks/edge-calls.REST All checks were successful build / build (push) Successful in 23s Details	2025-08-21 12:28:32 +00:00