From e2d1d4dc913b25fc7819eb726a965e33e8498ee4 Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 13:19:03 +0100
Subject: [PATCH 01/19] chore: modify test action

[skip ci]
---
 .github/actions/acc_test/action.yaml | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/.github/actions/acc_test/action.yaml b/.github/actions/acc_test/action.yaml
index 23bcd84e..800293dc 100644
--- a/.github/actions/acc_test/action.yaml
+++ b/.github/actions/acc_test/action.yaml
@@ -204,6 +204,7 @@ runs:
         fi
 
         echo "Running acceptance tests for the terraform provider"
+        set +e
         cd stackit || exit 1
         TF_ACC=1 \
         TF_ACC_PROJECT_ID=${TF_ACC_PROJECT_ID} \
@@ -214,7 +215,15 @@ runs:
         TF_ACC_KEK_KEY_RING_ID=${TF_ACC_KEK_KEY_RING_ID} \
         TF_ACC_KEK_KEY_VERSION=${TF_ACC_KEK_KEY_VERSION} \
         TF_ACC_KEK_SERVICE_ACCOUNT=${TF_ACC_KEK_SERVICE_ACCOUNT} \
-        go test -v ${{ inputs.test_file }} -timeout=${{ inputs.test_timeout_string }}
+        go test -v ${{ inputs.test_file }} -timeout=${{ inputs.test_timeout_string }} | tee -a acc_test_run.log
+        set -e
+        echo "::endgroup::"
+        echo "::group::go test result"
+        if [ $? -ne 0 ]; then
+          echo "Test failed, see acc_test_run.log for details"
+          cat acc_test_run.log | grep -v "=== RUN" | grep -v "--- PASS" | grep -v "=== CONT" | grep -v "=== PAUSE"
+          exit 1
+        fi
         echo "::endgroup::"
       env:
         TF_ACC_PROJECT_ID: ${{ inputs.project_id }}
@@ -243,7 +252,7 @@ runs:
 #        testArguments: "./... -timeout ${{ inputs.test_timeout_string }}"
 #        moduleDirectory: "stackit"
 
-    - name: Run acceptance tests
+    - name: Run all acceptance tests
       if: ${{ inputs.test_file == '' }}
       shell: bash
       run: |
@@ -258,6 +267,7 @@ runs:
 
         echo "Running acceptance tests for the terraform provider"
         cd stackit || exit 1
+        set +e
         TF_ACC=1 \
         TF_ACC_PROJECT_ID=${TF_ACC_PROJECT_ID} \
         TF_ACC_REGION=${TF_ACC_REGION} \
@@ -267,7 +277,15 @@ runs:
         TF_ACC_KEK_KEY_RING_ID=${TF_ACC_KEK_KEY_RING_ID} \
         TF_ACC_KEK_KEY_VERSION=${TF_ACC_KEK_KEY_VERSION} \
         TF_ACC_KEK_SERVICE_ACCOUNT=${TF_ACC_KEK_SERVICE_ACCOUNT} \
-        go test -v ./... -timeout=${{ inputs.test_timeout_string }}
+        go test -v ./... -timeout=${{ inputs.test_timeout_string }} | tee -a acc_test_run.log
+        set -e
+        echo "::endgroup::"
+        echo "::group::go test result"
+        if [ $? -ne 0 ]; then
+          echo "Test failed, see acc_test_run.log for details"
+          cat acc_test_run.log | grep -v "=== RUN" | grep -v "--- PASS" | grep -v "=== CONT" | grep -v "=== PAUSE"
+          exit 1
+        fi
         echo "::endgroup::"
       env:
         TF_ACC_PROJECT_ID: ${{ inputs.project_id }}
-- 
2.49.1


From ab6e2068c4a7a8c3f38823430fffcc3a1b8c950d Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 13:36:38 +0100
Subject: [PATCH 02/19] chore: modify test action

[skip ci]
---
 .github/actions/acc_test/action.yaml | 83 ++++++----------------------
 .github/workflows/tf-acc-test.yaml   |  4 +-
 2 files changed, 21 insertions(+), 66 deletions(-)

diff --git a/.github/actions/acc_test/action.yaml b/.github/actions/acc_test/action.yaml
index 800293dc..b9cfb641 100644
--- a/.github/actions/acc_test/action.yaml
+++ b/.github/actions/acc_test/action.yaml
@@ -65,6 +65,11 @@ inputs:
     description: "testfile to run"
     default: ''
 
