Skip to content

Commit 8ede59a

Browse files
negznegz
authored
Merge pull request #36 from negz/release-prep
Bump k8s.io/utils
2 parents aed1771 + 02ea9f5 commit 8ede59a

File tree

9 files changed

+137
-153
lines changed

9 files changed

+137
-153
lines changed

‎connection_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/google/go-cmp/cmp"
77
"github.com/google/go-cmp/cmp/cmpopts"
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
9-
"k8s.io/utils/pointer"
9+
"k8s.io/utils/ptr"
1010

1111
"github.com/crossplane/crossplane-runtime/pkg/errors"
1212
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
@@ -64,32 +64,32 @@ func TestExtractConnectionDetails(t *testing.T) {
6464
{
6565
Type: v1beta1.ConnectionDetailTypeFromConnectionSecretKey,
6666
Name: "bar",
67-
FromConnectionSecretKey: pointer.String("bar"),
67+
FromConnectionSecretKey: ptr.To[string]("bar"),
6868
},
6969
{
7070
Type: v1beta1.ConnectionDetailTypeFromConnectionSecretKey,
7171
Name: "none",
72-
FromConnectionSecretKey: pointer.String("none"),
72+
FromConnectionSecretKey: ptr.To[string]("none"),
7373
},
7474
{
7575
Type: v1beta1.ConnectionDetailTypeFromConnectionSecretKey,
7676
Name: "convfoo",
77-
FromConnectionSecretKey: pointer.String("foo"),
77+
FromConnectionSecretKey: ptr.To[string]("foo"),
7878
},
7979
{
8080
Type: v1beta1.ConnectionDetailTypeFromValue,
8181
Name: "fixed",
82-
Value: pointer.String("value"),
82+
Value: ptr.To[string]("value"),
8383
},
8484
{
8585
Type: v1beta1.ConnectionDetailTypeFromFieldPath,
8686
Name: "name",
87-
FromFieldPath: pointer.String("objectMeta.name"),
87+
FromFieldPath: ptr.To[string]("objectMeta.name"),
8888
},
8989
{
9090
Type: v1beta1.ConnectionDetailTypeFromFieldPath,
9191
Name: "generation",
92-
FromFieldPath: pointer.String("objectMeta.generation"),
92+
FromFieldPath: ptr.To[string]("objectMeta.generation"),
9393
},
9494
},
9595
},

‎fn_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"google.golang.org/protobuf/types/known/durationpb"
1212
"google.golang.org/protobuf/types/known/structpb"
1313
"k8s.io/apimachinery/pkg/runtime"
14-
"k8s.io/utils/pointer"
14+
"k8s.io/utils/ptr"
1515

1616
"github.com/crossplane/crossplane-runtime/pkg/logging"
1717

