Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use real terraform in acceptance tests #2267

Merged
merged 15 commits into from
Jan 31, 2025
Merged

Use real terraform in acceptance tests #2267

merged 15 commits into from
Jan 31, 2025

Conversation

denik
Copy link
Contributor

@denik denik commented Jan 29, 2025 •
edited
Loading

Changes

  • Add a script install_terraform.py that downloads terraform and provider and generates a config to use, inspired by https://gist.github.com/pietern/1cb6b6f3e0a452328e13cdc75031105e
  • Make acceptance tests run this script once before running the tests and set the required env vars to make cli use this terraform installation.
  • Use OS-specific directory for things that are build by acceptance test runner (CLI and terraform).

This enables acceptance tests against cloud #2242 and local test for bundle deploy #2254.

Tests

  • Add an acceptance test for standalone terraform. This is useful to debug terraform with TF_LOG=DEBUG to see that it uses local provider.
  • Other acceptance tests are updated with regard to terraform exec path.
  • The overall time for tests locally is unchanged (if terraform is already fetched).

@denik denik temporarily deployed to test-trigger-is January 29, 2025 21:34 — with GitHub Actions Inactive
@denik denik force-pushed the denik/acc-terraform branch from 6ca8038 to 77d4931 Compare January 29, 2025 21:40
@denik denik temporarily deployed to test-trigger-is January 29, 2025 21:40 — with GitHub Actions Inactive
@denik denik mentioned this pull request Jan 29, 2025
Merged
@denik denik force-pushed the denik/acc-terraform branch from 77d4931 to 86c8c5c Compare January 29, 2025 21:45
@denik denik temporarily deployed to test-trigger-is January 29, 2025 21:45 — with GitHub Actions Inactive
@denik denik force-pushed the denik/acc-terraform branch from 86c8c5c to c7587b5 Compare January 29, 2025 21:50
@denik denik temporarily deployed to test-trigger-is January 29, 2025 21:50 — with GitHub Actions Inactive
@denik denik temporarily deployed to test-trigger-is January 29, 2025 21:52 — with GitHub Actions Inactive
@denik denik marked this pull request as ready for review January 29, 2025 22:09
@denik denik temporarily deployed to test-trigger-is January 30, 2025 08:53 — with GitHub Actions Inactive
@denik denik temporarily deployed to test-trigger-is January 30, 2025 09:00 — with GitHub Actions Inactive
@denik denik temporarily deployed to test-trigger-is January 30, 2025 09:02 — with GitHub Actions Inactive
@denik denik temporarily deployed to test-trigger-is January 30, 2025 09:04 — with GitHub Actions Inactive
@denik denik changed the base branch from main to denik/ruff-line-length January 30, 2025 09:05
@denik denik temporarily deployed to test-trigger-is January 30, 2025 09:22 — with GitHub Actions Inactive
@denik denik temporarily deployed to test-trigger-is January 30, 2025 09:29 — with GitHub Actions Inactive
github-merge-queue bot pushed a commit that referenced this pull request Jan 30, 2025
@denik
Add ruff.toml with increased line-length (#2268)
a03ea73 
The default is 88 which reformats too much.

This has no effect on templates but affects Python script in this PR
#2267

For context, we do not set any line length for golang and have 177 .go
files with max line length 150 or more.
Base automatically changed from denik/ruff-line-length to main January 30, 2025 10:00
andrewnester
andrewnester reviewed Jan 30, 2025
View reviewed changes
acceptance/acceptance_test.go Show resolved Hide resolved
acceptance/terraform/main.tf Show resolved Hide resolved
acceptance/install_terraform.py Show resolved Hide resolved
@denik denik temporarily deployed to test-trigger-is January 30, 2025 10:17 — with GitHub Actions Inactive
@denik denik force-pushed the denik/acc-terraform branch from 0c13d7e to ca8aa72 Compare January 30, 2025 10:19
@denik denik temporarily deployed to test-trigger-is January 30, 2025 10:19 — with GitHub Actions Inactive
@denik denik changed the base branch from main to denik/acc-norepl January 30, 2025 10:20
@denik denik requested a review from andrewnester January 30, 2025 10:23
@denik denik temporarily deployed to test-trigger-is January 30, 2025 10:26 — with GitHub Actions Inactive
@denik denik temporarily deployed to test-trigger-is January 30, 2025 10:29 — with GitHub Actions Inactive
@denik denik mentioned this pull request Jan 30, 2025
Open
Base automatically changed from denik/acc-norepl to main January 30, 2025 10:44
denik added 15 commits January 30, 2025 12:48
@denik
acc: Use real (cached) terraform in acceptance tests
42095f2
@denik
tweak timestamp regex
1534422
@denik
filter out platform-specific messages
09a686f 
to fix this on ubuntu-latest:

        -The current .terraform.lock.hcl file only includes checksums for
        -darwin_arm64, so Terraform running on another platform will fail to install
        -these providers.
        +The current .terraform.lock.hcl file only includes checksums for linux_amd64,
        +so Terraform running on another platform will fail to install these
        +providers.
@denik
fix windows
a5c4f6c
@denik
filter out more
913c4e6
@denik
ruff
ab7b750
@denik
restore mapping x86_64 -> amd64
dbff077
@denik
Add $ before replaced string
2a2f70a
@denik
use json to serialize backslashes better and print terraformrc for de…
c06d80e 
…bugging
@denik
Use SetPath for paths
0dc7ffb
@denik
per-arch build directory
78433f9
@denik
support --targetdir a/b/c
ca8026e
@denik
exclude debuglog - too different on windows
4e4609c
@denik
Clean up timestamp replacement, not needed since detailed logs remove…
bbedfbe 
…d from output
@denik
Use terraform.exe on Windows
e9e47c5
@denik denik force-pushed the denik/acc-terraform branch from a07f23e to e9e47c5 Compare January 30, 2025 11:51
@denik denik temporarily deployed to test-trigger-is January 30, 2025 11:51 — with GitHub Actions Inactive
shreyas-goenka
shreyas-goenka reviewed Jan 31, 2025
View reviewed changes
acceptance/install_terraform.py Show resolved Hide resolved
acceptance/install_terraform.py Show resolved Hide resolved
acceptance/install_terraform.py Show resolved Hide resolved
acceptance/install_terraform.py Show resolved Hide resolved
acceptance/terraform/script Show resolved Hide resolved
acceptance/install_terraform.py Show resolved Hide resolved
acceptance/install_terraform.py Show resolved Hide resolved
acceptance/acceptance_test.go Show resolved Hide resolved
acceptance/acceptance_test.go Show resolved Hide resolved
@denik denik requested a review from shreyas-goenka January 31, 2025 12:21
@denik denik added this pull request to the merge queue Jan 31, 2025
Merged via the queue into main with commit e5730bf Jan 31, 2025
9 checks passed
@denik denik deleted the denik/acc-terraform branch January 31, 2025 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shreyas-goenka shreyas-goenka shreyas-goenka approved these changes

@pietern pietern Awaiting requested review from pietern pietern is a code owner

@andrewnester andrewnester Awaiting requested review from andrewnester andrewnester is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@denik @andrewnester @shreyas-goenka