+outputs:
+  result:
+    value: ${{ steps.testrun.result }}
+    description: "the output of the tests"
+
 runs:
   using: "composite"
   steps:
@@ -190,8 +195,8 @@ runs:
         ls -l stackit/"${{ inputs.service_account_json_file_path }}"
         echo "::endgroup::"
 
-    - name: Run acceptance test file
-      if: ${{ inputs.test_file != '' }}
+    - name: Run acceptance tests
+      id: testrun
       shell: bash
       run: |
         echo "::group::go test file"
@@ -203,6 +208,8 @@ runs:
           export TF_LOG
         fi
 
+        testfile="${{ inputs.test_file }}"
+
         echo "Running acceptance tests for the terraform provider"
         set +e
         cd stackit || exit 1
@@ -215,13 +222,14 @@ runs:
         TF_ACC_KEK_KEY_RING_ID=${TF_ACC_KEK_KEY_RING_ID} \
         TF_ACC_KEK_KEY_VERSION=${TF_ACC_KEK_KEY_VERSION} \
         TF_ACC_KEK_SERVICE_ACCOUNT=${TF_ACC_KEK_SERVICE_ACCOUNT} \
-        go test -v ${{ inputs.test_file }} -timeout=${{ inputs.test_timeout_string }} | tee -a acc_test_run.log
+        go test -v ${testfile} -timeout=${{ inputs.test_timeout_string }} | tee -a acc_test_run.log
         set -e
         echo "::endgroup::"
         echo "::group::go test result"
         if [ $? -ne 0 ]; then
           echo "Test failed, see acc_test_run.log for details"
-          cat acc_test_run.log | grep -v "=== RUN" | grep -v "--- PASS" | grep -v "=== CONT" | grep -v "=== PAUSE"
+          res=$(cat acc_test_run.log | grep -v "=== RUN" | grep -v "--- PASS" | grep -v "=== CONT" | grep -v "=== PAUSE")
+          echo "result=${res}" >> "$GITHUB_OUTPUT"
           exit 1
         fi
         echo "::endgroup::"
@@ -234,64 +242,9 @@ runs:
         TF_ACC_KEK_KEY_VERSION: ${{ inputs.tf_acc_kek_key_version }}
         TF_ACC_KEK_SERVICE_ACCOUNT: ${{ inputs.tf_acc_kek_service_account }}
 
