fix: pipeline fixes
[skip ci]
This commit is contained in:
parent
0ba4612438
commit
3309489612
2 changed files with 7 additions and 10 deletions
14
.github/actions/acc_test/action.yaml
vendored
14
.github/actions/acc_test/action.yaml
vendored
|
|
@ -2,6 +2,11 @@ name: Acceptance Testing
|
||||||
description: "Acceptance Testing pipeline"
|
description: "Acceptance Testing pipeline"
|
||||||
|
|
||||||
inputs:
|
inputs:
|
||||||
|
test_timeout_string:
|
||||||
|
description: "string that determines the timeout (default: 45m)"
|
||||||
|
default: '45m'
|
||||||
|
required: true
|
||||||
|
|
||||||
go-version:
|
go-version:
|
||||||
description: "go version to install"
|
description: "go version to install"
|
||||||
default: '1.25'
|
default: '1.25'
|
||||||
|
|
@ -115,11 +120,6 @@ runs:
|
||||||
go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs@latest
|
go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs@latest
|
||||||
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
|
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
|
||||||
|
|
||||||
# - name: Prepare pkg_gen directory
|
|
||||||
# shell: bash
|
|
||||||
# run: |
|
|
||||||
# go run generator/main.go build -p
|
|
||||||
|
|
||||||
- name: Run go mod tidy
|
- name: Run go mod tidy
|
||||||
shell: bash
|
shell: bash
|
||||||
run: go mod tidy
|
run: go mod tidy
|
||||||
|
|
@ -190,7 +190,7 @@ runs:
|
||||||
TF_ACC_KEK_KEY_RING_ID=${TF_ACC_KEK_KEY_RING_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_KEY_VERSION=${TF_ACC_KEK_KEY_VERSION} \
|
||||||
TF_ACC_KEK_SERVICE_ACCOUNT=${TF_ACC_KEK_SERVICE_ACCOUNT} \
|
TF_ACC_KEK_SERVICE_ACCOUNT=${TF_ACC_KEK_SERVICE_ACCOUNT} \
|
||||||
go test ${{ inputs.test_file }} -count=1 -timeout=30m
|
go test ${{ inputs.test_file }} -count=1 -timeout=${{ inputs.test_timeout_string }}
|
||||||
env:
|
env:
|
||||||
TF_ACC_PROJECT_ID: ${{ inputs.project_id }}
|
TF_ACC_PROJECT_ID: ${{ inputs.project_id }}
|
||||||
TF_ACC_REGION: ${{ inputs.region }}
|
TF_ACC_REGION: ${{ inputs.region }}
|
||||||
|
|
@ -218,7 +218,7 @@ runs:
|
||||||
TF_ACC_KEK_KEY_RING_ID=${TF_ACC_KEK_KEY_RING_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_KEY_VERSION=${TF_ACC_KEK_KEY_VERSION} \
|
||||||
TF_ACC_KEK_SERVICE_ACCOUNT=${TF_ACC_KEK_SERVICE_ACCOUNT} \
|
TF_ACC_KEK_SERVICE_ACCOUNT=${TF_ACC_KEK_SERVICE_ACCOUNT} \
|
||||||
go test ./... -count=1 -timeout=30m
|
go test ./... -count=1 -timeout=${{ inputs.test_timeout_string }}
|
||||||
env:
|
env:
|
||||||
TF_ACC_PROJECT_ID: ${{ inputs.project_id }}
|
TF_ACC_PROJECT_ID: ${{ inputs.project_id }}
|
||||||
TF_ACC_REGION: ${{ inputs.region }}
|
TF_ACC_REGION: ${{ inputs.region }}
|
||||||
|
|
|
||||||
|
|
@ -297,9 +297,6 @@ func TestAccInstanceWithUsers(t *testing.T) {
|
||||||
data := getExample()
|
data := getExample()
|
||||||
|
|
||||||
userName := "testUser"
|
userName := "testUser"
|
||||||
if pID, ok := os.LookupEnv("TF_ACC_PROJECT_ID"); !ok || pID == "" {
|
|
||||||
t.Errorf("TF_ACC_PROJECT_ID is not set")
|
|
||||||
}
|
|
||||||
data.Users = []User{
|
data.Users = []User{
|
||||||
{
|
{
|
||||||
Name: userName,
|
Name: userName,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue