Skip to content

ci: use matrix object (path + name) for module matrix #170

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
davidcollom merged 3 commits into from
Oct 9, 2026
Merged

ci: use matrix object (path + name) for module matrix #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7286976
ci(fix): avoid pipe on matrix for coverage artifact name
davidcollom Oct 9, 2026
7abdc7e
ci(refactor): use matrix object with path + name for each module
davidcollom Oct 9, 2026
87bf46d
chore(argo): rename pkg/argo/roll to pkg/argo/rollouts
davidcollom Oct 9, 2026
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
158 changes: 82 additions & 76 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ permissions:
# silently in this repo (matrix jobs never started)
# When adding or removing a module, update all five lists below AND
# .github/modules.json (kept in sync for documentation / future use).
#
# Each module entry is an object with:
# path: the Go module path (used for `go test ./<path>/...`, coverage files, cache key)
# name: an artifact-safe identifier (no `/`), used in the coverage-artifact name
# The `name` exists because GitHub artifact names must match [A-Za-z0-9_-],
# and the matrix `path` contains `/` for grouped modules like `pkg/argo/cd`.

jobs:
fmt:
Expand All @@ -28,29 +34,29 @@ jobs:
fail-fast: false
matrix:
module:
- pkg/utils
- pkg/k8s
- pkg/certmanager
- pkg/externalsecrets
- pkg/flux
- pkg/istio
- pkg/linkerd
- pkg/velero
- pkg/argo/cd
- pkg/argo/events
- pkg/argo/roll
- pkg/argo/workflows
- { path: pkg/utils, name: pkg-utils }
- { path: pkg/k8s, name: pkg-k8s }
- { path: pkg/certmanager, name: pkg-certmanager }
- { path: pkg/externalsecrets, name: pkg-externalsecrets }
- { path: pkg/flux, name: pkg-flux }
- { path: pkg/istio, name: pkg-istio }
- { path: pkg/linkerd, name: pkg-linkerd }
- { path: pkg/velero, name: pkg-velero }
- { path: pkg/argo/cd, name: pkg-argo-cd }
- { path: pkg/argo/events, name: pkg-argo-events }
- { path: pkg/argo/rollouts, name: pkg-argo-rollouts }

@chatgpt-codex-connector chatgpt-codex-connector Bot Oct 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Point the matrix at the existing rollout module

Use pkg/argo/roll here, as registered in go.work:15 and .github/modules.json:12; there is no pkg/argo/rollouts directory. I checked the exact fmt command, and gofmt -l pkg/argo/rollouts exits with status 2 and no such file or directory. Because the same nonexistent path appears in all five matrices, the prerequisite fmt/vet/lint jobs fail, the dependent test job is skipped, and the actual rollout module is no longer checked.

Useful? React with 👍 / 👎.

- { path: pkg/argo/workflows, name: pkg-argo-workflows }
steps:
- uses: actions/checkout@v7
- uses: actions/setup-go@v7
with:
go-version-file: go.work
cache-dependency-path: '${{ matrix.module }}/go.sum'
cache-dependency-path: '${{ matrix.module.path }}/go.sum'
- name: Check go fmt
run: |
UNFORMATTED=$(gofmt -l ${{ matrix.module }})
UNFORMATTED=$(gofmt -l ${{ matrix.module.path }})
if [ -n "$UNFORMATTED" ]; then
echo "The following files are not gofmt'd in ${{ matrix.module }}. Run: go fmt ./..."
echo "The following files are not gofmt'd in ${{ matrix.module.path }}. Run: go fmt ./..."
echo "$UNFORMATTED"
exit 1
fi
Expand All @@ -61,85 +67,85 @@ jobs:
fail-fast: false
matrix:
module:
- pkg/utils
- pkg/k8s
- pkg/certmanager
- pkg/externalsecrets
- pkg/flux
- pkg/istio
- pkg/linkerd
- pkg/velero
- pkg/argo/cd
- pkg/argo/events
- pkg/argo/roll
- pkg/argo/workflows
- { path: pkg/utils, name: pkg-utils }
- { path: pkg/k8s, name: pkg-k8s }
- { path: pkg/certmanager, name: pkg-certmanager }
- { path: pkg/externalsecrets, name: pkg-externalsecrets }
- { path: pkg/flux, name: pkg-flux }
- { path: pkg/istio, name: pkg-istio }
- { path: pkg/linkerd, name: pkg-linkerd }
- { path: pkg/velero, name: pkg-velero }
- { path: pkg/argo/cd, name: pkg-argo-cd }
- { path: pkg/argo/events, name: pkg-argo-events }
- { path: pkg/argo/rollouts, name: pkg-argo-rollouts }
- { path: pkg/argo/workflows, name: pkg-argo-workflows }
steps:
- uses: actions/checkout@v7
- uses: actions/setup-go@v7
with:
go-version-file: go.work
cache-dependency-path: '${{ matrix.module }}/go.sum'
cache-dependency-path: '${{ matrix.module.path }}/go.sum'
- name: Run go vet
run: go vet ./${{ matrix.module }}/...
run: go vet ./${{ matrix.module.path }}/...