-# does not work correctly
-#    - name: Run test action
-#      if: ${{ inputs.test_file == '' }}
-#      env:
-#        TF_ACC: 1
-#        TF_ACC_PROJECT_ID: ${{ inputs.project_id }}
-#        TF_ACC_REGION: ${{ inputs.region }}
-#        TF_ACC_TEST_PROJECT_USER_EMAIL: ${{ inputs.project_user_email }}
-#        TF_ACC_KEK_KEY_ID: ${{ inputs.tf_acc_kek_key_id }}
-#        TF_ACC_KEK_KEY_RING_ID: ${{ inputs.tf_acc_kek_key_ring_id }}
-#        TF_ACC_KEK_KEY_VERSION: ${{ inputs.tf_acc_kek_key_version }}
-#        TF_ACC_KEK_SERVICE_ACCOUNT: ${{ inputs.tf_acc_kek_service_account }}
-#        TF_ACC_SERVICE_ACCOUNT_FILE: ${{ steps.service_account.outputs.safile }}
-#      uses: robherley/go-test-action@v0
-#      with:
-#        testArguments: "./... -timeout ${{ inputs.test_timeout_string }}"
-#        moduleDirectory: "stackit"
-
-    - name: Run all acceptance tests
-      if: ${{ inputs.test_file == '' }}
-      shell: bash
-      run: |
-        echo "::group::go test all"
-        set -e
-        set -o pipefail
-
-        if [[ "${{ inputs.tf_debug }}" == "true" ]]; then
-          TF_LOG=INFO
-          export TF_LOG
-        fi
-
-        echo "Running acceptance tests for the terraform provider"
-        cd stackit || exit 1
-        set +e
-        TF_ACC=1 \
-        TF_ACC_PROJECT_ID=${TF_ACC_PROJECT_ID} \
-        TF_ACC_REGION=${TF_ACC_REGION} \
-        TF_ACC_TEST_PROJECT_USER_EMAIL=${TF_ACC_TEST_PROJECT_USER_EMAIL} \
-        TF_ACC_SERVICE_ACCOUNT_FILE="${PWD}/${{ inputs.service_account_json_file_path }}" \
-        TF_ACC_KEK_KEY_ID=${TF_ACC_KEK_KEY_ID} \
-        TF_ACC_KEK_KEY_RING_ID=${TF_ACC_KEK_KEY_RING_ID} \
-        TF_ACC_KEK_KEY_VERSION=${TF_ACC_KEK_KEY_VERSION} \
-        TF_ACC_KEK_SERVICE_ACCOUNT=${TF_ACC_KEK_SERVICE_ACCOUNT} \
-        go test -v ./... -timeout=${{ inputs.test_timeout_string }} | tee -a acc_test_run.log
-        set -e
-        echo "::endgroup::"
-        echo "::group::go test result"
-        if [ $? -ne 0 ]; then
-          echo "Test failed, see acc_test_run.log for details"
-          cat acc_test_run.log | grep -v "=== RUN" | grep -v "--- PASS" | grep -v "=== CONT" | grep -v "=== PAUSE"
-          exit 1
-        fi
-        echo "::endgroup::"
-      env:
-        TF_ACC_PROJECT_ID: ${{ inputs.project_id }}
-        TF_ACC_REGION: ${{ inputs.region }}
-        TF_ACC_TEST_PROJECT_USER_EMAIL: ${{ inputs.project_user_email }}
-        TF_ACC_KEK_KEY_ID: ${{ inputs.tf_acc_kek_key_id }}
-        TF_ACC_KEK_KEY_RING_ID: ${{ inputs.tf_acc_kek_key_ring_id }}
-        TF_ACC_KEK_KEY_VERSION: ${{ inputs.tf_acc_kek_key_version }}
-        TF_ACC_KEK_SERVICE_ACCOUNT: ${{ inputs.tf_acc_kek_service_account }}
+    - name: Upload test log artifact
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: acc_test.log
+        path: "stackit/acc_test_run.log"
diff --git a/.github/workflows/tf-acc-test.yaml b/.github/workflows/tf-acc-test.yaml
index 85c78437..e6a2194e 100644
--- a/.github/workflows/tf-acc-test.yaml
+++ b/.github/workflows/tf-acc-test.yaml
@@ -43,6 +43,7 @@ jobs:
 
       - name: Run Test (workflow dispatch)
         if: ${{ github.event_name == 'workflow_dispatch' }}
+        id: manual_run
         uses: ./.github/actions/acc_test
         with:
           go-version: ${{ env.GO_VERSION }}
@@ -59,6 +60,7 @@ jobs:
 
       - name: Run Test (automatic)
         if: ${{ github.event_name != 'workflow_dispatch' }}
+        id: automatic_run
         uses: ./.github/actions/acc_test
         with:
           go-version: ${{ env.GO_VERSION }}
@@ -78,6 +80,6 @@ jobs:
           title: Terraform Acceptance Tests finished
           event_title: ${{ github.event.type }}
           event_author: ${{ github.event.actor.login }}
-          event_body: 'No event body.'
+          event_body: "${{ steps.automatic_run.outputs.result || steps.manual_run.outputs.result }}"
           event_number: ${{ github.event.id }}
           event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ github.run_id }}"
-- 
2.49.1


From 6c99c66566b9cbaffd6d792bd908fb4c289377ae Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 14:47:50 +0100
Subject: [PATCH 03/19] chore: modify test action

[skip ci]
---
 .../sqlserverflexbeta/sqlserverflex_acc_test.go     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go b/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go
