Skip to content

Commit 26e8da7

Browse files
chrissetoRafalKorepta
authored andcommitted
gotohelm: restore to working order
Prior to this commit gotohelm failed to run post it's migration to this repository due to complications with `LoadPackages` and now being hosted in a new workspace layout. The root of this issue stemmed from the AST rewrites being performed on the bootstrap package which would introduce a dependency from `internal/bootstrap` to `helmette` for functions like `DictTest`, `Compact`, and `TypeTest`. This commit eliminates the helper functions and AST rewriting in favor of enhancing the transpiler itself. This allows the `internal/bootstrap` package to solely depend on the stdlib making it possible to load the package without any hijinks or dependency on cwd.
1 parent 8f29324 commit 26e8da7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1014
-1223
lines changed

.licenseupdater.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ignore:
1313
- directory: pkg/gotohelm/testdata/pkg
1414
# Ignore go files from gotohelm's rewrite tests, they'll have the header but
1515
# after a build directive.
16-
- match: /\.rewritten\.go$/
16+
- match: .+\.rewritten\.go$
1717
files:
1818
- name: licenses/boilerplate.go.txt
1919
type: go

go.work

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ use (
77
./licenseupdater
88
./operator
99
./pkg
10+
./pkg/gotohelm/testdata/src/example
1011
)

go.work.sum

Lines changed: 320 additions & 22 deletions
Large diffs are not rendered by default.

gotohelm/go.mod

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ module github.com/redpanda-data/redpanda-operator/gotohelm
22

33
go 1.23.2
44

5-
replace pgregory.net/rapid => github.com/chrisseto/rapid v0.0.0-20240815210052-cdeef406c65c
5+
replace github.com/redpanda-data/redpanda-operator/pkg => ../pkg
66

77
require (
8-
github.com/redpanda-data/helm-charts v0.0.0-20241129100931-05d3182eb933
8+
github.com/redpanda-data/redpanda-operator/pkg v0.0.0-00010101000000-000000000000
99
golang.org/x/tools v0.27.0
1010
)
1111