lint:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
module:
- pkg/utils
- pkg/k8s
- pkg/certmanager
- pkg/externalsecrets
- pkg/flux
- pkg/istio
- pkg/linkerd
- pkg/velero
- pkg/argo/cd
- pkg/argo/events
- pkg/argo/roll
- pkg/argo/workflows
- { path: pkg/utils, name: pkg-utils }
- { path: pkg/k8s, name: pkg-k8s }
- { path: pkg/certmanager, name: pkg-certmanager }
- { path: pkg/externalsecrets, name: pkg-externalsecrets }
- { path: pkg/flux, name: pkg-flux }
- { path: pkg/istio, name: pkg-istio }
- { path: pkg/linkerd, name: pkg-linkerd }
- { path: pkg/velero, name: pkg-velero }
- { path: pkg/argo/cd, name: pkg-argo-cd }
- { path: pkg/argo/events, name: pkg-argo-events }
- { path: pkg/argo/rollouts, name: pkg-argo-rollouts }
- { path: pkg/argo/workflows, name: pkg-argo-workflows }
steps:
- uses: actions/checkout@v7
- uses: actions/setup-go@v7
with:
go-version-file: go.work
cache-dependency-path: '${{ matrix.module }}/go.sum'
cache-dependency-path: '${{ matrix.module.path }}/go.sum'
- name: Install golangci-lint
run: go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.14.0
- name: Run golangci-lint
run: golangci-lint run ./${{ matrix.module }}/...
run: golangci-lint run ./${{ matrix.module.path }}/...

vulncheck:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
module:
- pkg/utils
- pkg/k8s
- pkg/certmanager
- pkg/externalsecrets
- pkg/flux
- pkg/istio
- pkg/linkerd
- pkg/velero
- pkg/argo/cd
- pkg/argo/events
- pkg/argo/roll
- pkg/argo/workflows
- { path: pkg/utils, name: pkg-utils }
- { path: pkg/k8s, name: pkg-k8s }
- { path: pkg/certmanager, name: pkg-certmanager }
- { path: pkg/externalsecrets, name: pkg-externalsecrets }
- { path: pkg/flux, name: pkg-flux }
- { path: pkg/istio, name: pkg-istio }
- { path: pkg/linkerd, name: pkg-linkerd }
- { path: pkg/velero, name: pkg-velero }
- { path: pkg/argo/cd, name: pkg-argo-cd }
- { path: pkg/argo/events, name: pkg-argo-events }
- { path: pkg/argo/rollouts, name: pkg-argo-rollouts }
- { path: pkg/argo/workflows, name: pkg-argo-workflows }
steps:
- uses: actions/checkout@v7
- uses: actions/setup-go@v7
with:
go-version-file: go.work
cache-dependency-path: '${{ matrix.module }}/go.sum'
cache-dependency-path: '${{ matrix.module.path }}/go.sum'
- name: Install govulncheck
run: go install golang.org/x/vuln/cmd/govulncheck@latest
- name: Run govulncheck
continue-on-error: true
run: govulncheck ./${{ matrix.module }}/...
run: govulncheck ./${{ matrix.module.path }}/...