index 77955dd5..656b93df 100644
--- a/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go
+++ b/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go
@@ -182,7 +182,7 @@ func TestAccInstance(t *testing.T) {
 				PreConfig: func() {
 					t.Logf("testing: %s - %s", t.Name(), "update name and verify")
 				},
-				ExpectNonEmptyPlan: true,
+				ExpectNonEmptyPlan: false,
 				Config: testutils.StringFromTemplateMust(
 					"testdata/instance_template.gompl",
 					updNameData,
@@ -196,6 +196,17 @@ func TestAccInstance(t *testing.T) {
 					defaultNoEncInstanceTestChecks(testInstanceID, updNameData),
 				),
 			},
+			// Expect empty plan after update
+			{
+				PreConfig: func() {
+					t.Logf("testing: %s - %s", t.Name(), "expect empty plan")
+				},
+				ExpectNonEmptyPlan: false,
+				Config: testutils.StringFromTemplateMust(
+					"testdata/instance_template.gompl",
+					updNameData,
+				),
+			},
 			// Update size and verify
 			{
 				PreConfig: func() {
-- 
2.49.1


From 3607f66c1726fbf6379e7d4f90f0eaf972b3f699 Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 14:55:49 +0100
Subject: [PATCH 04/19] chore: modify test action

[skip ci]
---
 .github/actions/acc_test/action.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/actions/acc_test/action.yaml b/.github/actions/acc_test/action.yaml
index b9cfb641..b95b299e 100644
--- a/.github/actions/acc_test/action.yaml
+++ b/.github/actions/acc_test/action.yaml
@@ -93,6 +93,10 @@ runs:
       with:
         terraform_wrapper: false
 
+    - uses: actions/setup-node@v6
+      with:
+        node-version: '24.x'
+
     - name: Setup JAVA
       uses: actions/setup-java@v5
       with:
@@ -244,7 +248,7 @@ runs:
 
     - name: Upload test log artifact
       if: always()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: acc_test.log
         path: "stackit/acc_test_run.log"
-- 
2.49.1


From 5470106f8abf854b5c55a95135bec4224a7e2f80 Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 14:58:20 +0100
Subject: [PATCH 05/19] chore: modify test action

[skip ci]
---
 .github/workflows/tf-acc-test.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/tf-acc-test.yaml b/.github/workflows/tf-acc-test.yaml
index e6a2194e..22e433bb 100644
--- a/.github/workflows/tf-acc-test.yaml
+++ b/.github/workflows/tf-acc-test.yaml
@@ -21,6 +21,13 @@ on:
         type: string
         default: '90m'
         required: true
+      test_file:
+        description: "string that determines the test file to run (default all tests)"
+        type: choice
+        options:
+          - internal/wait/postgresflexalpha/wait_test.go
+          - internal/wait/sqlserverflexbeta/wait_test.go
+        required: true
 
 jobs:
   acc_test:
-- 
2.49.1


From 9c4a819668a824df384ad6a4d372369f5760b207 Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 15:00:42 +0100
Subject: [PATCH 06/19] chore: modify test action

[skip ci]
---
 .github/workflows/tf-acc-test.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tf-acc-test.yaml b/.github/workflows/tf-acc-test.yaml
index 22e433bb..1ce8f11f 100644
--- a/.github/workflows/tf-acc-test.yaml
+++ b/.github/workflows/tf-acc-test.yaml
@@ -64,6 +64,7 @@ jobs:
           tf_acc_kek_service_account: ${{ vars.TF_ACC_KEK_SERVICE_ACCOUNT }}
           tf_debug: ${{ inputs.enable_debug }}
           test_timeout_string: ${{ inputs.test_timeout_string }}
+          test_file: ${{ inputs.test_file }}
 
       - name: Run Test (automatic)
         if: ${{ github.event_name != 'workflow_dispatch' }}
-- 
2.49.1


From c05208a12a70747ed2b3397a801342680c0bcc75 Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 15:01:32 +0100
Subject: [PATCH 07/19] chore: modify test action

[skip ci]
---
 .github/workflows/tf-acc-test.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tf-acc-test.yaml b/.github/workflows/tf-acc-test.yaml
index 1ce8f11f..85da6857 100644
--- a/.github/workflows/tf-acc-test.yaml
+++ b/.github/workflows/tf-acc-test.yaml
@@ -27,6 +27,7 @@ on:
         options:
           - internal/wait/postgresflexalpha/wait_test.go
           - internal/wait/sqlserverflexbeta/wait_test.go
+        default: 'internal/wait/postgresflexalpha/wait_test.go'
         required: true
 
 jobs:
-- 
2.49.1


From c26a5710c5c9b01bf2525ff7393d43c82635225f Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 15:25:10 +0100
Subject: [PATCH 08/19] chore: modify test action

[skip ci]
---
 .github/actions/acc_test/action.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/acc_test/action.yaml b/.github/actions/acc_test/action.yaml
index b95b299e..229a5f83 100644
--- a/.github/actions/acc_test/action.yaml
+++ b/.github/actions/acc_test/action.yaml
@@ -227,12 +227,12 @@ runs:
         TF_ACC_KEK_KEY_VERSION=${TF_ACC_KEK_KEY_VERSION} \
         TF_ACC_KEK_SERVICE_ACCOUNT=${TF_ACC_KEK_SERVICE_ACCOUNT} \
         go test -v ${testfile} -timeout=${{ inputs.test_timeout_string }} | tee -a acc_test_run.log
-        set -e
         echo "::endgroup::"
+        set -e
         echo "::group::go test result"
         if [ $? -ne 0 ]; then
           echo "Test failed, see acc_test_run.log for details"
-          res=$(cat acc_test_run.log | grep -v "=== RUN" | grep -v "--- PASS" | grep -v "=== CONT" | grep -v "=== PAUSE")
+          res=$(cat acc_test_run.log | grep -v "=== RUN" | grep -v "\-\-\- PASS" | grep -v "=== CONT" | grep -v "=== PAUSE")
           echo "result=${res}" >> "$GITHUB_OUTPUT"
           exit 1
         fi
-- 
2.49.1


From c1c7ecdc1d38f7c20a6dc0479d79d1242401b5bf Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 16:30:08 +0100
Subject: [PATCH 09/19] chore: modify test action

[skip ci]
---
 .github/workflows/tf-acc-test.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tf-acc-test.yaml b/.github/workflows/tf-acc-test.yaml
index 85da6857..8729997c 100644
--- a/.github/workflows/tf-acc-test.yaml
+++ b/.github/workflows/tf-acc-test.yaml
@@ -44,9 +44,9 @@ jobs:
           webhook_url: ${{ secrets.GOOGLE_WEBHOOK_URL }}
           title: Terraform Acceptance Tests started
           event_title: ${{ github.event.type }}
-          event_author: ${{ github.event.actor.login }}
-          event_body: 'No event body.'
-          event_number: ${{ github.event.id }}
+          event_author: ${{ github.actor }}
+          event_body: ${{ inputs.test_file }}
+          event_number: ${{ github.run_id }}
           event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ github.run_id }}"
 
       - name: Run Test (workflow dispatch)
@@ -88,7 +88,7 @@ jobs:
           webhook_url: ${{ secrets.GOOGLE_WEBHOOK_URL }}
           title: Terraform Acceptance Tests finished
           event_title: ${{ github.event.type }}
-          event_author: ${{ github.event.actor.login }}
+          event_author: ${{ github.actor }}
           event_body: "${{ steps.automatic_run.outputs.result || steps.manual_run.outputs.result }}"
           event_number: ${{ github.event.id }}
           event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ github.run_id }}"
