stackit-dev-tools/terraform-provider-stackitprivatepreview
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: adjust pipelines

Browse source 
[skip ci]
This commit is contained in:
Marcel S. Henselin 2026-03-13 18:39:28 +01:00
parent bd45b6696c
commit c0047cd5ec
3 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

37
.github/workflows/ci_new.yaml vendored
View file

@ -2,6 +2,7 @@ name: CI Workflow
on: on:
pull_request: pull_request:
types: [ opened, synchronize, reopened ]
branches: branches:
- alpha - alpha
- main - main
@ -218,11 +219,19 @@ jobs:
run: go mod tidy run: go mod tidy
- name: Testing - name: Testing
if: ${{ github.event_name != 'pull_request' }}
run: | run: |
TF_ACC_SERVICE_ACCOUNT_FILE=~/.service_account.json TF_ACC_SERVICE_ACCOUNT_FILE=~/.service_account.json
export TF_ACC_SERVICE_ACCOUNT_FILE export TF_ACC_SERVICE_ACCOUNT_FILE
make test make test
- name: Testing
if: ${{ github.event_name == 'pull_request' }}
run: |
TF_ACC_SERVICE_ACCOUNT_FILE=~/.service_account.json
export TF_ACC_SERVICE_ACCOUNT_FILE
make coverage
# - name: Acceptance Testing # - name: Acceptance Testing
# env: # env:
# TF_ACC: "1" # TF_ACC: "1"
@ -232,20 +241,20 @@ jobs:
# export TF_ACC_SERVICE_ACCOUNT_FILE # export TF_ACC_SERVICE_ACCOUNT_FILE
# make test-acceptance-tf # make test-acceptance-tf
- name: Run Test # - name: Run Acceptance Test
if: ${{ github.event_name == 'pull_request' }} # if: ${{ github.event_name == 'pull_request' }}
uses: ./.github/actions/acc_test # uses: ./.github/actions/acc_test
with: # with:
go-version: ${{ env.GO_VERSION }} # go-version: ${{ env.GO_VERSION }}
project_id: ${{ vars.TF_ACC_PROJECT_ID }} # project_id: ${{ vars.TF_ACC_PROJECT_ID }}
region: ${{ vars.TF_ACC_REGION }} # region: ${{ vars.TF_ACC_REGION }}
service_account_json_content_b64: "${{ secrets.TF_ACC_SERVICE_ACCOUNT_JSON_B64 }}" # service_account_json_content_b64: "${{ secrets.TF_ACC_SERVICE_ACCOUNT_JSON_B64 }}"
project_user_email: ${{ vars.TEST_PROJECT_USER_EMAIL }} # project_user_email: ${{ vars.TEST_PROJECT_USER_EMAIL }}
tf_acc_kek_key_id: ${{ vars.TF_ACC_KEK_KEY_ID }} # tf_acc_kek_key_id: ${{ vars.TF_ACC_KEK_KEY_ID }}
tf_acc_kek_key_ring_id: ${{ vars.TF_ACC_KEK_KEY_RING_ID }} # tf_acc_kek_key_ring_id: ${{ vars.TF_ACC_KEK_KEY_RING_ID }}
tf_acc_kek_key_version: ${{ vars.TF_ACC_KEK_KEY_VERSION }} # tf_acc_kek_key_version: ${{ vars.TF_ACC_KEK_KEY_VERSION }}
tf_acc_kek_service_account: ${{ vars.TF_ACC_KEK_SERVICE_ACCOUNT }} # tf_acc_kek_service_account: ${{ vars.TF_ACC_KEK_SERVICE_ACCOUNT }}
# service_account_json_file_path: "~/service_account.json" # # service_account_json_file_path: "~/service_account.json"
- name: Check coverage threshold - name: Check coverage threshold
shell: bash shell: bash

5
.github/workflows/tf-acc-test.yaml vendored
View file

@ -1,6 +1,11 @@
name: TF Acceptance Tests Workflow name: TF Acceptance Tests Workflow
on: on:
pull_request:
types: [opened, synchronize, reopened]
branches:
- alpha
- main
push: push:
branches: branches:
- master - master

6
stackit/internal/services/sqlserverflexalpha/sqlserverflex_acc_test.go
View file

@ -199,9 +199,9 @@ func TestAccInstanceNoEncryption(t *testing.T) {
"##STACKIT_DatabaseManager##", "##STACKIT_DatabaseManager##",
"##STACKIT_LoginManager##", "##STACKIT_LoginManager##",
// "##STACKIT_ProcessManager##", // "##STACKIT_ProcessManager##",
//"##STACKIT_SQLAgentManager##", // "##STACKIT_SQLAgentManager##",
//"##STACKIT_SQLAgentUser##", // "##STACKIT_SQLAgentUser##",
//"##STACKIT_ServerManager##", // "##STACKIT_ServerManager##",
}, },
}, },
} }