From e4206ca0f9647b1973a48c8214b23977bec35379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Ho=C3=9F?= Date: Sat, 20 Aug 2022 14:19:49 +0200 Subject: [PATCH] adjust terraform config for github actions --- .github/workflows/verify.yml | 14 ++++++++++---- tests/data_source_git_branch.tf | 15 ++++++++------- tests/data_source_git_branches.tf | 4 ++-- tests/data_source_git_comit.tf | 8 ++++---- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 8f14e09..95717a7 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -89,7 +89,7 @@ jobs: acceptance: name: Acceptance Tests with TF ${{ matrix.terraform }} needs: build - runs-on: ubuntu-latest + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -115,6 +115,12 @@ jobs: with: terraform_version: ${{ matrix.terraform }} terraform_wrapper: false - - id: tests - name: Run Tests - run: make acceptance + - id: install + name: Install Provider + run: make install + - id: init + name: Initialize Terraform + run: terraform -chdir=./tests init + - id: apply + name: Apply Terraform + run: terraform -chdir=./tests apply -auto-approve -var="git_repo_path=${GITHUB_WORKSPACE}" diff --git a/tests/data_source_git_branch.tf b/tests/data_source_git_branch.tf index c2ce76c..2d32295 100644 --- a/tests/data_source_git_branch.tf +++ b/tests/data_source_git_branch.tf @@ -1,20 +1,21 @@ # SPDX-FileCopyrightText: The terraform-provider-git Authors # SPDX-License-Identifier: 0BSD -data "git_branch" "main" { - directory = data.git_repository.repository.directory - name = "main" -} - data "git_branch" "current" { directory = data.git_repository.repository.directory name = data.git_repository.repository.branch } -output "data_source_git_branch_main" { - value = data.git_branch.main +data "git_branch" "every" { + for_each = data.git_branches.all.branches + directory = data.git_repository.repository.directory + name = each.key } output "data_source_git_branch_current" { value = data.git_branch.current } + +output "data_source_git_branch_every" { + value = data.git_branch.every[*] +} diff --git a/tests/data_source_git_branches.tf b/tests/data_source_git_branches.tf index 41c35fb..f2fb0b8 100644 --- a/tests/data_source_git_branches.tf +++ b/tests/data_source_git_branches.tf @@ -1,10 +1,10 @@ # SPDX-FileCopyrightText: The terraform-provider-git Authors # SPDX-License-Identifier: 0BSD -data "git_branches" "branches" { +data "git_branches" "all" { directory = data.git_repository.repository.directory } output "data_source_git_branches_branches" { - value = data.git_branches.branches + value = data.git_branches.all } diff --git a/tests/data_source_git_comit.tf b/tests/data_source_git_comit.tf index 0eb8e0a..8a3cd1f 100644 --- a/tests/data_source_git_comit.tf +++ b/tests/data_source_git_comit.tf @@ -1,11 +1,11 @@ # SPDX-FileCopyrightText: The terraform-provider-git Authors # SPDX-License-Identifier: 0BSD -data "git_commit" "main_head" { +data "git_commit" "current_head" { directory = data.git_repository.repository.directory - sha1 = data.git_branch.main.sha1 + sha1 = data.git_branch.current.sha1 } -output "data_source_git_commit_origin" { - value = data.git_commit.main_head +output "data_source_git_commit_current_head" { + value = data.git_commit.current_head }