Skip to content

Commit bd4f15a

Browse files
PeefyPeefy
authored
Merge pull request #335 from johngmyers/v2
feat: Upgrade function-sdk-go to v0.5.0
2 parents e8e704d + a2a0a0d commit bd4f15a

File tree

9 files changed

+222
-213
lines changed

9 files changed

+222
-213
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616

1717
env:
1818
# Common versions
19-
GO_VERSION: '1.24'
19+
GO_VERSION: '1.24.9'
2020
GOLANGCI_VERSION: 'v1.54.2'
2121
DOCKER_BUILDX_VERSION: 'v0.11.2'
2222

‎.github/workflows/e2e.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
pull_request: {}
1010

1111
env:
12-
GO_VERSION: '1.24'
12+
GO_VERSION: '1.24.9'
1313

1414
jobs:
1515
test:

‎fn.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"fmt"
77
"os"
88

9-
"github.com/crossplane/crossplane-runtime/pkg/errors"
10-
"github.com/crossplane/crossplane-runtime/pkg/logging"
9+
"github.com/crossplane/crossplane-runtime/v2/pkg/errors"
10+
"github.com/crossplane/crossplane-runtime/v2/pkg/logging"
1111
"google.golang.org/protobuf/types/known/structpb"
1212
"k8s.io/apimachinery/pkg/runtime"
1313
"kcl-lang.io/krm-kcl/pkg/api"

‎fn_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"path/filepath"
77
"testing"
88

9-
"github.com/crossplane/crossplane-runtime/pkg/logging"
9+
"github.com/crossplane/crossplane-runtime/v2/pkg/logging"
1010
"github.com/go-logr/logr/testr"
1111
"github.com/google/go-cmp/cmp"
1212
"github.com/google/go-cmp/cmp/cmpopts"

‎go.mod‎

Lines changed: 62 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module github.com/crossplane-contrib/function-kcl
22

3-
go 1.24.0
3+
go 1.24.9
44

55
toolchain go1.25.3
66