-- 
2.49.1


From 64d443417fa702a2107e868bda208971ec3f0b70 Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 16:33:00 +0100
Subject: [PATCH 10/19] chore: modify test action

[skip ci]
---
 .github/workflows/tf-acc-test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tf-acc-test.yaml b/.github/workflows/tf-acc-test.yaml
index 8729997c..8def0424 100644
--- a/.github/workflows/tf-acc-test.yaml
+++ b/.github/workflows/tf-acc-test.yaml
@@ -43,7 +43,7 @@ jobs:
         with:
           webhook_url: ${{ secrets.GOOGLE_WEBHOOK_URL }}
           title: Terraform Acceptance Tests started
-          event_title: ${{ github.event.type }}
+          event_title: ${{ github.event_name }}
           event_author: ${{ github.actor }}
           event_body: ${{ inputs.test_file }}
           event_number: ${{ github.run_id }}
@@ -87,7 +87,7 @@ jobs:
         with:
           webhook_url: ${{ secrets.GOOGLE_WEBHOOK_URL }}
           title: Terraform Acceptance Tests finished
-          event_title: ${{ github.event.type }}
+          event_title: ${{ github.event_name }}
           event_author: ${{ github.actor }}
           event_body: "${{ steps.automatic_run.outputs.result || steps.manual_run.outputs.result }}"
           event_number: ${{ github.event.id }}
-- 
2.49.1


From 9590cc01d5d23156d1f447de1c48a606fff13192 Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 16:37:04 +0100
Subject: [PATCH 11/19] chore: modify test action