@@ -159,8 +159,8 @@ func TestRunFunction(t *testing.T) {
159159
Patches: []v1beta1.Patch{
160160
{
161161
Type: v1beta1.PatchTypeFromCompositeFieldPath,
162-
FromFieldPath: pointer.String("spec.widgets"),
163-
ToFieldPath: pointer.String("spec.watchers"),
162+
FromFieldPath: ptr.To[string]("spec.widgets"),
163+
ToFieldPath: ptr.To[string]("spec.watchers"),
164164
Transforms: []v1beta1.Transform{
165165
{
166166
Type: v1beta1.TransformTypeConvert,
@@ -172,7 +172,7 @@ func TestRunFunction(t *testing.T) {
172172
Type: v1beta1.TransformTypeMath,
173173
Math: &v1beta1.MathTransform{
174174
Type: v1beta1.MathTransformTypeMultiply,
175-
Multiply: pointer.Int64(3),
175+
Multiply: ptr.To[int64](3),
176176
},
177177
},
178178
},
@@ -224,8 +224,8 @@ func TestRunFunction(t *testing.T) {
224224
Patches: []v1beta1.Patch{
225225
{
226226
Type: v1beta1.PatchTypeFromCompositeFieldPath,
227-
FromFieldPath: pointer.String("spec.widgets"),
228-
ToFieldPath: pointer.String("spec.watchers"),
227+
FromFieldPath: ptr.To[string]("spec.widgets"),
228+
ToFieldPath: ptr.To[string]("spec.watchers"),
229229
Transforms: []v1beta1.Transform{
230230
{
231231
Type: v1beta1.TransformTypeConvert,
@@ -237,7 +237,7 @@ func TestRunFunction(t *testing.T) {
237237
Type: v1beta1.TransformTypeMath,
238238
Math: &v1beta1.MathTransform{
239239
Type: v1beta1.MathTransformTypeMultiply,
240-
Multiply: pointer.Int64(3),
240+
Multiply: ptr.To[int64](3),
241241
},
242242
},
243243
},
@@ -294,8 +294,8 @@ func TestRunFunction(t *testing.T) {
294294
Patches: []v1beta1.Patch{
295295
{
296296
Type: v1beta1.PatchTypeFromCompositeFieldPath,
297-
FromFieldPath: pointer.String("spec.widgets"),
298-
ToFieldPath: pointer.String("spec.watchers"),
297+
FromFieldPath: ptr.To[string]("spec.widgets"),
298+
ToFieldPath: ptr.To[string]("spec.watchers"),
299299
},
300300
},
301301
},
@@ -391,16 +391,16 @@ func TestRunFunction(t *testing.T) {
391391
{
392392
// This patch should work.
393393
Type: v1beta1.PatchTypeFromCompositeFieldPath,
394-
FromFieldPath: pointer.String("spec.widgets"),
395-
ToFieldPath: pointer.String("spec.watchers"),
394+
FromFieldPath: ptr.To[string]("spec.widgets"),
395+
ToFieldPath: ptr.To[string]("spec.watchers"),
396396
},
397397
{
398398
// This patch should return an error,
399399
// because the required path does not
400400
// exist.
401401
Type: v1beta1.PatchTypeFromCompositeFieldPath,
402-
FromFieldPath: pointer.String("spec.doesNotExist"),
403-
ToFieldPath: pointer.String("spec.explode"),
402+
FromFieldPath: ptr.To[string]("spec.doesNotExist"),
403+
ToFieldPath: ptr.To[string]("spec.explode"),
404404
Policy: &v1beta1.PatchPolicy{
405405
FromFieldPath: func() *v1beta1.FromFieldPathPolicy {
406406
r := v1beta1.FromFieldPathPolicyRequired
@@ -513,7 +513,7 @@ func TestRunFunction(t *testing.T) {
513513
{
514514
Type: v1beta1.ConnectionDetailTypeFromConnectionSecretKey,
515515
Name: "very",
516-
FromConnectionSecretKey: pointer.String("very"),
516+
FromConnectionSecretKey: ptr.To[string]("very"),
517517
},
518518
},
519519
},
@@ -575,8 +575,8 @@ func TestRunFunction(t *testing.T) {
575575
Patches: []v1beta1.Patch{
576576
{
577577
Type: v1beta1.PatchTypeToCompositeFieldPath,
578-
FromFieldPath: pointer.String("spec.widgets"),
579-
ToFieldPath: pointer.String("spec.watchers"),
578+
FromFieldPath: ptr.To[string]("spec.widgets"),
579+
ToFieldPath: ptr.To[string]("spec.watchers"),
580580
Transforms: []v1beta1.Transform{
581581
{
582582
Type: v1beta1.TransformTypeConvert,
@@ -588,7 +588,7 @@ func TestRunFunction(t *testing.T) {
588588
Type: v1beta1.TransformTypeMath,
589589
Math: &v1beta1.MathTransform{
590590
Type: v1beta1.MathTransformTypeMultiply,
591-
Multiply: pointer.Int64(3),
591+
Multiply: ptr.To[int64](3),
592592
},
593593
},
594594
},

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
k8s.io/api v0.28.3
1313
k8s.io/apiextensions-apiserver v0.28.3
1414
k8s.io/apimachinery v0.28.3
15-
k8s.io/utils v0.0.0-20230505201702-9f6742963106
15+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
1616
sigs.k8s.io/controller-tools v0.12.1
1717
)
1818

‎go.sum

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
4141
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
4242
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
4343
github.com/alecthomas/assert/v2 v2.1.0 h1:tbredtNcQnoSd3QBhQWI7QZ3XHOVkw1Moklp2ojoH/0=
44-
github.com/alecthomas/kong v0.8.0 h1:ryDCzutfIqJPnNn0omnrgHLbAggDQM2VWHikE1xqK7s=
45-
github.com/alecthomas/kong v0.8.0/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U=
4644
github.com/alecthomas/kong v0.8.1 h1:acZdn3m4lLRobeh3Zi2S2EpnXTd1mOL6U7xVml+vfkY=
4745
github.com/alecthomas/kong v0.8.1/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U=
4846
github.com/alecthomas/repr v0.1.0 h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE=
@@ -223,17 +221,13 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
223221
github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
224222
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
225223
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
226-
github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI=
227-
github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
228224
github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
229225
github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
230226
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
231227
github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
232228
github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
233229
github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
234230
github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
235-
github.com/prometheus/procfs v0.10.0 h1:UkG7GPYkO4UZyLnyXjaWYcgOSONqwdBqFUT95ugmt6I=
236-
github.com/prometheus/procfs v0.10.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
237231
github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
238232
github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
239233
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@@ -614,32 +608,22 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
614608
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
615609
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
616610
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
617-
k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw=
618-
k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg=
619611
k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM=
620612
k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc=
621-
k8s.io/apiextensions-apiserver v0.27.3 h1:xAwC1iYabi+TDfpRhxh4Eapl14Hs2OftM2DN5MpgKX4=
622-
k8s.io/apiextensions-apiserver v0.27.3/go.mod h1:BH3wJ5NsB9XE1w+R6SSVpKmYNyIiyIz9xAmBl8Mb+84=
623613
k8s.io/apiextensions-apiserver v0.28.3 h1:Od7DEnhXHnHPZG+W9I97/fSQkVpVPQx2diy+2EtmY08=
624614
k8s.io/apiextensions-apiserver v0.28.3/go.mod h1:NE1XJZ4On0hS11aWWJUTNkmVB03j9LM7gJSisbRt8Lc=
625-
k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ=
626-
k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU=
627615
k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A=
628616
k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8=
629-
k8s.io/client-go v0.28.2 h1:DNoYI1vGq0slMBN/SWKMZMw0Rq+0EQW6/AK4v9+3VeY=
630-
k8s.io/client-go v0.28.2/go.mod h1:sMkApowspLuc7omj1FOSUxSoqjr+d5Q0Yc0LOFnYFJY=
631617
k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4=
632618
k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo=
633-
k8s.io/component-base v0.27.3 h1:g078YmdcdTfrCE4fFobt7qmVXwS8J/3cI1XxRi/2+6k=
634-
k8s.io/component-base v0.27.3/go.mod h1:JNiKYcGImpQ44iwSYs6dysxzR9SxIIgQalk4HaCNVUY=
635619
k8s.io/component-base v0.28.3 h1:rDy68eHKxq/80RiMb2Ld/tbH8uAE75JdCqJyi6lXMzI=
636620
k8s.io/component-base v0.28.3/go.mod h1:fDJ6vpVNSk6cRo5wmDa6eKIG7UlIQkaFmZN2fYgIUD8=
637621
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
638622
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
639623
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
640624
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
641-
k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU=
642-
k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
625+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
626+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
643627
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
644628
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
645629
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

0 commit comments

Comments
 (0)