77
require (
8-
dario.cat/mergo v1.0.1
8+
dario.cat/mergo v1.0.2
99
github.com/alecthomas/kong v1.12.1
10-
github.com/crossplane/crossplane-runtime v1.20.0
11-
github.com/crossplane/function-sdk-go v0.5.0-rc.0.0.20250805171053-2910b68d255d
10+
github.com/crossplane/crossplane-runtime/v2 v2.0.0
11+
github.com/crossplane/function-sdk-go v0.5.0
1212
github.com/go-logr/logr v1.4.3
1313
github.com/google/go-cmp v0.7.0
1414
github.com/pkg/errors v0.9.1
@@ -23,13 +23,19 @@ require (
2323

2424
require (
2525
cel.dev/expr v0.24.0 // indirect
26-
cloud.google.com/go v0.112.1 // indirect
27-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
28-
cloud.google.com/go/iam v1.1.6 // indirect
29-
cloud.google.com/go/storage v1.38.0 // indirect
26+
cloud.google.com/go v0.116.0 // indirect
27+
cloud.google.com/go/auth v0.13.0 // indirect
28+
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
29+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
30+
cloud.google.com/go/iam v1.2.2 // indirect
31+
cloud.google.com/go/monitoring v1.21.2 // indirect
32+
cloud.google.com/go/storage v1.49.0 // indirect
3033
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
3134
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
3235
github.com/BurntSushi/toml v1.5.0 // indirect
36+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
37+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
38+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
3339
github.com/Microsoft/go-winio v0.6.2 // indirect
3440
github.com/ProtonMail/go-crypto v1.1.6 // indirect
3541
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
@@ -46,8 +52,9 @@ require (
4652
github.com/chai2010/protorpc v1.1.4 // indirect
4753
github.com/chainguard-dev/git-urls v1.0.2 // indirect
4854
github.com/cloudflare/circl v1.6.1 // indirect
55+
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
4956
github.com/containerd/containerd v1.7.22 // indirect
50-
github.com/containerd/errdefs v0.3.0 // indirect
57+
github.com/containerd/errdefs v1.0.0 // indirect
5158
github.com/containerd/log v0.1.0 // indirect
5259
github.com/containerd/platforms v0.2.1 // indirect
5360
github.com/containers/image/v5 v5.34.3 // indirect
@@ -58,11 +65,11 @@ require (
5865
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5966
github.com/dchest/siphash v1.2.3 // indirect
6067
github.com/distribution/reference v0.6.0 // indirect
61-
github.com/docker/cli v27.5.1+incompatible // indirect
68+
github.com/docker/cli v28.5.1+incompatible // indirect
6269
github.com/docker/distribution v2.8.3+incompatible // indirect
63-
github.com/docker/docker v27.5.1+incompatible // indirect
64-
github.com/docker/docker-credential-helpers v0.8.2 // indirect
65-
github.com/docker/go-connections v0.5.0 // indirect
70+
github.com/docker/docker v28.5.1+incompatible // indirect
71+
github.com/docker/docker-credential-helpers v0.9.4 // indirect
72+
github.com/docker/go-connections v0.6.0 // indirect
6673
github.com/docker/go-metrics v0.0.1 // indirect
6774
github.com/docker/go-units v0.5.0 // indirect
6875
github.com/dominikbraun/graph v0.23.0 // indirect
@@ -71,6 +78,8 @@ require (
7178
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
7279
github.com/emicklei/proto v1.14.2 // indirect
7380
github.com/emirpasic/gods v1.18.1 // indirect
81+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
82+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
7483
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
7584
github.com/fatih/color v1.18.0 // indirect
7685
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -80,6 +89,7 @@ require (
8089
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
8190
github.com/go-git/go-billy/v5 v5.6.2 // indirect
8291
github.com/go-git/go-git/v5 v5.16.2 // indirect
92+
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
8393
github.com/go-json-experiment/json v0.0.0-20240815175050-ebd3a8989ca1 // indirect
8494
github.com/go-logr/stdr v1.2.2 // indirect
8595
github.com/go-logr/zapr v1.3.0 // indirect
@@ -95,19 +105,21 @@ require (
95105
github.com/go-openapi/validate v0.24.0 // indirect
96106
github.com/gobuffalo/flect v1.0.3 // indirect
97107
github.com/goccy/go-yaml v1.18.0 // indirect
98-
github.com/gofrs/flock v0.12.1 // indirect
108+
github.com/gofrs/flock v0.13.0 // indirect
99109
github.com/gogo/protobuf v1.3.2 // indirect
100110
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect
101111
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
102112
github.com/golang/protobuf v1.5.4 // indirect
103113
github.com/golang/snappy v0.0.4 // indirect
104-
github.com/google/cel-go v0.26.0 // indirect
114+
github.com/google/cel-go v0.26.1 // indirect
105115
github.com/google/gnostic-models v0.7.0 // indirect
106-
github.com/google/s2a-go v0.1.7 // indirect
116+
github.com/google/s2a-go v0.1.8 // indirect
107117
github.com/google/uuid v1.6.0 // indirect
108-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
109-
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
118+
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
119+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
110120
github.com/gorilla/mux v1.8.1 // indirect
121+
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
122+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 // indirect
111123
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
112124
github.com/hashicorp/go-getter v1.7.9 // indirect
113125
github.com/hashicorp/go-safetemp v1.0.0 // indirect
@@ -125,7 +137,7 @@ require (
125137
github.com/kr/text v0.2.0 // indirect
126138
github.com/kubescape/go-git-url v0.0.30 // indirect
127139
github.com/mailru/easyjson v0.7.7 // indirect
128-
github.com/mattn/go-colorable v0.1.13 // indirect
140+
github.com/mattn/go-colorable v0.1.14 // indirect
129141
github.com/mattn/go-isatty v0.0.20 // indirect
130142
github.com/mitchellh/go-homedir v1.1.0 // indirect
131143
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -150,6 +162,7 @@ require (
150162
github.com/otiai10/mint v1.6.3 // indirect
151163
github.com/perimeterx/marshmallow v1.1.5 // indirect
152164
github.com/pjbgf/sha1cd v0.3.2 // indirect
165+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
153166
github.com/prometheus/client_golang v1.22.0 // indirect
154167
github.com/prometheus/client_model v0.6.1 // indirect
155168
github.com/prometheus/common v0.62.0 // indirect
@@ -160,45 +173,50 @@ require (
160173
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
161174
github.com/sirupsen/logrus v1.9.3 // indirect
162175
github.com/skeema/knownhosts v1.3.1 // indirect
163-
github.com/spf13/afero v1.11.0 // indirect
164-
github.com/spf13/cobra v1.9.1 // indirect
165-
github.com/spf13/pflag v1.0.7 // indirect
166-
github.com/stoewer/go-strcase v1.3.0 // indirect
176+
github.com/spf13/afero v1.12.0 // indirect
177+
github.com/spf13/cobra v1.10.1 // indirect
178+
github.com/spf13/pflag v1.0.10 // indirect
179+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
180+
github.com/stoewer/go-strcase v1.3.1 // indirect
167181
github.com/thoas/go-funk v0.9.3 // indirect
168182
github.com/ulikunitz/xz v0.5.12 // indirect
169183
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
170184
github.com/x448/float16 v0.8.4 // indirect
171185
github.com/xanzy/ssh-agent v0.3.3 // indirect
172186
github.com/xlab/treeprint v1.2.0 // indirect
173187
github.com/yuin/goldmark v1.7.12 // indirect
188+
github.com/zeebo/errs v1.4.0 // indirect
174189
go.mongodb.org/mongo-driver v1.14.0 // indirect
175190
go.opencensus.io v0.24.0 // indirect
176-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
191+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
192+
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
177193
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
178-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
179-
go.opentelemetry.io/otel v1.35.0 // indirect
180-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
181-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
194+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
195+
go.opentelemetry.io/otel v1.38.0 // indirect
196+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
197+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
198+
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
199+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
182200
go.uber.org/multierr v1.11.0 // indirect
183201
go.uber.org/zap v1.27.0 // indirect
184202
go.yaml.in/yaml/v2 v2.4.2 // indirect
185203
go.yaml.in/yaml/v3 v3.0.4 // indirect
186-
golang.org/x/crypto v0.41.0 // indirect
187-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
188-
golang.org/x/mod v0.27.0 // indirect
189-
golang.org/x/net v0.43.0 // indirect
190-
golang.org/x/oauth2 v0.28.0 // indirect
191-
golang.org/x/sync v0.16.0 // indirect
192-
golang.org/x/sys v0.35.0 // indirect
193-
golang.org/x/term v0.34.0 // indirect
194-
golang.org/x/text v0.28.0 // indirect
195-
golang.org/x/time v0.9.0 // indirect
196-
golang.org/x/tools v0.36.0 // indirect
197-
google.golang.org/api v0.169.0 // indirect
198-
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
199-
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
200-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
201-
google.golang.org/grpc v1.73.0 // indirect
204+
golang.org/x/crypto v0.43.0 // indirect
205+
golang.org/x/exp v0.0.0-20251009144603-d2f985daa21b // indirect
206+
golang.org/x/mod v0.29.0 // indirect
207+
golang.org/x/net v0.46.0 // indirect
208+
golang.org/x/oauth2 v0.30.0 // indirect
209+
golang.org/x/sync v0.17.0 // indirect
210+
golang.org/x/sys v0.37.0 // indirect
211+
golang.org/x/term v0.36.0 // indirect
212+
golang.org/x/text v0.30.0 // indirect
213+
golang.org/x/time v0.11.0 // indirect
214+
golang.org/x/tools v0.38.0 // indirect
215+
google.golang.org/api v0.215.0 // indirect
216+
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
217+
google.golang.org/genproto/googleapis/api v0.0.0-20251007200510-49b9836ed3ff // indirect
218+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff // indirect
219+
google.golang.org/grpc v1.75.1 // indirect
202220
gopkg.in/inf.v0 v0.9.1 // indirect
203221
gopkg.in/warnings.v0 v0.1.2 // indirect
204222
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)