[skip ci]
---
 .github/workflows/tf-acc-test.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tf-acc-test.yaml b/.github/workflows/tf-acc-test.yaml
index 8def0424..071dd13d 100644
--- a/.github/workflows/tf-acc-test.yaml
+++ b/.github/workflows/tf-acc-test.yaml
@@ -25,9 +25,9 @@ on:
         description: "string that determines the test file to run (default all tests)"
         type: choice
         options:
-          - internal/wait/postgresflexalpha/wait_test.go
-          - internal/wait/sqlserverflexbeta/wait_test.go
-        default: 'internal/wait/postgresflexalpha/wait_test.go'
+          - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait/postgresflexalpha
+          - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait/sqlserverflexbeta
+        default: ' tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait/postgresflexalpha'
         required: true
 
 jobs:
-- 
2.49.1


From eaa4bc79f29e83422140f5d4440d5f139cc6711d Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 16:46:07 +0100
Subject: [PATCH 12/19] chore: modify test action

[skip ci]
---
 .github/actions/acc_test/action.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/acc_test/action.yaml b/.github/actions/acc_test/action.yaml
index 229a5f83..6cf2419b 100644
--- a/.github/actions/acc_test/action.yaml
+++ b/.github/actions/acc_test/action.yaml
@@ -248,7 +248,7 @@ runs:
 
     - name: Upload test log artifact
       if: always()
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v3
       with:
         name: acc_test.log
         path: "stackit/acc_test_run.log"
-- 
2.49.1


From 10d1e0c451f405c964f208a59922cb96ff6b49ff Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 16:50:46 +0100
Subject: [PATCH 13/19] chore: modify test action

[skip ci]
---
 .github/workflows/clean_up.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/clean_up.yaml b/.github/workflows/clean_up.yaml
index 318c5054..8bbd2ec0 100644
--- a/.github/workflows/clean_up.yaml
+++ b/.github/workflows/clean_up.yaml
@@ -38,11 +38,11 @@ jobs:
         uses: ./.github/actions/notify
         with:
           webhook_url: ${{ secrets.GOOGLE_WEBHOOK_URL }}
-          title: CI pipeline started
-          event_title: ${{ github.event.type }}
-          event_author: ${{ github.event.actor.login }}
+          title: CLEAN UP pipeline started
+          event_title: ${{ github.event_name }}
+          event_author: ${{ github.actor }}
           event_body: "Filter: ${{ inputs.res_prefix }}"
-          event_number: ${{ github.event.id }}
+          event_number: ${{ github.run_number }}
           event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ github.run_id }}"
 
       - name: Clean
-- 
2.49.1


From d8a3bf4b235bc3905cf453fd14c75ddee0d46721 Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 16:55:18 +0100
Subject: [PATCH 14/19] chore: modify test action

[skip ci]
---
 .github/workflows/clean_up.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/clean_up.yaml b/.github/workflows/clean_up.yaml
index 8bbd2ec0..918df968 100644
--- a/.github/workflows/clean_up.yaml
+++ b/.github/workflows/clean_up.yaml
@@ -39,10 +39,10 @@ jobs:
         with:
           webhook_url: ${{ secrets.GOOGLE_WEBHOOK_URL }}
           title: CLEAN UP pipeline started
-          event_title: ${{ github.event_name }}
-          event_author: ${{ github.actor }}
+          event_title: ${{ forgejo.event_name }}
+          event_author: ${{ forgejo.actor }}
           event_body: "Filter: ${{ inputs.res_prefix }}"
-          event_number: ${{ github.run_number }}
+          event_number: ${{ forgejo.run_number }}
           event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ github.run_id }}"
 
       - name: Clean
-- 
2.49.1


From 72f6e27ceb2e50e845e87d4f5a0046ff0093f7f9 Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 16:58:35 +0100
Subject: [PATCH 15/19] chore: modify test action

[skip ci]
---
 .github/workflows/clean_up.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/clean_up.yaml b/.github/workflows/clean_up.yaml
index 918df968..b366488f 100644
--- a/.github/workflows/clean_up.yaml
+++ b/.github/workflows/clean_up.yaml
@@ -43,7 +43,7 @@ jobs:
           event_author: ${{ forgejo.actor }}
           event_body: "Filter: ${{ inputs.res_prefix }}"
           event_number: ${{ forgejo.run_number }}
