From 725bc0c916a593de8010a494fc11efcd4e2f42b4 Mon Sep 17 00:00:00 2001 From: ninotosh <6128440+ninotosh@users.noreply.github.com> Date: Tue, 24 Mar 2026 01:25:11 +0900 Subject: [PATCH] added files for integration tests --- .github/workflows/integration-tests.yml | 25 ++++++++----------- ...e-commit.yml => prevent-config-commit.yml} | 4 +-- terraform/tests/config-aws.yml | 18 +++++++++++++ terraform/tests/config-empty.yml | 5 ++++ terraform/tests/config-gc.yml | 24 ++++++++++++++++++ 5 files changed, 58 insertions(+), 18 deletions(-) rename .github/workflows/{unsuitable-commit.yml => prevent-config-commit.yml} (74%) create mode 100644 terraform/tests/config-aws.yml create mode 100644 terraform/tests/config-empty.yml create mode 100644 terraform/tests/config-gc.yml diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 2b2d4fc..f23fcf2 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -15,17 +15,17 @@ jobs: - uses: ./.github/actions/cue with: - data-file: dev/config-empty.yml + data-file: terraform/tests/config-empty.yml schema-file: config.cue - uses: ./.github/actions/cue with: - data-file: dev/config-aws.yml + data-file: terraform/tests/config-aws.yml schema-file: config.cue - uses: ./.github/actions/cue with: - data-file: dev/config-gc.yml + data-file: terraform/tests/config-gc.yml schema-file: config.cue empty: @@ -37,10 +37,9 @@ jobs: run: working-directory: terraform env: - TARGET: ${{ github.job }} - CONFIG: ../dev/config-${{ github.job }}.yml - PLAN_RESOURCES_JSON_PATH: /tmp/${{ github.job }}_plan_resources.json - APPLY_OUTPUT_JSON_PATH: /tmp/${{ github.job }}_apply_output.json + CONFIG: tests/config-empty.yml + PLAN_RESOURCES_JSON_PATH: /tmp/empty_plan_resources.json + APPLY_OUTPUT_JSON_PATH: /tmp/empty_apply_output.json steps: - uses: actions/checkout@v6 @@ -74,10 +73,8 @@ jobs: env: HCP_TERRAFORM_TEAM_TOKEN: ${{ secrets.HCP_TERRAFORM_TEAM_TOKEN }} - - uses: ./.github/actions/cue - with: - data-file: ${{ env.PLAN_RESOURCES_JSON_PATH }} - schema-file: dev/${{ env.TARGET }}-plan.cue + - run: | + [ "$(cat ${{ env.PLAN_RESOURCES_JSON_PATH }})" = '[]' ] - run: > make -f commands.mk @@ -85,7 +82,5 @@ jobs: APPLY_OUTPUT_JSON_PATH=${APPLY_OUTPUT_JSON_PATH} apply-output - - uses: ./.github/actions/cue - with: - data-file: ${{ env.APPLY_OUTPUT_JSON_PATH }} - schema-file: dev/${{ env.TARGET }}-apply.cue + - run: | + [ "$(cat ${{ env.APPLY_OUTPUT_JSON_PATH }})" = '{}' ] diff --git a/.github/workflows/unsuitable-commit.yml b/.github/workflows/prevent-config-commit.yml similarity index 74% rename from .github/workflows/unsuitable-commit.yml rename to .github/workflows/prevent-config-commit.yml index 0a08019..45c8f20 100644 --- a/.github/workflows/unsuitable-commit.yml +++ b/.github/workflows/prevent-config-commit.yml @@ -1,13 +1,11 @@ -name: check unsuitable commit of files +name: prevent config commit on: pull_request: paths: - config.yml - - '**/dev/**' push: paths: - config.yml - - '**/dev/**' jobs: fail: diff --git a/terraform/tests/config-aws.yml b/terraform/tests/config-aws.yml new file mode 100644 index 0000000..83dd13f --- /dev/null +++ b/terraform/tests/config-aws.yml @@ -0,0 +1,18 @@ +terraform_cloud: + organization: + name: organization_84380 + workspace: integration_tests +servers: + blue: + provider: aws + aws: + region: ap-northeast-1 + compute: lightsail + lightsail: + availability_zone: a + blueprint_id: ubuntu_24_04 + bundle_id: nano_3_0 + applications: + - openvpn + clients: + - client0 diff --git a/terraform/tests/config-empty.yml b/terraform/tests/config-empty.yml new file mode 100644 index 0000000..d2479b6 --- /dev/null +++ b/terraform/tests/config-empty.yml @@ -0,0 +1,5 @@ +terraform_cloud: + organization: + name: organization_84380 + workspace: integration_tests +servers: diff --git a/terraform/tests/config-gc.yml b/terraform/tests/config-gc.yml new file mode 100644 index 0000000..74d5a09 --- /dev/null +++ b/terraform/tests/config-gc.yml @@ -0,0 +1,24 @@ +terraform_cloud: + organization: + name: organization_84380 + workspace: integration_tests +google_cloud: + project_id: tidy-interface-339810 +servers: + green: + provider: gc + gc: + compute: gce + gce: + region: us-west1 + zone: b + machine_type: e2-micro + image: + project: ubuntu-os-cloud + family: ubuntu-2204-lts + enable_ipv6: true + applications: + - openvpn + clients: + - client1 + - client2