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

feat: support for go.work #2849

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open

feat: support for go.work #2849

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0af0767
feat: support for generating the go.work file
mdelapenya Oct 24, 2024
26ce7cc
fix: update tests to assert the new module is added to all files
mdelapenya Oct 24, 2024
ea14e6b
fix: normalize go version across modules
mdelapenya Oct 24, 2024
75147a9
chore: lint
mdelapenya Oct 24, 2024
a083e9f
chore: move test
mdelapenya Oct 24, 2024
cb56778
chore: remove unused function
mdelapenya Oct 24, 2024
04fde29
chore: format errors
mdelapenya Oct 25, 2024
7d64155
chore: merge generate module tests
mdelapenya Oct 25, 2024
e4b8d22
chore: return zero value for root context if error
mdelapenya Oct 25, 2024
6da6a1e
fix: use t.Helper
mdelapenya Oct 25, 2024
ea005eb
chore: use modfile package to handle workfiles
mdelapenya Oct 25, 2024
14cab8e
chore: remove duplicated tests
mdelapenya Oct 25, 2024
8c17d3e
chore: move tests
mdelapenya Oct 25, 2024
711e50c
chore: assert against types, not strings
mdelapenya Oct 25, 2024
36a08a9
chore: remove unused template
mdelapenya Oct 25, 2024
255b953
docs: proper comments
mdelapenya Oct 25, 2024
11d0d76
chore: proper error message
mdelapenya Oct 25, 2024
0f9f98a
chore: include go.work file in git
mdelapenya Oct 25, 2024
d2421ba
chore: remove unused file
mdelapenya Oct 25, 2024
b08b839
chore: go work sync
mdelapenya Oct 25, 2024
87210d6
fix: resolve AWS deprecations for localstack
mdelapenya Oct 25, 2024
e0859c7
chore: run mod tidy
mdelapenya Oct 25, 2024
cdf541e
fix: mod tidy
mdelapenya Oct 25, 2024
693e1df
fix: include modulegen tidy in tidy-all
mdelapenya Oct 25, 2024
0463cc6
Merge branch 'main' into go-workfile
mdelapenya Oct 28, 2024
ac85826
Merge branch 'main' into go-workfile
mdelapenya Oct 29, 2024
6727948
Revert "chore: return zero value for root context if error"
mdelapenya Oct 29, 2024
c553a3d
chore: simplify test dirs creation
mdelapenya Oct 29, 2024
1628cec
chore: simpler test names
mdelapenya Oct 29, 2024
4d9762d
chore: remove useless comment
mdelapenya Oct 29, 2024
2c75d9a
chore: wrap error
mdelapenya Oct 29, 2024
cd0788c
docs: document new type
mdelapenya Oct 29, 2024
8212bd1
fix: wrong copy&paste in error message
mdelapenya Oct 29, 2024
047e7bb
docs: document exposed funtions
mdelapenya Oct 29, 2024
cbfdea7
Merge branch 'main' into go-workfile
mdelapenya Oct 29, 2024
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
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,5 @@ TEST-*.xml

tcvenv

**/go.work
Copy link
Collaborator

Choose a reason for hiding this comment

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

question: do we want it committed or part of a setup process? Typically its not standard to add this, but I wonder if this is a good example for it?


# VS Code settings
.vscode
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ test-examples:
.PHONY: tidy-all
tidy-all:
$(MAKE) tidy
$(MAKE) -C modulegen tidy
$(MAKE) -C examples tidy-examples
$(MAKE) -C modules tidy-modules

Expand Down
53 changes: 29 additions & 24 deletions examples/nginx/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,53 +11,58 @@ replace github.com/testcontainers/testcontainers-go => ../..

require (
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/containerd/containerd v1.7.18 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/cpuguy83/dockercfg v0.3.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker v27.1.1+incompatible // indirect
github.com/docker/docker v27.3.1+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/klauspost/compress v1.17.4 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/moby/sys/user v0.1.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sys v0.21.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
github.com/tklauser/go-sysconf v0.3.14 // indirect
github.com/tklauser/numcpus v0.8.0 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sys v0.26.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading