Skip to content

Commit 3b8cf57

Browse files
DevelopmentCatsDevelopmentCats
authored
Merge branch 'main' into feat-amp-version
2 parents 89739b6 + ff09c41 commit 3b8cf57

File tree

4 files changed

+149
-18
lines changed

4 files changed

+149
-18
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
- 'tsconfig.json'
2828
- '.github/workflows/ci.yaml'
2929
- 'scripts/ts_test_auto.sh'
30+
- 'scripts/terraform_test_all.sh'
31+
- 'scripts/terraform_validate.sh'
3032
modules:
3133
- 'registry/**/modules/**'
3234
all:
@@ -49,10 +51,18 @@ jobs:
4951
ALL_CHANGED_FILES: ${{ steps.filter.outputs.all_files }}
5052
SHARED_CHANGED: ${{ steps.filter.outputs.shared }}
5153
MODULE_CHANGED_FILES: ${{ steps.filter.outputs.modules_files }}
52-
run: ./scripts/ts_test_auto.sh
54+
run: bun tstest
5355
- name: Run Terraform tests
54-
run: ./scripts/terraform_test_all.sh
56+
env:
57+
ALL_CHANGED_FILES: ${{ steps.filter.outputs.all_files }}
58+
SHARED_CHANGED: ${{ steps.filter.outputs.shared }}
59+
MODULE_CHANGED_FILES: ${{ steps.filter.outputs.modules_files }}
60+
run: bun tftest
5561
- name: Run Terraform Validate
62+
env:
63+
ALL_CHANGED_FILES: ${{ steps.filter.outputs.all_files }}
64+
SHARED_CHANGED: ${{ steps.filter.outputs.shared }}
65+
MODULE_CHANGED_FILES: ${{ steps.filter.outputs.modules_files }}
5666
run: bun terraform-validate
5767
validate-style:
5868
name: Check for typos and unformatted code

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"fmt": "bun x prettier --write . && terraform fmt -recursive -diff",
55
"fmt:ci": "bun x prettier --check . && terraform fmt -check -recursive -diff",
66
"terraform-validate": "./scripts/terraform_validate.sh",
7-
"test": "./scripts/terraform_test_all.sh",
7+
"tftest": "./scripts/terraform_test_all.sh",
8+
"tstest": "./scripts/ts_test_auto.sh",
89
"update-version": "./update-version.sh"
910
},
1011
"devDependencies": {

‎scripts/terraform_test_all.sh‎

Lines changed: 69 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,87 @@
11
#!/usr/bin/env bash
22
set -euo pipefail
33

4-
# Find all directories that contain any .tftest.hcl files and run terraform test in each
4+
# Auto-detect which Terraform tests to run based on changed files from paths-filter
5+
# Uses paths-filter outputs from GitHub Actions:
6+
# ALL_CHANGED_FILES - all files changed in the PR (for logging)
7+
# SHARED_CHANGED - boolean indicating if shared infrastructure changed
8+
# MODULE_CHANGED_FILES - only files in registry/**/modules/** (for processing)
9+
# Runs all tests if shared infrastructure changes, or skips if no changes detected
10+
#
11+
# This script only runs tests for changed modules. Documentation and template changes are ignored.
512

613
run_dir() {
714
local dir="$1"
815
echo "==> Running terraform test in $dir"
916
(cd "$dir" && terraform init -upgrade -input=false -no-color > /dev/null && terraform test -no-color -verbose)
1017
}
1118

12-
mapfile -t test_dirs < <(find . -type f -name "*.tftest.hcl" -print0 | xargs -0 -I{} dirname {} | sort -u)
19+
echo "==> Detecting changed files..."
20+
21+
if [[ -n "${ALL_CHANGED_FILES:-}" ]]; then
22+
echo "Changed files in PR:"
23+
echo "$ALL_CHANGED_FILES" | tr ' ' '\n' | sed 's/^/ - /'
24+
echo ""
25+
fi
26+
27+
if [[ "${SHARED_CHANGED:-false}" == "true" ]]; then
28+
echo "==> Shared infrastructure changed"
29+
echo "==> Running all tests for safety"
30+
mapfile -t test_dirs < <(find . -type f -name "*.tftest.hcl" -print0 | xargs -0 -I{} dirname {} | sort -u)
31+
elif [[ -z "${MODULE_CHANGED_FILES:-}" ]]; then
32+
echo "✓ No module files changed, skipping tests"
33+
exit 0
34+
else
35+
CHANGED_FILES=$(echo "$MODULE_CHANGED_FILES" | tr ' ' '\n')
36+
37+
MODULE_DIRS=()
38+
while IFS= read -r file; do
39+
if [[ "$file" =~ \.(md|png|jpg|jpeg|svg)$ ]]; then
40+
continue
41+
fi
42+
43+
if [[ "$file" =~ ^registry/([^/]+)/modules/([^/]+)/ ]]; then
44+
namespace="${BASH_REMATCH[1]}"
45+
module="${BASH_REMATCH[2]}"
46+
module_dir="registry/${namespace}/modules/${module}"
47+
48+
if [[ -d "$module_dir" ]] && [[ ! " ${MODULE_DIRS[*]} " =~ " ${module_dir} " ]]; then
49+
MODULE_DIRS+=("$module_dir")
50+
fi
51+
fi
52+
done <<< "$CHANGED_FILES"
53+
54+
if [[ ${#MODULE_DIRS[@]} -eq 0 ]]; then
55+
echo "✓ No Terraform tests to run"
56+
echo " (documentation, templates, namespace files, or modules without changes)"
57+
exit 0
58+
fi
59+
60+
echo "==> Finding .tftest.hcl files in ${#MODULE_DIRS[@]} changed module(s):"
61+
for dir in "${MODULE_DIRS[@]}"; do
62+
echo " - $dir"
63+
done
64+
echo ""
65+
66+
test_dirs=()
67+
for module_dir in "${MODULE_DIRS[@]}"; do
68+
while IFS= read -r test_file; do
69+
test_dir=$(dirname "$test_file")
70+
if [[ ! " ${test_dirs[*]} " =~ " ${test_dir} " ]]; then
71+
test_dirs+=("$test_dir")
72+
fi
73+
done < <(find "$module_dir" -type f -name "*.tftest.hcl")
74+
done
75+
fi
1376

1477
if [[ ${#test_dirs[@]} -eq 0 ]]; then
15-
echo "No .tftest.hcl tests found."
78+
echo "✓ No .tftest.hcl tests found in changed modules"
1679
exit 0
1780
fi
1881

82+
echo "==> Running terraform test in ${#test_dirs[@]} directory(ies)"
83+
echo ""
84+
1985
status=0
2086
for d in "${test_dirs[@]}"; do
2187
if ! run_dir "$d"; then

‎scripts/terraform_validate.sh‎

Lines changed: 66 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,90 @@
22

33
set -euo pipefail
44

5+
# Auto-detect which Terraform modules to validate based on changed files from paths-filter
6+
# Uses paths-filter outputs from GitHub Actions:
7+
# ALL_CHANGED_FILES - all files changed in the PR (for logging)
8+
# SHARED_CHANGED - boolean indicating if shared infrastructure changed
9+
# MODULE_CHANGED_FILES - only files in registry/**/modules/** (for processing)
10+
# Validates all modules if shared infrastructure changes, or skips if no changes detected
11+
#
12+
# This script only validates changed modules. Documentation and template changes are ignored.
13+
514
validate_terraform_directory() {
615
local dir="$1"
716
echo "Running \`terraform validate\` in $dir"
8-
pushd "$dir"
17+
pushd "$dir" > /dev/null
918
terraform init -upgrade
1019
terraform validate
11-
popd
20+
popd > /dev/null
1221
}
1322

1423
main() {
15-
# Get the directory of the script
24+
echo "==> Detecting changed files..."
25+
26+
if [[ -n "${ALL_CHANGED_FILES:-}" ]]; then
27+
echo "Changed files in PR:"
28+
echo "$ALL_CHANGED_FILES" | tr ' ' '\n' | sed 's/^/ - /'
29+
echo ""
30+
fi
31+
1632
local script_dir=$(dirname "$(readlink -f "$0")")
33+
local registry_dir=$(readlink -f "$script_dir/../registry")
34+
35+
if [[ "${SHARED_CHANGED:-false}" == "true" ]]; then
36+
echo "==> Shared infrastructure changed"
37+
echo "==> Validating all modules for safety"
38+
local subdirs=$(find "$registry_dir" -mindepth 3 -maxdepth 3 -path "*/modules/*" -type d | sort)
39+
elif [[ -z "${MODULE_CHANGED_FILES:-}" ]]; then
40+
echo "✓ No module files changed, skipping validation"
41+
exit 0
42+
else
43+
CHANGED_FILES=$(echo "$MODULE_CHANGED_FILES" | tr ' ' '\n')
44+
45+
MODULE_DIRS=()
46+
while IFS= read -r file; do
47+
if [[ "$file" =~ \.(md|png|jpg|jpeg|svg)$ ]]; then
48+
continue
49+
fi
1750

18-
# Code assumes that registry directory will always be in same position
19-
# relative to the main script directory
20-
local registry_dir="$script_dir/../registry"
51+
if [[ "$file" =~ ^registry/([^/]+)/modules/([^/]+)/ ]]; then
52+
namespace="${BASH_REMATCH[1]}"
53+
module="${BASH_REMATCH[2]}"
54+
module_dir="registry/${namespace}/modules/${module}"
2155

22-
# Get all module subdirectories in the registry directory. Code assumes that
23-
# Terraform module directories won't begin to appear until three levels deep into
24-
# the registry (e.g., registry/coder/modules/coder-login, which will then
25-
# have a main.tf file inside it)
26-
local subdirs=$(find "$registry_dir" -mindepth 3 -path "*/modules/*" -type d | sort)
56+
if [[ -d "$module_dir" ]] && [[ ! " ${MODULE_DIRS[*]} " =~ " ${module_dir} " ]]; then
57+
MODULE_DIRS+=("$module_dir")
58+
fi
59+
fi
60+
done <<< "$CHANGED_FILES"
2761

62+
if [[ ${#MODULE_DIRS[@]} -eq 0 ]]; then
63+
echo "✓ No modules to validate"
64+
echo " (documentation, templates, namespace files, or modules without changes)"
65+
exit 0
66+
fi
67+
68+
echo "==> Validating ${#MODULE_DIRS[@]} changed module(s):"
69+
for dir in "${MODULE_DIRS[@]}"; do
70+
echo " - $dir"
71+
done
72+
echo ""
73+
74+
local subdirs="${MODULE_DIRS[*]}"
75+
fi
76+
77+
status=0
2878
for dir in $subdirs; do
2979
# Skip over any directories that obviously don't have the necessary
3080
# files
3181
if test -f "$dir/main.tf"; then
32-
validate_terraform_directory "$dir"
82+
if ! validate_terraform_directory "$dir"; then
83+
status=1
84+
fi
3385
fi
3486
done
87+
88+
exit $status
3589
}
3690

3791
main

0 commit comments

Comments
 (0)