Skip to content

ci: add HCL validate/fmt workflow and Makefile targets for #71 (Phase 1) #100

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

Merged
rfay merged 1 commit into from
Apr 30, 2026
Merged

ci: add HCL validate/fmt workflow and Makefile targets for #71 (Phase 1) #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Validate Templates

on:
push:
branches: [main]
pull_request:

jobs:
validate:
name: Validate (${{ matrix.template }})
runs-on: ubuntu-latest
strategy:
matrix:
template: [user-defined-web, drupal-core, freeform]
fail-fast: false
steps:
- uses: actions/checkout@v4
- uses: hashicorp/setup-terraform@v4
with:
terraform_version: "~1.9"
- name: Init
run: terraform init -backend=false -input=false
working-directory: ${{ matrix.template }}
- name: Validate
run: terraform validate
working-directory: ${{ matrix.template }}

fmt:
name: Format Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: hashicorp/setup-terraform@v4
with:
terraform_version: "~1.9"
- name: Check formatting
run: terraform fmt -check -recursive
12 changes: 12 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,18 @@ test: ## Test the built image by running it
docker run --rm $(IMAGE_TAG) node --version
@echo "Test complete"

.PHONY: validate
validate: ## Validate all Terraform templates (requires terraform in PATH)
@for t in $(TEMPLATES); do \
echo "--- Validating $$t ---"; \
(cd $$t && terraform init -backend=false -input=false -no-color && terraform validate -no-color) || exit 1; \
done
@echo "All templates valid."

.PHONY: fmt-check
fmt-check: ## Check Terraform formatting across all templates
terraform fmt -check -recursive

.PHONY: clean
clean: ## Remove local image
@echo "Removing local images..."
Expand Down
20 changes: 10 additions & 10 deletions drupal-core/template.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
source = "kreuzwerker/docker"
version = "~> 3.0"
}
}
}
}

