Skip to content

Commit a0a7fbd

Browse files
Add make targets for local builds (#297)
Description of changes: Adds a `go.local.mod`, and make targets using the new file, to more easily reference the local runtime package. Developers are now able to run `make local-build-ack-generate` to build and test changes to `code-generator` when updating `runtime`. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent ade2429 commit a0a7fbd

File tree

3 files changed

+1363
-5
lines changed

3 files changed

+1363
-5
lines changed

Makefile

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,23 @@ GO_LDFLAGS=-ldflags "-X $(IMPORT_PATH)/pkg/version.Version=$(VERSION) \
1616

1717
# We need to use the codegen tag when building and testing because the
1818
# aws-sdk-go/private/model/api package is gated behind a build tag "codegen"...
19-
GO_TAGS=-tags codegen
19+
GO_CMD_FLAGS=-tags codegen
20+
GO_CMD_LOCAL_FLAGS=-modfile=go.local.mod $(GO_CMD_FLAGS)
2021

21-
.PHONY: all build-ack-generate build-controller test \
22-
build-controller-image local-build-controller-image
22+
.PHONY: all local-build-ack-generate build-ack-generate local-build-controller \
23+
build-controller test local-test build-controller-image \
24+
local-build-controller-image
2325

2426
all: test
2527

2628
build-ack-generate: ## Build ack-generate binary
2729
@echo -n "building ack-generate ... "
28-
@go build ${GO_TAGS} ${GO_LDFLAGS} -o bin/ack-generate cmd/ack-generate/main.go
30+
@go build ${GO_CMD_FLAGS} ${GO_LDFLAGS} -o bin/ack-generate cmd/ack-generate/main.go
31+
@echo "ok."
32+
33+
local-build-ack-generate: ## Build ack-generate binary using the local go.mod
34+
@echo -n "building ack-generate ... "
35+
@go build ${GO_CMD_LOCAL_FLAGS} ${GO_LDFLAGS} -o bin/ack-generate cmd/ack-generate/main.go
2936
@echo "ok."
3037

3138
build-controller: build-ack-generate ## Generate controller code for SERVICE
@@ -35,6 +42,8 @@ build-controller: build-ack-generate ## Generate controller code for SERVICE
3542
@echo "==== building $(AWS_SERVICE)-controller release artifacts ===="
3643
@./scripts/build-controller-release.sh $(AWS_SERVICE)
3744

45+
local-build-controller: local-build-ack-generate build-controller ## Generate controller code for SERVICE using the local go.mod
46+
3847
build-controller-image: export LOCAL_MODULES = false
3948
build-controller-image: ## Build container image for SERVICE
4049
@./scripts/build-controller-image.sh $(AWS_SERVICE)
@@ -47,7 +56,10 @@ check-versions: ## Checks the code-generator version matches the runtime depende
4756
@./scripts/check-versions.sh $(VERSION)
4857

4958
test: ## Run code tests
50-
go test ${GO_TAGS} ./...
59+
go test ${GO_CMD_FLAGS} ./...
60+
61+
local-test: ## Run code tests using the local go.mod
62+
go test ${GO_CMD_LOCAL_FLAGS} ./...
5163

5264
help: ## Show this help.
5365
@grep -F -h "##" $(MAKEFILE_LIST) | grep -F -v grep | sed -e 's/\\$$//' \

go.local.mod

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
module github.com/aws-controllers-k8s/code-generator
2+
3+
go 1.17
4+
5+
replace github.com/aws-controllers-k8s/runtime => ../runtime
6+
7+
require (
8+
github.com/aws-controllers-k8s/runtime v0.16.4
9+
github.com/aws/aws-sdk-go v1.42.0
10+
github.com/dlclark/regexp2 v1.4.0
11+
// pin to v0.1.1 due to release problem with v0.1.2
12+
github.com/gertd/go-pluralize v0.1.1
13+
github.com/ghodss/yaml v1.0.0
14+
github.com/go-logr/logr v1.2.0
15+
github.com/iancoleman/strcase v0.1.3
16+
github.com/operator-framework/api v0.6.0
17+
github.com/pkg/errors v0.9.1
18+
github.com/spf13/cobra v1.2.1
19+
github.com/stretchr/testify v1.7.0
20+
golang.org/x/mod v0.4.2
21+
gopkg.in/src-d/go-git.v4 v4.13.1
22+
k8s.io/apimachinery v0.23.0
23+
sigs.k8s.io/controller-runtime v0.11.0
24+
)
25+
26+
require (
27+
github.com/beorn7/perks v1.0.1 // indirect
28+
github.com/blang/semver/v4 v4.0.0 // indirect
29+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
30+
github.com/davecgh/go-spew v1.1.1 // indirect
31+
github.com/emirpasic/gods v1.12.0 // indirect
32+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
33+
github.com/fsnotify/fsnotify v1.5.1 // indirect
34+
github.com/go-logr/zapr v1.2.0 // indirect
35+
github.com/gogo/protobuf v1.3.2 // indirect
36+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
37+
github.com/golang/protobuf v1.5.2 // indirect
38+
github.com/google/go-cmp v0.5.5 // indirect
39+
github.com/google/gofuzz v1.1.0 // indirect
40+
github.com/google/uuid v1.1.2 // indirect
41+
github.com/googleapis/gnostic v0.5.5 // indirect
42+
github.com/imdario/mergo v0.3.12 // indirect
43+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
44+
github.com/jaypipes/envutil v1.0.0 // indirect
45+
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
46+
github.com/jmespath/go-jmespath v0.4.0 // indirect
47+
github.com/json-iterator/go v1.1.12 // indirect
48+
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
49+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
50+
github.com/mitchellh/go-homedir v1.1.0 // indirect
51+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
52+
github.com/modern-go/reflect2 v1.0.2 // indirect
53+
github.com/pmezard/go-difflib v1.0.0 // indirect
54+
github.com/prometheus/client_golang v1.11.0 // indirect
55+
github.com/prometheus/client_model v0.2.0 // indirect
56+
github.com/prometheus/common v0.28.0 // indirect
57+
github.com/prometheus/procfs v0.6.0 // indirect
58+
github.com/sergi/go-diff v1.0.0 // indirect
59+
github.com/sirupsen/logrus v1.8.1 // indirect
60+
github.com/spf13/pflag v1.0.5 // indirect
61+
github.com/src-d/gcfg v1.4.0 // indirect
62+
github.com/xanzy/ssh-agent v0.2.1 // indirect
63+
go.uber.org/atomic v1.7.0 // indirect
64+
go.uber.org/multierr v1.6.0 // indirect
65+
go.uber.org/zap v1.19.1 // indirect
66+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
67+
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
68+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
69+
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
70+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
71+
golang.org/x/text v0.3.7 // indirect
72+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
73+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
74+
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
75+
google.golang.org/appengine v1.6.7 // indirect
76+
google.golang.org/protobuf v1.27.1 // indirect
77+
gopkg.in/inf.v0 v0.9.1 // indirect
78+
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
79+
gopkg.in/warnings.v0 v0.1.2 // indirect
80+
gopkg.in/yaml.v2 v2.4.0 // indirect
81+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
82+
k8s.io/api v0.23.0 // indirect
83+
k8s.io/apiextensions-apiserver v0.23.0 // indirect
84+
k8s.io/client-go v0.23.0 // indirect
85+
k8s.io/component-base v0.23.0 // indirect
86+
k8s.io/klog/v2 v2.30.0 // indirect
87+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
88+
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
89+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
90+
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
91+
sigs.k8s.io/yaml v1.3.0 // indirect
92+
)

0 commit comments

Comments
 (0)