-          event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ github.run_id }}"
+          event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ forgejo.run_number }}"
 
       - name: Clean
         uses: ./.github/actions/clean_up
-- 
2.49.1


From a02913b07b799059d6dcd23a9fcf0638111397a4 Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 16:59:28 +0100
Subject: [PATCH 16/19] chore: modify test action

[skip ci]
---
 .github/workflows/tf-acc-test.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tf-acc-test.yaml b/.github/workflows/tf-acc-test.yaml
index 071dd13d..705b795a 100644
--- a/.github/workflows/tf-acc-test.yaml
+++ b/.github/workflows/tf-acc-test.yaml
@@ -25,9 +25,11 @@ on:
         description: "string that determines the test file to run (default all tests)"
         type: choice
         options:
+          - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit
+          - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait
           - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait/postgresflexalpha
           - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait/sqlserverflexbeta
-        default: ' tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait/postgresflexalpha'
+        default: 'tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait'
         required: true
 
 jobs:
-- 
2.49.1


From 5e058d79ae6a04b2ffeb659a96589682905f1e6d Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 17:00:05 +0100
Subject: [PATCH 17/19] chore: modify test action

[skip ci]
---
 .github/workflows/tf-acc-test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tf-acc-test.yaml b/.github/workflows/tf-acc-test.yaml
index 705b795a..06be840a 100644
--- a/.github/workflows/tf-acc-test.yaml
+++ b/.github/workflows/tf-acc-test.yaml
@@ -49,7 +49,7 @@ jobs:
           event_author: ${{ github.actor }}
           event_body: ${{ inputs.test_file }}
           event_number: ${{ github.run_id }}
-          event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ github.run_id }}"
+          event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ forgejo.run_number }}"
 
       - name: Run Test (workflow dispatch)
         if: ${{ github.event_name == 'workflow_dispatch' }}
@@ -93,4 +93,4 @@ jobs:
           event_author: ${{ github.actor }}
           event_body: "${{ steps.automatic_run.outputs.result || steps.manual_run.outputs.result }}"
           event_number: ${{ github.event.id }}
-          event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ github.run_id }}"
+          event_url: "https://tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/actions/runs/${{ forgejo.run_number }}"
-- 
2.49.1


From 8b1b7208fcee68f7804a890176fef4814220d863 Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 17:07:27 +0100
Subject: [PATCH 18/19] chore: modify test action

[skip ci]
---
 .github/actions/acc_test/action.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/actions/acc_test/action.yaml b/.github/actions/acc_test/action.yaml
index 6cf2419b..13674a9a 100644
--- a/.github/actions/acc_test/action.yaml
+++ b/.github/actions/acc_test/action.yaml
@@ -246,9 +246,19 @@ runs:
         TF_ACC_KEK_KEY_VERSION: ${{ inputs.tf_acc_kek_key_version }}
         TF_ACC_KEK_SERVICE_ACCOUNT: ${{ inputs.tf_acc_kek_service_account }}
 
+    - name: Artifact upload start
+      shell: bash
+      run: |
+        echo "::group::artifact upload"
+
     - name: Upload test log artifact
       if: always()
       uses: actions/upload-artifact@v3
       with:
         name: acc_test.log
         path: "stackit/acc_test_run.log"
+
+    - name: Artifact upload finish
+      shell: bash
+      run: |
+        echo "::endgroup::"
-- 
2.49.1


From 5693b1fabe0c44d7335e529a528bf4757cc141f9 Mon Sep 17 00:00:00 2001
From: "Marcel S. Henselin" <marcel.henselin@stackit.cloud>
Date: Thu, 26 Mar 2026 17:17:12 +0100
Subject: [PATCH 19/19] chore: modify test action

[skip ci]
---
 .github/workflows/tf-acc-test.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tf-acc-test.yaml b/.github/workflows/tf-acc-test.yaml
index 06be840a..642fe63b 100644
--- a/.github/workflows/tf-acc-test.yaml
+++ b/.github/workflows/tf-acc-test.yaml
@@ -25,11 +25,11 @@ on:
         description: "string that determines the test file to run (default all tests)"
         type: choice
         options:
-          - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit
-          - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait
           - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait/postgresflexalpha
+          - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha
           - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait/sqlserverflexbeta
-        default: 'tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait'
+          - tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexbeta
+        default: ''
         required: true
 
 jobs:
-- 
2.49.1