Skip to content

Commit 6d25f60

Browse files
blampeblampe
authored
Ignore unnamed properties (#135)
The VictoriaMetrics CRD includes a property like this: ```yaml properties: '-': type: string ``` which breaks codegen because the property name camel cases to "", and as a result we generates a bunch of unnamed functions. This PR modifies our logic to ignore unnamed properties like this. We also bump pu/pu and apimachinery for good measure. Fixes #133.
1 parent 93444b9 commit 6d25f60

File tree

11 files changed

+297
-219
lines changed

11 files changed

+297
-219
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
- name: Checkout
1414
uses: actions/checkout@v3
1515

16-
- name: Install Go 1.20.x
16+
- name: Install Go
1717
uses: actions/setup-go@v4
1818
with:
19-
go-version: 1.20.x
19+
go-version-file: go.mod
2020
cache-dependency-path: |
2121
**/go.sum
2222

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
uses: jaxxstorm/action-install-gh-release@v1.1.0
1919
with:
2020
repo: pulumi/pulumictl
21-
- name: Install Go 1.20.x
21+
- name: Install Go
2222
uses: actions/setup-go@v4
2323
with:
24-
go-version: 1.20.x
24+
go-version-file: go.mod
2525
cache-dependency-path: |
2626
**/go.sum
2727
- name: Goreleaser publish

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
## Unreleased
44

5+
- Fix invalid generated code due to unnamed properties. [#135](https://github.com/pulumi/crd2pulumi/pull/135)
56
- Fix unpinned Kubernetes version in generated nodejs resources. [#121](https://github.com/pulumi/crd2pulumi/pull/121)
6-
- Fix .NET generated code to use provider v4. [#134](https://github.com/pulumi/crd2pulumi/pull/134)
7+
- Fix .NET generated code to use provider v4. [#134](https://github.com/pulumi/crd2pulumi/pull/134)
78
- Add Java generation support. [#129](https://github.com/pulumi/crd2pulumi/pull/129)
89

910
## 1.3.0 (2023-12-12)

‎go.mod‎

Lines changed: 68 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
11
module github.com/pulumi/crd2pulumi
22

3-
go 1.19
3+
go 1.22.0
4+
5+
toolchain go1.22.1
46

57
require (
68
github.com/iancoleman/strcase v0.3.0
7-
github.com/pulumi/pulumi-java/pkg v0.9.8
8-
github.com/pulumi/pulumi/pkg/v3 v3.95.0
9-
github.com/pulumi/pulumi/sdk/v3 v3.95.0
9+
github.com/pulumi/pulumi-java/pkg v0.10.0
10+
github.com/pulumi/pulumi/pkg/v3 v3.115.2
11+
github.com/pulumi/pulumi/sdk/v3 v3.115.2
1012
github.com/spf13/cobra v1.8.0
11-
github.com/stretchr/testify v1.8.4
13+
github.com/stretchr/testify v1.9.0
1214
golang.org/x/text v0.14.0
13-
k8s.io/apimachinery v0.28.4
15+
k8s.io/apimachinery v0.30.0
1416
)
1517

1618
require (
17-
cloud.google.com/go v0.111.0 // indirect
18-
cloud.google.com/go/compute v1.23.3 // indirect
19+
cloud.google.com/go v0.112.1 // indirect
20+
cloud.google.com/go/compute v1.25.0 // indirect
1921
cloud.google.com/go/compute/metadata v0.2.3 // indirect
20-
cloud.google.com/go/iam v1.1.5 // indirect
21-
cloud.google.com/go/kms v1.15.5 // indirect
22-
cloud.google.com/go/logging v1.8.1 // indirect
23-
cloud.google.com/go/longrunning v0.5.4 // indirect
24-
cloud.google.com/go/storage v1.35.1 // indirect
22+
cloud.google.com/go/iam v1.1.6 // indirect
23+
cloud.google.com/go/kms v1.15.7 // indirect
24+
cloud.google.com/go/logging v1.9.0 // indirect
25+
cloud.google.com/go/longrunning v0.5.5 // indirect
26+
cloud.google.com/go/storage v1.39.1 // indirect
2527
dario.cat/mergo v1.0.0 // indirect
26-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0 // indirect
27-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 // indirect
28-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 // indirect
28+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0 // indirect
29+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // indirect
30+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
2931
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 // indirect
3032
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
31-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 // indirect
33+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
3234
github.com/BurntSushi/toml v1.3.2 // indirect
3335
github.com/Microsoft/go-winio v0.6.1 // indirect
34-
github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
36+
github.com/ProtonMail/go-crypto v1.0.0 // indirect
3537
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
3638
github.com/agext/levenshtein v1.2.3 // indirect
3739
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
3840
github.com/atotto/clipboard v0.1.4 // indirect
39-
github.com/aws/aws-sdk-go v1.48.13 // indirect
40-
github.com/aws/aws-sdk-go-v2 v1.23.5 // indirect
41-
github.com/aws/aws-sdk-go-v2/config v1.25.11 // indirect
42-
github.com/aws/aws-sdk-go-v2/credentials v1.16.9 // indirect
43-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.9 // indirect
44-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.4 // indirect
45-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.8 // indirect
46-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.8 // indirect
47-
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.1 // indirect
48-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.3 // indirect
49-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.8 // indirect
50-
github.com/aws/aws-sdk-go-v2/service/kms v1.27.2 // indirect
51-
github.com/aws/aws-sdk-go-v2/service/s3 v1.47.2 // indirect
52-
github.com/aws/aws-sdk-go-v2/service/sso v1.18.2 // indirect
53-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.2 // indirect
54-
github.com/aws/aws-sdk-go-v2/service/sts v1.26.2 // indirect
55-
github.com/aws/smithy-go v1.18.1 // indirect
41+
github.com/aws/aws-sdk-go v1.50.36 // indirect
42+
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
43+
github.com/aws/aws-sdk-go-v2/config v1.27.11 // indirect
44+
github.com/aws/aws-sdk-go-v2/credentials v1.17.11 // indirect
45+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 // indirect
46+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect
47+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect
48+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
49+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
50+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect
51+
github.com/aws/aws-sdk-go-v2/service/kms v1.30.1 // indirect
52+
github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 // indirect
53+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect
54+
github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 // indirect
55+
github.com/aws/smithy-go v1.20.2 // indirect
5656
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
5757
github.com/blang/semver v3.5.1+incompatible // indirect
5858
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
@@ -64,31 +64,33 @@ require (
6464
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
6565
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
6666
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
67+
github.com/deckarep/golang-set/v2 v2.5.0 // indirect
6768
github.com/djherbis/times v1.6.0 // indirect
6869
github.com/edsrzf/mmap-go v1.1.0 // indirect
6970
github.com/emirpasic/gods v1.18.1 // indirect
7071
github.com/fatih/color v1.16.0 // indirect
72+
github.com/felixge/httpsnoop v1.0.4 // indirect
7173
github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813 // indirect
7274
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
7375
github.com/go-git/go-billy/v5 v5.5.0 // indirect
74-
github.com/go-git/go-git/v5 v5.11.0 // indirect
76+
github.com/go-git/go-git/v5 v5.12.0 // indirect
7577
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
76-
github.com/go-logr/logr v1.3.0 // indirect
78+
github.com/go-logr/logr v1.4.1 // indirect
7779
github.com/go-logr/stdr v1.2.2 // indirect
7880
github.com/go-test/deep v1.1.0 // indirect
7981
github.com/gofrs/uuid v4.4.0+incompatible // indirect
8082
github.com/gogo/protobuf v1.3.2 // indirect
81-
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
83+
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
8284
github.com/golang/glog v1.2.0 // indirect
8385
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
84-
github.com/golang/protobuf v1.5.3 // indirect
86+
github.com/golang/protobuf v1.5.4 // indirect
8587
github.com/google/go-querystring v1.1.0 // indirect
8688
github.com/google/gofuzz v1.2.0 // indirect
8789
github.com/google/s2a-go v0.1.7 // indirect
88-
github.com/google/uuid v1.4.0 // indirect
89-
github.com/google/wire v0.5.0 // indirect
90+
github.com/google/uuid v1.6.0 // indirect
91+
github.com/google/wire v0.6.0 // indirect
9092
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
91-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
93+
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
9294
github.com/gorilla/mux v1.8.1 // indirect
9395
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
9496
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -110,7 +112,6 @@ require (
110112
github.com/kevinburke/ssh_config v1.2.0 // indirect
111113
github.com/kylelemons/godebug v1.1.0 // indirect
112114
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
113-
github.com/mattn/go-colorable v0.1.13 // indirect
114115
github.com/mattn/go-isatty v0.0.20 // indirect
115116
github.com/mattn/go-localereader v0.0.1 // indirect
116117
github.com/mattn/go-runewidth v0.0.15 // indirect
@@ -132,21 +133,21 @@ require (
132133
github.com/pgavlin/fx v0.1.6 // indirect
133134
github.com/pgavlin/goldmark v1.1.33-0.20200616210433-b5eb04559386 // indirect
134135
github.com/pjbgf/sha1cd v0.3.0 // indirect
135-
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
136+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
136137
github.com/pkg/errors v0.9.1 // indirect
137138
github.com/pkg/term v1.1.0 // indirect
138139
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
139140
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
140-
github.com/pulumi/esc v0.6.1-0.20231111193429-44b746a5b3b5 // indirect
141+
github.com/pulumi/esc v0.6.2 // indirect
141142
github.com/rivo/uniseg v0.4.4 // indirect
142143
github.com/rogpeppe/go-internal v1.11.0 // indirect
143144
github.com/ryanuber/go-glob v1.0.0 // indirect
144145
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
145146
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
146147
github.com/segmentio/asm v1.2.0 // indirect
147148
github.com/segmentio/encoding v0.4.0 // indirect
148-
github.com/sergi/go-diff v1.3.1 // indirect
149-
github.com/skeema/knownhosts v1.2.1 // indirect
149+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
150+
github.com/skeema/knownhosts v1.2.2 // indirect
150151
github.com/spf13/afero v1.11.0 // indirect
151152
github.com/spf13/pflag v1.0.5 // indirect
152153
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
@@ -159,35 +160,37 @@ require (
159160
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
160161
github.com/zclconf/go-cty v1.14.1 // indirect
161162
go.opencensus.io v0.24.0 // indirect
162-
go.opentelemetry.io/otel v1.21.0 // indirect
163-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
164-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
163+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
164+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
165+
go.opentelemetry.io/otel v1.24.0 // indirect
166+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
167+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
165168
go.uber.org/atomic v1.11.0 // indirect
166-
gocloud.dev v0.34.0 // indirect
169+
gocloud.dev v0.37.0 // indirect
167170
gocloud.dev/secrets/hashivault v0.34.0 // indirect
168-
golang.org/x/crypto v0.19.0 // indirect
171+
golang.org/x/crypto v0.22.0 // indirect
169172
golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
170-
golang.org/x/mod v0.14.0 // indirect
171-
golang.org/x/net v0.19.0 // indirect
172-
golang.org/x/oauth2 v0.15.0 // indirect
173-
golang.org/x/sync v0.5.0 // indirect
174-
golang.org/x/sys v0.17.0 // indirect
175-
golang.org/x/term v0.17.0 // indirect
173+
golang.org/x/mod v0.15.0 // indirect
174+
golang.org/x/net v0.23.0 // indirect
175+
golang.org/x/oauth2 v0.18.0 // indirect
176+
golang.org/x/sync v0.6.0 // indirect
177+
golang.org/x/sys v0.19.0 // indirect
178+
golang.org/x/term v0.19.0 // indirect
176179
golang.org/x/time v0.5.0 // indirect
177-
golang.org/x/tools v0.16.0 // indirect
180+
golang.org/x/tools v0.18.0 // indirect
178181
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
179-
google.golang.org/api v0.153.0 // indirect
182+
google.golang.org/api v0.169.0 // indirect
180183
google.golang.org/appengine v1.6.8 // indirect
181-
google.golang.org/genproto v0.0.0-20231127180814-3a041ad873d4 // indirect
182-
google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4 // indirect
183-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
184-
google.golang.org/grpc v1.59.0 // indirect
184+
google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7 // indirect
185+
google.golang.org/genproto/googleapis/api v0.0.0-20240311173647-c811ad7063a7 // indirect
186+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect
187+
google.golang.org/grpc v1.63.2 // indirect
185188
google.golang.org/protobuf v1.33.0 // indirect
186189
gopkg.in/inf.v0 v0.9.1 // indirect
187190
gopkg.in/warnings.v0 v0.1.2 // indirect
188191
gopkg.in/yaml.v2 v2.4.0 // indirect
189192
gopkg.in/yaml.v3 v3.0.1 // indirect
190-
k8s.io/klog/v2 v2.110.1 // indirect
193+
k8s.io/klog/v2 v2.120.1 // indirect
191194
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
192195
lukechampine.com/frand v1.4.2 // indirect
193196
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

0 commit comments

Comments
 (0)