1212
require (
1313
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
1414
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
15-
github.com/BurntSushi/toml v1.3.2 // indirect
15+
github.com/BurntSushi/toml v1.4.0 // indirect
1616
github.com/MakeNowJust/heredoc v1.0.0 // indirect
1717
github.com/Masterminds/goutils v1.1.1 // indirect
1818
github.com/Masterminds/semver/v3 v3.2.1 // indirect
@@ -36,28 +36,28 @@ require (
3636
github.com/distribution/reference v0.6.0 // indirect
3737
github.com/docker/cli v25.0.1+incompatible // indirect
3838
github.com/docker/distribution v2.8.3+incompatible // indirect
39-
github.com/docker/docker v27.0.3+incompatible // indirect
40-
github.com/docker/docker-credential-helpers v0.7.0 // indirect
39+
github.com/docker/docker v27.1.1+incompatible // indirect
40+
github.com/docker/docker-credential-helpers v0.8.0 // indirect
4141
github.com/docker/go-connections v0.5.0 // indirect
4242
github.com/docker/go-metrics v0.0.1 // indirect
43-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
43+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
4444
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
45-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
46-
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
47-
github.com/fatih/color v1.16.0 // indirect
45+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
46+
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
47+
github.com/fatih/color v1.17.0 // indirect
4848
github.com/felixge/httpsnoop v1.0.4 // indirect
4949
github.com/getsentry/sentry-go v0.18.0 // indirect
50-
github.com/go-errors/errors v1.4.2 // indirect
50+
github.com/go-errors/errors v1.5.1 // indirect
5151
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
52-
github.com/go-logr/logr v1.4.1 // indirect
52+
github.com/go-logr/logr v1.4.2 // indirect
5353
github.com/go-logr/stdr v1.2.2 // indirect
5454
github.com/go-openapi/jsonpointer v0.21.0 // indirect
55-
github.com/go-openapi/jsonreference v0.20.4 // indirect
55+
github.com/go-openapi/jsonreference v0.21.0 // indirect
5656
github.com/go-openapi/swag v0.23.0 // indirect
5757
github.com/gobwas/glob v0.2.3 // indirect
5858
github.com/gogo/protobuf v1.3.2 // indirect
5959
github.com/golang/protobuf v1.5.4 // indirect
60-
github.com/google/btree v1.0.1 // indirect
60+
github.com/google/btree v1.1.2 // indirect
6161
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
6262
github.com/google/go-cmp v0.6.0 // indirect
6363
github.com/google/gofuzz v1.2.0 // indirect
@@ -66,17 +66,18 @@ require (
6666
github.com/gorilla/mux v1.8.1 // indirect
6767
github.com/gorilla/websocket v1.5.0 // indirect
6868
github.com/gosuri/uitable v0.0.4 // indirect
69-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
69+
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
7070
github.com/hashicorp/errwrap v1.1.0 // indirect
7171
github.com/hashicorp/go-multierror v1.1.1 // indirect
72+
github.com/hashicorp/golang-lru/arc/v2 v2.0.7 // indirect
7273
github.com/huandu/xstrings v1.4.0 // indirect
7374
github.com/imdario/mergo v0.3.16 // indirect
7475
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7576
github.com/invopop/jsonschema v0.12.0 // indirect
7677
github.com/jmoiron/sqlx v1.3.5 // indirect
7778
github.com/josharian/intern v1.0.0 // indirect
7879
github.com/json-iterator/go v1.1.12 // indirect
79-
github.com/klauspost/compress v1.17.8 // indirect
80+
github.com/klauspost/compress v1.17.9 // indirect
8081
github.com/kr/pretty v0.3.1 // indirect
8182
github.com/kr/text v0.2.0 // indirect
8283
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
@@ -93,75 +94,75 @@ require (
9394
github.com/mitchellh/mapstructure v1.5.0 // indirect
9495
github.com/mitchellh/reflectwalk v1.0.2 // indirect
9596
github.com/moby/locker v1.0.1 // indirect
96-
github.com/moby/spdystream v0.2.0 // indirect
97+
github.com/moby/spdystream v0.4.0 // indirect
9798
github.com/moby/term v0.5.0 // indirect
9899
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
99100
github.com/modern-go/reflect2 v1.0.2 // indirect
100101
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
101102
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
102103
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
103-
github.com/opencontainers/go-digest v1.0.0 // indirect
104+
github.com/opencontainers/go-digest v1.0.1-0.20231025023718-d50d2fec9c98 // indirect
104105
github.com/opencontainers/image-spec v1.1.0 // indirect
105106
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
106107
github.com/pkg/errors v0.9.1 // indirect
107-
github.com/prometheus/client_golang v1.19.0 // indirect
108+
github.com/prometheus/client_golang v1.20.0 // indirect
108109
github.com/prometheus/client_model v0.6.1 // indirect
109-
github.com/prometheus/common v0.53.0 // indirect
110-
github.com/prometheus/procfs v0.14.0 // indirect
111-
github.com/rivo/uniseg v0.4.4 // indirect
110+
github.com/prometheus/common v0.55.0 // indirect
111+
github.com/prometheus/procfs v0.15.1 // indirect
112+
github.com/rivo/uniseg v0.4.7 // indirect
112113
github.com/rogpeppe/go-internal v1.12.0 // indirect
113114
github.com/rubenv/sql-migrate v1.5.2 // indirect
114115
github.com/russross/blackfriday/v2 v2.1.0 // indirect
115116
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
116117
github.com/shopspring/decimal v1.3.1 // indirect
117118
github.com/sirupsen/logrus v1.9.3 // indirect
118-
github.com/spf13/cast v1.5.0 // indirect
119-
github.com/spf13/cobra v1.8.0 // indirect
119+
github.com/spf13/cast v1.6.0 // indirect
120+
github.com/spf13/cobra v1.8.1 // indirect
120121
github.com/spf13/pflag v1.0.5 // indirect
121122
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
122123
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
123124
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
124125
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
125126
github.com/xlab/treeprint v1.2.0 // indirect
126-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
127-
go.opentelemetry.io/otel v1.26.0 // indirect
128-
go.opentelemetry.io/otel/metric v1.26.0 // indirect
129-
go.opentelemetry.io/otel/trace v1.26.0 // indirect
130-
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
127+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
128+
go.opentelemetry.io/otel v1.28.0 // indirect
129+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
130+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
131+
go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect
131132
golang.org/x/crypto v0.29.0 // indirect
132-
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
133+
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
133134
golang.org/x/mod v0.22.0 // indirect
134135
golang.org/x/net v0.31.0 // indirect
135-
golang.org/x/oauth2 v0.18.0 // indirect
136+
golang.org/x/oauth2 v0.22.0 // indirect
136137
golang.org/x/sync v0.9.0 // indirect
137138
golang.org/x/sys v0.27.0 // indirect
138139
golang.org/x/term v0.26.0 // indirect
139140
golang.org/x/text v0.20.0 // indirect
140-
golang.org/x/time v0.5.0 // indirect
141-
google.golang.org/appengine v1.6.8 // indirect
141+
golang.org/x/time v0.6.0 // indirect
142142
google.golang.org/genproto/googleapis/rpc v0.0.0-20240808171019-573a1156607a // indirect
143-
google.golang.org/grpc v1.63.2 // indirect
143+
google.golang.org/grpc v1.65.0 // indirect
144144
google.golang.org/protobuf v1.34.2 // indirect
145+
gopkg.in/evanphx/json-patch.v5 v5.7.0 // indirect
145146
gopkg.in/inf.v0 v0.9.1 // indirect
146147
gopkg.in/yaml.v2 v2.4.0 // indirect
147148
gopkg.in/yaml.v3 v3.0.1 // indirect
148149
helm.sh/helm/v3 v3.14.4 // indirect
149-
k8s.io/api v0.29.5 // indirect
150-
k8s.io/apiextensions-apiserver v0.29.5 // indirect
151-
k8s.io/apimachinery v0.29.5 // indirect
152-
k8s.io/apiserver v0.29.5 // indirect
153-
k8s.io/cli-runtime v0.29.0 // indirect
154-
k8s.io/client-go v0.29.5 // indirect
155-
k8s.io/component-base v0.29.5 // indirect
156-
k8s.io/klog/v2 v2.120.1 // indirect
157-
k8s.io/kube-openapi v0.0.0-20240103051144-eec4567ac022 // indirect
158-
k8s.io/kubectl v0.29.0 // indirect
159-
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
150+
k8s.io/api v0.30.3 // indirect
151+
k8s.io/apiextensions-apiserver v0.30.3 // indirect
152+
k8s.io/apimachinery v0.30.3 // indirect
153+
k8s.io/apiserver v0.30.3 // indirect
154+
k8s.io/cli-runtime v0.30.3 // indirect
155+
k8s.io/client-go v0.30.3 // indirect
156+
k8s.io/component-base v0.30.3 // indirect
157+
k8s.io/klog/v2 v2.130.1 // indirect
158+
k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f // indirect
159+
k8s.io/kubectl v0.30.3 // indirect
160+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
160161
oras.land/oras-go v1.2.5 // indirect
161-
sigs.k8s.io/controller-runtime v0.17.2 // indirect
162+
sigs.k8s.io/controller-runtime v0.18.5 // indirect
162163
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
163-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
164-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
164+
sigs.k8s.io/kustomize/api v0.16.0 // indirect
165+
sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
165166
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
166167
sigs.k8s.io/yaml v1.4.0 // indirect
167168
)

0 commit comments

Comments
 (0)