provider "docker" {
Expand Down Expand Up @@ -171,10 +171,10 @@ data "coder_workspace_owner" "me" {}
locals {
# Determine workspace home path
# Sysbox Strategy: Use standard /home/coder
workspace_home = "/home/coder"
workspace_home = "/home/coder"
selected_extensions = jsondecode(data.coder_parameter.vscode_extensions.value)
issue_fork_clean = trimprefix(data.coder_parameter.issue_fork.value, "drupal-")
issue_url = local.issue_fork_clean != "" ? "https://www.drupal.org/project/drupal/issues/${local.issue_fork_clean}" : ""
issue_fork_clean = trimprefix(data.coder_parameter.issue_fork.value, "drupal-")
issue_url = local.issue_fork_clean != "" ? "https://www.drupal.org/project/drupal/issues/${local.issue_fork_clean}" : ""
}

locals {
Expand Down Expand Up @@ -1471,8 +1471,8 @@ BASHCOMP
CODER_AGENT_FORCE_UPDATE = "35"
# DOCKER_HOST not needed as we use local socket
# DOCKER_HOST = var.docker_host
CODER_WORKSPACE_ID = data.coder_workspace.me.id
CODER_WORKSPACE_NAME = data.coder_workspace.me.name
CODER_WORKSPACE_ID = data.coder_workspace.me.id
CODER_WORKSPACE_NAME = data.coder_workspace.me.name
CODER_WORKSPACE_OWNER_NAME = data.coder_workspace_owner.me.name
CODER_WORKSPACE_OWNER_EMAIL = data.coder_workspace_owner.me.email
# Force HOME to /home/coder (Standard Home Strategy)
Expand Down Expand Up @@ -1598,8 +1598,8 @@ resource "coder_script" "ddev_shutdown" {


resource "docker_container" "workspace" {
count = data.coder_workspace.me.start_count
image = docker_image.workspace_image.image_id
count = data.coder_workspace.me.start_count
image = docker_image.workspace_image.image_id
name = "coder-${data.coder_workspace.me.id}"
hostname = "${data.coder_workspace.me.name}-${data.coder_workspace_owner.me.name}"
user = "coder"
Expand All @@ -1609,8 +1609,8 @@ resource "docker_container" "workspace" {

# Increase stop_timeout to allow shutdown_script and ddev stop to run
# Default is usually 10s, which is not enough for ddev shutdown
stop_timeout = 180
stop_signal = "SIGINT"
stop_timeout = 180
stop_signal = "SIGINT"
destroy_grace_seconds = 180

# Direct Mount Strategy: Set Working Directory to path matching Host
Expand Down
36 changes: 18 additions & 18 deletions freeform/template.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
source = "kreuzwerker/docker"
version = "~> 3.0"
}
}
}
}

provider "docker" {
Expand Down Expand Up @@ -86,9 +86,9 @@ data "coder_parameter" "vscode_extensions" {
}

locals {
workspace_home = "/home/coder"
workspace_home = "/home/coder"
selected_extensions = jsondecode(data.coder_parameter.vscode_extensions.value)
image_version = try(trimspace(file("${path.module}/VERSION")), var.image_version)
image_version = try(trimspace(file("${path.module}/VERSION")), var.image_version)

registry_without_version = replace(var.workspace_image_registry, ":${local.image_version}", "")
workspace_image_registry_base = replace(local.registry_without_version, ":latest", "")
Expand Down Expand Up @@ -395,9 +395,9 @@ BASHCOMP
EOT

env = {
CODER_AGENT_FORCE_UPDATE = "1"
CODER_WORKSPACE_ID = data.coder_workspace.me.id
CODER_WORKSPACE_NAME = data.coder_workspace.me.name
CODER_AGENT_FORCE_UPDATE = "1"
CODER_WORKSPACE_ID = data.coder_workspace.me.id
CODER_WORKSPACE_NAME = data.coder_workspace.me.name
CODER_WORKSPACE_OWNER_NAME = data.coder_workspace_owner.me.name
CODER_WORKSPACE_OWNER_EMAIL = data.coder_workspace_owner.me.email
HOME = "/home/coder"
Expand Down Expand Up @@ -510,19 +510,19 @@ resource "coder_script" "ddev_shutdown" {
}

resource "docker_container" "workspace" {
count = data.coder_workspace.me.start_count
image = docker_image.workspace_image.image_id
name = "coder-${data.coder_workspace.me.id}"
hostname = "${data.coder_workspace.me.name}-${data.coder_workspace_owner.me.name}"
user = "coder"
group_add = [tostring(var.docker_gid)]
stop_timeout = 180
stop_signal = "SIGINT"
count = data.coder_workspace.me.start_count
image = docker_image.workspace_image.image_id
name = "coder-${data.coder_workspace.me.id}"
hostname = "${data.coder_workspace.me.name}-${data.coder_workspace_owner.me.name}"
user = "coder"
group_add = [tostring(var.docker_gid)]
stop_timeout = 180
stop_signal = "SIGINT"
destroy_grace_seconds = 60
working_dir = local.workspace_home
cpu_shares = var.cpu * 1024
memory = var.memory * 1024 * 1024 * 1024
runtime = "sysbox-runc"
working_dir = local.workspace_home
cpu_shares = var.cpu * 1024
memory = var.memory * 1024 * 1024 * 1024
runtime = "sysbox-runc"

volumes {
container_path = local.workspace_home
Expand Down
16 changes: 8 additions & 8 deletions user-defined-web/template.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
source = "kreuzwerker/docker"
version = "~> 3.0"
}
}
}
}

provider "docker" {
Expand Down Expand Up @@ -103,7 +103,7 @@ data "coder_parameter" "vscode_extensions" {
locals {
# Determine workspace home path
# Sysbox Strategy: Use standard /home/coder
workspace_home = "/home/coder"
workspace_home = "/home/coder"
selected_extensions = jsondecode(data.coder_parameter.vscode_extensions.value)
}

Expand Down Expand Up @@ -571,8 +571,8 @@ BASHCOMP
CODER_AGENT_FORCE_UPDATE = "35"
# DOCKER_HOST not needed as we use local socket
# DOCKER_HOST = var.docker_host
CODER_WORKSPACE_ID = data.coder_workspace.me.id
CODER_WORKSPACE_NAME = data.coder_workspace.me.name
CODER_WORKSPACE_ID = data.coder_workspace.me.id
CODER_WORKSPACE_NAME = data.coder_workspace.me.name
CODER_WORKSPACE_OWNER_NAME = data.coder_workspace_owner.me.name
CODER_WORKSPACE_OWNER_EMAIL = data.coder_workspace_owner.me.email
# Force HOME to /home/coder (Standard Home Strategy)
Expand Down Expand Up @@ -658,8 +658,8 @@ resource "coder_script" "ddev_shutdown" {


resource "docker_container" "workspace" {
count = data.coder_workspace.me.start_count
image = docker_image.workspace_image.image_id
count = data.coder_workspace.me.start_count
image = docker_image.workspace_image.image_id
name = "coder-${data.coder_workspace.me.id}"
hostname = "${data.coder_workspace.me.name}-${data.coder_workspace_owner.me.name}"
user = "coder"
Expand All @@ -669,8 +669,8 @@ resource "docker_container" "workspace" {

# Increase stop_timeout to allow shutdown_script and ddev stop to run
# Default is usually 10s, which is not enough for ddev shutdown
stop_timeout = 180
stop_signal = "SIGINT"
stop_timeout = 180
stop_signal = "SIGINT"
destroy_grace_seconds = 60


Expand Down
Loading