test:
needs: [fmt, vet, lint, vulncheck]
Expand All @@ -148,38 +154,38 @@ jobs:
fail-fast: false
matrix:
module:
- pkg/utils
- pkg/k8s
- pkg/certmanager
- pkg/externalsecrets
- pkg/flux
- pkg/istio
- pkg/linkerd
- pkg/velero
- pkg/argo/cd
- pkg/argo/events
- pkg/argo/roll
- pkg/argo/workflows
- { path: pkg/utils, name: pkg-utils }
- { path: pkg/k8s, name: pkg-k8s }
- { path: pkg/certmanager, name: pkg-certmanager }
- { path: pkg/externalsecrets, name: pkg-externalsecrets }
- { path: pkg/flux, name: pkg-flux }
- { path: pkg/istio, name: pkg-istio }
- { path: pkg/linkerd, name: pkg-linkerd }
- { path: pkg/velero, name: pkg-velero }
- { path: pkg/argo/cd, name: pkg-argo-cd }
- { path: pkg/argo/events, name: pkg-argo-events }
- { path: pkg/argo/rollouts, name: pkg-argo-rollouts }
- { path: pkg/argo/workflows, name: pkg-argo-workflows }
steps:
- uses: actions/checkout@v7
- uses: actions/setup-go@v7
with:
go-version-file: go.work
cache-dependency-path: '${{ matrix.module }}/go.sum'
cache-dependency-path: '${{ matrix.module.path }}/go.sum'
- name: Run tests with coverage
run: go test -v -coverprofile=${{ matrix.module }}/coverage.out -covermode=atomic ./${{ matrix.module }}/...
run: go test -v -coverprofile=${{ matrix.module.path }}/coverage.out -covermode=atomic ./${{ matrix.module.path }}/...
- name: Show coverage summary
if: always()
run: go tool cover -func=${{ matrix.module }}/coverage.out | tail -1
run: go tool cover -func=${{ matrix.module.path }}/coverage.out | tail -1
- name: Generate HTML coverage report
if: always()
run: go tool cover -html=${{ matrix.module }}/coverage.out -o ${{ matrix.module }}/coverage.html
run: go tool cover -html=${{ matrix.module.path }}/coverage.out -o ${{ matrix.module.path }}/coverage.html
- name: Upload coverage artifact
if: always()
uses: actions/upload-artifact@v4
with:
name: coverage-${{ matrix.module | replace('/', '-') }}
name: coverage-${{ matrix.module.name }}
path: |
${{ matrix.module }}/coverage.out
${{ matrix.module }}/coverage.html
${{ matrix.module.path }}/coverage.out
${{ matrix.module.path }}/coverage.html
retention-days: 90
2 changes: 1 addition & 1 deletion go.work
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use (
./pkg/velero
./pkg/argo/cd
./pkg/argo/events
./pkg/argo/roll
./pkg/argo/rollouts
./pkg/argo/workflows
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/argo/roll/go.mod → pkg/argo/rollouts/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/davidcollom/terratest-utils/pkg/argo/roll
module github.com/davidcollom/terratest-utils/pkg/argo/rollouts

go 1.27.1

Expand Down
0 pkg/argo/roll/go.sum → pkg/argo/rollouts/go.sum
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions pkg/argo/roll/rollout.go → pkg/argo/rollouts/rollout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
)

// NewArgoRolloutsClient creates a new Argo Rollouts client using the provided testing context and kubectl options.
// It retrieves the Kubernetes REST configuration from the given options or generates one if not present.
// Returns an Argo Rollouts client interface and an error if the client could not be created.
// It is a variable so tests can override it with a fake clientset (see .github/copilot-instructions.md
// "Client Construction Pattern").
//
// Parameters:
// - t: The testing context, used for logging and error handling.
Expand All @@ -32,9 +32,9 @@ import (
// Returns:
// - rolloutClientSet.Interface: The Argo Rollouts client interface for interacting with Rollouts resources.
// - error: An error if the client could not be created.
//
// NewArgoRolloutsClient creates a new client or helper instance.
func NewArgoRolloutsClient(t testing.TestingT, options *k8s.KubectlOptions) (rolloutClientSet.Interface, error) {
var NewArgoRolloutsClient = newArgoRolloutsClient

func newArgoRolloutsClient(t testing.TestingT, options *k8s.KubectlOptions) (rolloutClientSet.Interface, error) {
var cfg *rest.Config
var err error
if options.RestConfig == nil {
Expand Down
Loading