Skip to content

Commit

Permalink
linodego update from 1.36.2 to 1.37.0 (#417)
Browse files Browse the repository at this point in the history 
Co-authored-by: Unnati Aggarwal <[email protected]>
  • Loading branch information
@unnatiagg
unnatiagg and Unnati Aggarwal committed Jul 22, 2024
1 parent 8746ec1 commit b5ab05a
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion clients/clients.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ type LinodeNodeBalancerClient interface {

// LinodeObjectStorageClient defines the methods that interact with Linode's Object Storage service.
type LinodeObjectStorageClient interface {
GetObjectStorageBucket(ctx context.Context, cluster, label string) (*linodego.ObjectStorageBucket, error)
GetObjectStorageBucket(ctx context.Context, regionID, label string) (*linodego.ObjectStorageBucket, error)
CreateObjectStorageBucket(ctx context.Context, opts linodego.ObjectStorageBucketCreateOptions) (*linodego.ObjectStorageBucket, error)
GetObjectStorageKey(ctx context.Context, keyID int) (*linodego.ObjectStorageKey, error)
CreateObjectStorageKey(ctx context.Context, opts linodego.ObjectStorageKeyCreateOptions) (*linodego.ObjectStorageKey, error)
Expand Down
4 changes: 2 additions & 2 deletions cloud/scope/object_storage_bucket.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func (s *ObjectStorageBucketScope) GenerateKeySecret(ctx context.Context, keys [
secretStringData = map[string]string{
"bucket-details-secret.yaml": fmt.Sprintf(bucketDataSecret,
bucket.Label,
bucket.Cluster,
bucket.Region,
bucket.Hostname,
keys[0].AccessKey,
keys[0].SecretKey,
Expand All @@ -144,7 +144,7 @@ func (s *ObjectStorageBucketScope) GenerateKeySecret(ctx context.Context, keys [
} else {
secretStringData = map[string]string{
"bucket_name": bucket.Label,
"bucket_region": bucket.Cluster,
"bucket_region": bucket.Region,
"bucket_endpoint": bucket.Hostname,
"access_key_rw": keys[0].AccessKey,
"secret_key_rw": keys[0].SecretKey,
Expand Down
10 changes: 5 additions & 5 deletions cloud/scope/object_storage_bucket_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ func TestGenerateKeySecret(t *testing.T) {
BucketAccess: &[]linodego.ObjectStorageKeyBucketAccess{
{
BucketName: "bucket",
Cluster: "test-bucket",
Region: "test-bucket",
Permissions: "read_write",
},
},
Expand All @@ -340,7 +340,7 @@ func TestGenerateKeySecret(t *testing.T) {
BucketAccess: &[]linodego.ObjectStorageKeyBucketAccess{
{
BucketName: "bucket",
Cluster: "test-bucket",
Region: "test-bucket",
Permissions: "read_only",
},
},
Expand Down Expand Up @@ -376,7 +376,7 @@ func TestGenerateKeySecret(t *testing.T) {
BucketAccess: &[]linodego.ObjectStorageKeyBucketAccess{
{
BucketName: "bucket",
Cluster: "test-bucket",
Region: "test-bucket",
Permissions: "read_write",
},
},
Expand All @@ -402,7 +402,7 @@ func TestGenerateKeySecret(t *testing.T) {
BucketAccess: &[]linodego.ObjectStorageKeyBucketAccess{
{
BucketName: "bucket",
Cluster: "test-bucket",
Region: "test-bucket",
Permissions: "read_write",
},
},
Expand All @@ -416,7 +416,7 @@ func TestGenerateKeySecret(t *testing.T) {
BucketAccess: &[]linodego.ObjectStorageKeyBucketAccess{
{
BucketName: "bucket",
Cluster: "test-bucket",
Region: "test-bucket",
Permissions: "read_only",
},
},
Expand Down
8 changes: 4 additions & 4 deletions cloud/services/object_storage_buckets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ func EnsureObjectStorageBucket(ctx context.Context, bScope *scope.ObjectStorageB
}

opts := linodego.ObjectStorageBucketCreateOptions{
Cluster: bScope.Bucket.Spec.Cluster,
Label: bScope.Bucket.Name,
ACL: linodego.ACLPrivate,
Region: bScope.Bucket.Spec.Cluster,
Label: bScope.Bucket.Name,
ACL: linodego.ACLPrivate,
}

if bucket, err = bScope.LinodeClient.CreateObjectStorageBucket(ctx, opts); err != nil {
Expand Down Expand Up @@ -78,7 +78,7 @@ func createObjectStorageKey(ctx context.Context, bScope *scope.ObjectStorageBuck
BucketAccess: &[]linodego.ObjectStorageKeyBucketAccess{
{
BucketName: bScope.Bucket.Name,
Cluster: bScope.Bucket.Spec.Cluster,
Region: bScope.Bucket.Spec.Cluster,
Permissions: permission,
},
},
Expand Down
4 changes: 2 additions & 2 deletions controller/linodeobjectstoragebucket_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ var _ = Describe("lifecycle", Ordered, Label("bucket", "lifecycle"), func() {
After(getBucket).
Return(&linodego.ObjectStorageBucket{
Label: obj.Name,
Cluster: obj.Spec.Cluster,
Region: obj.Spec.Cluster,
Created: util.Pointer(time.Now()),
Hostname: "hostname",
}, nil)
Expand Down Expand Up @@ -202,7 +202,7 @@ var _ = Describe("lifecycle", Ordered, Label("bucket", "lifecycle"), func() {
mck.LinodeClient.EXPECT().GetObjectStorageBucket(gomock.Any(), obj.Spec.Cluster, gomock.Any()).
Return(&linodego.ObjectStorageBucket{
Label: obj.Name,
Cluster: obj.Spec.Cluster,
Region: obj.Spec.Cluster,
Created: util.Pointer(time.Now()),
Hostname: "hostname",
}, nil)
Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/go-logr/logr v1.4.2
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.6.0
github.com/linode/linodego v1.36.2
github.com/linode/linodego v1.37.0
github.com/onsi/ginkgo/v2 v2.19.0
github.com/onsi/gomega v1.33.1
github.com/stretchr/testify v1.9.0
Expand Down Expand Up @@ -87,9 +87,9 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
Expand Down
20 changes: 10 additions & 10 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/linode/linodego v1.36.2 h1:F5ZIXjLq0Zyyy0Kk9UgD/OffUTBx4TQuCkjMSYbqeVA=
github.com/linode/linodego v1.36.2/go.mod h1:KyV4OO/9/tAxaLSjyjFyOQBcS9bYUdei1hwk3nl0UjI=
github.com/linode/linodego v1.37.0 h1:B/2Spzv9jYXzKA+p+GD8fVCNJ7Wuw6P91ZDD9eCkkso=
github.com/linode/linodego v1.37.0/go.mod h1:L7GXKFD3PoN2xSEtFc04wIXP5WK65O10jYQx0PQISWQ=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
Expand Down Expand Up @@ -212,8 +212,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
Expand All @@ -232,8 +232,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand All @@ -254,16 +254,16 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
Expand Down
16 changes: 8 additions & 8 deletions mock/client.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions observability/wrappers/linodeclient/linodeclient.gen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b5ab05a

Please sign in to comment.