diff --git a/CODE_GENERATION.md b/CODE_GENERATION.md index 42f567f12b..cd334b1012 100644 --- a/CODE_GENERATION.md +++ b/CODE_GENERATION.md @@ -103,7 +103,7 @@ func SetupStage(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, po return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Stage{}). Complete(managed.NewReconciler(mgr, @@ -185,13 +185,13 @@ func SetupStage(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, po return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Stage{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.StageGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) diff --git a/apis/ec2/v1beta1/routetable_types.go b/apis/ec2/v1beta1/routetable_types.go index 779eff984d..7f45ed187f 100644 --- a/apis/ec2/v1beta1/routetable_types.go +++ b/apis/ec2/v1beta1/routetable_types.go @@ -146,7 +146,7 @@ func (a *Association) ClearRefSelectors() { // AssociationState describes an association state in the route table. type AssociationState struct { // Indicates whether this is the main route table. - Main bool `json:"main"` + Main *bool `json:"main"` // The ID of the association between a route table and a subnet. AssociationID string `json:"associationId,omitempty"` diff --git a/apis/ec2/v1beta1/zz_generated.deepcopy.go b/apis/ec2/v1beta1/zz_generated.deepcopy.go index 10a7630c6f..1d3c63c859 100644 --- a/apis/ec2/v1beta1/zz_generated.deepcopy.go +++ b/apis/ec2/v1beta1/zz_generated.deepcopy.go @@ -211,6 +211,11 @@ func (in *Association) DeepCopy() *Association { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AssociationState) DeepCopyInto(out *AssociationState) { *out = *in + if in.Main != nil { + in, out := &in.Main, &out.Main + *out = new(bool) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AssociationState. @@ -860,7 +865,9 @@ func (in *RouteTableObservation) DeepCopyInto(out *RouteTableObservation) { if in.Associations != nil { in, out := &in.Associations, &out.Associations *out = make([]AssociationState, len(*in)) - copy(*out, *in) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } } } diff --git a/apis/s3/v1beta1/CORSConfiguration_types.go b/apis/s3/v1beta1/CORSConfiguration_types.go index a2670a3ef8..049c14b59a 100644 --- a/apis/s3/v1beta1/CORSConfiguration_types.go +++ b/apis/s3/v1beta1/CORSConfiguration_types.go @@ -51,5 +51,5 @@ type CORSRule struct { // The time in seconds that your browser is to cache the preflight response // for the specified resource. // +optional - MaxAgeSeconds *int32 `json:"maxAgeSeconds,omitempty"` + MaxAgeSeconds int32 `json:"maxAgeSeconds,omitempty"` } diff --git a/apis/s3/v1beta1/lifecycleConfiguration_types.go b/apis/s3/v1beta1/lifecycleConfiguration_types.go index 0b85c133c3..019639c751 100644 --- a/apis/s3/v1beta1/lifecycleConfiguration_types.go +++ b/apis/s3/v1beta1/lifecycleConfiguration_types.go @@ -98,13 +98,13 @@ type LifecycleExpiration struct { // Indicates the lifetime, in days, of the objects that are subject to the rule. // The value must be a non-zero positive integer. // +kubebuilder:validation:Minimum=1 - Days *int32 `json:"days,omitempty"` + Days int32 `json:"days,omitempty"` // Indicates whether Amazon S3 will remove a delete marker with no noncurrent // versions. If set to true, the delete marker will be expired; if set to false // the policy takes no action. This cannot be specified with Days or Date in // a Lifecycle Expiration Policy. - ExpiredObjectDeleteMarker *bool `json:"expiredObjectDeleteMarker,omitempty"` + ExpiredObjectDeleteMarker bool `json:"expiredObjectDeleteMarker,omitempty"` } // LifecycleRuleFilter is used to identify objects that a Lifecycle Rule applies to. @@ -145,7 +145,7 @@ type NoncurrentVersionExpiration struct { // calculations, see How Amazon S3 Calculates When an Object Became Noncurrent // (https://docs.aws.amazon.com/AmazonS3/latest/dev/intro-lifecycle-rules.html#non-current-days-calculations) // in the Amazon Simple Storage Service Developer Guide. - NoncurrentDays *int32 `json:"noncurrentDays,omitempty"` + NoncurrentDays int32 `json:"noncurrentDays,omitempty"` } // NoncurrentVersionTransition contains the transition rule that describes when noncurrent objects @@ -161,7 +161,7 @@ type NoncurrentVersionTransition struct { // calculations, see How Amazon S3 Calculates How Long an Object Has Been Noncurrent // (https://docs.aws.amazon.com/AmazonS3/latest/dev/intro-lifecycle-rules.html#non-current-days-calculations) // in the Amazon Simple Storage Service Developer Guide. - NoncurrentDays *int32 `json:"noncurrentDays,omitempty"` + NoncurrentDays int32 `json:"noncurrentDays,omitempty"` // The class of storage used to store the object. // Valid values are: GLACIER, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, DEEP_ARCHIVE @@ -181,7 +181,7 @@ type Transition struct { // Indicates the number of days after creation when objects are transitioned // to the specified storage class. The value must be a positive integer. // +kubebuilder:validation:Minimum=1 - Days *int32 `json:"days,omitempty"` + Days int32 `json:"days,omitempty"` // The storage class to which you want the object to transition. // Valid values are: GLACIER, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, DEEP_ARCHIVE diff --git a/apis/s3/v1beta1/replicationConfiguration_types.go b/apis/s3/v1beta1/replicationConfiguration_types.go index b66d389076..17bbecbabf 100644 --- a/apis/s3/v1beta1/replicationConfiguration_types.go +++ b/apis/s3/v1beta1/replicationConfiguration_types.go @@ -93,7 +93,7 @@ type ReplicationRule struct { // // For more information, see Replication (https://docs.aws.amazon.com/AmazonS3/latest/dev/replication.html) // in the Amazon Simple Storage Service Developer Guide. - Priority *int32 `json:"priority,omitempty"` + Priority int32 `json:"priority,omitempty"` // A container that describes additional filters for identifying the source // objects that you want to replicate. You can choose to enable or disable the @@ -206,7 +206,7 @@ type EncryptionConfiguration struct { // supports symmetric customer managed CMKs. For more information, see Using // Symmetric and Asymmetric Keys (https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html) // in the AWS Key Management Service Developer Guide. - ReplicaKmsKeyID string `json:"replicaKmsKeyId"` + ReplicaKmsKeyID *string `json:"replicaKmsKeyId"` } // Metrics specifies replication metrics-related settings enabling metrics diff --git a/apis/s3/v1beta1/zz_generated.deepcopy.go b/apis/s3/v1beta1/zz_generated.deepcopy.go index 688d2f62e0..455a7f3f9a 100644 --- a/apis/s3/v1beta1/zz_generated.deepcopy.go +++ b/apis/s3/v1beta1/zz_generated.deepcopy.go @@ -355,11 +355,6 @@ func (in *CORSRule) DeepCopyInto(out *CORSRule) { *out = make([]string, len(*in)) copy(*out, *in) } - if in.MaxAgeSeconds != nil { - in, out := &in.MaxAgeSeconds, &out.MaxAgeSeconds - *out = new(int32) - **out = **in - } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CORSRule. @@ -443,7 +438,7 @@ func (in *Destination) DeepCopyInto(out *Destination) { if in.EncryptionConfiguration != nil { in, out := &in.EncryptionConfiguration, &out.EncryptionConfiguration *out = new(EncryptionConfiguration) - **out = **in + (*in).DeepCopyInto(*out) } if in.Metrics != nil { in, out := &in.Metrics, &out.Metrics @@ -475,6 +470,11 @@ func (in *Destination) DeepCopy() *Destination { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *EncryptionConfiguration) DeepCopyInto(out *EncryptionConfiguration) { *out = *in + if in.ReplicaKmsKeyID != nil { + in, out := &in.ReplicaKmsKeyID, &out.ReplicaKmsKeyID + *out = new(string) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EncryptionConfiguration. @@ -589,16 +589,6 @@ func (in *LifecycleExpiration) DeepCopyInto(out *LifecycleExpiration) { in, out := &in.Date, &out.Date *out = (*in).DeepCopy() } - if in.Days != nil { - in, out := &in.Days, &out.Days - *out = new(int32) - **out = **in - } - if in.ExpiredObjectDeleteMarker != nil { - in, out := &in.ExpiredObjectDeleteMarker, &out.ExpiredObjectDeleteMarker - *out = new(bool) - **out = **in - } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LifecycleExpiration. @@ -637,14 +627,12 @@ func (in *LifecycleRule) DeepCopyInto(out *LifecycleRule) { if in.NoncurrentVersionExpiration != nil { in, out := &in.NoncurrentVersionExpiration, &out.NoncurrentVersionExpiration *out = new(NoncurrentVersionExpiration) - (*in).DeepCopyInto(*out) + **out = **in } if in.NoncurrentVersionTransitions != nil { in, out := &in.NoncurrentVersionTransitions, &out.NoncurrentVersionTransitions *out = make([]NoncurrentVersionTransition, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } + copy(*out, *in) } if in.Transitions != nil { in, out := &in.Transitions, &out.Transitions @@ -776,11 +764,6 @@ func (in *Metrics) DeepCopy() *Metrics { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NoncurrentVersionExpiration) DeepCopyInto(out *NoncurrentVersionExpiration) { *out = *in - if in.NoncurrentDays != nil { - in, out := &in.NoncurrentDays, &out.NoncurrentDays - *out = new(int32) - **out = **in - } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NoncurrentVersionExpiration. @@ -796,11 +779,6 @@ func (in *NoncurrentVersionExpiration) DeepCopy() *NoncurrentVersionExpiration { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NoncurrentVersionTransition) DeepCopyInto(out *NoncurrentVersionTransition) { *out = *in - if in.NoncurrentDays != nil { - in, out := &in.NoncurrentDays, &out.NoncurrentDays - *out = new(int32) - **out = **in - } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NoncurrentVersionTransition. @@ -1060,11 +1038,6 @@ func (in *ReplicationRule) DeepCopyInto(out *ReplicationRule) { *out = new(string) **out = **in } - if in.Priority != nil { - in, out := &in.Priority, &out.Priority - *out = new(int32) - **out = **in - } if in.SourceSelectionCriteria != nil { in, out := &in.SourceSelectionCriteria, &out.SourceSelectionCriteria *out = new(SourceSelectionCriteria) @@ -1438,11 +1411,6 @@ func (in *Transition) DeepCopyInto(out *Transition) { in, out := &in.Date, &out.Date *out = (*in).DeepCopy() } - if in.Days != nil { - in, out := &in.Days, &out.Days - *out = new(int32) - **out = **in - } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Transition. diff --git a/build b/build index dd61c12a7e..d393bdfee0 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit dd61c12a7eafa27b2aa92befacecde43c0e08804 +Subproject commit d393bdfee0adf9732e32ecca8437586917fc5018 diff --git a/cmd/provider/main.go b/cmd/provider/main.go index d98feb21c1..090ef7cdbb 100644 --- a/cmd/provider/main.go +++ b/cmd/provider/main.go @@ -64,7 +64,7 @@ func main() { kingpin.FatalIfError(err, "Cannot create controller manager") kingpin.FatalIfError(apis.AddToScheme(mgr.GetScheme()), "Cannot add AWS APIs to scheme") - kingpin.FatalIfError(controller.Setup(mgr, log, ratelimiter.NewDefaultProviderRateLimiter(ratelimiter.DefaultProviderRPS), *pollInterval), "Cannot setup AWS controllers") + kingpin.FatalIfError(controller.Setup(mgr, log, ratelimiter.NewGlobal(ratelimiter.DefaultGlobalRPS), *pollInterval), "Cannot setup AWS controllers") kingpin.FatalIfError(mgr.Start(ctrl.SetupSignalHandler()), "Cannot start controller manager") } diff --git a/go.mod b/go.mod index 654cae1254..e2bf68b63e 100644 --- a/go.mod +++ b/go.mod @@ -4,39 +4,39 @@ go 1.16 require ( github.com/aws/aws-sdk-go v1.37.4 - github.com/aws/aws-sdk-go-v2 v1.3.3 - github.com/aws/aws-sdk-go-v2/config v1.1.6 - github.com/aws/aws-sdk-go-v2/credentials v1.1.6 - github.com/aws/aws-sdk-go-v2/service/acm v1.2.2 - github.com/aws/aws-sdk-go-v2/service/acmpca v1.2.2 - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.3.1 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.5.0 - github.com/aws/aws-sdk-go-v2/service/ecr v1.2.2 - github.com/aws/aws-sdk-go-v2/service/eks v1.2.2 - github.com/aws/aws-sdk-go-v2/service/elasticache v1.3.0 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.2.2 - github.com/aws/aws-sdk-go-v2/service/iam v1.3.1 - github.com/aws/aws-sdk-go-v2/service/rds v1.3.0 - github.com/aws/aws-sdk-go-v2/service/redshift v1.4.0 - github.com/aws/aws-sdk-go-v2/service/route53 v1.4.0 - github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0 - github.com/aws/aws-sdk-go-v2/service/sns v1.2.2 - github.com/aws/aws-sdk-go-v2/service/sqs v1.3.1 - github.com/aws/aws-sdk-go-v2/service/sts v1.3.0 - github.com/aws/smithy-go v1.3.1 - github.com/crossplane/crossplane-runtime v0.14.1-0.20210722005935-0b469fcc77cd + github.com/aws/aws-sdk-go-v2 v1.9.1 + github.com/aws/aws-sdk-go-v2/config v1.8.2 + github.com/aws/aws-sdk-go-v2/credentials v1.4.2 + github.com/aws/aws-sdk-go-v2/service/acm v1.6.1 + github.com/aws/aws-sdk-go-v2/service/acmpca v1.8.1 + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.10.1 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.18.0 + github.com/aws/aws-sdk-go-v2/service/ecr v1.7.0 + github.com/aws/aws-sdk-go-v2/service/eks v1.10.1 + github.com/aws/aws-sdk-go-v2/service/elasticache v1.11.1 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.6.1 + github.com/aws/aws-sdk-go-v2/service/iam v1.10.0 + github.com/aws/aws-sdk-go-v2/service/rds v1.9.0 + github.com/aws/aws-sdk-go-v2/service/redshift v1.11.1 + github.com/aws/aws-sdk-go-v2/service/route53 v1.11.1 + github.com/aws/aws-sdk-go-v2/service/s3 v1.16.0 + github.com/aws/aws-sdk-go-v2/service/sns v1.8.1 + github.com/aws/aws-sdk-go-v2/service/sqs v1.9.1 + github.com/aws/aws-sdk-go-v2/service/sts v1.7.1 + github.com/aws/smithy-go v1.8.0 + github.com/crossplane/crossplane-runtime v0.15.1-0.20210930095326-d5661210733b github.com/crossplane/crossplane-tools v0.0.0-20210320162312-1baca298c527 github.com/evanphx/json-patch v4.11.0+incompatible github.com/go-ini/ini v1.46.0 - github.com/google/go-cmp v0.5.5 + github.com/google/go-cmp v0.5.6 github.com/mitchellh/copystructure v1.0.0 - github.com/onsi/gomega v1.13.0 + github.com/onsi/gomega v1.14.0 github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.7.0 gopkg.in/alecthomas/kingpin.v2 v2.2.6 - k8s.io/api v0.21.2 - k8s.io/apimachinery v0.21.2 - k8s.io/client-go v0.21.2 - sigs.k8s.io/controller-runtime v0.9.2 - sigs.k8s.io/controller-tools v0.4.0 + k8s.io/api v0.21.3 + k8s.io/apimachinery v0.21.3 + k8s.io/client-go v0.21.3 + sigs.k8s.io/controller-runtime v0.9.6 + sigs.k8s.io/controller-tools v0.6.2 ) diff --git a/go.sum b/go.sum index bca49baef5..bf26f6c9b7 100644 --- a/go.sum +++ b/go.sum @@ -9,45 +9,49 @@ cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6T cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -55,67 +59,68 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.37.4 h1:tWxrpMK/oRSXVnjUzhGeCWLR00fW0WF4V4sycYPPrJ8= github.com/aws/aws-sdk-go v1.37.4/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go-v2 v1.3.2/go.mod h1:7OaACgj2SX3XGWnrIjGlJM22h6yD6MEWKvm7levnnM8= -github.com/aws/aws-sdk-go-v2 v1.3.3 h1:BKKakJ9v28yopLRF6bg6FAMbVKmcXuZe+r688XMsxtk= -github.com/aws/aws-sdk-go-v2 v1.3.3/go.mod h1:7OaACgj2SX3XGWnrIjGlJM22h6yD6MEWKvm7levnnM8= -github.com/aws/aws-sdk-go-v2/config v1.1.6 h1:tg8KyxrxDt1CrYmZXWs9lc6IFE1yxtk9kn6eS/v2fdA= -github.com/aws/aws-sdk-go-v2/config v1.1.6/go.mod h1:Kx90DDOgkMpRfSkzGbF13AVXHHfBNct1liO+95KxXsU= -github.com/aws/aws-sdk-go-v2/credentials v1.1.6 h1:efaeh6FsO/jzyJ+U4ZxduKC6rRJDrUpu+Z0k5+guqHo= -github.com/aws/aws-sdk-go-v2/credentials v1.1.6/go.mod h1:q1wQ5jHdFNhc4wnNcOEpnovs4keJA5Ds+qESCnfEsgU= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6 h1:zoOz5V56jO/rGixsCDnrQtAzYRYM2hGA/43U6jVMFbo= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6/go.mod h1:0+fWMitrmIpENiY8/1DyhdYPUCAPvd9UNz9mtCsEoLQ= -github.com/aws/aws-sdk-go-v2/service/acm v1.2.2 h1:V/hFBaY4MQyTyCBMnQ9iacetd7+XLzNSLekKJFbUyO4= -github.com/aws/aws-sdk-go-v2/service/acm v1.2.2/go.mod h1:dqFW/dd0pYR+UJzDpaa0DJ3h57EkUon77+TgKIZe9zg= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.2.2 h1:A/gd670NXSDfdLqyNk1hHlg0jjxG/h3Yw+ZmjVTYGsU= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.2.2/go.mod h1:/4M2asE2bJQirag13oJUSklS7+2ZTxTZgQf0SUesSXE= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.3.1 h1:Hw2Ten8sgwpwYnagyiuL35VAd5pLIrGofJQWOZRrZd8= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.3.1/go.mod h1:MH1u3+6v48cHFGorEvYNBu+QJ6bE8gZVmvQo0NSWZls= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.5.0 h1:LG5ozCp5FRKOodR2NPtbn9c/yrSrodTkzOGjRJY5yV8= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.5.0/go.mod h1:3iBezuZtNxZnKX7Zv2JB/lGyGCSYOES8TMq4WSXPBl0= -github.com/aws/aws-sdk-go-v2/service/ecr v1.2.2 h1:2EY0F1skAOArBsRM6nD9kPo0sdK32IPzT8O7PKocVR8= -github.com/aws/aws-sdk-go-v2/service/ecr v1.2.2/go.mod h1:XnQfi4PwRBjy+CQD7zqVRRHKWe529+1nTsrWXvsSSJk= -github.com/aws/aws-sdk-go-v2/service/eks v1.2.2 h1:WdaRevsJe42tAhEJJ8ShxzR04zNs1Glu9KRDRwhKGrk= -github.com/aws/aws-sdk-go-v2/service/eks v1.2.2/go.mod h1:GlSwCB/FZ8JE0mwhPOS8aYDULY9bUf2GsR0tugQ6D4o= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.3.0 h1:ftZ/5F/CPqW7A18xVD02hGX1b1r8QsdLRk/w/BEg3E8= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.3.0/go.mod h1:e1FkqFNH1T9yPSPyONXxVld5n/si/508e64Is5OX7tk= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.2.2 h1:fxj1pgVxP0pK80LnwsgQmw4YSKWnreceLEjU63qkGcE= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.2.2/go.mod h1:wEAYvdbWnLiDmHY+M2aATX6GGIxtTgOyN8nB55dsn1I= -github.com/aws/aws-sdk-go-v2/service/iam v1.3.1 h1:aTJTynJuqZjZ0ptNubJcEEN511FDiajRYI/PTnRO1U8= -github.com/aws/aws-sdk-go-v2/service/iam v1.3.1/go.mod h1:b1K3TViQAwFbfJn8htcD5vtM8AqkMtDc53OreIpCRtk= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4 h1:8yeByqOL6UWBsOOXsHnW93/ukwL66O008tRfxXxnTwA= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4/go.mod h1:BCfU3Uo2fhKcMZFp9zU5QQGQxqWCOYmZ/27Dju3S/do= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.6 h1:ldYIsOP4WyjdzW8t6RC/aSieajrlx+3UN3UCZy1KM5Y= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.6/go.mod h1:L0KWr0ASo83PRZu9NaZaDsw3koS6PspKv137DMDZjHo= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2 h1:aU8H58DoYxNo8R1TaSPTofkuxfQNnoqZmWL+G3+k/vA= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2/go.mod h1:nnutjMLuna0s3GVY/MAkpLX03thyNER06gXvnMAPj5g= -github.com/aws/aws-sdk-go-v2/service/rds v1.3.0 h1:nsuJTEqqWoO/28UKPakRafclBuLbsK72KOaTG56nGzw= -github.com/aws/aws-sdk-go-v2/service/rds v1.3.0/go.mod h1:mW+SUZrd1ky9iSCwVmcWNAAiUMDUbIkU51lzNi4XBnU= -github.com/aws/aws-sdk-go-v2/service/redshift v1.4.0 h1:imJ4aQHWqC2VnWihvPQDExVKK5HukaTo6fEjzDuJuII= -github.com/aws/aws-sdk-go-v2/service/redshift v1.4.0/go.mod h1:MRsZonKZ+BOVGxGFrCxCwHYbrs5PdWmGZ1udfeL8hIg= -github.com/aws/aws-sdk-go-v2/service/route53 v1.4.0 h1:O0uJ4SI2f3q84vPcwsVyLTuASS1hAKb8RKnMVGgMqaU= -github.com/aws/aws-sdk-go-v2/service/route53 v1.4.0/go.mod h1:BNPIchdQA/UcqNmWkPBmUruDm7asbm/Q6nxBmURvAHU= -github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0 h1:VbwXUI3L0hyhVmrFxbDxrs6cBX8TNFX0YxCpooMNjvY= -github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0/go.mod h1:uwA7gs93Qcss43astPUb1eq4RyceNmYWAQjZFDOAMLo= -github.com/aws/aws-sdk-go-v2/service/sns v1.2.2 h1:phLGFAc2O7yX2ZmDENxd8CJ/jwGtsKp+ZycI9vJtCgI= -github.com/aws/aws-sdk-go-v2/service/sns v1.2.2/go.mod h1:bmy5i6vmXNNTOK8ZXGxD1qEuZtzfKaJXy6PEMBMt5sQ= -github.com/aws/aws-sdk-go-v2/service/sqs v1.3.1 h1:JHv/dumXk3jooM7CrYoYp9+74YRZ4dGsXzMob2Kds5s= -github.com/aws/aws-sdk-go-v2/service/sqs v1.3.1/go.mod h1:E6ASpQhmNCYI1xKp//5LwIsdvtAqcFMFA7chocaSWY8= -github.com/aws/aws-sdk-go-v2/service/sso v1.1.5 h1:B7ec5wE4+3Ldkurmq0C4gfQFtElGTG+/iTpi/YPMzi4= -github.com/aws/aws-sdk-go-v2/service/sso v1.1.5/go.mod h1:bpGz0tidC4y39sZkQSkpO/J0tzWCMXHbw6FZ0j1GkWM= -github.com/aws/aws-sdk-go-v2/service/sts v1.3.0 h1:4o69U9waE25xhRbsnXa4jjQac03BFJcNfcZkSedk3e4= -github.com/aws/aws-sdk-go-v2/service/sts v1.3.0/go.mod h1:ssRzzJ2RZOVuKj2Vx1YE7ypfil/BIlgmQnCSW4DistU= -github.com/aws/smithy-go v1.3.1 h1:xJFO4pK0y9J8fCl34uGsSJX5KNnGbdARDlA5BPhXnwE= -github.com/aws/smithy-go v1.3.1/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/aws-sdk-go-v2 v1.9.1 h1:ZbovGV/qo40nrOJ4q8G33AGICzaPI45FHQWJ9650pF4= +github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= +github.com/aws/aws-sdk-go-v2/config v1.8.2 h1:Dqy4ySXFmulRmZhfynm/5CD4Y6aXiTVhDtXLIuUe/r0= +github.com/aws/aws-sdk-go-v2/config v1.8.2/go.mod h1:r0bkX9NyuCuf28qVcsEMtpAQibT7gA1Q0gzkjvgJdLU= +github.com/aws/aws-sdk-go-v2/credentials v1.4.2 h1:8kVE4Og6wlhVrMGiORQ3p9gRj2exjzhFRB+QzWBUa5Q= +github.com/aws/aws-sdk-go-v2/credentials v1.4.2/go.mod h1:9Sp6u121/f0NnvHyhG7dgoYeUTEFC2vsvJqJ6wXpkaI= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.5.1 h1:Nm+BxqBtT0r+AnD6byGMCGT4Km0QwHBy8mAYptNPXY4= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.5.1/go.mod h1:W1ldHfsgeGlKpJ4xZMKZUI6Wmp6EAstU7PxnhbXWWrI= +github.com/aws/aws-sdk-go-v2/internal/ini v1.2.3 h1:NnXJXUz7oihrSlPKEM0yZ19b+7GQ47MX/LluLlEyE/Y= +github.com/aws/aws-sdk-go-v2/internal/ini v1.2.3/go.mod h1:EES9ToeC3h063zCFDdqWGnARExNdULPaBvARm1FLwxA= +github.com/aws/aws-sdk-go-v2/service/acm v1.6.1 h1:VtAzCtIBLCwkSdA7L9uG0ZkKeEDSaWhtn+II5PklotQ= +github.com/aws/aws-sdk-go-v2/service/acm v1.6.1/go.mod h1:iOP3tLxkXzTlV+BqgIVYmBCGJaZjgDP12WXFopp+Rzw= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.8.1 h1:vTtSRHHKnT7o9DpK9Uxz4HXQ+qg0czIEMh3IZ16edqI= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.8.1/go.mod h1:auQKNheXl81Yu6S5JuTwEjpL+cFPppJgQsp/tS0Du0I= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.10.1 h1:gzhtXomhFLQ+buBaFDvqmF1zKI4ool1Gbc54d3SHfGM= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.10.1/go.mod h1:ccHKnr19GgmHUdlpVI8vr36PAfG7Q1V/pT5ZH7Owmq8= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.18.0 h1:5wWtSfYRWgkpKKMW4yJ5llzI9s24Fls7Pv7uw2BiYbk= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.18.0/go.mod h1:d8R2f1hFcknkA3MW4SeExwEua2KpR+dhSrwWlnlwe5Q= +github.com/aws/aws-sdk-go-v2/service/ecr v1.7.0 h1:lgPtXjJNEbRLLlnk8fGDQk80A4cSpPBtyTcI4VSxork= +github.com/aws/aws-sdk-go-v2/service/ecr v1.7.0/go.mod h1:uFNN66CD8T+MPYoN5ku0atY9hMNtEZqOTgvX3WLQ0Hc= +github.com/aws/aws-sdk-go-v2/service/eks v1.10.1 h1:7kjDZmPDoZk5oNjg+om0gW1Rtaz+Qe9ue0MWvTx04oA= +github.com/aws/aws-sdk-go-v2/service/eks v1.10.1/go.mod h1:XvRP9WVB1pEGT7866n95d+UQDvUcFYSfV43Jn2cF7FU= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.11.1 h1:Y+PAWbWxZuKkiqV1OOgC1e9w1GxKvH+vz2LwFKw+2gM= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.11.1/go.mod h1:MFhUc/W+vMheVeD41EWVZKbxt/VRYDejWhFoukC+Z5I= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.6.1 h1:aYhSQFySBnTYICuQXolLUi2MFfYfBD5Ncy44EealBHc= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.6.1/go.mod h1:oXAJ+1PKeezJjjU+52htAJOh4DI9uBSqpTAt/YH/riI= +github.com/aws/aws-sdk-go-v2/service/iam v1.10.0 h1:VJXUtZTgUAZ9Xng8svkIeOcWQWOlZW5sonCtCHxtA1I= +github.com/aws/aws-sdk-go-v2/service/iam v1.10.0/go.mod h1:8jDIYQgKHgBEQcAye4lC7DnKqZLqROyOE4etd6nY2jw= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.3.0 h1:gceOysEWNNwLd6cki65IMBZ4WAM0MwgBQq2n7kejoT8= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.3.0/go.mod h1:v8ygadNyATSm6elwJ/4gzJwcFhri9RqS8skgHKiwXPU= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.1 h1:APEjhKZLFlNVLATnA/TJyA+w1r/xd5r5ACWBDZ9aIvc= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.1/go.mod h1:Ve+eJOx9UWaT/lMVebnFhDhO49fSLVedHoA82+Rqme0= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.7.1 h1:YEz2KMyqK2zyG3uOa0l2xBc/H6NUVJir8FhwHQHF3rc= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.7.1/go.mod h1:yg4EN/BKoc7+DLhNOxxdvoO3+iyW2FuynvaKqLcLDUM= +github.com/aws/aws-sdk-go-v2/service/rds v1.9.0 h1:bzd6i32oOSbJx8jaJ4Qsta2mhxyzK3qKB04bRLI4TJA= +github.com/aws/aws-sdk-go-v2/service/rds v1.9.0/go.mod h1:fIU8V/6JhjWkgUwu17xbG/ujO8rxCnD4fdHjHhdgy+M= +github.com/aws/aws-sdk-go-v2/service/redshift v1.11.1 h1:p/NtN1sZLZWRVm6x4NmU3vhBkhmhogzX3VIAxSk8cxI= +github.com/aws/aws-sdk-go-v2/service/redshift v1.11.1/go.mod h1:8UXD+gPoGvLo/OMev4Boxia+LVgha5XUEZCbJeFE2/I= +github.com/aws/aws-sdk-go-v2/service/route53 v1.11.1 h1:B34NCD+MdZpErF2UsP4OGZ6RvaKeTyh0zwrY2yNVOtg= +github.com/aws/aws-sdk-go-v2/service/route53 v1.11.1/go.mod h1:mHf5IbYkEW9DzxqZhMAkSmH2eHNEEuh9BzV78R28Bcs= +github.com/aws/aws-sdk-go-v2/service/s3 v1.16.0 h1:dt1JQFj/135ozwGIWeCM3aQ8N/kB3Xu3Uu4r9zuOIyc= +github.com/aws/aws-sdk-go-v2/service/s3 v1.16.0/go.mod h1:Tk23mCmfL3wb3tNIeMk/0diUZ0W4R6uZtjYKguMLW2s= +github.com/aws/aws-sdk-go-v2/service/sns v1.8.1 h1:lc85IVo9239W3qFAws6pvD/xk+7LC/1OrTx8kgXCIsY= +github.com/aws/aws-sdk-go-v2/service/sns v1.8.1/go.mod h1:lIdbip+wK3lL1D2BSEyqxtiM3kaQrBBrm/sWYjkmoUM= +github.com/aws/aws-sdk-go-v2/service/sqs v1.9.1 h1:8m+6iuSldxMrVQbjHRcWPnUxdpD3RCPtacmFFNkR4Vw= +github.com/aws/aws-sdk-go-v2/service/sqs v1.9.1/go.mod h1:nbjBtoH25NLQ7Pv/QqmB94JLDdy3kSGvys2iH2OBspk= +github.com/aws/aws-sdk-go-v2/service/sso v1.4.1 h1:RfgQyv3bFT2Js6XokcrNtTjQ6wAVBRpoCgTFsypihHA= +github.com/aws/aws-sdk-go-v2/service/sso v1.4.1/go.mod h1:ycPdbJZlM0BLhuBnd80WX9PucWPG88qps/2jl9HugXs= +github.com/aws/aws-sdk-go-v2/service/sts v1.7.1 h1:7ce9ugapSgBapwLhg7AJTqKW5U92VRX3vX65k2tsB+g= +github.com/aws/aws-sdk-go-v2/service/sts v1.7.1/go.mod h1:r1i8QwKPzwByXqZb3POQfBs7jozrdnHz8PVbsvyx73w= +github.com/aws/smithy-go v1.8.0 h1:AEwwwXQZtUwP5Mz506FeXXrKBe0jA8gVM+1gEcSRooc= +github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -123,7 +128,7 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= @@ -135,66 +140,60 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/crossplane/crossplane-runtime v0.14.1-0.20210722005935-0b469fcc77cd h1:2ZdR/HyjXFIo6KxmM08jBLeiJs7GRdGmb6qPKQANGvI= -github.com/crossplane/crossplane-runtime v0.14.1-0.20210722005935-0b469fcc77cd/go.mod h1:0sB8XOV2zy1GdZvSMY0/5QzKQJUiNSek08wbAYHJbws= +github.com/crossplane/crossplane-runtime v0.15.1-0.20210930095326-d5661210733b h1:uT3DYSHFvWPilEMNSeR2rcuzPPVf56O0D+NJmnQFXbw= +github.com/crossplane/crossplane-runtime v0.15.1-0.20210930095326-d5661210733b/go.mod h1:gKix9Gq5kRzVe/4XOpwlFgG7OurzrYayviJxWZakhw0= github.com/crossplane/crossplane-tools v0.0.0-20210320162312-1baca298c527 h1:9M6hMLKqjxtL9d9nwfcaAt59Ey0CPfSXQ3iIdYRUNaE= github.com/crossplane/crossplane-tools v0.0.0-20210320162312-1baca298c527/go.mod h1:C735A9X0x0lR8iGVOOxb49Mt70Ua4EM2b7PGaRPBLd4= github.com/dave/jennifer v1.3.0 h1:p3tl41zjjCZTNBytMwrUuiAnherNUZktlhPTKoF/sEk= github.com/dave/jennifer v1.3.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= -github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= -github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.11.0+incompatible h1:glyUF9yIYtMHzn8xaKw5rMhdWcwsYV8dZHIq5567/xs= github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.12.0 h1:mRhaKNwANqRgUBGKmnI5ZxEk7QXmjQeCcuYFMX2bfcc= +github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -212,59 +211,21 @@ github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/zapr v0.4.0 h1:uc1uML3hRYL9/ZZPdgHS/n8Nzo+eaYL/Efxkkamf7OM= github.com/go-logr/zapr v0.4.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= -github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= -github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= -github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= -github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= -github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= -github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= -github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= -github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk= -github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= -github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= -github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= -github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= -github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= -github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= -github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= -github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= -github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= -github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= -github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/gobuffalo/flect v0.1.5/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= -github.com/gobuffalo/flect v0.2.0 h1:EWCvMGGxOjsgwlWaP+f4+Hh6yrrte7JeFL2S6b+0hdM= -github.com/gobuffalo/flect v0.2.0/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= +github.com/gobuffalo/flect v0.2.3 h1:f/ZukRnSNA/DUpSNDadko7Qc0PhGvsew35p/2tu+CRY= +github.com/gobuffalo/flect v0.2.3/go.mod h1:vmkQwuZYhN5Pc4ljYQZzP+1sq+NEkK+lh20jmEmX3jc= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -279,12 +240,15 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -294,6 +258,7 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -302,20 +267,32 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -323,26 +300,20 @@ github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= -github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -371,6 +342,7 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= @@ -384,10 +356,8 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -398,11 +368,11 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -411,21 +381,18 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= 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/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -442,6 +409,7 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= @@ -449,7 +417,6 @@ github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXy github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= @@ -467,35 +434,30 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak= -github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= +github.com/onsi/gomega v1.14.0 h1:ep6kpPVwmr/nTbklSx2nrLNSIO62DoYAhnPNIMhK8gI= +github.com/onsi/gomega v1.14.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= @@ -507,14 +469,12 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0 h1:iMAkS2TDoNWnKM+Kopnx/8tnEStIfpYA0ur0xQzzhMQ= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -522,14 +482,12 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -539,33 +497,32 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykE github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4= github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= +github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= +github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -574,65 +531,56 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= -github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= -go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= +go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +go.uber.org/zap v1.18.1 h1:CSUJ2mjFszzEWt4CdKISEuChVIXGBn3lAPwkRGyVrc4= +go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= @@ -652,8 +600,10 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -662,13 +612,14 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 h1:xUIPaMhvROX9dhPvRCenIJtU78+lbEenGbgqB5hfHCQ= golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -676,19 +627,16 @@ golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -696,28 +644,49 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 h1:DzZ89McO9/gWPsQXS/FVKAlG02ZjaQ6AlZRBimEYOd0= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 h1:0Ja1LBD+yisY6RWM/BH7TJVXWsSjs2VwBSmvSX4HdBc= +golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -725,12 +694,8 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -743,42 +708,59 @@ golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 h1:JWgyZ1qgdTaF3N3oxC+MdTV7qvEEgHo3otj+HB5CM7Q= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -786,15 +768,11 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 h1:Vv0JUPWTyeqUq42B2WJ1FeIDjjvGKoA2Ss+Ts0lAVbs= -golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs= +golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -805,13 +783,11 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191018212557-ed542cd5b28a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -830,14 +806,30 @@ golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200616195046-dc31b401abb5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -845,9 +837,6 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1N golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= -gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= -gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -857,12 +846,25 @@ google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsb google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -882,19 +884,52 @@ google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvx google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -919,11 +954,11 @@ gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= +gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= @@ -932,18 +967,17 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -952,78 +986,41 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20190918155943-95b840bb6a1f/go.mod h1:uWuOHnjmNrtQomJrvEBg0c0HRNyQ+8KTEERVsK0PW48= -k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= -k8s.io/api v0.21.2 h1:vz7DqmRsXTCSa6pNxXwQ1IYeAZgdIsua+DZU+o+SX3Y= -k8s.io/api v0.21.2/go.mod h1:Lv6UGJZ1rlMI1qusN8ruAp9PUBFyBwpEHAdG24vIsiU= -k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783/go.mod h1:xvae1SZB3E17UpV59AWc271W/Ph25N+bjPyR63X6tPY= -k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY= -k8s.io/apiextensions-apiserver v0.21.2 h1:+exKMRep4pDrphEafRvpEi79wTnCFMqKf8LBtlA3yrE= -k8s.io/apiextensions-apiserver v0.21.2/go.mod h1:+Axoz5/l3AYpGLlhJDfcVQzCerVYq3K3CvDMvw6X1RA= -k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= -k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= -k8s.io/apimachinery v0.21.2 h1:vezUc/BHqWlQDnZ+XkrpXSmnANSLbpnlpwo0Lhk0gpc= -k8s.io/apimachinery v0.21.2/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM= -k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad/go.mod h1:XPCXEwhjaFN29a8NldXA901ElnKeKLrLtREO9ZhFyhg= -k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw= -k8s.io/apiserver v0.21.2/go.mod h1:lN4yBoGyiNT7SC1dmNk0ue6a5Wi6O3SWOIw91TsucQw= -k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90/go.mod h1:J69/JveO6XESwVgG53q3Uz5OSfgsv4uxpScmmyYOOlk= -k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU= -k8s.io/client-go v0.21.2 h1:Q1j4L/iMN4pTw6Y4DWppBoUxgKO8LbffEMVEV00MUp0= -k8s.io/client-go v0.21.2/go.mod h1:HdJ9iknWpbl3vMGtib6T2PyI/VYxiZfq936WNVHBRrA= -k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE= -k8s.io/code-generator v0.18.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= -k8s.io/code-generator v0.21.2/go.mod h1:8mXJDCB7HcRo1xiEQstcguZkbxZaqeUOrO9SsicWs3U= -k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090/go.mod h1:933PBGtQFJky3TEwYx4aEPZ4IxqhWh3R6DCmzqIn1hA= -k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM= -k8s.io/component-base v0.21.2 h1:EsnmFFoJ86cEywC0DoIkAUiEV6fjgauNugiw1lmIjs4= -k8s.io/component-base v0.21.2/go.mod h1:9lvmIThzdlrJj5Hp8Z/TOgIkdfsNARQ1pT+3PByuiuc= -k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/api v0.21.3 h1:cblWILbLO8ar+Fj6xdDGr603HRsf8Wu9E9rngJeprZQ= +k8s.io/api v0.21.3/go.mod h1:hUgeYHUbBp23Ue4qdX9tR8/ANi/g3ehylAqDn9NWVOg= +k8s.io/apiextensions-apiserver v0.21.3 h1:+B6biyUWpqt41kz5x6peIsljlsuwvNAp/oFax/j2/aY= +k8s.io/apiextensions-apiserver v0.21.3/go.mod h1:kl6dap3Gd45+21Jnh6utCx8Z2xxLm8LGDkprcd+KbsE= +k8s.io/apimachinery v0.21.3 h1:3Ju4nvjCngxxMYby0BimUk+pQHPOQp3eCGChk5kfVII= +k8s.io/apimachinery v0.21.3/go.mod h1:H/IM+5vH9kZRNJ4l3x/fXP/5bOPJaVP/guptnZPeCFI= +k8s.io/apiserver v0.21.3/go.mod h1:eDPWlZG6/cCCMj/JBcEpDoK+I+6i3r9GsChYBHSbAzU= +k8s.io/client-go v0.21.3 h1:J9nxZTOmvkInRDCzcSNQmPJbDYN/PjlxXT9Mos3HcLg= +k8s.io/client-go v0.21.3/go.mod h1:+VPhCgTsaFmGILxR/7E1N0S+ryO010QBeNCv5JwRGYU= +k8s.io/code-generator v0.21.3/go.mod h1:K3y0Bv9Cz2cOW2vXUrNZlFbflhuPvuadW6JdnN6gGKo= +k8s.io/component-base v0.21.3 h1:4WuuXY3Npa+iFfi2aDRiOz+anhNvRfye0859ZgfC5Og= +k8s.io/component-base v0.21.3/go.mod h1:kkuhtfEHeZM6LkX0saqSK8PbdO7A0HigUngmhhrwfGQ= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= -k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= -k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210527160623-6fdb442a123b h1:MSqsVQ3pZvPGTqCjptfimO2WjG7A9un2zcpiHkA6M/s= -k8s.io/utils v0.0.0-20210527160623-6fdb442a123b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= -modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= -modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= -modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= -modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= +k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471 h1:DnzUXII7sVg1FJ/4JX6YDRJfLNAC7idRatPwe07suiI= +k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.19/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/controller-runtime v0.9.2 h1:MnCAsopQno6+hI9SgJHKddzXpmv2wtouZz6931Eax+Q= -sigs.k8s.io/controller-runtime v0.9.2/go.mod h1:TxzMCHyEUpaeuOiZx/bIdc2T81vfs/aKdvJt9wuu0zk= -sigs.k8s.io/controller-tools v0.2.4/go.mod h1:m/ztfQNocGYBgTTCmFdnK94uVvgxeZeE3LtJvd/jIzA= -sigs.k8s.io/controller-tools v0.4.0 h1:9zIdrc6q9RKke8+DnVPVBVZ+cfF9L0TwM01cxNnklYo= -sigs.k8s.io/controller-tools v0.4.0/go.mod h1:G9rHdZMVlBDocIxGkK3jHLWqcTMNvveypYJwrvYKjWU= -sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca h1:6dsH6AYQWbyZmtttJNe8Gq1cXOeS1BdV3eW37zHilAQ= -sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= -sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= -sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= +sigs.k8s.io/controller-runtime v0.9.6 h1:EevVMlgUj4fC1NVM4+DB3iPkWkmGRNarA66neqv9Qew= +sigs.k8s.io/controller-runtime v0.9.6/go.mod h1:q6PpkM5vqQubEKUKOM6qr06oXGzOBcCby1DA9FbyZeA= +sigs.k8s.io/controller-tools v0.6.2 h1:+Y8L0UsAugDipGRw8lrkPoAi6XqlQVZuf1DQHME3PgU= +sigs.k8s.io/controller-tools v0.6.2/go.mod h1:oaeGpjXn6+ZSEIQkUe/+3I40PNiDYp9aeawbt3xTgJ8= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.1.0 h1:C4r9BgJ98vrKnnVCjwCSXcWjWe0NKcUQkmzDXZXGwH8= -sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno= +sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/package/crds/acm.aws.crossplane.io_certificates.yaml b/package/crds/acm.aws.crossplane.io_certificates.yaml index cc74682933..b2e308c8a1 100644 --- a/package/crds/acm.aws.crossplane.io_certificates.yaml +++ b/package/crds/acm.aws.crossplane.io_certificates.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: certificates.acm.aws.crossplane.io spec: diff --git a/package/crds/acmpca.aws.crossplane.io_certificateauthorities.yaml b/package/crds/acmpca.aws.crossplane.io_certificateauthorities.yaml index 31fc04604a..b58ba30783 100644 --- a/package/crds/acmpca.aws.crossplane.io_certificateauthorities.yaml +++ b/package/crds/acmpca.aws.crossplane.io_certificateauthorities.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: certificateauthorities.acmpca.aws.crossplane.io spec: diff --git a/package/crds/acmpca.aws.crossplane.io_certificateauthoritypermissions.yaml b/package/crds/acmpca.aws.crossplane.io_certificateauthoritypermissions.yaml index 96860a53d2..a7cfa1a24d 100644 --- a/package/crds/acmpca.aws.crossplane.io_certificateauthoritypermissions.yaml +++ b/package/crds/acmpca.aws.crossplane.io_certificateauthoritypermissions.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: certificateauthoritypermissions.acmpca.aws.crossplane.io spec: diff --git a/package/crds/apigatewayv2.aws.crossplane.io_apimappings.yaml b/package/crds/apigatewayv2.aws.crossplane.io_apimappings.yaml index aaa40adcbc..6cfec19ebb 100644 --- a/package/crds/apigatewayv2.aws.crossplane.io_apimappings.yaml +++ b/package/crds/apigatewayv2.aws.crossplane.io_apimappings.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: apimappings.apigatewayv2.aws.crossplane.io spec: diff --git a/package/crds/apigatewayv2.aws.crossplane.io_apis.yaml b/package/crds/apigatewayv2.aws.crossplane.io_apis.yaml index 3c01a3db18..182fbf4544 100644 --- a/package/crds/apigatewayv2.aws.crossplane.io_apis.yaml +++ b/package/crds/apigatewayv2.aws.crossplane.io_apis.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: apis.apigatewayv2.aws.crossplane.io spec: diff --git a/package/crds/apigatewayv2.aws.crossplane.io_authorizers.yaml b/package/crds/apigatewayv2.aws.crossplane.io_authorizers.yaml index f7075c4a9c..5de3923540 100644 --- a/package/crds/apigatewayv2.aws.crossplane.io_authorizers.yaml +++ b/package/crds/apigatewayv2.aws.crossplane.io_authorizers.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: authorizers.apigatewayv2.aws.crossplane.io spec: diff --git a/package/crds/apigatewayv2.aws.crossplane.io_deployments.yaml b/package/crds/apigatewayv2.aws.crossplane.io_deployments.yaml index f4f373ee9e..8f9bf06c27 100644 --- a/package/crds/apigatewayv2.aws.crossplane.io_deployments.yaml +++ b/package/crds/apigatewayv2.aws.crossplane.io_deployments.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: deployments.apigatewayv2.aws.crossplane.io spec: diff --git a/package/crds/apigatewayv2.aws.crossplane.io_domainnames.yaml b/package/crds/apigatewayv2.aws.crossplane.io_domainnames.yaml index d12555694a..d69c171d91 100644 --- a/package/crds/apigatewayv2.aws.crossplane.io_domainnames.yaml +++ b/package/crds/apigatewayv2.aws.crossplane.io_domainnames.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: domainnames.apigatewayv2.aws.crossplane.io spec: diff --git a/package/crds/apigatewayv2.aws.crossplane.io_integrationresponses.yaml b/package/crds/apigatewayv2.aws.crossplane.io_integrationresponses.yaml index 928cf0a747..75491be411 100644 --- a/package/crds/apigatewayv2.aws.crossplane.io_integrationresponses.yaml +++ b/package/crds/apigatewayv2.aws.crossplane.io_integrationresponses.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: integrationresponses.apigatewayv2.aws.crossplane.io spec: diff --git a/package/crds/apigatewayv2.aws.crossplane.io_integrations.yaml b/package/crds/apigatewayv2.aws.crossplane.io_integrations.yaml index e3d906cb50..56c64cf291 100644 --- a/package/crds/apigatewayv2.aws.crossplane.io_integrations.yaml +++ b/package/crds/apigatewayv2.aws.crossplane.io_integrations.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: integrations.apigatewayv2.aws.crossplane.io spec: diff --git a/package/crds/apigatewayv2.aws.crossplane.io_models.yaml b/package/crds/apigatewayv2.aws.crossplane.io_models.yaml index f4889a9299..4f7aef8c88 100644 --- a/package/crds/apigatewayv2.aws.crossplane.io_models.yaml +++ b/package/crds/apigatewayv2.aws.crossplane.io_models.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: models.apigatewayv2.aws.crossplane.io spec: diff --git a/package/crds/apigatewayv2.aws.crossplane.io_routeresponses.yaml b/package/crds/apigatewayv2.aws.crossplane.io_routeresponses.yaml index 0b35df3b51..5f9523492b 100644 --- a/package/crds/apigatewayv2.aws.crossplane.io_routeresponses.yaml +++ b/package/crds/apigatewayv2.aws.crossplane.io_routeresponses.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: routeresponses.apigatewayv2.aws.crossplane.io spec: diff --git a/package/crds/apigatewayv2.aws.crossplane.io_routes.yaml b/package/crds/apigatewayv2.aws.crossplane.io_routes.yaml index 3e9c9cf2ba..f4d8f28910 100644 --- a/package/crds/apigatewayv2.aws.crossplane.io_routes.yaml +++ b/package/crds/apigatewayv2.aws.crossplane.io_routes.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: routes.apigatewayv2.aws.crossplane.io spec: diff --git a/package/crds/apigatewayv2.aws.crossplane.io_stages.yaml b/package/crds/apigatewayv2.aws.crossplane.io_stages.yaml index c594213668..f62fe78ef6 100644 --- a/package/crds/apigatewayv2.aws.crossplane.io_stages.yaml +++ b/package/crds/apigatewayv2.aws.crossplane.io_stages.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: stages.apigatewayv2.aws.crossplane.io spec: diff --git a/package/crds/apigatewayv2.aws.crossplane.io_vpclinks.yaml b/package/crds/apigatewayv2.aws.crossplane.io_vpclinks.yaml index 93113f6863..c3dd9cf23b 100644 --- a/package/crds/apigatewayv2.aws.crossplane.io_vpclinks.yaml +++ b/package/crds/apigatewayv2.aws.crossplane.io_vpclinks.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: vpclinks.apigatewayv2.aws.crossplane.io spec: diff --git a/package/crds/aws.crossplane.io_providerconfigs.yaml b/package/crds/aws.crossplane.io_providerconfigs.yaml index 0c4f4e6671..1967b6dfb3 100644 --- a/package/crds/aws.crossplane.io_providerconfigs.yaml +++ b/package/crds/aws.crossplane.io_providerconfigs.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: providerconfigs.aws.crossplane.io spec: diff --git a/package/crds/aws.crossplane.io_providerconfigusages.yaml b/package/crds/aws.crossplane.io_providerconfigusages.yaml index 20e668b498..7e8caa6bdf 100644 --- a/package/crds/aws.crossplane.io_providerconfigusages.yaml +++ b/package/crds/aws.crossplane.io_providerconfigusages.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: providerconfigusages.aws.crossplane.io spec: diff --git a/package/crds/aws.crossplane.io_providers.yaml b/package/crds/aws.crossplane.io_providers.yaml index a90813681f..981bcd9a43 100644 --- a/package/crds/aws.crossplane.io_providers.yaml +++ b/package/crds/aws.crossplane.io_providers.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: providers.aws.crossplane.io spec: diff --git a/package/crds/cache.aws.crossplane.io_cacheclusters.yaml b/package/crds/cache.aws.crossplane.io_cacheclusters.yaml index bb8790e366..f2393297da 100644 --- a/package/crds/cache.aws.crossplane.io_cacheclusters.yaml +++ b/package/crds/cache.aws.crossplane.io_cacheclusters.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cacheclusters.cache.aws.crossplane.io spec: diff --git a/package/crds/cache.aws.crossplane.io_cachesubnetgroups.yaml b/package/crds/cache.aws.crossplane.io_cachesubnetgroups.yaml index 0610c8451a..1c76496a1d 100644 --- a/package/crds/cache.aws.crossplane.io_cachesubnetgroups.yaml +++ b/package/crds/cache.aws.crossplane.io_cachesubnetgroups.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cachesubnetgroups.cache.aws.crossplane.io spec: diff --git a/package/crds/cache.aws.crossplane.io_replicationgroups.yaml b/package/crds/cache.aws.crossplane.io_replicationgroups.yaml index 5e6e78721c..a19ebc24a2 100644 --- a/package/crds/cache.aws.crossplane.io_replicationgroups.yaml +++ b/package/crds/cache.aws.crossplane.io_replicationgroups.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: replicationgroups.cache.aws.crossplane.io spec: diff --git a/package/crds/cloudfront.aws.crossplane.io_cachepolicies.yaml b/package/crds/cloudfront.aws.crossplane.io_cachepolicies.yaml index f1015139bb..45a720902e 100644 --- a/package/crds/cloudfront.aws.crossplane.io_cachepolicies.yaml +++ b/package/crds/cloudfront.aws.crossplane.io_cachepolicies.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cachepolicies.cloudfront.aws.crossplane.io spec: diff --git a/package/crds/cloudfront.aws.crossplane.io_distributions.yaml b/package/crds/cloudfront.aws.crossplane.io_distributions.yaml index 191c67bad9..5f09c7bf31 100644 --- a/package/crds/cloudfront.aws.crossplane.io_distributions.yaml +++ b/package/crds/cloudfront.aws.crossplane.io_distributions.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: distributions.cloudfront.aws.crossplane.io spec: diff --git a/package/crds/database.aws.crossplane.io_dbsubnetgroups.yaml b/package/crds/database.aws.crossplane.io_dbsubnetgroups.yaml index f3e6f9df86..f7dbd3e6c3 100644 --- a/package/crds/database.aws.crossplane.io_dbsubnetgroups.yaml +++ b/package/crds/database.aws.crossplane.io_dbsubnetgroups.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: dbsubnetgroups.database.aws.crossplane.io spec: diff --git a/package/crds/database.aws.crossplane.io_rdsinstances.yaml b/package/crds/database.aws.crossplane.io_rdsinstances.yaml index a2037b67bf..86e0cc318e 100644 --- a/package/crds/database.aws.crossplane.io_rdsinstances.yaml +++ b/package/crds/database.aws.crossplane.io_rdsinstances.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: rdsinstances.database.aws.crossplane.io spec: diff --git a/package/crds/docdb.aws.crossplane.io_dbclusterparametergroups.yaml b/package/crds/docdb.aws.crossplane.io_dbclusterparametergroups.yaml index ced474ae07..cab1720081 100644 --- a/package/crds/docdb.aws.crossplane.io_dbclusterparametergroups.yaml +++ b/package/crds/docdb.aws.crossplane.io_dbclusterparametergroups.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: dbclusterparametergroups.docdb.aws.crossplane.io spec: diff --git a/package/crds/docdb.aws.crossplane.io_dbclusters.yaml b/package/crds/docdb.aws.crossplane.io_dbclusters.yaml index 553fb2bd89..007265c0f4 100644 --- a/package/crds/docdb.aws.crossplane.io_dbclusters.yaml +++ b/package/crds/docdb.aws.crossplane.io_dbclusters.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: dbclusters.docdb.aws.crossplane.io spec: diff --git a/package/crds/docdb.aws.crossplane.io_dbinstances.yaml b/package/crds/docdb.aws.crossplane.io_dbinstances.yaml index b1cf81367e..439bb35693 100644 --- a/package/crds/docdb.aws.crossplane.io_dbinstances.yaml +++ b/package/crds/docdb.aws.crossplane.io_dbinstances.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: dbinstances.docdb.aws.crossplane.io spec: diff --git a/package/crds/docdb.aws.crossplane.io_dbsubnetgroups.yaml b/package/crds/docdb.aws.crossplane.io_dbsubnetgroups.yaml index 31a82010ab..b33016a594 100644 --- a/package/crds/docdb.aws.crossplane.io_dbsubnetgroups.yaml +++ b/package/crds/docdb.aws.crossplane.io_dbsubnetgroups.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: dbsubnetgroups.docdb.aws.crossplane.io spec: diff --git a/package/crds/dynamodb.aws.crossplane.io_backups.yaml b/package/crds/dynamodb.aws.crossplane.io_backups.yaml index a110a910c3..3b046ef646 100644 --- a/package/crds/dynamodb.aws.crossplane.io_backups.yaml +++ b/package/crds/dynamodb.aws.crossplane.io_backups.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: backups.dynamodb.aws.crossplane.io spec: diff --git a/package/crds/dynamodb.aws.crossplane.io_globaltables.yaml b/package/crds/dynamodb.aws.crossplane.io_globaltables.yaml index fb70b3258b..fa7722c00c 100644 --- a/package/crds/dynamodb.aws.crossplane.io_globaltables.yaml +++ b/package/crds/dynamodb.aws.crossplane.io_globaltables.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: globaltables.dynamodb.aws.crossplane.io spec: diff --git a/package/crds/dynamodb.aws.crossplane.io_tables.yaml b/package/crds/dynamodb.aws.crossplane.io_tables.yaml index b825c733e5..16a812adea 100644 --- a/package/crds/dynamodb.aws.crossplane.io_tables.yaml +++ b/package/crds/dynamodb.aws.crossplane.io_tables.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: tables.dynamodb.aws.crossplane.io spec: diff --git a/package/crds/ec2.aws.crossplane.io_addresses.yaml b/package/crds/ec2.aws.crossplane.io_addresses.yaml index 4bf69ae171..fdb5f82900 100644 --- a/package/crds/ec2.aws.crossplane.io_addresses.yaml +++ b/package/crds/ec2.aws.crossplane.io_addresses.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: addresses.ec2.aws.crossplane.io spec: diff --git a/package/crds/ec2.aws.crossplane.io_internetgateways.yaml b/package/crds/ec2.aws.crossplane.io_internetgateways.yaml index 79aebf1dff..4ff770896d 100644 --- a/package/crds/ec2.aws.crossplane.io_internetgateways.yaml +++ b/package/crds/ec2.aws.crossplane.io_internetgateways.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: internetgateways.ec2.aws.crossplane.io spec: diff --git a/package/crds/ec2.aws.crossplane.io_natgateways.yaml b/package/crds/ec2.aws.crossplane.io_natgateways.yaml index af6a20e62c..f7761876a9 100644 --- a/package/crds/ec2.aws.crossplane.io_natgateways.yaml +++ b/package/crds/ec2.aws.crossplane.io_natgateways.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: natgateways.ec2.aws.crossplane.io spec: diff --git a/package/crds/ec2.aws.crossplane.io_routetables.yaml b/package/crds/ec2.aws.crossplane.io_routetables.yaml index 399719cf04..fc30e910c0 100644 --- a/package/crds/ec2.aws.crossplane.io_routetables.yaml +++ b/package/crds/ec2.aws.crossplane.io_routetables.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: routetables.ec2.aws.crossplane.io spec: diff --git a/package/crds/ec2.aws.crossplane.io_securitygroups.yaml b/package/crds/ec2.aws.crossplane.io_securitygroups.yaml index 0092a2d285..637cddf1b7 100644 --- a/package/crds/ec2.aws.crossplane.io_securitygroups.yaml +++ b/package/crds/ec2.aws.crossplane.io_securitygroups.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: securitygroups.ec2.aws.crossplane.io spec: diff --git a/package/crds/ec2.aws.crossplane.io_subnets.yaml b/package/crds/ec2.aws.crossplane.io_subnets.yaml index 9510f948af..9ee16b86f6 100644 --- a/package/crds/ec2.aws.crossplane.io_subnets.yaml +++ b/package/crds/ec2.aws.crossplane.io_subnets.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: subnets.ec2.aws.crossplane.io spec: diff --git a/package/crds/ec2.aws.crossplane.io_vpccidrblocks.yaml b/package/crds/ec2.aws.crossplane.io_vpccidrblocks.yaml index 840e5a3e0a..a9dfedc662 100644 --- a/package/crds/ec2.aws.crossplane.io_vpccidrblocks.yaml +++ b/package/crds/ec2.aws.crossplane.io_vpccidrblocks.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: vpccidrblocks.ec2.aws.crossplane.io spec: diff --git a/package/crds/ec2.aws.crossplane.io_vpcpeeringconnections.yaml b/package/crds/ec2.aws.crossplane.io_vpcpeeringconnections.yaml index 3fa19def46..96565af4f3 100644 --- a/package/crds/ec2.aws.crossplane.io_vpcpeeringconnections.yaml +++ b/package/crds/ec2.aws.crossplane.io_vpcpeeringconnections.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: vpcpeeringconnections.ec2.aws.crossplane.io spec: diff --git a/package/crds/ec2.aws.crossplane.io_vpcs.yaml b/package/crds/ec2.aws.crossplane.io_vpcs.yaml index d44f1b2ffb..9dea0accb3 100644 --- a/package/crds/ec2.aws.crossplane.io_vpcs.yaml +++ b/package/crds/ec2.aws.crossplane.io_vpcs.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: vpcs.ec2.aws.crossplane.io spec: diff --git a/package/crds/ecr.aws.crossplane.io_repositories.yaml b/package/crds/ecr.aws.crossplane.io_repositories.yaml index 759697e7c0..ff17ce7784 100644 --- a/package/crds/ecr.aws.crossplane.io_repositories.yaml +++ b/package/crds/ecr.aws.crossplane.io_repositories.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: repositories.ecr.aws.crossplane.io spec: diff --git a/package/crds/ecr.aws.crossplane.io_repositorypolicies.yaml b/package/crds/ecr.aws.crossplane.io_repositorypolicies.yaml index 71c4fc6972..207d2e50e1 100644 --- a/package/crds/ecr.aws.crossplane.io_repositorypolicies.yaml +++ b/package/crds/ecr.aws.crossplane.io_repositorypolicies.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: repositorypolicies.ecr.aws.crossplane.io spec: diff --git a/package/crds/efs.aws.crossplane.io_filesystems.yaml b/package/crds/efs.aws.crossplane.io_filesystems.yaml index a90b7959ea..66b70aa7db 100644 --- a/package/crds/efs.aws.crossplane.io_filesystems.yaml +++ b/package/crds/efs.aws.crossplane.io_filesystems.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: filesystems.efs.aws.crossplane.io spec: diff --git a/package/crds/efs.aws.crossplane.io_mounttargets.yaml b/package/crds/efs.aws.crossplane.io_mounttargets.yaml index dd9b052631..b1f9f4d20d 100644 --- a/package/crds/efs.aws.crossplane.io_mounttargets.yaml +++ b/package/crds/efs.aws.crossplane.io_mounttargets.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: mounttargets.efs.aws.crossplane.io spec: diff --git a/package/crds/eks.aws.crossplane.io_clusters.yaml b/package/crds/eks.aws.crossplane.io_clusters.yaml index 8fc35e68b6..43f69630f6 100644 --- a/package/crds/eks.aws.crossplane.io_clusters.yaml +++ b/package/crds/eks.aws.crossplane.io_clusters.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: clusters.eks.aws.crossplane.io spec: diff --git a/package/crds/eks.aws.crossplane.io_fargateprofiles.yaml b/package/crds/eks.aws.crossplane.io_fargateprofiles.yaml index f785d28a6c..7ea93f06b5 100644 --- a/package/crds/eks.aws.crossplane.io_fargateprofiles.yaml +++ b/package/crds/eks.aws.crossplane.io_fargateprofiles.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: fargateprofiles.eks.aws.crossplane.io spec: diff --git a/package/crds/eks.aws.crossplane.io_nodegroups.yaml b/package/crds/eks.aws.crossplane.io_nodegroups.yaml index 0feae34bb6..857bd161b0 100644 --- a/package/crds/eks.aws.crossplane.io_nodegroups.yaml +++ b/package/crds/eks.aws.crossplane.io_nodegroups.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: nodegroups.eks.aws.crossplane.io spec: diff --git a/package/crds/elasticloadbalancing.aws.crossplane.io_elbattachments.yaml b/package/crds/elasticloadbalancing.aws.crossplane.io_elbattachments.yaml index b79b1900b6..d5d12aaefe 100644 --- a/package/crds/elasticloadbalancing.aws.crossplane.io_elbattachments.yaml +++ b/package/crds/elasticloadbalancing.aws.crossplane.io_elbattachments.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: elbattachments.elasticloadbalancing.aws.crossplane.io spec: diff --git a/package/crds/elasticloadbalancing.aws.crossplane.io_elbs.yaml b/package/crds/elasticloadbalancing.aws.crossplane.io_elbs.yaml index 72b889f81a..44e4ab5d1e 100644 --- a/package/crds/elasticloadbalancing.aws.crossplane.io_elbs.yaml +++ b/package/crds/elasticloadbalancing.aws.crossplane.io_elbs.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: elbs.elasticloadbalancing.aws.crossplane.io spec: diff --git a/package/crds/identity.aws.crossplane.io_iamaccesskeys.yaml b/package/crds/identity.aws.crossplane.io_iamaccesskeys.yaml index eacaa420e2..551d436aa8 100644 --- a/package/crds/identity.aws.crossplane.io_iamaccesskeys.yaml +++ b/package/crds/identity.aws.crossplane.io_iamaccesskeys.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: iamaccesskeys.identity.aws.crossplane.io spec: diff --git a/package/crds/identity.aws.crossplane.io_iamgrouppolicyattachments.yaml b/package/crds/identity.aws.crossplane.io_iamgrouppolicyattachments.yaml index de9507a9e4..90cb1f7d13 100644 --- a/package/crds/identity.aws.crossplane.io_iamgrouppolicyattachments.yaml +++ b/package/crds/identity.aws.crossplane.io_iamgrouppolicyattachments.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: iamgrouppolicyattachments.identity.aws.crossplane.io spec: diff --git a/package/crds/identity.aws.crossplane.io_iamgroups.yaml b/package/crds/identity.aws.crossplane.io_iamgroups.yaml index 5fb39d79a3..3e70067181 100644 --- a/package/crds/identity.aws.crossplane.io_iamgroups.yaml +++ b/package/crds/identity.aws.crossplane.io_iamgroups.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: iamgroups.identity.aws.crossplane.io spec: diff --git a/package/crds/identity.aws.crossplane.io_iamgroupusermemberships.yaml b/package/crds/identity.aws.crossplane.io_iamgroupusermemberships.yaml index bcd0b49b04..ac551a4e27 100644 --- a/package/crds/identity.aws.crossplane.io_iamgroupusermemberships.yaml +++ b/package/crds/identity.aws.crossplane.io_iamgroupusermemberships.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: iamgroupusermemberships.identity.aws.crossplane.io spec: diff --git a/package/crds/identity.aws.crossplane.io_iampolicies.yaml b/package/crds/identity.aws.crossplane.io_iampolicies.yaml index 24d0a01b82..33b87651fd 100644 --- a/package/crds/identity.aws.crossplane.io_iampolicies.yaml +++ b/package/crds/identity.aws.crossplane.io_iampolicies.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: iampolicies.identity.aws.crossplane.io spec: diff --git a/package/crds/identity.aws.crossplane.io_iamrolepolicyattachments.yaml b/package/crds/identity.aws.crossplane.io_iamrolepolicyattachments.yaml index 2b59c7bcc5..d3e4338053 100644 --- a/package/crds/identity.aws.crossplane.io_iamrolepolicyattachments.yaml +++ b/package/crds/identity.aws.crossplane.io_iamrolepolicyattachments.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: iamrolepolicyattachments.identity.aws.crossplane.io spec: diff --git a/package/crds/identity.aws.crossplane.io_iamroles.yaml b/package/crds/identity.aws.crossplane.io_iamroles.yaml index fefacca090..6d2d2ac47d 100644 --- a/package/crds/identity.aws.crossplane.io_iamroles.yaml +++ b/package/crds/identity.aws.crossplane.io_iamroles.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: iamroles.identity.aws.crossplane.io spec: diff --git a/package/crds/identity.aws.crossplane.io_iamuserpolicyattachments.yaml b/package/crds/identity.aws.crossplane.io_iamuserpolicyattachments.yaml index ced3c7fafc..9e0bd3481b 100644 --- a/package/crds/identity.aws.crossplane.io_iamuserpolicyattachments.yaml +++ b/package/crds/identity.aws.crossplane.io_iamuserpolicyattachments.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: iamuserpolicyattachments.identity.aws.crossplane.io spec: diff --git a/package/crds/identity.aws.crossplane.io_iamusers.yaml b/package/crds/identity.aws.crossplane.io_iamusers.yaml index 9697f322a5..bd68e95094 100644 --- a/package/crds/identity.aws.crossplane.io_iamusers.yaml +++ b/package/crds/identity.aws.crossplane.io_iamusers.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: iamusers.identity.aws.crossplane.io spec: diff --git a/package/crds/identity.aws.crossplane.io_openidconnectproviders.yaml b/package/crds/identity.aws.crossplane.io_openidconnectproviders.yaml index 4185da63a5..3012f69fbd 100644 --- a/package/crds/identity.aws.crossplane.io_openidconnectproviders.yaml +++ b/package/crds/identity.aws.crossplane.io_openidconnectproviders.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: openidconnectproviders.identity.aws.crossplane.io spec: diff --git a/package/crds/kafka.aws.crossplane.io_clusters.yaml b/package/crds/kafka.aws.crossplane.io_clusters.yaml index f593d106e3..bab209cad5 100644 --- a/package/crds/kafka.aws.crossplane.io_clusters.yaml +++ b/package/crds/kafka.aws.crossplane.io_clusters.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: clusters.kafka.aws.crossplane.io spec: diff --git a/package/crds/kms.aws.crossplane.io_keys.yaml b/package/crds/kms.aws.crossplane.io_keys.yaml index 68f13f3991..7555a7c20c 100644 --- a/package/crds/kms.aws.crossplane.io_keys.yaml +++ b/package/crds/kms.aws.crossplane.io_keys.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: keys.kms.aws.crossplane.io spec: diff --git a/package/crds/lambda.aws.crossplane.io_functions.yaml b/package/crds/lambda.aws.crossplane.io_functions.yaml index 1c298196f0..060e8682bc 100644 --- a/package/crds/lambda.aws.crossplane.io_functions.yaml +++ b/package/crds/lambda.aws.crossplane.io_functions.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: functions.lambda.aws.crossplane.io spec: diff --git a/package/crds/notification.aws.crossplane.io_snssubscriptions.yaml b/package/crds/notification.aws.crossplane.io_snssubscriptions.yaml index a6938e8a91..b369d5f8a7 100644 --- a/package/crds/notification.aws.crossplane.io_snssubscriptions.yaml +++ b/package/crds/notification.aws.crossplane.io_snssubscriptions.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: snssubscriptions.notification.aws.crossplane.io spec: diff --git a/package/crds/notification.aws.crossplane.io_snstopics.yaml b/package/crds/notification.aws.crossplane.io_snstopics.yaml index 488ad96cc9..d773aae434 100644 --- a/package/crds/notification.aws.crossplane.io_snstopics.yaml +++ b/package/crds/notification.aws.crossplane.io_snstopics.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: snstopics.notification.aws.crossplane.io spec: diff --git a/package/crds/rds.aws.crossplane.io_dbclusterparametergroups.yaml b/package/crds/rds.aws.crossplane.io_dbclusterparametergroups.yaml index d7a15e698f..eec9b8f76a 100644 --- a/package/crds/rds.aws.crossplane.io_dbclusterparametergroups.yaml +++ b/package/crds/rds.aws.crossplane.io_dbclusterparametergroups.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: dbclusterparametergroups.rds.aws.crossplane.io spec: diff --git a/package/crds/rds.aws.crossplane.io_dbclusters.yaml b/package/crds/rds.aws.crossplane.io_dbclusters.yaml index 7eb0a3c12f..188201b2f2 100644 --- a/package/crds/rds.aws.crossplane.io_dbclusters.yaml +++ b/package/crds/rds.aws.crossplane.io_dbclusters.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: dbclusters.rds.aws.crossplane.io spec: diff --git a/package/crds/rds.aws.crossplane.io_dbinstances.yaml b/package/crds/rds.aws.crossplane.io_dbinstances.yaml index 0132a12c01..14583ebb59 100644 --- a/package/crds/rds.aws.crossplane.io_dbinstances.yaml +++ b/package/crds/rds.aws.crossplane.io_dbinstances.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: dbinstances.rds.aws.crossplane.io spec: diff --git a/package/crds/rds.aws.crossplane.io_dbparametergroups.yaml b/package/crds/rds.aws.crossplane.io_dbparametergroups.yaml index 6f41341694..d54d23ee7b 100644 --- a/package/crds/rds.aws.crossplane.io_dbparametergroups.yaml +++ b/package/crds/rds.aws.crossplane.io_dbparametergroups.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: dbparametergroups.rds.aws.crossplane.io spec: diff --git a/package/crds/rds.aws.crossplane.io_globalclusters.yaml b/package/crds/rds.aws.crossplane.io_globalclusters.yaml index c9c1b1d011..ceb9550886 100644 --- a/package/crds/rds.aws.crossplane.io_globalclusters.yaml +++ b/package/crds/rds.aws.crossplane.io_globalclusters.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: globalclusters.rds.aws.crossplane.io spec: diff --git a/package/crds/redshift.aws.crossplane.io_clusters.yaml b/package/crds/redshift.aws.crossplane.io_clusters.yaml index 4f8db7268a..5189cf7771 100644 --- a/package/crds/redshift.aws.crossplane.io_clusters.yaml +++ b/package/crds/redshift.aws.crossplane.io_clusters.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: clusters.redshift.aws.crossplane.io spec: diff --git a/package/crds/route53.aws.crossplane.io_hostedzones.yaml b/package/crds/route53.aws.crossplane.io_hostedzones.yaml index dbd6e8fa98..727c820447 100644 --- a/package/crds/route53.aws.crossplane.io_hostedzones.yaml +++ b/package/crds/route53.aws.crossplane.io_hostedzones.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: hostedzones.route53.aws.crossplane.io spec: diff --git a/package/crds/route53.aws.crossplane.io_resourcerecordsets.yaml b/package/crds/route53.aws.crossplane.io_resourcerecordsets.yaml index 0bc836a2b0..b7be48e840 100644 --- a/package/crds/route53.aws.crossplane.io_resourcerecordsets.yaml +++ b/package/crds/route53.aws.crossplane.io_resourcerecordsets.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: resourcerecordsets.route53.aws.crossplane.io spec: diff --git a/package/crds/route53resolver.aws.crossplane.io_resolverendpoints.yaml b/package/crds/route53resolver.aws.crossplane.io_resolverendpoints.yaml index 96ee17971f..f8cfd08bb4 100644 --- a/package/crds/route53resolver.aws.crossplane.io_resolverendpoints.yaml +++ b/package/crds/route53resolver.aws.crossplane.io_resolverendpoints.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: resolverendpoints.route53resolver.aws.crossplane.io spec: diff --git a/package/crds/route53resolver.aws.crossplane.io_resolverrules.yaml b/package/crds/route53resolver.aws.crossplane.io_resolverrules.yaml index 86cdb83127..6a5f9b4b71 100644 --- a/package/crds/route53resolver.aws.crossplane.io_resolverrules.yaml +++ b/package/crds/route53resolver.aws.crossplane.io_resolverrules.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: resolverrules.route53resolver.aws.crossplane.io spec: diff --git a/package/crds/s3.aws.crossplane.io_bucketpolicies.yaml b/package/crds/s3.aws.crossplane.io_bucketpolicies.yaml index bef3c753d3..19ab3d0b84 100644 --- a/package/crds/s3.aws.crossplane.io_bucketpolicies.yaml +++ b/package/crds/s3.aws.crossplane.io_bucketpolicies.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: bucketpolicies.s3.aws.crossplane.io spec: diff --git a/package/crds/s3.aws.crossplane.io_buckets.yaml b/package/crds/s3.aws.crossplane.io_buckets.yaml index 859ee9adb0..0f39468419 100644 --- a/package/crds/s3.aws.crossplane.io_buckets.yaml +++ b/package/crds/s3.aws.crossplane.io_buckets.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: buckets.s3.aws.crossplane.io spec: diff --git a/package/crds/secretsmanager.aws.crossplane.io_secrets.yaml b/package/crds/secretsmanager.aws.crossplane.io_secrets.yaml index 98b25b2310..ce9b590f66 100644 --- a/package/crds/secretsmanager.aws.crossplane.io_secrets.yaml +++ b/package/crds/secretsmanager.aws.crossplane.io_secrets.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: secrets.secretsmanager.aws.crossplane.io spec: diff --git a/package/crds/servicediscovery.aws.crossplane.io_httpnamespaces.yaml b/package/crds/servicediscovery.aws.crossplane.io_httpnamespaces.yaml index 5bab8f9d07..e73c1344b7 100644 --- a/package/crds/servicediscovery.aws.crossplane.io_httpnamespaces.yaml +++ b/package/crds/servicediscovery.aws.crossplane.io_httpnamespaces.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: httpnamespaces.servicediscovery.aws.crossplane.io spec: diff --git a/package/crds/servicediscovery.aws.crossplane.io_privatednsnamespaces.yaml b/package/crds/servicediscovery.aws.crossplane.io_privatednsnamespaces.yaml index 9f787cfb08..b98fccc040 100644 --- a/package/crds/servicediscovery.aws.crossplane.io_privatednsnamespaces.yaml +++ b/package/crds/servicediscovery.aws.crossplane.io_privatednsnamespaces.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: privatednsnamespaces.servicediscovery.aws.crossplane.io spec: diff --git a/package/crds/servicediscovery.aws.crossplane.io_publicdnsnamespaces.yaml b/package/crds/servicediscovery.aws.crossplane.io_publicdnsnamespaces.yaml index e95f962c03..e4bd8bdde8 100644 --- a/package/crds/servicediscovery.aws.crossplane.io_publicdnsnamespaces.yaml +++ b/package/crds/servicediscovery.aws.crossplane.io_publicdnsnamespaces.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: publicdnsnamespaces.servicediscovery.aws.crossplane.io spec: diff --git a/package/crds/sfn.aws.crossplane.io_activities.yaml b/package/crds/sfn.aws.crossplane.io_activities.yaml index d2aaa2883e..290839f458 100644 --- a/package/crds/sfn.aws.crossplane.io_activities.yaml +++ b/package/crds/sfn.aws.crossplane.io_activities.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: activities.sfn.aws.crossplane.io spec: diff --git a/package/crds/sfn.aws.crossplane.io_statemachines.yaml b/package/crds/sfn.aws.crossplane.io_statemachines.yaml index e9bf5b10d2..e7d38352ab 100644 --- a/package/crds/sfn.aws.crossplane.io_statemachines.yaml +++ b/package/crds/sfn.aws.crossplane.io_statemachines.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: statemachines.sfn.aws.crossplane.io spec: diff --git a/package/crds/sqs.aws.crossplane.io_queues.yaml b/package/crds/sqs.aws.crossplane.io_queues.yaml index 48d153e9da..1770cf1a07 100644 --- a/package/crds/sqs.aws.crossplane.io_queues.yaml +++ b/package/crds/sqs.aws.crossplane.io_queues.yaml @@ -1,10 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: queues.sqs.aws.crossplane.io spec: diff --git a/package/crds/transfer.aws.crossplane.io_servers.yaml b/package/crds/transfer.aws.crossplane.io_servers.yaml index 663b70c024..f65656420a 100644 --- a/package/crds/transfer.aws.crossplane.io_servers.yaml +++ b/package/crds/transfer.aws.crossplane.io_servers.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: servers.transfer.aws.crossplane.io spec: diff --git a/package/crds/transfer.aws.crossplane.io_users.yaml b/package/crds/transfer.aws.crossplane.io_users.yaml index 4cf4a4417e..189c25fe32 100644 --- a/package/crds/transfer.aws.crossplane.io_users.yaml +++ b/package/crds/transfer.aws.crossplane.io_users.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.0 + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: users.transfer.aws.crossplane.io spec: diff --git a/pkg/clients/acm/certificate.go b/pkg/clients/acm/certificate.go index e63ba3015c..b6d69ec7a5 100644 --- a/pkg/clients/acm/certificate.go +++ b/pkg/clients/acm/certificate.go @@ -75,15 +75,11 @@ func GenerateCreateCertificateInput(name string, p *v1alpha1.CertificateParamete } // GenerateCertificateStatus is used to produce CertificateExternalStatus from acm.certificateStatus -<<<<<<< HEAD func GenerateCertificateStatus(certificate types.CertificateDetail) v1alpha1.CertificateExternalStatus { -======= -func GenerateCertificateStatus(certificate acm.CertificateDetail) v1alpha1.CertificateExternalStatus { - - if certificate.Type == acm.CertificateTypeAmazonIssued && len(certificate.DomainValidationOptions) > 0 { + if certificate.Type == acmtypes.CertificateTypeAmazonIssued && len(certificate.DomainValidationOptions) > 0 { if certificate.DomainValidationOptions[0].ResourceRecord != nil { return v1alpha1.CertificateExternalStatus{ - CertificateARN: aws.StringValue(certificate.CertificateArn), + CertificateARN: aws.ToString(certificate.CertificateArn), RenewalEligibility: certificate.RenewalEligibility, Status: certificate.Status, Type: certificate.Type, @@ -96,7 +92,6 @@ func GenerateCertificateStatus(certificate acm.CertificateDetail) v1alpha1.Certi } } ->>>>>>> upstream/master return v1alpha1.CertificateExternalStatus{ CertificateARN: aws.ToString(certificate.CertificateArn), RenewalEligibility: certificate.RenewalEligibility, diff --git a/pkg/clients/acm/certificate_test.go b/pkg/clients/acm/certificate_test.go index 16eb542f7c..b99e5586df 100644 --- a/pkg/clients/acm/certificate_test.go +++ b/pkg/clients/acm/certificate_test.go @@ -3,6 +3,10 @@ package acm import ( "testing" + "github.com/aws/smithy-go/document" + + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/aws/aws-sdk-go-v2/service/acm" acmtypes "github.com/aws/aws-sdk-go-v2/service/acm/types" "github.com/google/go-cmp/cmp" @@ -52,7 +56,7 @@ func TestGenerateCreateCertificateInput(t *testing.T) { t.Run(name, func(t *testing.T) { r := GenerateCreateCertificateInput(name, &tc.in) - if diff := cmp.Diff(r, &tc.out); diff != "" { + if diff := cmp.Diff(r, &tc.out, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateCreateCertificateInput(...): -want, +got:\n%s", diff) } }) @@ -167,27 +171,27 @@ func TestGenerateCertificateStatus(t *testing.T) { }, }, "DomainValidationOptionsResourceRecord": { - in: acm.CertificateDetail{ + in: acmtypes.CertificateDetail{ CertificateArn: aws.String(certificateArn), - RenewalEligibility: acm.RenewalEligibilityIneligible, - Type: acm.CertificateTypeAmazonIssued, - Status: acm.CertificateStatusPendingValidation, - DomainValidationOptions: []acm.DomainValidation{ + RenewalEligibility: acmtypes.RenewalEligibilityIneligible, + Type: acmtypes.CertificateTypeAmazonIssued, + Status: acmtypes.CertificateStatusPendingValidation, + DomainValidationOptions: []acmtypes.DomainValidation{ { DomainName: &sName, - ResourceRecord: &acm.ResourceRecord{ + ResourceRecord: &acmtypes.ResourceRecord{ Name: &sName, Value: &sValue, - Type: acm.RecordType(sType), + Type: acmtypes.RecordType(sType), }, }, }, }, out: v1alpha1.CertificateExternalStatus{ CertificateARN: certificateArn, - RenewalEligibility: acm.RenewalEligibilityIneligible, - Type: acm.CertificateTypeAmazonIssued, - Status: acm.CertificateStatusPendingValidation, + RenewalEligibility: acmtypes.RenewalEligibilityIneligible, + Type: acmtypes.CertificateTypeAmazonIssued, + Status: acmtypes.CertificateStatusPendingValidation, ResourceRecord: &v1alpha1.ResourceRecord{ Name: &sName, Value: &sValue, diff --git a/pkg/clients/acmpca/certificateauthority_test.go b/pkg/clients/acmpca/certificateauthority_test.go index f0605a2f38..2d1891cbd4 100644 --- a/pkg/clients/acmpca/certificateauthority_test.go +++ b/pkg/clients/acmpca/certificateauthority_test.go @@ -19,6 +19,9 @@ package acmpca import ( "testing" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/aws/aws-sdk-go-v2/service/acmpca" "github.com/aws/aws-sdk-go-v2/service/acmpca/types" "github.com/google/go-cmp/cmp" @@ -113,7 +116,7 @@ func TestGenerateCreateCertificateAuthorityInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { r := GenerateCreateCertificateAuthorityInput(tc.in) - if diff := cmp.Diff(r, tc.out); diff != "" { + if diff := cmp.Diff(r, tc.out, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateCreateCertificateAuthorityInput(...): -want, +got:\n%s", diff) } }) @@ -172,7 +175,7 @@ func TestGenerateCertificateAuthorityConfiguration(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { r := GenerateCertificateAuthorityConfiguration(tc.in) - if diff := cmp.Diff(r, tc.out); diff != "" { + if diff := cmp.Diff(r, tc.out, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateCertificateAuthorityConfiguration(...): -want, +got:\n%s", diff) } }) @@ -203,7 +206,7 @@ func TestGenerateRevocationConfiguration(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { r := GenerateRevocationConfiguration(tc.in) - if diff := cmp.Diff(r, tc.out); diff != "" { + if diff := cmp.Diff(r, tc.out, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateRevocationConfiguration(...): -want, +got:\n%s", diff) } }) diff --git a/pkg/clients/aws_test.go b/pkg/clients/aws_test.go index 8fb2c53c42..2338b9b610 100644 --- a/pkg/clients/aws_test.go +++ b/pkg/clients/aws_test.go @@ -23,6 +23,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/aws/smithy-go/document" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" . "github.com/onsi/gomega" @@ -357,10 +358,10 @@ func TestDiffEC2Tags(t *testing.T) { return StringValue(i.Key) < StringValue(j.Key) }) add, remove := DiffEC2Tags(tc.args.local, tc.args.remote) - if diff := cmp.Diff(tc.want.add, add, tagCmp); diff != "" { + if diff := cmp.Diff(tc.want.add, add, tagCmp, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } - if diff := cmp.Diff(tc.want.remove, remove, tagCmp); diff != "" { + if diff := cmp.Diff(tc.want.remove, remove, tagCmp, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } }) diff --git a/pkg/clients/ec2/securitygroup.go b/pkg/clients/ec2/securitygroup.go index c30b538b0e..4f09242fd5 100644 --- a/pkg/clients/ec2/securitygroup.go +++ b/pkg/clients/ec2/securitygroup.go @@ -73,9 +73,9 @@ func GenerateEC2Permissions(objectPerms []v1beta1.IPPermission) []ec2types.IpPer permissions := make([]ec2types.IpPermission, len(objectPerms)) for i, p := range objectPerms { ipPerm := ec2types.IpPermission{ - FromPort: *p.FromPort, + FromPort: p.FromPort, IpProtocol: aws.String(p.IPProtocol), - ToPort: *p.ToPort, + ToPort: p.ToPort, } for _, c := range p.IPRanges { ipPerm.IpRanges = append(ipPerm.IpRanges, ec2types.IpRange{ @@ -118,9 +118,9 @@ func GenerateIPPermissions(objectPerms []ec2types.IpPermission) []v1beta1.IPPerm permissions := make([]v1beta1.IPPermission, len(objectPerms)) for i, p := range objectPerms { ipPerm := v1beta1.IPPermission{ - FromPort: awsgo.Int32(p.FromPort), + FromPort: p.FromPort, IPProtocol: aws.StringValue(p.IpProtocol), - ToPort: awsgo.Int32(p.ToPort), + ToPort: p.ToPort, } for _, c := range p.IpRanges { ipPerm.IPRanges = append(ipPerm.IPRanges, v1beta1.IPRange{ @@ -202,8 +202,6 @@ func LateInitializeIPPermissions(spec []v1beta1.IPPermission, o []ec2types.IpPer return spec } for i := range o { - spec[i].FromPort = awsclients.LateInitializeInt32Ptr(spec[i].FromPort, &o[i].FromPort) - spec[i].ToPort = awsclients.LateInitializeInt32Ptr(spec[i].FromPort, &o[i].ToPort) spec[i].IPProtocol = awsclients.LateInitializeString(spec[i].IPProtocol, o[i].IpProtocol) for j := range o[i].IpRanges { @@ -271,6 +269,12 @@ func LateInitializeIPPermissions(spec []v1beta1.IPPermission, o []ec2types.IpPer // *ec2types.SecurityGroup func CreateSGPatch(in ec2types.SecurityGroup, target v1beta1.SecurityGroupParameters) (*v1beta1.SecurityGroupParameters, error) { // nolint:gocyclo v1beta1.SortTags(target.Tags, in.Tags) + sort.Slice(target.Egress, func(i, j int) bool { + return awsgo.ToInt32(target.Egress[i].FromPort) < awsgo.ToInt32(target.Egress[j].FromPort) + }) + sort.Slice(target.Ingress, func(i, j int) bool { + return awsgo.ToInt32(target.Ingress[i].FromPort) < awsgo.ToInt32(target.Ingress[j].FromPort) + }) currentParams := &v1beta1.SecurityGroupParameters{ Description: awsclients.StringValue(in.Description), GroupName: awsclients.StringValue(in.GroupName), @@ -306,13 +310,6 @@ func CreateSGPatch(in ec2types.SecurityGroup, target v1beta1.SecurityGroupParame } } - sort.Slice(target.Egress, func(i, j int) bool { - return awsgo.ToInt32(target.Egress[i].FromPort) < awsgo.ToInt32(target.Egress[j].FromPort) - }) - sort.Slice(target.Ingress, func(i, j int) bool { - return awsgo.ToInt32(target.Ingress[i].FromPort) < awsgo.ToInt32(target.Ingress[j].FromPort) - }) - jsonPatch, err := awsclients.CreateJSONPatch(*currentParams, target) if err != nil { return nil, err diff --git a/pkg/clients/ec2/securitygroup_test.go b/pkg/clients/ec2/securitygroup_test.go index e9a8234b23..084385c483 100644 --- a/pkg/clients/ec2/securitygroup_test.go +++ b/pkg/clients/ec2/securitygroup_test.go @@ -39,8 +39,8 @@ func specIPPermission(ports ...int) (ret []v1beta1.IPPermission) { func sgIPPermission(ports ...int) (ret []ec2types.IpPermission) { for _, port := range ports { ret = append(ret, ec2types.IpPermission{ - FromPort: int32(port), - ToPort: int32(port), + FromPort: aws.Int32(int32(port)), + ToPort: aws.Int32(int32(port)), IpProtocol: aws.String(sgProtocol), IpRanges: []ec2types.IpRange{ { diff --git a/pkg/clients/ec2/subnet.go b/pkg/clients/ec2/subnet.go index 14365556fa..ec87a30069 100644 --- a/pkg/clients/ec2/subnet.go +++ b/pkg/clients/ec2/subnet.go @@ -46,8 +46,8 @@ func IsSubnetNotFoundErr(err error) bool { // ec2types.Subnet func GenerateSubnetObservation(subnet ec2types.Subnet) v1beta1.SubnetObservation { o := v1beta1.SubnetObservation{ - AvailableIPAddressCount: subnet.AvailableIpAddressCount, - DefaultForAZ: subnet.DefaultForAz, + AvailableIPAddressCount: aws.ToInt32(subnet.AvailableIpAddressCount), + DefaultForAZ: aws.ToBool(subnet.DefaultForAz), SubnetID: aws.ToString(subnet.SubnetId), SubnetState: string(subnet.State), } @@ -64,11 +64,11 @@ func LateInitializeSubnet(in *v1beta1.SubnetParameters, s *ec2types.Subnet) { // return } - in.AssignIPv6AddressOnCreation = awsclients.LateInitializeBoolPtr(in.AssignIPv6AddressOnCreation, &s.AssignIpv6AddressOnCreation) + in.AssignIPv6AddressOnCreation = awsclients.LateInitializeBoolPtr(in.AssignIPv6AddressOnCreation, s.AssignIpv6AddressOnCreation) in.AvailabilityZone = awsclients.LateInitializeStringPtr(in.AvailabilityZone, s.AvailabilityZone) in.AvailabilityZoneID = awsclients.LateInitializeStringPtr(in.AvailabilityZoneID, s.AvailabilityZoneId) in.CIDRBlock = awsclients.LateInitializeString(in.CIDRBlock, s.CidrBlock) - in.MapPublicIPOnLaunch = awsclients.LateInitializeBoolPtr(in.MapPublicIPOnLaunch, &s.MapPublicIpOnLaunch) + in.MapPublicIPOnLaunch = awsclients.LateInitializeBoolPtr(in.MapPublicIPOnLaunch, s.MapPublicIpOnLaunch) in.VPCID = awsclients.LateInitializeStringPtr(in.VPCID, s.VpcId) if s.Ipv6CidrBlockAssociationSet != nil { @@ -82,13 +82,11 @@ func LateInitializeSubnet(in *v1beta1.SubnetParameters, s *ec2types.Subnet) { // // IsSubnetUpToDate checks whether there is a change in any of the modifiable fields. func IsSubnetUpToDate(p v1beta1.SubnetParameters, s ec2types.Subnet) bool { - if p.MapPublicIPOnLaunch != nil && (*p.MapPublicIPOnLaunch != s.MapPublicIpOnLaunch) { + if aws.ToBool(p.MapPublicIPOnLaunch) != aws.ToBool(s.MapPublicIpOnLaunch) { return false } - - if p.AssignIPv6AddressOnCreation != nil && (*p.AssignIPv6AddressOnCreation != s.AssignIpv6AddressOnCreation) { + if aws.ToBool(p.AssignIPv6AddressOnCreation) != aws.ToBool(s.AssignIpv6AddressOnCreation) { return false } - return v1beta1.CompareTags(p.Tags, s.Tags) } diff --git a/pkg/clients/ec2/subnet_test.go b/pkg/clients/ec2/subnet_test.go index d8cb408c6a..f689f24f8e 100644 --- a/pkg/clients/ec2/subnet_test.go +++ b/pkg/clients/ec2/subnet_test.go @@ -33,8 +33,8 @@ func TestIsSubnetUpToDate(t *testing.T) { subnet: ec2types.Subnet{ CidrBlock: aws.String(cidr), VpcId: aws.String(vpc), - AssignIpv6AddressOnCreation: true, - MapPublicIpOnLaunch: true, + AssignIpv6AddressOnCreation: aws.Bool(true), + MapPublicIpOnLaunch: aws.Bool(true), }, p: v1beta1.SubnetParameters{ CIDRBlock: cidr, @@ -50,8 +50,8 @@ func TestIsSubnetUpToDate(t *testing.T) { subnet: ec2types.Subnet{ CidrBlock: aws.String(cidr), VpcId: aws.String(vpc), - AssignIpv6AddressOnCreation: true, - MapPublicIpOnLaunch: false, + AssignIpv6AddressOnCreation: aws.Bool(true), + MapPublicIpOnLaunch: aws.Bool(false), }, p: v1beta1.SubnetParameters{ CIDRBlock: cidr, @@ -81,8 +81,8 @@ func TestGenerateSubnetObservation(t *testing.T) { }{ "AllFilled": { in: ec2types.Subnet{ - AvailableIpAddressCount: int32(availableIPCount), - DefaultForAz: true, + AvailableIpAddressCount: aws.Int32(int32(availableIPCount)), + DefaultForAz: aws.Bool(true), SubnetId: aws.String(subnetID), State: ec2types.SubnetStateAvailable, }, @@ -95,7 +95,7 @@ func TestGenerateSubnetObservation(t *testing.T) { }, "NoIpCount": { in: ec2types.Subnet{ - DefaultForAz: true, + DefaultForAz: aws.Bool(true), SubnetId: aws.String(subnetID), State: ec2types.SubnetStateAvailable, }, diff --git a/pkg/clients/ec2/vpc.go b/pkg/clients/ec2/vpc.go index 7516500de6..695452a338 100644 --- a/pkg/clients/ec2/vpc.go +++ b/pkg/clients/ec2/vpc.go @@ -51,8 +51,8 @@ func IsVpcUpToDate(spec v1beta1.VPCParameters, vpc ec2types.Vpc, attributes ec2. return false } - if aws.ToBool(spec.EnableDNSHostNames) != attributes.EnableDnsHostnames.Value || - aws.ToBool(spec.EnableDNSSupport) != attributes.EnableDnsSupport.Value { + if aws.ToBool(spec.EnableDNSHostNames) != aws.ToBool(attributes.EnableDnsHostnames.Value) || + aws.ToBool(spec.EnableDNSSupport) != aws.ToBool(attributes.EnableDnsSupport.Value) { return false } @@ -63,7 +63,7 @@ func IsVpcUpToDate(spec v1beta1.VPCParameters, vpc ec2types.Vpc, attributes ec2. // ec2types.Vpc. func GenerateVpcObservation(vpc ec2types.Vpc) v1beta1.VPCObservation { o := v1beta1.VPCObservation{ - IsDefault: vpc.IsDefault, + IsDefault: aws.ToBool(vpc.IsDefault), DHCPOptionsID: aws.ToString(vpc.DhcpOptionsId), OwnerID: aws.ToString(vpc.OwnerId), VPCState: string(vpc.State), @@ -112,9 +112,9 @@ func LateInitializeVPC(in *v1beta1.VPCParameters, v *ec2types.Vpc, attributes *e in.CIDRBlock = awsclients.LateInitializeString(in.CIDRBlock, v.CidrBlock) in.InstanceTenancy = awsclients.LateInitializeStringPtr(in.InstanceTenancy, aws.String(string(v.InstanceTenancy))) if attributes.EnableDnsHostnames != nil { - in.EnableDNSHostNames = awsclients.LateInitializeBoolPtr(in.EnableDNSHostNames, aws.Bool(attributes.EnableDnsHostnames.Value)) + in.EnableDNSHostNames = awsclients.LateInitializeBoolPtr(in.EnableDNSHostNames, attributes.EnableDnsHostnames.Value) } if attributes.EnableDnsHostnames != nil { - in.EnableDNSSupport = awsclients.LateInitializeBoolPtr(in.EnableDNSSupport, aws.Bool(attributes.EnableDnsSupport.Value)) + in.EnableDNSSupport = awsclients.LateInitializeBoolPtr(in.EnableDNSSupport, attributes.EnableDnsSupport.Value) } } diff --git a/pkg/clients/ec2/vpc_test.go b/pkg/clients/ec2/vpc_test.go index ee2b3ffa98..b9ee12b649 100644 --- a/pkg/clients/ec2/vpc_test.go +++ b/pkg/clients/ec2/vpc_test.go @@ -23,7 +23,7 @@ func TestGenerateVPCObservation(t *testing.T) { }{ "AllFilled": { in: ec2types.Vpc{ - IsDefault: boolFalse, + IsDefault: &boolFalse, OwnerId: aws.String(vpcOwner), VpcId: aws.String(vpcID), State: ec2types.VpcStateAvailable, @@ -36,7 +36,7 @@ func TestGenerateVPCObservation(t *testing.T) { }, "NoOwner": { in: ec2types.Vpc{ - IsDefault: boolFalse, + IsDefault: &boolFalse, VpcId: aws.String(vpcID), State: ec2types.VpcStateAvailable, }, diff --git a/pkg/clients/ec2/vpccidrblock.go b/pkg/clients/ec2/vpccidrblock.go index 08365bb3b9..dbb02ff29e 100644 --- a/pkg/clients/ec2/vpccidrblock.go +++ b/pkg/clients/ec2/vpccidrblock.go @@ -6,15 +6,11 @@ import ( awsgo "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/ec2" ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" -<<<<<<< HEAD - "github.com/crossplane/provider-aws/apis/ec2/v1alpha1" - aws "github.com/crossplane/provider-aws/pkg/clients" -======= "github.com/crossplane/provider-aws/apis/ec2/manualv1alpha1" awsclient "github.com/crossplane/provider-aws/pkg/clients" ->>>>>>> upstream/master ) const ( @@ -57,11 +53,7 @@ func IsCIDRNotFound(err error) bool { // IsVpcCidrBlockUpToDate returns true if there is no update-able difference between desired // and observed state of the resource. -<<<<<<< HEAD -func IsVpcCidrBlockUpToDate(associationID string, spec v1alpha1.VPCCIDRBlockParameters, vpc ec2types.Vpc) (bool, error) { -======= -func IsVpcCidrBlockUpToDate(associationID string, spec manualv1alpha1.VPCCIDRBlockParameters, vpc ec2.Vpc) (bool, error) { ->>>>>>> upstream/master +func IsVpcCidrBlockUpToDate(associationID string, spec manualv1alpha1.VPCCIDRBlockParameters, vpc ec2types.Vpc) (bool, error) { IPv4, IPv6 := FindCIDRAssociation(associationID, vpc) if IPv4 != nil { @@ -92,25 +84,15 @@ func IsVpcCidrDeleting(observation manualv1alpha1.VPCCIDRBlockObservation) bool // GenerateVpcCIDRBlockObservation is used to produce v1alpha1.VPCObservation from // ec2.Vpc. -<<<<<<< HEAD -func GenerateVpcCIDRBlockObservation(associationID string, vpc ec2types.Vpc) v1alpha1.VPCCIDRBlockObservation { - o := v1alpha1.VPCCIDRBlockObservation{} -======= -func GenerateVpcCIDRBlockObservation(associationID string, vpc ec2.Vpc) manualv1alpha1.VPCCIDRBlockObservation { +func GenerateVpcCIDRBlockObservation(associationID string, vpc ec2types.Vpc) manualv1alpha1.VPCCIDRBlockObservation { o := manualv1alpha1.VPCCIDRBlockObservation{} ->>>>>>> upstream/master IPv4, IPv6 := FindCIDRAssociation(associationID, vpc) if IPv4 != nil { o.AssociationID = IPv4.AssociationId -<<<<<<< HEAD - o.CIDRBlockState = &v1alpha1.VPCCIDRBlockState{ - State: aws.String(string(IPv4.CidrBlockState.State)), -======= o.CIDRBlockState = &manualv1alpha1.VPCCIDRBlockState{ - State: awsclient.String(string(IPv4.CidrBlockState.State)), ->>>>>>> upstream/master + State: aws.String(string(IPv4.CidrBlockState.State)), StatusMessage: IPv4.CidrBlockState.StatusMessage, } o.CIDRBlock = IPv4.CidrBlock @@ -119,13 +101,8 @@ func GenerateVpcCIDRBlockObservation(associationID string, vpc ec2.Vpc) manualv1 if IPv6 != nil { o.AssociationID = IPv6.AssociationId -<<<<<<< HEAD - o.IPv6CIDRBlockState = &v1alpha1.VPCCIDRBlockState{ - State: aws.String(string(IPv6.Ipv6CidrBlockState.State)), -======= o.IPv6CIDRBlockState = &manualv1alpha1.VPCCIDRBlockState{ State: awsclient.String(string(IPv6.Ipv6CidrBlockState.State)), ->>>>>>> upstream/master StatusMessage: IPv6.Ipv6CidrBlockState.StatusMessage, } o.IPv6CIDRBlock = IPv6.Ipv6CidrBlock diff --git a/pkg/clients/ec2/vpccidrblock_test.go b/pkg/clients/ec2/vpccidrblock_test.go index bce25ad118..542a626b4b 100644 --- a/pkg/clients/ec2/vpccidrblock_test.go +++ b/pkg/clients/ec2/vpccidrblock_test.go @@ -22,13 +22,8 @@ var ( func TestGenerateVPCCIDRBlockObservation(t *testing.T) { cases := map[string]struct { associationID string -<<<<<<< HEAD in types.Vpc - out v1alpha1.VPCCIDRBlockObservation -======= - in ec2.Vpc out manualv1alpha1.VPCCIDRBlockObservation ->>>>>>> upstream/master }{ "IPv4": { associationID: matchAssociationID, diff --git a/pkg/clients/ecr/repository.go b/pkg/clients/ecr/repository.go index 7d5f5799b2..616f2749c9 100644 --- a/pkg/clients/ecr/repository.go +++ b/pkg/clients/ecr/repository.go @@ -9,7 +9,6 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/ecr" ecrtypes "github.com/aws/aws-sdk-go-v2/service/ecr/types" - "github.com/aws/smithy-go" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/crossplane/provider-aws/apis/ecr/v1alpha1" @@ -106,12 +105,8 @@ func IsRepositoryUpToDate(e *v1alpha1.RepositoryParameters, tags []ecrtypes.Tag, // IsRepoNotFoundErr returns true if the error is because the item doesn't exist func IsRepoNotFoundErr(err error) bool { - if awsErr, ok := err.(smithy.APIError); ok { - if awsErr.ErrorCode() == RepositoryNotFoundException { - return true - } - } - return false + _, ok := err.(*ecrtypes.RepositoryNotFoundException) + return ok } // GenerateCreateRepositoryInput Generates the CreateRepositoryInput from the RepositoryParameters diff --git a/pkg/clients/ecr/repository_policy.go b/pkg/clients/ecr/repository_policy.go index e7ebed71aa..8a90b4e141 100644 --- a/pkg/clients/ecr/repository_policy.go +++ b/pkg/clients/ecr/repository_policy.go @@ -8,20 +8,13 @@ import ( "strconv" "github.com/aws/aws-sdk-go-v2/service/ecr" -<<<<<<< HEAD - "github.com/aws/smithy-go" - "github.com/google/go-cmp/cmp" -======= ->>>>>>> upstream/master + awsecrtypes "github.com/aws/aws-sdk-go-v2/service/ecr/types" "github.com/crossplane/provider-aws/apis/ecr/v1alpha1" awsclient "github.com/crossplane/provider-aws/pkg/clients" ) const ( - // RepositoryPolicyNotFoundException policy was not found - RepositoryPolicyNotFoundException = "RepositoryPolicyNotFoundException" - errNotSpecified = "failed to format Repository Policy, no rawPolicy or policy specified" ) @@ -55,12 +48,8 @@ func LateInitializeRepositoryPolicy(in *v1alpha1.RepositoryPolicyParameters, r * // IsPolicyNotFoundErr returns true if the error code indicates that the policy was not found func IsPolicyNotFoundErr(err error) bool { - if awsErr, ok := err.(smithy.APIError); ok { - if awsErr.ErrorCode() == RepositoryPolicyNotFoundException { - return true - } - } - return false + _, ok := err.(*awsecrtypes.RepositoryPolicyNotFoundException) + return ok } // Serialize is the custom marshaller for the RepositoryPolicyBody diff --git a/pkg/clients/ecr/repository_test.go b/pkg/clients/ecr/repository_test.go index 1ccd5e81f6..761a70817a 100644 --- a/pkg/clients/ecr/repository_test.go +++ b/pkg/clients/ecr/repository_test.go @@ -5,6 +5,8 @@ import ( "testing" "time" + "github.com/aws/smithy-go/document" + "github.com/aws/aws-sdk-go-v2/service/ecr" ecrtypes "github.com/aws/aws-sdk-go-v2/service/ecr/types" "github.com/google/go-cmp/cmp" @@ -163,7 +165,7 @@ func TestGenerateCreateRepositoryInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { got := GenerateCreateRepositoryInput(tc.args.name, tc.args.p) - if diff := cmp.Diff(tc.want, got); diff != "" { + if diff := cmp.Diff(tc.want, got, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } }) @@ -298,7 +300,7 @@ func TestDiffTags(t *testing.T) { return aws.StringValue(i.Key) < aws.StringValue(j.Key) }) add, remove := DiffTags(tc.args.local, tc.args.remote) - if diff := cmp.Diff(tc.want.add, add, tagCmp); diff != "" { + if diff := cmp.Diff(tc.want.add, add, tagCmp, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } sort.Strings(tc.want.remove) diff --git a/pkg/clients/eks/eks_test.go b/pkg/clients/eks/eks_test.go index 86825ea1ea..9ab258cacf 100644 --- a/pkg/clients/eks/eks_test.go +++ b/pkg/clients/eks/eks_test.go @@ -20,6 +20,9 @@ import ( "testing" "time" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/aws/aws-sdk-go-v2/service/eks" ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types" "github.com/google/go-cmp/cmp" @@ -232,7 +235,7 @@ func TestGenerateCreateClusterInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { got := GenerateCreateClusterInput(tc.args.name, tc.args.p) - if diff := cmp.Diff(tc.want, got); diff != "" { + if diff := cmp.Diff(tc.want, got, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } }) @@ -327,7 +330,7 @@ func TestGenerateUpdateClusterInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { got := GenerateUpdateClusterConfigInput(tc.args.name, tc.args.p) - if diff := cmp.Diff(tc.want, got); diff != "" { + if diff := cmp.Diff(tc.want, got, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } }) diff --git a/pkg/clients/eks/fargateprofile_test.go b/pkg/clients/eks/fargateprofile_test.go index 6eea257bf9..ee32815250 100644 --- a/pkg/clients/eks/fargateprofile_test.go +++ b/pkg/clients/eks/fargateprofile_test.go @@ -19,6 +19,9 @@ package eks import ( "testing" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/aws/aws-sdk-go-v2/service/eks" ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types" "github.com/google/go-cmp/cmp" @@ -112,7 +115,7 @@ func TestGenerateCreateFargateProfileInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { got := GenerateCreateFargateProfileInput(tc.args.name, tc.args.p) - if diff := cmp.Diff(tc.want, got); diff != "" { + if diff := cmp.Diff(tc.want, got, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } }) diff --git a/pkg/clients/eks/nodegroup_test.go b/pkg/clients/eks/nodegroup_test.go index 65e14291b5..c93273e4d6 100644 --- a/pkg/clients/eks/nodegroup_test.go +++ b/pkg/clients/eks/nodegroup_test.go @@ -20,6 +20,9 @@ import ( "testing" "time" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/aws/aws-sdk-go-v2/service/eks" ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types" "github.com/google/go-cmp/cmp" @@ -165,7 +168,7 @@ func TestGenerateCreateNodeGroupInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { got := GenerateCreateNodeGroupInput(tc.args.name, tc.args.p) - if diff := cmp.Diff(tc.want, got); diff != "" { + if diff := cmp.Diff(tc.want, got, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } }) @@ -371,7 +374,7 @@ func TestGenerateUpdateNodeGroupInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { got := GenerateUpdateNodeGroupConfigInput(tc.args.name, tc.args.p, tc.args.n) - if diff := cmp.Diff(tc.want, got); diff != "" { + if diff := cmp.Diff(tc.want, got, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } }) diff --git a/pkg/clients/elasticache/elasticache.go b/pkg/clients/elasticache/elasticache.go index 2032f89d0d..a4eb769a58 100644 --- a/pkg/clients/elasticache/elasticache.go +++ b/pkg/clients/elasticache/elasticache.go @@ -22,6 +22,8 @@ import ( "strconv" "strings" + "github.com/aws/smithy-go/document" + xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/google/go-cmp/cmp" @@ -615,5 +617,5 @@ func IsClusterUpToDate(name string, in *cachev1alpha1.CacheClusterParameters, ob } GenerateCluster(name, *in, desired) - return cmp.Equal(desired, observed, cmpopts.EquateEmpty()), nil + return cmp.Equal(desired, observed, cmpopts.EquateEmpty(), cmpopts.IgnoreTypes(document.NoSerde{})), nil } diff --git a/pkg/clients/elasticache/elasticache_test.go b/pkg/clients/elasticache/elasticache_test.go index 0c78bccb4d..059ce649b3 100644 --- a/pkg/clients/elasticache/elasticache_test.go +++ b/pkg/clients/elasticache/elasticache_test.go @@ -20,6 +20,9 @@ import ( "strconv" "testing" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/aws/aws-sdk-go-v2/service/elasticache" elasticachetypes "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/google/go-cmp/cmp" @@ -215,7 +218,7 @@ func TestNewCreateReplicationGroupInput(t *testing.T) { t.Run(tc.name, func(t *testing.T) { got := NewCreateReplicationGroupInput(tc.params, name, tc.authToken) - if diff := cmp.Diff(tc.want, got); diff != "" { + if diff := cmp.Diff(tc.want, got, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("NewCreateReplicationGroupInput(...): -want, +got:\n%s", diff) } }) @@ -283,7 +286,7 @@ func TestNewModifyReplicationGroupInput(t *testing.T) { t.Run(tc.name, func(t *testing.T) { got := NewModifyReplicationGroupInput(tc.params, name) - if diff := cmp.Diff(tc.want, got); diff != "" { + if diff := cmp.Diff(tc.want, got, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("NewModifyReplicationGroupInput(...): -want, +got:\n%s", diff) } }) @@ -305,7 +308,7 @@ func TestNewDeleteReplicationGroupInput(t *testing.T) { t.Run(tc.name, func(t *testing.T) { got := NewDeleteReplicationGroupInput(name) - if diff := cmp.Diff(tc.want, got); diff != "" { + if diff := cmp.Diff(tc.want, got, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("NewDeleteReplicationGroupInput(...): -want, +got:\n%s", diff) } }) @@ -326,7 +329,7 @@ func TestNewDescribeReplicationGroupsInput(t *testing.T) { for _, tc := range cases { t.Run(tc.name, func(t *testing.T) { got := NewDescribeReplicationGroupsInput(name) - if diff := cmp.Diff(tc.want, got); diff != "" { + if diff := cmp.Diff(tc.want, got, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("NewDescribeReplicationGroupsInput(...): -want, +got:\n%s", diff) } }) @@ -349,7 +352,7 @@ func TestNewDescribeCacheClustersInput(t *testing.T) { for _, tc := range cases { t.Run(tc.name, func(t *testing.T) { got := NewDescribeCacheClustersInput(tc.cluster) - if diff := cmp.Diff(tc.want, got); diff != "" { + if diff := cmp.Diff(tc.want, got, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("NewDescribeCacheClustersInput(...): -want, +got:\n%s", diff) } }) diff --git a/pkg/clients/elasticache/elasticcachecluster_test.go b/pkg/clients/elasticache/elasticcachecluster_test.go index 906a195eb0..0615231e28 100644 --- a/pkg/clients/elasticache/elasticcachecluster_test.go +++ b/pkg/clients/elasticache/elasticcachecluster_test.go @@ -19,6 +19,9 @@ package elasticache import ( "testing" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + awscache "github.com/aws/aws-sdk-go-v2/service/elasticache" awscachetypes "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/google/go-cmp/cmp" @@ -156,7 +159,7 @@ func TestGenerateCreateCacheClusterInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { r := GenerateCreateCacheClusterInput(tc.in, clusterID) - if diff := cmp.Diff(r, &tc.out); diff != "" { + if diff := cmp.Diff(r, &tc.out, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateNetworkObservation(...): -want, +got:\n%s", diff) } }) @@ -184,7 +187,7 @@ func TestGenerateModifyCacheClusterInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { r := GenerateModifyCacheClusterInput(tc.in, clusterID) - if diff := cmp.Diff(r, &tc.out); diff != "" { + if diff := cmp.Diff(r, &tc.out, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateNetworkObservation(...): -want, +got:\n%s", diff) } }) diff --git a/pkg/clients/elasticloadbalancing/elb/elb_test.go b/pkg/clients/elasticloadbalancing/elb/elb_test.go index a93fcaa064..26eb731261 100644 --- a/pkg/clients/elasticloadbalancing/elb/elb_test.go +++ b/pkg/clients/elasticloadbalancing/elb/elb_test.go @@ -19,6 +19,9 @@ package elb import ( "testing" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/aws/aws-sdk-go-v2/aws" elb "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing" elbtypes "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" @@ -168,7 +171,7 @@ func TestGenerateCreateRoleInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { r := GenerateCreateELBInput(elbName, tc.in) - if diff := cmp.Diff(r, &tc.out); diff != "" { + if diff := cmp.Diff(r, &tc.out, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateNetworkObservation(...): -want, +got:\n%s", diff) } }) @@ -189,7 +192,7 @@ func TestBuildELBListeners(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { r := BuildELBListeners(tc.in) - if diff := cmp.Diff(r, tc.out); diff != "" { + if diff := cmp.Diff(r, tc.out, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateNetworkObservation(...): -want, +got:\n%s", diff) } }) @@ -210,7 +213,7 @@ func TestBuildELBTags(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { r := BuildELBTags(tc.in) - if diff := cmp.Diff(r, tc.out); diff != "" { + if diff := cmp.Diff(r, tc.out, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateNetworkObservation(...): -want, +got:\n%s", diff) } }) diff --git a/pkg/clients/iam/iam.go b/pkg/clients/iam/iam.go index 87f925c751..4b92ba05f9 100644 --- a/pkg/clients/iam/iam.go +++ b/pkg/clients/iam/iam.go @@ -2,7 +2,6 @@ package iam import ( "context" - "errors" "fmt" "github.com/aws/aws-sdk-go-v2/aws" @@ -223,20 +222,14 @@ func (c *iamClient) attachPolicyToUser(policyName string, username string) error } func isErrorAlreadyExists(err error) bool { - var iee *iamtypes.EntityAlreadyExistsException - return errors.As(err, &iee) + _, ok := err.(*iamtypes.EntityAlreadyExistsException) + return ok } // IsErrorNotFound returns true if the error code indicates that the item was not found func IsErrorNotFound(err error) bool { - var nse *iamtypes.NoSuchEntityException - return errors.As(err, &nse) -} - -// NewErrorNotFound returns an aws error with error code indicating the item was not found. -func NewErrorNotFound() error { - var nse *iamtypes.NoSuchEntityException - return errors.New(*nse.Message) + _, ok := err.(*iamtypes.NoSuchEntityException) + return ok } // PolicyDocument is the structure of IAM policy document diff --git a/pkg/clients/iam/iamrole.go b/pkg/clients/iam/iamrole.go index 6043fa14b9..714f28a578 100644 --- a/pkg/clients/iam/iamrole.go +++ b/pkg/clients/iam/iamrole.go @@ -5,6 +5,8 @@ import ( "encoding/json" "net/url" + "github.com/aws/smithy-go/document" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/iam" iamtypes "github.com/aws/aws-sdk-go-v2/service/iam/types" @@ -159,11 +161,7 @@ func isAssumeRolePolicyUpToDate(a, b *string) (bool, error) { } // IsRoleUpToDate checks whether there is a change in any of the modifiable fields in role. -<<<<<<< HEAD -func IsRoleUpToDate(in v1beta1.IAMRoleParameters, observed iamtypes.Role) (bool, error) { -======= -func IsRoleUpToDate(in v1beta1.IAMRoleParameters, observed iam.Role) (bool, string, error) { ->>>>>>> upstream/master +func IsRoleUpToDate(in v1beta1.IAMRoleParameters, observed iamtypes.Role) (bool, string, error) { generated, err := copystructure.Copy(&observed) if err != nil { return true, "", errors.Wrap(err, errCheckUpToDate) @@ -182,7 +180,7 @@ func IsRoleUpToDate(in v1beta1.IAMRoleParameters, observed iam.Role) (bool, stri return false, "", err } - diff := cmp.Diff(desired, &observed, cmpopts.IgnoreInterfaces(struct{ resource.AttributeReferencer }{}), cmpopts.IgnoreFields(observed, "AssumeRolePolicyDocument")) + diff := cmp.Diff(desired, &observed, cmpopts.IgnoreInterfaces(struct{ resource.AttributeReferencer }{}), cmpopts.IgnoreFields(observed, "AssumeRolePolicyDocument"), cmpopts.IgnoreTypes(document.NoSerde{})) if diff == "" && policyUpToDate { return true, diff, nil } diff --git a/pkg/clients/iam/iamrole_test.go b/pkg/clients/iam/iamrole_test.go index 66be392c74..7c46ae67c0 100644 --- a/pkg/clients/iam/iamrole_test.go +++ b/pkg/clients/iam/iamrole_test.go @@ -6,6 +6,8 @@ import ( "testing" "time" + "github.com/aws/smithy-go/document" + "github.com/aws/aws-sdk-go-v2/service/iam" iamtypes "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/google/go-cmp/cmp" @@ -124,7 +126,7 @@ func TestGenerateCreateRoleInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { r := GenerateCreateRoleInput(roleName, &tc.in) - if diff := cmp.Diff(r, &tc.out); diff != "" { + if diff := cmp.Diff(r, &tc.out, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateNetworkObservation(...): -want, +got:\n%s", diff) } }) @@ -272,16 +274,16 @@ func TestIsRoleUpToDate(t *testing.T) { }, "DifferentPolicy": { args: args{ - role: iam.Role{ + role: iamtypes.Role{ AssumeRolePolicyDocument: escapedPolicyJSON(), Description: &description, - MaxSessionDuration: aws.Int64(1), + MaxSessionDuration: aws.Int32(1), Path: aws.String("/"), }, p: v1beta1.IAMRoleParameters{ Description: &description, AssumeRolePolicyDocument: assumeRolePolicyDocument2, - MaxSessionDuration: aws.Int64(1), + MaxSessionDuration: aws.Int32(1), Path: aws.String("/"), }, }, @@ -426,12 +428,12 @@ func TestDiffIAMTags(t *testing.T) { return aws.StringValue(i.Key) < aws.StringValue(j.Key) }) add, remove := DiffIAMTags(tc.args.local, tc.args.remote) - if diff := cmp.Diff(tc.want.add, add, tagCmp); diff != "" { + if diff := cmp.Diff(tc.want.add, add, tagCmp, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } sort.Strings(tc.want.remove) sort.Strings(remove) - if diff := cmp.Diff(tc.want.remove, remove, tagCmp); diff != "" { + if diff := cmp.Diff(tc.want.remove, remove, tagCmp, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } }) diff --git a/pkg/clients/rds/rds.go b/pkg/clients/rds/rds.go index 6d7ddcd423..5b0dc93ab5 100644 --- a/pkg/clients/rds/rds.go +++ b/pkg/clients/rds/rds.go @@ -310,7 +310,6 @@ func GenerateObservation(db rdstypes.DBInstance) v1beta1.RDSInstanceObservation } if db.PendingModifiedValues != nil { o.PendingModifiedValues = v1beta1.PendingModifiedValues{ -<<<<<<< HEAD AllocatedStorage: int(aws.ToInt32(db.PendingModifiedValues.AllocatedStorage)), BackupRetentionPeriod: int(aws.ToInt32(db.PendingModifiedValues.BackupRetentionPeriod)), CACertificateIdentifier: aws.ToString(db.PendingModifiedValues.CACertificateIdentifier), @@ -321,19 +320,6 @@ func GenerateObservation(db rdstypes.DBInstance) v1beta1.RDSInstanceObservation MultiAZ: aws.ToBool(db.PendingModifiedValues.MultiAZ), Port: int(aws.ToInt32(db.PendingModifiedValues.Port)), StorageType: aws.ToString(db.PendingModifiedValues.StorageType), -======= - AllocatedStorage: int(aws.Int64Value(db.PendingModifiedValues.AllocatedStorage)), - BackupRetentionPeriod: int(aws.Int64Value(db.PendingModifiedValues.BackupRetentionPeriod)), - CACertificateIdentifier: aws.StringValue(db.PendingModifiedValues.CACertificateIdentifier), - DBInstanceClass: aws.StringValue(db.PendingModifiedValues.DBInstanceClass), - DBSubnetGroupName: aws.StringValue(db.PendingModifiedValues.DBSubnetGroupName), - EngineVersion: aws.StringValue(db.PendingModifiedValues.EngineVersion), - IOPS: int(aws.Int64Value(db.PendingModifiedValues.Iops)), - LicenseModel: aws.StringValue(db.PendingModifiedValues.LicenseModel), - MultiAZ: aws.BoolValue(db.PendingModifiedValues.MultiAZ), - Port: int(aws.Int64Value(db.PendingModifiedValues.Port)), - StorageType: aws.StringValue(db.PendingModifiedValues.StorageType), ->>>>>>> upstream/master } if db.PendingModifiedValues.PendingCloudwatchLogsExports != nil { o.PendingModifiedValues.PendingCloudwatchLogsExports = v1beta1.PendingCloudwatchLogsExports{ diff --git a/pkg/clients/rds/rds_test.go b/pkg/clients/rds/rds_test.go index 12548e10af..6ddba5f5bc 100644 --- a/pkg/clients/rds/rds_test.go +++ b/pkg/clients/rds/rds_test.go @@ -22,6 +22,9 @@ import ( "testing" "time" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/aws/aws-sdk-go-v2/service/rds" rdstypes "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/google/go-cmp/cmp" @@ -1134,7 +1137,7 @@ func TestGenerateModifyDBInstanceInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { got := GenerateModifyDBInstanceInput(tc.name, &tc.params) - if diff := cmp.Diff(&tc.want, got); diff != "" { + if diff := cmp.Diff(&tc.want, got, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } }) diff --git a/pkg/clients/redshift/redshift_test.go b/pkg/clients/redshift/redshift_test.go index a539e13916..a7a7c98412 100644 --- a/pkg/clients/redshift/redshift_test.go +++ b/pkg/clients/redshift/redshift_test.go @@ -20,6 +20,9 @@ import ( "errors" "testing" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/redshift" redshifttypes "github.com/aws/aws-sdk-go-v2/service/redshift/types" @@ -385,7 +388,7 @@ func TestGenerateCreateClusterInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { r := GenerateCreateClusterInput(tc.in, aws.String("unit-test"), aws.String("very-strong-password")) - if diff := cmp.Diff(r, tc.out); diff != "" { + if diff := cmp.Diff(r, tc.out, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateCreateClusterInput(...): -want, +got:\n%s", diff) } }) @@ -476,7 +479,7 @@ func TestGenerateModifyClusterInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { r := GenerateModifyClusterInput(tc.args.in, tc.args.cl) - if diff := cmp.Diff(r, tc.want); diff != "" { + if diff := cmp.Diff(r, tc.want, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateModifyClusterInput(...): -want, +got:\n%s", diff) } }) @@ -509,7 +512,7 @@ func TestGenerateDeleteClusterInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { r := GenerateDeleteClusterInput(tc.in, aws.String("unit-test")) - if diff := cmp.Diff(r, tc.out); diff != "" { + if diff := cmp.Diff(r, tc.out, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateDeleteClusterInput(...): -want, +got:\n%s", diff) } }) diff --git a/pkg/clients/s3/bucket.go b/pkg/clients/s3/bucket.go index 4c7e4ccfb9..7f69a76087 100644 --- a/pkg/clients/s3/bucket.go +++ b/pkg/clients/s3/bucket.go @@ -18,7 +18,6 @@ package s3 import ( "context" - "errors" "fmt" "sort" @@ -119,14 +118,14 @@ func NewClient(cfg aws.Config) BucketClient { // IsNotFound helper function to test for NotFound error func IsNotFound(err error) bool { - var nsb *s3types.NoSuchBucket - return errors.As(err, &nsb) + _, ok := err.(*s3types.NoSuchBucket) + return ok } // IsAlreadyExists helper function to test for ErrCodeBucketAlreadyOwnedByYou error func IsAlreadyExists(err error) bool { - var nsb *s3types.BucketAlreadyOwnedByYou - return errors.As(err, &nsb) + _, ok := err.(*s3types.BucketAlreadyOwnedByYou) + return ok } // GenerateCreateBucketInput creates the input for CreateBucket S3 Client request diff --git a/pkg/clients/sns/snssubscription_test.go b/pkg/clients/sns/snssubscription_test.go index 17ad53b7cb..25c3baae21 100644 --- a/pkg/clients/sns/snssubscription_test.go +++ b/pkg/clients/sns/snssubscription_test.go @@ -19,6 +19,9 @@ package sns import ( "testing" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/aws/aws-sdk-go-v2/service/sns" "github.com/google/go-cmp/cmp" @@ -170,7 +173,7 @@ func TestGenerateSubscribeInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { input := GenerateSubscribeInput(&tc.in) - if diff := cmp.Diff(input, &tc.out); diff != "" { + if diff := cmp.Diff(input, &tc.out, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateSubscribeInput(...): -want, +got\n:%s", diff) } }) diff --git a/pkg/clients/sns/snstopic_test.go b/pkg/clients/sns/snstopic_test.go index ac4dee8175..bbe6d024c9 100644 --- a/pkg/clients/sns/snstopic_test.go +++ b/pkg/clients/sns/snstopic_test.go @@ -20,6 +20,9 @@ import ( "strconv" "testing" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/aws/aws-sdk-go-v2/aws" awssns "github.com/aws/aws-sdk-go-v2/service/sns" awssnstypes "github.com/aws/aws-sdk-go-v2/service/sns/types" @@ -168,7 +171,7 @@ func TestGenerateCreateTopicInput(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { input := GenerateCreateTopicInput(&tc.in) - if diff := cmp.Diff(input, &tc.out); diff != "" { + if diff := cmp.Diff(input, &tc.out, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("GenerateCreateTopicInput(...): -want, +got\n:%s", diff) } }) diff --git a/pkg/controller/acm/controller.go b/pkg/controller/acm/controller.go index 78a569ef3a..30da8baee3 100644 --- a/pkg/controller/acm/controller.go +++ b/pkg/controller/acm/controller.go @@ -67,7 +67,7 @@ func SetupCertificate(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimit return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.Certificate{}). Complete(managed.NewReconciler(mgr, @@ -76,7 +76,7 @@ func SetupCertificate(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimit managed.WithConnectionPublishers(), managed.WithPollInterval(poll), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) } @@ -135,7 +135,7 @@ func (e *external) Observe(ctx context.Context, mgd resource.Managed) (managed.E return managed.ExternalObservation{}, errors.Wrap(err, errKubeUpdateFailed) } } - if certificate.Status == awsacm.CertificateStatusIssued { + if certificate.Status == awsacmtypes.CertificateStatusIssued { cr.SetConditions(xpv1.Available()) } @@ -166,7 +166,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate) } meta.SetExternalName(cr, awsclient.StringValue(response.CertificateArn)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } @@ -211,23 +211,14 @@ func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.Ex } } -<<<<<<< HEAD - // Update the Certificate Option - if cr.Spec.ForProvider.CertificateTransparencyLoggingPreference != nil { - _, err := e.client.UpdateCertificateOptions(ctx, &awsacm.UpdateCertificateOptionsInput{ - CertificateArn: aws.String(meta.GetExternalName(cr)), - Options: &awsacmtypes.CertificateOptions{CertificateTransparencyLoggingPreference: *cr.Spec.ForProvider.CertificateTransparencyLoggingPreference}, - }) -======= // the UpdateCertificateOptions command is not permitted for private certificates. - if cr.Status.AtProvider.Type != awsacm.CertificateTypePrivate { + if cr.Status.AtProvider.Type != awsacmtypes.CertificateTypePrivate { // Update the Certificate Option if cr.Spec.ForProvider.CertificateTransparencyLoggingPreference != nil { - _, err := e.client.UpdateCertificateOptionsRequest(&awsacm.UpdateCertificateOptionsInput{ + _, err := e.client.UpdateCertificateOptions(ctx, &awsacm.UpdateCertificateOptionsInput{ CertificateArn: aws.String(meta.GetExternalName(cr)), - Options: &awsacm.CertificateOptions{CertificateTransparencyLoggingPreference: *cr.Spec.ForProvider.CertificateTransparencyLoggingPreference}, - }).Send(ctx) ->>>>>>> upstream/master + Options: &awsacmtypes.CertificateOptions{CertificateTransparencyLoggingPreference: *cr.Spec.ForProvider.CertificateTransparencyLoggingPreference}, + }) if err != nil { return managed.ExternalUpdate{}, awsclient.Wrap(err, errUpdate) @@ -236,16 +227,9 @@ func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.Ex } // Renew the certificate if request for RenewCertificate and Certificate is eligible -<<<<<<< HEAD if aws.ToBool(cr.Spec.ForProvider.RenewCertificate) { - if cr.Status.AtProvider.RenewalEligibility == awsacmtypes.RenewalEligibilityEligible { _, err := e.client.RenewCertificate(ctx, &awsacm.RenewCertificateInput{ -======= - if aws.BoolValue(cr.Spec.ForProvider.RenewCertificate) { - if cr.Status.AtProvider.RenewalEligibility == awsacm.RenewalEligibilityEligible { - _, err := e.client.RenewCertificateRequest(&awsacm.RenewCertificateInput{ ->>>>>>> upstream/master CertificateArn: aws.String(meta.GetExternalName(cr)), }) diff --git a/pkg/controller/acm/controller_test.go b/pkg/controller/acm/controller_test.go index e76ac34dc5..f6ee9a4ddd 100644 --- a/pkg/controller/acm/controller_test.go +++ b/pkg/controller/acm/controller_test.go @@ -94,7 +94,7 @@ func withCertificateArn() certificateModifier { } } -func withStatus(status awsacm.CertificateStatus) certificateModifier { +func withStatus(status awsacmtype.CertificateStatus) certificateModifier { return func(r *v1alpha1.Certificate) { r.Status.AtProvider.Status = status } @@ -124,26 +124,14 @@ func TestObserve(t *testing.T) { "ValidInput": { args: args{ acm: &fake.MockCertificateClient{ -<<<<<<< HEAD MockDescribeCertificate: func(ctx context.Context, input *awsacm.DescribeCertificateInput, opts []func(*awsacm.Options)) (*awsacm.DescribeCertificateOutput, error) { return &awsacm.DescribeCertificateOutput{ Certificate: &awsacmtype.CertificateDetail{ CertificateArn: aws.String(certificateArn), Options: &awsacmtype.CertificateOptions{CertificateTransparencyLoggingPreference: awsacmtype.CertificateTransparencyLoggingPreferenceDisabled}, + Status: awsacmtype.CertificateStatusIssued, }, }, nil -======= - MockDescribeCertificateRequest: func(input *awsacm.DescribeCertificateInput) awsacm.DescribeCertificateRequest { - return awsacm.DescribeCertificateRequest{ - Request: &aws.Request{HTTPRequest: &http.Request{}, Retryer: aws.NoOpRetryer{}, Data: &awsacm.DescribeCertificateOutput{ - Certificate: &awsacm.CertificateDetail{ - CertificateArn: aws.String(certificateArn), - Options: &awsacm.CertificateOptions{CertificateTransparencyLoggingPreference: awsacm.CertificateTransparencyLoggingPreferenceDisabled}, - Status: awsacm.CertificateStatusIssued, - }, - }}, - } ->>>>>>> upstream/master }, MockListTagsForCertificate: func(ctx context.Context, input *awsacm.ListTagsForCertificateInput, opts []func(*awsacm.Options)) (*awsacm.ListTagsForCertificateOutput, error) { return &awsacm.ListTagsForCertificateOutput{ @@ -154,7 +142,7 @@ func TestObserve(t *testing.T) { cr: certificate(), }, want: want{ - cr: certificate(withCertificateArn(), withStatus(awsacm.CertificateStatusIssued), withConditions(xpv1.Available())), + cr: certificate(withCertificateArn(), withStatus(awsacmtype.CertificateStatusIssued), withConditions(xpv1.Available())), result: managed.ExternalObservation{ ResourceExists: true, ResourceUpToDate: false, @@ -249,7 +237,7 @@ func TestCreate(t *testing.T) { want: want{ cr: certificate( withDomainName()), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "InValidInput": { diff --git a/pkg/controller/acmpca/certificateauthority/controller.go b/pkg/controller/acmpca/certificateauthority/controller.go index c48e2aeef3..f6db9a64d5 100644 --- a/pkg/controller/acmpca/certificateauthority/controller.go +++ b/pkg/controller/acmpca/certificateauthority/controller.go @@ -65,7 +65,7 @@ func SetupCertificateAuthority(mgr ctrl.Manager, l logging.Logger, rl workqueue. return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.CertificateAuthority{}). Complete(managed.NewReconciler(mgr, @@ -76,7 +76,7 @@ func SetupCertificateAuthority(mgr ctrl.Manager, l logging.Logger, rl workqueue. // TODO: implement tag initializer - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) } @@ -136,7 +136,7 @@ func (e *external) Observe(ctx context.Context, mgd resource.Managed) (managed.E return managed.ExternalObservation{}, errors.Wrap(err, errKubeUpdateFailed) } } - if certificateAuthority.Status == awsacmpca.CertificateAuthorityStatusActive { + if certificateAuthority.Status == awsacmpcatypes.CertificateAuthorityStatusActive { cr.SetConditions(xpv1.Available()) } @@ -168,7 +168,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate) } meta.SetExternalName(cr, aws.ToString(response.CertificateAuthorityArn)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } diff --git a/pkg/controller/acmpca/certificateauthority/controller_test.go b/pkg/controller/acmpca/certificateauthority/controller_test.go index 9c0c9fe89f..f4322d5d4a 100644 --- a/pkg/controller/acmpca/certificateauthority/controller_test.go +++ b/pkg/controller/acmpca/certificateauthority/controller_test.go @@ -126,28 +126,15 @@ func TestObserve(t *testing.T) { "ValidInput": { args: args{ acmpca: &fake.MockCertificateAuthorityClient{ -<<<<<<< HEAD MockDescribeCertificateAuthority: func(ctx context.Context, input *awsacmpca.DescribeCertificateAuthorityInput, opts []func(*awsacmpca.Options)) (*awsacmpca.DescribeCertificateAuthorityOutput, error) { return &awsacmpca.DescribeCertificateAuthorityOutput{ CertificateAuthority: &awsacmpcatypes.CertificateAuthority{ - Arn: aws.String(certificateAuthorityArn), - Type: awsacmpcatypes.CertificateAuthorityTypeRoot, + Arn: aws.String(certificateAuthorityArn), + Type: awsacmpcatypes.CertificateAuthorityTypeRoot, + Status: awsacmpcatypes.CertificateAuthorityStatusActive, RevocationConfiguration: &awsacmpcatypes.RevocationConfiguration{ CrlConfiguration: &awsacmpcatypes.CrlConfiguration{ Enabled: false, -======= - MockDescribeCertificateAuthorityRequest: func(*awsacmpca.DescribeCertificateAuthorityInput) awsacmpca.DescribeCertificateAuthorityRequest { - return awsacmpca.DescribeCertificateAuthorityRequest{ - Request: &aws.Request{HTTPRequest: &http.Request{}, Retryer: aws.NoOpRetryer{}, Data: &awsacmpca.DescribeCertificateAuthorityOutput{ - CertificateAuthority: &awsacmpca.CertificateAuthority{ - Arn: aws.String(certificateAuthorityArn), - Type: awsacmpca.CertificateAuthorityTypeRoot, - Status: awsacmpca.CertificateAuthorityStatusActive, - RevocationConfiguration: &awsacmpca.RevocationConfiguration{ - CrlConfiguration: &awsacmpca.CrlConfiguration{ - Enabled: aws.Bool(false), - }, ->>>>>>> upstream/master }, }, CertificateAuthorityConfiguration: &awsacmpcatypes.CertificateAuthorityConfiguration{ @@ -265,7 +252,7 @@ func TestCreate(t *testing.T) { }, want: want{ cr: certificateAuthority(withCertificateAuthorityArn()), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "InValidInput": { diff --git a/pkg/controller/acmpca/certificateauthoritypermission/controller.go b/pkg/controller/acmpca/certificateauthoritypermission/controller.go index 2474f5d441..2aa0cfec84 100644 --- a/pkg/controller/acmpca/certificateauthoritypermission/controller.go +++ b/pkg/controller/acmpca/certificateauthoritypermission/controller.go @@ -57,7 +57,7 @@ func SetupCertificateAuthorityPermission(mgr ctrl.Manager, l logging.Logger, rl return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.CertificateAuthorityPermission{}). Complete(managed.NewReconciler(mgr, @@ -66,7 +66,7 @@ func SetupCertificateAuthorityPermission(mgr ctrl.Manager, l logging.Logger, rl managed.WithConnectionPublishers(), managed.WithPollInterval(poll), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) } @@ -98,11 +98,6 @@ func (e *external) Observe(ctx context.Context, mgd resource.Managed) (managed.E if !ok { return managed.ExternalObservation{}, errors.New(errUnexpectedObject) } -<<<<<<< HEAD - response, err := e.client.ListPermissions(ctx, &awsacmpca.ListPermissionsInput{ - CertificateAuthorityArn: cr.Spec.ForProvider.CertificateAuthorityARN, - }) -======= if meta.GetExternalName(cr) == "" { return managed.ExternalObservation{ResourceExists: false}, nil @@ -115,15 +110,14 @@ func (e *external) Observe(ctx context.Context, mgd resource.Managed) (managed.E } principal, caARN := nn[0], nn[1] - response, err := e.client.ListPermissionsRequest(&awsacmpca.ListPermissionsInput{ + response, err := e.client.ListPermissions(ctx, &awsacmpca.ListPermissionsInput{ CertificateAuthorityArn: &caARN, - }).Send(ctx) ->>>>>>> upstream/master + }) if err != nil { return managed.ExternalObservation{}, awsclient.Wrap(resource.Ignore(acmpca.IsErrorNotFound, err), errGet) } - var attachedPermission *awsacmpca.Permission + var attachedPermission *awsacmpcatypes.Permission for i := range response.Permissions { if awsclient.StringValue(response.Permissions[i].Principal) == principal { attachedPermission = &response.Permissions[i] @@ -149,21 +143,16 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex if !ok { return managed.ExternalCreation{}, errors.New(errUnexpectedObject) } -<<<<<<< HEAD - cr.Status.SetConditions(xpv1.Creating()) - _, err := e.client.CreatePermission(ctx, &awsacmpca.CreatePermissionInput{ - Actions: []awsacmpcatypes.ActionType{awsacmpcatypes.ActionTypeIssueCertificate, awsacmpcatypes.ActionTypeGetCertificate, awsacmpcatypes.ActionTypeListPermissions}, - CertificateAuthorityArn: cr.Spec.ForProvider.CertificateAuthorityARN, - Principal: aws.String(principal), - }) - return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate) -======= - _, err := e.client.CreatePermissionRequest(&awsacmpca.CreatePermissionInput{ - Actions: []awsacmpca.ActionType{awsacmpca.ActionTypeIssueCertificate, awsacmpca.ActionTypeGetCertificate, awsacmpca.ActionTypeListPermissions}, + _, err := e.client.CreatePermission(ctx, &awsacmpca.CreatePermissionInput{ + Actions: []awsacmpcatypes.ActionType{ + awsacmpcatypes.ActionTypeIssueCertificate, + awsacmpcatypes.ActionTypeGetCertificate, + awsacmpcatypes.ActionTypeListPermissions, + }, CertificateAuthorityArn: cr.Spec.ForProvider.CertificateAuthorityARN, Principal: aws.String(cr.Spec.ForProvider.Principal), - }).Send(ctx) + }) if err != nil { return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate) } @@ -173,12 +162,11 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex // identity of the CA it applies to, and the principal it applies. meta.SetExternalName(cr, cr.Spec.ForProvider.Principal+"/"+awsclient.StringValue(cr.Spec.ForProvider.CertificateAuthorityARN)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil ->>>>>>> upstream/master + return managed.ExternalCreation{}, nil } -func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) { +func (e *external) Update(_ context.Context, _ resource.Managed) (managed.ExternalUpdate, error) { return managed.ExternalUpdate{}, nil } @@ -187,20 +175,10 @@ func (e *external) Delete(ctx context.Context, mgd resource.Managed) error { if !ok { return errors.New(errUnexpectedObject) } - -<<<<<<< HEAD - cr.Status.SetConditions(xpv1.Deleting()) - _, err := e.client.DeletePermission(ctx, &awsacmpca.DeletePermissionInput{ - CertificateAuthorityArn: cr.Spec.ForProvider.CertificateAuthorityARN, - Principal: aws.String(principal), - }) -======= - _, err := e.client.DeletePermissionRequest(&awsacmpca.DeletePermissionInput{ CertificateAuthorityArn: cr.Spec.ForProvider.CertificateAuthorityARN, Principal: aws.String(cr.Spec.ForProvider.Principal), - }).Send(ctx) ->>>>>>> upstream/master + }) return awsclient.Wrap(resource.Ignore(acmpca.IsErrorNotFound, err), errDelete) } diff --git a/pkg/controller/acmpca/certificateauthoritypermission/controller_test.go b/pkg/controller/acmpca/certificateauthoritypermission/controller_test.go index fda9642624..fa19e68dd5 100644 --- a/pkg/controller/acmpca/certificateauthoritypermission/controller_test.go +++ b/pkg/controller/acmpca/certificateauthoritypermission/controller_test.go @@ -32,9 +32,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/resource" "github.com/crossplane/crossplane-runtime/pkg/test" - v1alpha1 "github.com/crossplane/provider-aws/apis/acmpca/v1alpha1" + "github.com/crossplane/provider-aws/apis/acmpca/v1alpha1" awsclient "github.com/crossplane/provider-aws/pkg/clients" - acmpca "github.com/crossplane/provider-aws/pkg/clients/acmpca" + "github.com/crossplane/provider-aws/pkg/clients/acmpca" "github.com/crossplane/provider-aws/pkg/clients/acmpca/fake" ) @@ -95,24 +95,13 @@ func TestObserve(t *testing.T) { "ValidInput": { args: args{ acmpca: &fake.MockCertificateAuthorityPermissionClient{ -<<<<<<< HEAD MockListPermissions: func(ctx context.Context, input *awsacmpca.ListPermissionsInput, opts []func(*awsacmpca.Options)) (*awsacmpca.ListPermissionsOutput, error) { return &awsacmpca.ListPermissionsOutput{ NextToken: aws.String(nextToken), Permissions: []awsacmpcatypes.Permission{{ Actions: []awsacmpcatypes.ActionType{awsacmpcatypes.ActionTypeIssueCertificate, awsacmpcatypes.ActionTypeGetCertificate, awsacmpcatypes.ActionTypeListPermissions}, CertificateAuthorityArn: aws.String(certificateAuthorityArn), -======= - MockListPermissionsRequest: func(input *awsacmpca.ListPermissionsInput) awsacmpca.ListPermissionsRequest { - return awsacmpca.ListPermissionsRequest{ - Request: &aws.Request{HTTPRequest: &http.Request{}, Retryer: aws.NoOpRetryer{}, Data: &awsacmpca.ListPermissionsOutput{ - NextToken: aws.String(nextToken), - Permissions: []awsacmpca.Permission{{ - Actions: []awsacmpca.ActionType{awsacmpca.ActionTypeIssueCertificate, awsacmpca.ActionTypeGetCertificate, awsacmpca.ActionTypeListPermissions}, - CertificateAuthorityArn: aws.String(certificateAuthorityArn), - Principal: &principal, - }}, ->>>>>>> upstream/master + Principal: &principal, }}, }, nil }, @@ -214,7 +203,7 @@ func TestCreate(t *testing.T) { withPrincipal(principal), withCertificateAuthorityARN(arn), withExternalName(principal+"/"+arn)), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "InValidInput": { @@ -340,13 +329,8 @@ func TestDelete(t *testing.T) { cr: certificateAuthorityPermission(), }, want: want{ -<<<<<<< HEAD - cr: certificateAuthorityPermission(withConditions(xpv1.Deleting())), - err: awsclient.Wrap(&awsacmpcatypes.ResourceNotFoundException{}, errDelete), -======= cr: certificateAuthorityPermission(), - err: awsclient.Wrap(awserr.New(awsacmpca.ErrCodeResourceNotFoundException, "", nil), errDelete), ->>>>>>> upstream/master + err: awsclient.Wrap(&awsacmpcatypes.ResourceNotFoundException{}, errDelete), }, }, } diff --git a/pkg/controller/apigatewayv2/api/setup.go b/pkg/controller/apigatewayv2/api/setup.go index 7995ed20c9..8beebdd4d7 100644 --- a/pkg/controller/apigatewayv2/api/setup.go +++ b/pkg/controller/apigatewayv2/api/setup.go @@ -51,13 +51,13 @@ func SetupAPI(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, poll return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.API{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.APIGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -81,7 +81,6 @@ func postCreate(_ context.Context, cr *svcapitypes.API, resp *svcsdk.CreateApiOu return managed.ExternalCreation{}, err } meta.SetExternalName(cr, aws.StringValue(resp.ApiId)) - cre.ExternalNameAssigned = true return cre, nil } diff --git a/pkg/controller/apigatewayv2/apimapping/setup.go b/pkg/controller/apigatewayv2/apimapping/setup.go index 9b3a941df2..d41e9d55ae 100644 --- a/pkg/controller/apigatewayv2/apimapping/setup.go +++ b/pkg/controller/apigatewayv2/apimapping/setup.go @@ -52,13 +52,13 @@ func SetupAPIMapping(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimite return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.APIMapping{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.APIMappingGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -90,7 +90,6 @@ func postCreate(_ context.Context, cr *svcapitypes.APIMapping, resp *svcsdk.Crea return managed.ExternalCreation{}, err } meta.SetExternalName(cr, aws.StringValue(resp.ApiMappingId)) - cre.ExternalNameAssigned = true return cre, nil } diff --git a/pkg/controller/apigatewayv2/authorizer/setup.go b/pkg/controller/apigatewayv2/authorizer/setup.go index be27880bc2..4fcc689fc3 100644 --- a/pkg/controller/apigatewayv2/authorizer/setup.go +++ b/pkg/controller/apigatewayv2/authorizer/setup.go @@ -52,13 +52,13 @@ func SetupAuthorizer(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimite return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Authorizer{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.AuthorizerGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -88,7 +88,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Authorizer, resp *svcsdk.Crea return managed.ExternalCreation{}, err } meta.SetExternalName(cr, aws.StringValue(resp.AuthorizerId)) - cre.ExternalNameAssigned = true return cre, err } diff --git a/pkg/controller/apigatewayv2/deployment/setup.go b/pkg/controller/apigatewayv2/deployment/setup.go index bae2639c8c..e1f7a08b8e 100644 --- a/pkg/controller/apigatewayv2/deployment/setup.go +++ b/pkg/controller/apigatewayv2/deployment/setup.go @@ -52,13 +52,13 @@ func SetupDeployment(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimite return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Deployment{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.DeploymentGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -88,7 +88,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Deployment, resp *svcsdk.Crea return managed.ExternalCreation{}, err } meta.SetExternalName(cr, aws.StringValue(resp.DeploymentId)) - cre.ExternalNameAssigned = true return cre, nil } diff --git a/pkg/controller/apigatewayv2/domainname/setup.go b/pkg/controller/apigatewayv2/domainname/setup.go index 7a9b06a00f..7742314c74 100644 --- a/pkg/controller/apigatewayv2/domainname/setup.go +++ b/pkg/controller/apigatewayv2/domainname/setup.go @@ -51,7 +51,7 @@ func SetupDomainName(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimite return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.DomainName{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/apigatewayv2/integration/setup.go b/pkg/controller/apigatewayv2/integration/setup.go index 15afe894a5..087d675b95 100644 --- a/pkg/controller/apigatewayv2/integration/setup.go +++ b/pkg/controller/apigatewayv2/integration/setup.go @@ -53,13 +53,13 @@ func SetupIntegration(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimit return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Integration{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.IntegrationGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -100,7 +100,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Integration, resp *svcsdk.Cre return managed.ExternalCreation{}, err } meta.SetExternalName(cr, aws.StringValue(resp.IntegrationId)) - cre.ExternalNameAssigned = true return cre, nil } diff --git a/pkg/controller/apigatewayv2/integrationresponse/setup.go b/pkg/controller/apigatewayv2/integrationresponse/setup.go index 6953827c1e..5ae2ad2f72 100644 --- a/pkg/controller/apigatewayv2/integrationresponse/setup.go +++ b/pkg/controller/apigatewayv2/integrationresponse/setup.go @@ -52,13 +52,13 @@ func SetupIntegrationResponse(mgr ctrl.Manager, l logging.Logger, rl workqueue.R return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.IntegrationResponse{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.IntegrationResponseGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -88,7 +88,6 @@ func postCreate(_ context.Context, cr *svcapitypes.IntegrationResponse, resp *sv return managed.ExternalCreation{}, err } meta.SetExternalName(cr, aws.StringValue(resp.IntegrationResponseId)) - cre.ExternalNameAssigned = true return cre, nil } diff --git a/pkg/controller/apigatewayv2/model/setup.go b/pkg/controller/apigatewayv2/model/setup.go index d0ecad6d25..765377e207 100644 --- a/pkg/controller/apigatewayv2/model/setup.go +++ b/pkg/controller/apigatewayv2/model/setup.go @@ -52,13 +52,13 @@ func SetupModel(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, po return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Model{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.ModelGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -88,7 +88,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Model, resp *svcsdk.CreateMod return managed.ExternalCreation{}, err } meta.SetExternalName(cr, aws.StringValue(resp.ModelId)) - cre.ExternalNameAssigned = true return cre, nil } diff --git a/pkg/controller/apigatewayv2/route/setup.go b/pkg/controller/apigatewayv2/route/setup.go index ad9e5b9621..0d759da9dd 100644 --- a/pkg/controller/apigatewayv2/route/setup.go +++ b/pkg/controller/apigatewayv2/route/setup.go @@ -52,13 +52,13 @@ func SetupRoute(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, po return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Route{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.RouteGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -90,7 +90,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Route, res *svcsdk.CreateRout // NOTE(muvaf): Route ID is chosen as external name since it's the only unique // identifier. meta.SetExternalName(cr, aws.StringValue(res.RouteId)) - cre.ExternalNameAssigned = true return cre, nil } diff --git a/pkg/controller/apigatewayv2/routeresponse/setup.go b/pkg/controller/apigatewayv2/routeresponse/setup.go index 9e319428b3..a65ba9500a 100644 --- a/pkg/controller/apigatewayv2/routeresponse/setup.go +++ b/pkg/controller/apigatewayv2/routeresponse/setup.go @@ -52,13 +52,13 @@ func SetupRouteResponse(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLim return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.RouteResponse{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.RouteResponseGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -90,7 +90,6 @@ func postCreate(_ context.Context, cr *svcapitypes.RouteResponse, resp *svcsdk.C return managed.ExternalCreation{}, err } meta.SetExternalName(cr, aws.StringValue(resp.RouteResponseId)) - cre.ExternalNameAssigned = true return cre, nil } diff --git a/pkg/controller/apigatewayv2/stage/setup.go b/pkg/controller/apigatewayv2/stage/setup.go index 21c475a4a4..3ab802c85c 100644 --- a/pkg/controller/apigatewayv2/stage/setup.go +++ b/pkg/controller/apigatewayv2/stage/setup.go @@ -51,7 +51,7 @@ func SetupStage(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, po return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Stage{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/apigatewayv2/vpclink/setup.go b/pkg/controller/apigatewayv2/vpclink/setup.go index aa692753bd..cdb14070c2 100644 --- a/pkg/controller/apigatewayv2/vpclink/setup.go +++ b/pkg/controller/apigatewayv2/vpclink/setup.go @@ -52,13 +52,13 @@ func SetupVPCLink(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.VPCLink{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.VPCLinkGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -94,7 +94,6 @@ func postCreate(_ context.Context, cr *svcapitypes.VPCLink, resp *svcsdk.CreateV return managed.ExternalCreation{}, err } meta.SetExternalName(cr, aws.StringValue(resp.VpcLinkId)) - cre.ExternalNameAssigned = true return cre, nil } diff --git a/pkg/controller/cache/cachesubnetgroup/controller.go b/pkg/controller/cache/cachesubnetgroup/controller.go index 9e70b438f0..0aa1153330 100644 --- a/pkg/controller/cache/cachesubnetgroup/controller.go +++ b/pkg/controller/cache/cachesubnetgroup/controller.go @@ -57,7 +57,7 @@ func SetupCacheSubnetGroup(mgr ctrl.Manager, l logging.Logger, rl workqueue.Rate return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.CacheSubnetGroup{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/cache/cluster/controller.go b/pkg/controller/cache/cluster/controller.go index c6a14649e6..7fc083c016 100644 --- a/pkg/controller/cache/cluster/controller.go +++ b/pkg/controller/cache/cluster/controller.go @@ -60,7 +60,7 @@ func SetupCacheCluster(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimi return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.CacheCluster{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/cache/managed.go b/pkg/controller/cache/managed.go index ba030382ce..96102a9d06 100644 --- a/pkg/controller/cache/managed.go +++ b/pkg/controller/cache/managed.go @@ -64,7 +64,7 @@ func SetupReplicationGroup(mgr ctrl.Manager, l logging.Logger, rl workqueue.Rate return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.ReplicationGroup{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/cloudfront/cachepolicy/setup.go b/pkg/controller/cloudfront/cachepolicy/setup.go index 27f0c20b47..5a04c211e2 100644 --- a/pkg/controller/cloudfront/cachepolicy/setup.go +++ b/pkg/controller/cloudfront/cachepolicy/setup.go @@ -43,7 +43,7 @@ func SetupCachePolicy(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimit return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.CachePolicy{}). Complete(managed.NewReconciler(mgr, @@ -74,7 +74,6 @@ func postCreate(_ context.Context, cp *svcapitypes.CachePolicy, cpo *svcsdk.Crea } meta.SetExternalName(cp, awsclients.StringValue(cpo.CachePolicy.Id)) - ec.ExternalNameAssigned = true return ec, nil } diff --git a/pkg/controller/cloudfront/distribution/setup.go b/pkg/controller/cloudfront/distribution/setup.go index c7b25bbd4e..d17ce8a97d 100644 --- a/pkg/controller/cloudfront/distribution/setup.go +++ b/pkg/controller/cloudfront/distribution/setup.go @@ -48,7 +48,7 @@ func SetupDistribution(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimi return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Distribution{}). Complete(managed.NewReconciler(mgr, @@ -92,7 +92,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Distribution, cdo *svcsdk.Cre } meta.SetExternalName(cr, awsclients.StringValue(cdo.Distribution.Id)) - ec.ExternalNameAssigned = true return ec, nil } diff --git a/pkg/controller/config/config.go b/pkg/controller/config/config.go index 02ac29d355..6c522f5f6c 100644 --- a/pkg/controller/config/config.go +++ b/pkg/controller/config/config.go @@ -44,7 +44,7 @@ func Setup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter) error { return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.ProviderConfig{}). Watches(&source.Kind{Type: &v1beta1.ProviderConfigUsage{}}, &resource.EnqueueRequestForProviderConfig{}). diff --git a/pkg/controller/database/dbsubnetgroup/controller.go b/pkg/controller/database/dbsubnetgroup/controller.go index 42d2a78cd4..a96894553c 100644 --- a/pkg/controller/database/dbsubnetgroup/controller.go +++ b/pkg/controller/database/dbsubnetgroup/controller.go @@ -64,7 +64,7 @@ func SetupDBSubnetGroup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLim return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.DBSubnetGroup{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/database/rdsinstance.go b/pkg/controller/database/rdsinstance.go index 00c42e7a8a..ed29191125 100644 --- a/pkg/controller/database/rdsinstance.go +++ b/pkg/controller/database/rdsinstance.go @@ -65,7 +65,7 @@ func SetupRDSInstance(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimit return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.RDSInstance{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/docdb/dbcluster/setup.go b/pkg/controller/docdb/dbcluster/setup.go index 98851a725c..4d15d54875 100644 --- a/pkg/controller/docdb/dbcluster/setup.go +++ b/pkg/controller/docdb/dbcluster/setup.go @@ -60,7 +60,7 @@ func SetupDBCluster(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter Named(name). For(&svcapitypes.DBCluster{}). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.DBClusterGroupVersionKind), diff --git a/pkg/controller/docdb/dbclusterparametergroup/setup.go b/pkg/controller/docdb/dbclusterparametergroup/setup.go index 5b10c3ed6b..9e74b665af 100644 --- a/pkg/controller/docdb/dbclusterparametergroup/setup.go +++ b/pkg/controller/docdb/dbclusterparametergroup/setup.go @@ -65,7 +65,7 @@ func SetupDBClusterParameterGroup(mgr ctrl.Manager, l logging.Logger, rl workque Named(name). For(&svcapitypes.DBClusterParameterGroup{}). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.DBClusterParameterGroupGroupVersionKind), diff --git a/pkg/controller/docdb/dbinstance/setup.go b/pkg/controller/docdb/dbinstance/setup.go index 745a4eb0df..1d3fbda3cc 100644 --- a/pkg/controller/docdb/dbinstance/setup.go +++ b/pkg/controller/docdb/dbinstance/setup.go @@ -61,7 +61,7 @@ func SetupDBInstance(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimite Named(name). For(&svcapitypes.DBInstance{}). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.DBInstanceGroupVersionKind), diff --git a/pkg/controller/docdb/dbsubnetgroup/setup.go b/pkg/controller/docdb/dbsubnetgroup/setup.go index 30f8c9cfea..ca47af9999 100644 --- a/pkg/controller/docdb/dbsubnetgroup/setup.go +++ b/pkg/controller/docdb/dbsubnetgroup/setup.go @@ -60,7 +60,7 @@ func SetupDBSubnetGroup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLim Named(name). For(&svcapitypes.DBSubnetGroup{}). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.DBSubnetGroupGroupVersionKind), diff --git a/pkg/controller/dynamodb/backup/hooks.go b/pkg/controller/dynamodb/backup/hooks.go index 98e5d74baa..e8c6914243 100644 --- a/pkg/controller/dynamodb/backup/hooks.go +++ b/pkg/controller/dynamodb/backup/hooks.go @@ -52,13 +52,13 @@ func SetupBackup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, p return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Backup{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.BackupGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -94,7 +94,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Backup, resp *svcsdk.CreateBa return managed.ExternalCreation{}, err } meta.SetExternalName(cr, aws.StringValue(resp.BackupDetails.BackupArn)) - cre.ExternalNameAssigned = true return cre, err } diff --git a/pkg/controller/dynamodb/globaltable/hooks.go b/pkg/controller/dynamodb/globaltable/hooks.go index 885b06437c..7fa79993fa 100644 --- a/pkg/controller/dynamodb/globaltable/hooks.go +++ b/pkg/controller/dynamodb/globaltable/hooks.go @@ -59,7 +59,7 @@ func SetupGlobalTable(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimit return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.GlobalTable{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/dynamodb/table/hooks.go b/pkg/controller/dynamodb/table/hooks.go index 02df7ddfa6..55668bb50f 100644 --- a/pkg/controller/dynamodb/table/hooks.go +++ b/pkg/controller/dynamodb/table/hooks.go @@ -63,7 +63,7 @@ func SetupTable(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, po return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Table{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/ec2/address/controller.go b/pkg/controller/ec2/address/controller.go index 8dd144d1c7..cc76446dc8 100644 --- a/pkg/controller/ec2/address/controller.go +++ b/pkg/controller/ec2/address/controller.go @@ -62,7 +62,7 @@ func SetupAddress(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.Address{}). Complete(managed.NewReconciler(mgr, @@ -177,7 +177,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex } else { meta.SetExternalName(cr, aws.ToString(result.AllocationId)) } - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) { diff --git a/pkg/controller/ec2/address/controller_test.go b/pkg/controller/ec2/address/controller_test.go index d697beec35..820401b648 100644 --- a/pkg/controller/ec2/address/controller_test.go +++ b/pkg/controller/ec2/address/controller_test.go @@ -229,7 +229,7 @@ func TestCreate(t *testing.T) { want: want{ cr: address(withExternalName(allocationID), withConditions(xpv1.Creating())), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "SuccessfulStandard": { @@ -255,7 +255,7 @@ func TestCreate(t *testing.T) { withSpec(v1beta1.AddressParameters{ Domain: &domainStandard, })), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "CreateFail": { diff --git a/pkg/controller/ec2/internetgateway/controller.go b/pkg/controller/ec2/internetgateway/controller.go index 52b7acbaec..0e97438ca3 100644 --- a/pkg/controller/ec2/internetgateway/controller.go +++ b/pkg/controller/ec2/internetgateway/controller.go @@ -62,14 +62,14 @@ func SetupInternetGateway(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateL return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.InternetGateway{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.InternetGatewayGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: ec2.NewInternetGatewayClient}), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithConnectionPublishers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), @@ -156,7 +156,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex meta.SetExternalName(cr, aws.ToString(ig.InternetGateway.InternetGatewayId)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) { diff --git a/pkg/controller/ec2/internetgateway/controller_test.go b/pkg/controller/ec2/internetgateway/controller_test.go index f325bb6dff..931088a23d 100644 --- a/pkg/controller/ec2/internetgateway/controller_test.go +++ b/pkg/controller/ec2/internetgateway/controller_test.go @@ -253,7 +253,7 @@ func TestCreate(t *testing.T) { }), withExternalName(igID), withConditions(xpv1.Creating())), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "FailedRequest": { diff --git a/pkg/controller/ec2/natgateway/controller.go b/pkg/controller/ec2/natgateway/controller.go index 32d891eb20..14afa8a984 100644 --- a/pkg/controller/ec2/natgateway/controller.go +++ b/pkg/controller/ec2/natgateway/controller.go @@ -43,14 +43,14 @@ func SetupNatGateway(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimite return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.NATGateway{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.NATGatewayGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: ec2.NewNatGatewayClient}), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithConnectionPublishers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), @@ -148,7 +148,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate) } meta.SetExternalName(cr, aws.ToString(nat.NatGateway.NatGatewayId)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) { diff --git a/pkg/controller/ec2/natgateway/controller_test.go b/pkg/controller/ec2/natgateway/controller_test.go index f89bdca9cc..feec533ef1 100644 --- a/pkg/controller/ec2/natgateway/controller_test.go +++ b/pkg/controller/ec2/natgateway/controller_test.go @@ -428,7 +428,7 @@ func TestCreate(t *testing.T) { cr: nat(withExternalName(natGatewayID), withSpec(specNatSpec()), ), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "FailedRequest": { diff --git a/pkg/controller/ec2/routetable/controller.go b/pkg/controller/ec2/routetable/controller.go index 3ffa84c18b..1900fc1201 100644 --- a/pkg/controller/ec2/routetable/controller.go +++ b/pkg/controller/ec2/routetable/controller.go @@ -67,14 +67,14 @@ func SetupRouteTable(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimite return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.RouteTable{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.RouteTableGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: ec2.NewRouteTableClient}), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithConnectionPublishers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), @@ -171,7 +171,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate) } meta.SetExternalName(cr, aws.ToString(result.RouteTable.RouteTableId)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) { // nolint:gocyclo diff --git a/pkg/controller/ec2/routetable/controller_test.go b/pkg/controller/ec2/routetable/controller_test.go index 482890e0ed..feb50199b2 100644 --- a/pkg/controller/ec2/routetable/controller_test.go +++ b/pkg/controller/ec2/routetable/controller_test.go @@ -206,7 +206,7 @@ func TestCreate(t *testing.T) { cr: rt(withSpec(v1beta1.RouteTableParameters{ VPCID: aws.String(vpcID), }), withExternalName(rtID)), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "CreateFailed": { diff --git a/pkg/controller/ec2/securitygroup/controller.go b/pkg/controller/ec2/securitygroup/controller.go index d12282638e..3ba44fe0d4 100644 --- a/pkg/controller/ec2/securitygroup/controller.go +++ b/pkg/controller/ec2/securitygroup/controller.go @@ -69,14 +69,14 @@ func SetupSecurityGroup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLim return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.SecurityGroup{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.SecurityGroupGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: ec2.NewSecurityGroupClient}), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithConnectionPublishers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), diff --git a/pkg/controller/ec2/securitygroup/controller_test.go b/pkg/controller/ec2/securitygroup/controller_test.go index 6a80626d53..e53979144e 100644 --- a/pkg/controller/ec2/securitygroup/controller_test.go +++ b/pkg/controller/ec2/securitygroup/controller_test.go @@ -20,6 +20,8 @@ import ( "context" "testing" + "github.com/aws/smithy-go/document" + "github.com/aws/aws-sdk-go-v2/aws" awsec2 "github.com/aws/aws-sdk-go-v2/service/ec2" awsec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" @@ -60,8 +62,8 @@ type sgModifier func(*v1beta1.SecurityGroup) func specPermissions() []v1beta1.IPPermission { return []v1beta1.IPPermission{ { - FromPort: aws.Int32(port80), - ToPort: aws.Int32(80), + FromPort: &port80, + ToPort: &port80, IPRanges: []v1beta1.IPRange{ {CIDRIP: cidr}, }, @@ -73,8 +75,8 @@ func specPermissions() []v1beta1.IPPermission { func sgPersmissions() []awsec2types.IpPermission { return []awsec2types.IpPermission{ { - FromPort: port100, - ToPort: port100, + FromPort: &port100, + ToPort: &port100, IpProtocol: aws.String(tcpProtocol), IpRanges: []awsec2types.IpRange{{ CidrIp: aws.String(cidr), @@ -505,14 +507,14 @@ func TestUpdateTags(t *testing.T) { Key: aws.String("k3"), Value: aws.String("v3"), }, - }, cmpopts.SortSlices(compareTags)); diff != "" { + }, cmpopts.SortSlices(compareTags), cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } return &awsec2.CreateTagsOutput{}, nil }, MockDeleteTags: func(ctx context.Context, input *awsec2.DeleteTagsInput, opts []func(*awsec2.Options)) (*awsec2.DeleteTagsOutput, error) { - if diff := cmp.Diff(input.Tags, []awsec2types.Tag{{Key: aws.String("k4")}}); diff != "" { + if diff := cmp.Diff(input.Tags, []awsec2types.Tag{{Key: aws.String("k4")}}, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } diff --git a/pkg/controller/ec2/subnet/controller.go b/pkg/controller/ec2/subnet/controller.go index 8adfeea03c..26b864131e 100644 --- a/pkg/controller/ec2/subnet/controller.go +++ b/pkg/controller/ec2/subnet/controller.go @@ -60,14 +60,14 @@ func SetupSubnet(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, p return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.Subnet{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(v1beta1.SubnetGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: ec2.NewSubnetClient}), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithConnectionPublishers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), @@ -163,7 +163,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex meta.SetExternalName(cr, aws.ToString(result.Subnet.SubnetId)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) { @@ -195,10 +195,10 @@ func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.Ex } } - if subnet.MapPublicIpOnLaunch != aws.ToBool(cr.Spec.ForProvider.MapPublicIPOnLaunch) { + if aws.ToBool(subnet.MapPublicIpOnLaunch) != aws.ToBool(cr.Spec.ForProvider.MapPublicIPOnLaunch) { _, err = e.client.ModifySubnetAttribute(ctx, &awsec2.ModifySubnetAttributeInput{ MapPublicIpOnLaunch: &awsec2types.AttributeBooleanValue{ - Value: aws.ToBool(cr.Spec.ForProvider.MapPublicIPOnLaunch), + Value: cr.Spec.ForProvider.MapPublicIPOnLaunch, }, SubnetId: aws.String(meta.GetExternalName(cr)), }) @@ -207,10 +207,10 @@ func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.Ex } } - if subnet.AssignIpv6AddressOnCreation != aws.ToBool(cr.Spec.ForProvider.AssignIPv6AddressOnCreation) { + if aws.ToBool(subnet.AssignIpv6AddressOnCreation) != aws.ToBool(cr.Spec.ForProvider.AssignIPv6AddressOnCreation) { _, err = e.client.ModifySubnetAttribute(ctx, &awsec2.ModifySubnetAttributeInput{ AssignIpv6AddressOnCreation: &awsec2types.AttributeBooleanValue{ - Value: aws.ToBool(cr.Spec.ForProvider.AssignIPv6AddressOnCreation), + Value: cr.Spec.ForProvider.AssignIPv6AddressOnCreation, }, SubnetId: aws.String(meta.GetExternalName(cr)), }) diff --git a/pkg/controller/ec2/subnet/controller_test.go b/pkg/controller/ec2/subnet/controller_test.go index 6a050ab536..3a0ce4eba9 100644 --- a/pkg/controller/ec2/subnet/controller_test.go +++ b/pkg/controller/ec2/subnet/controller_test.go @@ -108,15 +108,11 @@ func TestObserve(t *testing.T) { want: want{ cr: subnet(withStatus(v1beta1.SubnetObservation{ SubnetState: "available", - }), withExternalName(subnetID), withSpec(v1beta1.SubnetParameters{ - MapPublicIPOnLaunch: aws.Bool(false), - AssignIPv6AddressOnCreation: aws.Bool(false), - }), + }), withExternalName(subnetID), withConditions(xpv1.Available())), result: managed.ExternalObservation{ - ResourceExists: true, - ResourceUpToDate: true, - ResourceLateInitialized: true, + ResourceExists: true, + ResourceUpToDate: true, }, }, }, @@ -143,8 +139,9 @@ func TestObserve(t *testing.T) { return &awsec2.DescribeSubnetsOutput{ Subnets: []awsec2types.Subnet{ { - State: awsec2types.SubnetStateAvailable, - MapPublicIpOnLaunch: false, + State: awsec2types.SubnetStateAvailable, + MapPublicIpOnLaunch: aws.Bool(false), + AssignIpv6AddressOnCreation: aws.Bool(false), }, }, }, nil @@ -230,7 +227,7 @@ func TestCreate(t *testing.T) { }, want: want{ cr: subnet(withExternalName(subnetID)), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "CreateFailed": { @@ -292,7 +289,7 @@ func TestUpdate(t *testing.T) { return &awsec2.DescribeSubnetsOutput{ Subnets: []awsec2types.Subnet{{ SubnetId: aws.String(subnetID), - MapPublicIpOnLaunch: false, + MapPublicIpOnLaunch: aws.Bool(false), }}, }, nil }, @@ -321,7 +318,7 @@ func TestUpdate(t *testing.T) { return &awsec2.DescribeSubnetsOutput{ Subnets: []awsec2types.Subnet{{ SubnetId: aws.String(subnetID), - MapPublicIpOnLaunch: false, + MapPublicIpOnLaunch: aws.Bool(false), }}, }, nil }, diff --git a/pkg/controller/ec2/vpc/controller.go b/pkg/controller/ec2/vpc/controller.go index e81e7e8914..d4d01324fc 100644 --- a/pkg/controller/ec2/vpc/controller.go +++ b/pkg/controller/ec2/vpc/controller.go @@ -63,7 +63,7 @@ func SetupVPC(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, poll return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.VPC{}). Complete(managed.NewReconciler(mgr, @@ -196,7 +196,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex meta.SetExternalName(cr, aws.ToString(result.Vpc.VpcId)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) { @@ -208,7 +208,7 @@ func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.Ex if cr.Spec.ForProvider.EnableDNSSupport != nil { modifyInput := &awsec2.ModifyVpcAttributeInput{ VpcId: aws.String(meta.GetExternalName(cr)), - EnableDnsSupport: &awsec2types.AttributeBooleanValue{Value: aws.ToBool(cr.Spec.ForProvider.EnableDNSSupport)}, + EnableDnsSupport: &awsec2types.AttributeBooleanValue{Value: cr.Spec.ForProvider.EnableDNSSupport}, } if _, err := e.client.ModifyVpcAttribute(ctx, modifyInput); err != nil { return managed.ExternalUpdate{}, awsclient.Wrap(err, errModifyVPCAttributes) @@ -218,7 +218,7 @@ func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.Ex if cr.Spec.ForProvider.EnableDNSHostNames != nil { modifyInput := &awsec2.ModifyVpcAttributeInput{ VpcId: aws.String(meta.GetExternalName(cr)), - EnableDnsHostnames: &awsec2types.AttributeBooleanValue{Value: aws.ToBool(cr.Spec.ForProvider.EnableDNSHostNames)}, + EnableDnsHostnames: &awsec2types.AttributeBooleanValue{Value: cr.Spec.ForProvider.EnableDNSHostNames}, } if _, err := e.client.ModifyVpcAttribute(ctx, modifyInput); err != nil { return managed.ExternalUpdate{}, awsclient.Wrap(err, errModifyVPCAttributes) diff --git a/pkg/controller/ec2/vpc/controller_test.go b/pkg/controller/ec2/vpc/controller_test.go index 7a08a865e1..ef1dc82e80 100644 --- a/pkg/controller/ec2/vpc/controller_test.go +++ b/pkg/controller/ec2/vpc/controller_test.go @@ -253,7 +253,7 @@ func TestCreate(t *testing.T) { withSpec(v1beta1.VPCParameters{ EnableDNSSupport: &enableDNS, })), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "CreateFail": { diff --git a/pkg/controller/ec2/vpccidrblock/controller.go b/pkg/controller/ec2/vpccidrblock/controller.go index 8314f39ff9..29b54f174b 100644 --- a/pkg/controller/ec2/vpccidrblock/controller.go +++ b/pkg/controller/ec2/vpccidrblock/controller.go @@ -57,7 +57,7 @@ func SetupVPCCIDRBlock(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimi return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&manualv1alpha1.VPCCIDRBlock{}). Complete(managed.NewReconciler(mgr, @@ -65,7 +65,7 @@ func SetupVPCCIDRBlock(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimi managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: ec2.NewVPCCIDRBlockClient}), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), managed.WithConnectionPublishers(), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -105,22 +105,14 @@ func (e *external) Observe(ctx context.Context, mgd resource.Managed) (managed.E }, nil } -<<<<<<< HEAD response, err := e.client.DescribeVpcs(ctx, &awsec2.DescribeVpcsInput{ - VpcIds: []string{awsgo.StringValue(cr.Spec.ForProvider.VPCID)}, + VpcIds: []string{aws.ToString(cr.Spec.ForProvider.VPCID)}, }) - if err != nil && !ec2.IsCIDRNotFound(err) { - return managed.ExternalObservation{}, awsclient.Wrap(err, errDescribe) -======= - response, err := e.client.DescribeVpcsRequest(&awsec2.DescribeVpcsInput{ - VpcIds: []string{aws.StringValue(cr.Spec.ForProvider.VPCID)}, - }).Send(ctx) if err != nil { return managed.ExternalObservation{ ResourceExists: false, }, awsclient.Wrap(resource.Ignore(ec2.IsVPCNotFoundErr, err), errDescribe) ->>>>>>> upstream/master } // in a successful response, there should be one and only one object @@ -163,7 +155,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex } result, err := e.client.AssociateVpcCidrBlock(ctx, &awsec2.AssociateVpcCidrBlockInput{ - AmazonProvidedIpv6CidrBlock: awsgo.BoolValue(cr.Spec.ForProvider.AmazonProvidedIPv6CIDRBlock), + AmazonProvidedIpv6CidrBlock: cr.Spec.ForProvider.AmazonProvidedIPv6CIDRBlock, CidrBlock: cr.Spec.ForProvider.CIDRBlock, Ipv6CidrBlock: cr.Spec.ForProvider.IPv6CIDRBlock, Ipv6CidrBlockNetworkBorderGroup: cr.Spec.ForProvider.IPv6CIDRBlockNetworkBorderGroup, @@ -183,7 +175,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex } } - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func (e *external) Update(_ context.Context, _ resource.Managed) (managed.ExternalUpdate, error) { diff --git a/pkg/controller/ec2/vpccidrblock/controller_test.go b/pkg/controller/ec2/vpccidrblock/controller_test.go index c1f530914b..9f26bef4da 100644 --- a/pkg/controller/ec2/vpccidrblock/controller_test.go +++ b/pkg/controller/ec2/vpccidrblock/controller_test.go @@ -266,7 +266,7 @@ func TestCreate(t *testing.T) { CIDRBlock: &cidr, VPCID: &vpcID, }), withExternalName(matchAssociationID)), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "SuccessfulIPv6": { @@ -293,7 +293,7 @@ func TestCreate(t *testing.T) { IPv6CIDRBlock: &ipv6CIDR, VPCID: &vpcID, }), withExternalName(matchAssociationID)), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "CreateFail": { diff --git a/pkg/controller/ec2/vpcpeeringconnection/setup.go b/pkg/controller/ec2/vpcpeeringconnection/setup.go index 3b1c1aef5b..edcc829e01 100644 --- a/pkg/controller/ec2/vpcpeeringconnection/setup.go +++ b/pkg/controller/ec2/vpcpeeringconnection/setup.go @@ -40,7 +40,7 @@ func SetupVPCPeeringConnection(mgr ctrl.Manager, l logging.Logger, rl workqueue. return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.VPCPeeringConnection{}). Complete(managed.NewReconciler(mgr, @@ -140,6 +140,5 @@ func (e *custom) postCreate(ctx context.Context, cr *svcapitypes.VPCPeeringConne // set peering connection id as external name annotation on k8s object after creation meta.SetExternalName(cr, aws.StringValue(obj.VpcPeeringConnection.VpcPeeringConnectionId)) - cre.ExternalNameAssigned = true return cre, nil } diff --git a/pkg/controller/ecr/repository/controller.go b/pkg/controller/ecr/repository/controller.go index 24dc7be0e2..54638c7ae6 100644 --- a/pkg/controller/ecr/repository/controller.go +++ b/pkg/controller/ecr/repository/controller.go @@ -68,7 +68,7 @@ func SetupRepository(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimite return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.Repository{}). Complete(managed.NewReconciler(mgr, @@ -235,13 +235,8 @@ func (e *external) Delete(ctx context.Context, mgd resource.Managed) error { cr.Status.SetConditions(xpv1.Deleting()) _, err := e.client.DeleteRepository(ctx, &awsecr.DeleteRepositoryInput{ RepositoryName: aws.String(meta.GetExternalName(cr)), -<<<<<<< HEAD + Force: aws.ToBool(cr.Spec.ForProvider.ForceDelete), }) -======= - Force: cr.Spec.ForProvider.ForceDelete, - }).Send(ctx) ->>>>>>> upstream/master - return awsclient.Wrap(resource.Ignore(ecr.IsRepoNotFoundErr, err), errDelete) } diff --git a/pkg/controller/ecr/repository/controller_test.go b/pkg/controller/ecr/repository/controller_test.go index 7f2c82417b..fc916e1a7c 100644 --- a/pkg/controller/ecr/repository/controller_test.go +++ b/pkg/controller/ecr/repository/controller_test.go @@ -557,19 +557,12 @@ func TestDelete(t *testing.T) { "SuccessfulForce": { args: args{ repository: &fake.MockRepositoryClient{ -<<<<<<< HEAD MockDelete: func(ctx context.Context, input *awsecr.DeleteRepositoryInput, opts []func(*awsecr.Options)) (*awsecr.DeleteRepositoryOutput, error) { - return &awsecr.DeleteRepositoryOutput{}, nil -======= - MockDelete: func(input *awsecr.DeleteRepositoryInput) awsecr.DeleteRepositoryRequest { var err error - if !aws.BoolValue(input.Force) { + if !input.Force { err = errors.New("force must be set when forceDelete=true") } - return awsecr.DeleteRepositoryRequest{ - Request: &aws.Request{HTTPRequest: &http.Request{}, Retryer: aws.NoOpRetryer{}, Data: &awsecr.DeleteRepositoryOutput{}, Error: err}, - } ->>>>>>> upstream/master + return &awsecr.DeleteRepositoryOutput{}, err }, }, cr: repository(withForceDelete(true)), @@ -581,14 +574,12 @@ func TestDelete(t *testing.T) { "SuccessfulNoForce": { args: args{ repository: &fake.MockRepositoryClient{ - MockDelete: func(input *awsecr.DeleteRepositoryInput) awsecr.DeleteRepositoryRequest { + MockDelete: func(ctx context.Context, input *awsecr.DeleteRepositoryInput, opts []func(*awsecr.Options)) (*awsecr.DeleteRepositoryOutput, error) { var err error - if aws.BoolValue(input.Force) { + if input.Force { err = errors.New("force must not be true when forceDelete is not set") } - return awsecr.DeleteRepositoryRequest{ - Request: &aws.Request{HTTPRequest: &http.Request{}, Retryer: aws.NoOpRetryer{}, Data: &awsecr.DeleteRepositoryOutput{}, Error: err}, - } + return &awsecr.DeleteRepositoryOutput{}, err }, }, cr: repository(withForceDelete(false)), diff --git a/pkg/controller/ecr/repositorypolicy/controller.go b/pkg/controller/ecr/repositorypolicy/controller.go index e12b9b1d46..0f32932bea 100644 --- a/pkg/controller/ecr/repositorypolicy/controller.go +++ b/pkg/controller/ecr/repositorypolicy/controller.go @@ -55,7 +55,7 @@ func SetupRepositoryPolicy(mgr ctrl.Manager, l logging.Logger, rl workqueue.Rate return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.RepositoryPolicy{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/ecr/repositorypolicy/controller_test.go b/pkg/controller/ecr/repositorypolicy/controller_test.go index e159ff0fd5..90e88d5d41 100644 --- a/pkg/controller/ecr/repositorypolicy/controller_test.go +++ b/pkg/controller/ecr/repositorypolicy/controller_test.go @@ -20,8 +20,9 @@ import ( "context" "testing" + awsecrtypes "github.com/aws/aws-sdk-go-v2/service/ecr/types" + awsecr "github.com/aws/aws-sdk-go-v2/service/ecr" - "github.com/aws/aws-sdk-go/aws/awserr" "github.com/crossplane/crossplane-runtime/pkg/resource" "github.com/crossplane/crossplane-runtime/pkg/test" "github.com/google/go-cmp/cmp" @@ -138,12 +139,10 @@ func TestObserve(t *testing.T) { "NeedUpdateInput": { args: args{ ecr: &fake.MockRepositoryPolicyClient{ - MockGet: func(input *awsecr.GetRepositoryPolicyInput) awsecr.GetRepositoryPolicyRequest { - return awsecr.GetRepositoryPolicyRequest{ - Request: &aws.Request{HTTPRequest: &http.Request{}, Retryer: aws.NoOpRetryer{}, Data: &awsecr.GetRepositoryPolicyOutput{ - PolicyText: &needUpdatePolicy, - }}, - } + MockGet: func(_ context.Context, _ *awsecr.GetRepositoryPolicyInput, _ []func(*awsecr.Options)) (*awsecr.GetRepositoryPolicyOutput, error) { + return &awsecr.GetRepositoryPolicyOutput{ + PolicyText: &needUpdatePolicy, + }, nil }, }, cr: repositoryPolicy(withPolicy(¶ms)), @@ -175,7 +174,7 @@ func TestObserve(t *testing.T) { args: args{ ecr: &fake.MockRepositoryPolicyClient{ MockGet: func(ctx context.Context, input *awsecr.GetRepositoryPolicyInput, opts []func(*awsecr.Options)) (*awsecr.GetRepositoryPolicyOutput, error) { - return &awsecr.GetRepositoryPolicyOutput{}, awserr.New(ecr.RepositoryPolicyNotFoundException, "", nil) + return &awsecr.GetRepositoryPolicyOutput{}, &awsecrtypes.RepositoryPolicyNotFoundException{} }, }, cr: repositoryPolicy(), @@ -391,7 +390,7 @@ func TestDelete(t *testing.T) { args: args{ ecr: &fake.MockRepositoryPolicyClient{ MockDelete: func(ctx context.Context, input *awsecr.DeleteRepositoryPolicyInput, opts []func(*awsecr.Options)) (*awsecr.DeleteRepositoryPolicyOutput, error) { - return &awsecr.DeleteRepositoryPolicyOutput{}, awserr.New(ecr.RepositoryPolicyNotFoundException, "", nil) + return &awsecr.DeleteRepositoryPolicyOutput{}, &awsecrtypes.RepositoryPolicyNotFoundException{} }, }, cr: repositoryPolicy(withPolicy(¶ms)), diff --git a/pkg/controller/efs/filesystem/setup.go b/pkg/controller/efs/filesystem/setup.go index e8d2d6df73..944563b756 100644 --- a/pkg/controller/efs/filesystem/setup.go +++ b/pkg/controller/efs/filesystem/setup.go @@ -39,12 +39,12 @@ func SetupFileSystem(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimite return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.FileSystem{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.FileSystemGroupVersionKind), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), @@ -108,5 +108,5 @@ func postCreate(_ context.Context, cr *svcapitypes.FileSystem, obj *svcsdk.FileS return managed.ExternalCreation{}, err } meta.SetExternalName(cr, awsclients.StringValue(obj.FileSystemId)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } diff --git a/pkg/controller/efs/mounttarget/setup.go b/pkg/controller/efs/mounttarget/setup.go index 94d716bcfd..88cd86577a 100644 --- a/pkg/controller/efs/mounttarget/setup.go +++ b/pkg/controller/efs/mounttarget/setup.go @@ -35,12 +35,12 @@ func SetupMountTarget(mgr ctrl.Manager, l logging.Logger, limiter workqueue.Rate return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(limiter), + RateLimiter: ratelimiter.NewController(limiter), }). For(&svcapitypes.MountTarget{}). Complete(managed.NewReconciler(mgr, cpresource.ManagedKind(svcapitypes.MountTargetGroupVersionKind), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -62,7 +62,7 @@ func postCreate(_ context.Context, cr *svcapitypes.MountTarget, obj *svcsdk.Moun return managed.ExternalCreation{}, err } meta.SetExternalName(cr, awsclients.StringValue(obj.MountTargetId)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func preObserve(_ context.Context, cr *svcapitypes.MountTarget, obj *svcsdk.DescribeMountTargetsInput) error { diff --git a/pkg/controller/eks/cluster.go b/pkg/controller/eks/cluster.go index 6394ecc4f0..dda79dc8ae 100644 --- a/pkg/controller/eks/cluster.go +++ b/pkg/controller/eks/cluster.go @@ -63,7 +63,7 @@ func SetupCluster(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.Cluster{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/eks/fargateprofile/controller.go b/pkg/controller/eks/fargateprofile/controller.go index 3a6f72e637..71e717b7f6 100644 --- a/pkg/controller/eks/fargateprofile/controller.go +++ b/pkg/controller/eks/fargateprofile/controller.go @@ -58,7 +58,7 @@ func SetupFargateProfile(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLi return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.FargateProfile{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/eks/nodegroup/controller.go b/pkg/controller/eks/nodegroup/controller.go index 65ae6ff836..3f8ddd7123 100644 --- a/pkg/controller/eks/nodegroup/controller.go +++ b/pkg/controller/eks/nodegroup/controller.go @@ -61,7 +61,7 @@ func SetupNodeGroup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.NodeGroup{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/elasticloadbalancing/elb/controller.go b/pkg/controller/elasticloadbalancing/elb/controller.go index 7538147010..d049b41497 100644 --- a/pkg/controller/elasticloadbalancing/elb/controller.go +++ b/pkg/controller/elasticloadbalancing/elb/controller.go @@ -62,7 +62,7 @@ func SetupELB(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, poll return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.ELB{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/elasticloadbalancing/elbattachment/controller.go b/pkg/controller/elasticloadbalancing/elbattachment/controller.go index e3f45e3f23..d487c99e26 100644 --- a/pkg/controller/elasticloadbalancing/elbattachment/controller.go +++ b/pkg/controller/elasticloadbalancing/elbattachment/controller.go @@ -57,7 +57,7 @@ func SetupELBAttachment(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLim return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.ELBAttachment{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/identity/iamaccesskey/controller.go b/pkg/controller/identity/iamaccesskey/controller.go index a0ce576c3f..cb32968ffd 100644 --- a/pkg/controller/identity/iamaccesskey/controller.go +++ b/pkg/controller/identity/iamaccesskey/controller.go @@ -57,7 +57,7 @@ func SetupIAMAccessKey(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimi return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.IAMAccessKey{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/identity/iamgroup/controller.go b/pkg/controller/identity/iamgroup/controller.go index ef35089f5d..cfa638cf60 100644 --- a/pkg/controller/identity/iamgroup/controller.go +++ b/pkg/controller/identity/iamgroup/controller.go @@ -59,7 +59,7 @@ func SetupIAMGroup(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.IAMGroup{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/identity/iamgrouppolicyattachment/controller.go b/pkg/controller/identity/iamgrouppolicyattachment/controller.go index a3610b39dd..8852bcfaa5 100644 --- a/pkg/controller/identity/iamgrouppolicyattachment/controller.go +++ b/pkg/controller/identity/iamgrouppolicyattachment/controller.go @@ -59,7 +59,7 @@ func SetupIAMGroupPolicyAttachment(mgr ctrl.Manager, l logging.Logger, rl workqu return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.IAMGroupPolicyAttachment{}). Complete(managed.NewReconciler(mgr, @@ -67,7 +67,7 @@ func SetupIAMGroupPolicyAttachment(mgr ctrl.Manager, l logging.Logger, rl workqu managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: iam.NewGroupPolicyAttachmentClient}), managed.WithConnectionPublishers(), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -97,11 +97,6 @@ func (e *external) Observe(ctx context.Context, mgd resource.Managed) (managed.E return managed.ExternalObservation{}, errors.New(errUnexpectedObject) } -<<<<<<< HEAD - observed, err := e.client.ListAttachedGroupPolicies(ctx, &awsiam.ListAttachedGroupPoliciesInput{ - GroupName: &cr.Spec.ForProvider.GroupName, - }) -======= if meta.GetExternalName(cr) == "" { return managed.ExternalObservation{ResourceExists: false}, nil } @@ -113,21 +108,16 @@ func (e *external) Observe(ctx context.Context, mgd resource.Managed) (managed.E } groupName, policyARN := nn[0], nn[1] - observed, err := e.client.ListAttachedGroupPoliciesRequest(&awsiam.ListAttachedGroupPoliciesInput{ + observed, err := e.client.ListAttachedGroupPolicies(ctx, &awsiam.ListAttachedGroupPoliciesInput{ GroupName: &groupName, - }).Send(ctx) ->>>>>>> upstream/master + }) if err != nil { return managed.ExternalObservation{}, awsclient.Wrap(resource.Ignore(iam.IsErrorNotFound, err), errGet) } var attachedPolicyObject *awsiamtypes.AttachedPolicy for i, policy := range observed.AttachedPolicies { -<<<<<<< HEAD - if cr.Spec.ForProvider.PolicyARN == aws.ToString(policy.PolicyArn) { -======= - if policyARN == aws.StringValue(policy.PolicyArn) { ->>>>>>> upstream/master + if policyARN == aws.ToString(policy.PolicyArn) { attachedPolicyObject = &observed.AttachedPolicies[i] break } @@ -157,18 +147,10 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex return managed.ExternalCreation{}, errors.New(errUnexpectedObject) } -<<<<<<< HEAD - cr.SetConditions(xpv1.Creating()) - _, err := e.client.AttachGroupPolicy(ctx, &awsiam.AttachGroupPolicyInput{ PolicyArn: &cr.Spec.ForProvider.PolicyARN, GroupName: &cr.Spec.ForProvider.GroupName, }) -======= - _, err := e.client.AttachGroupPolicyRequest(&awsiam.AttachGroupPolicyInput{ - PolicyArn: &cr.Spec.ForProvider.PolicyARN, - GroupName: &cr.Spec.ForProvider.GroupName, - }).Send(ctx) if err != nil { return managed.ExternalCreation{}, awsclient.Wrap(err, errAttach) } @@ -177,9 +159,8 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex // external identity. We therefore derive an external name from the // names of the group and user that are bound. meta.SetExternalName(cr, cr.Spec.ForProvider.GroupName+"/"+cr.Spec.ForProvider.PolicyARN) ->>>>>>> upstream/master - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func (e *external) Update(_ context.Context, _ resource.Managed) (managed.ExternalUpdate, error) { diff --git a/pkg/controller/identity/iamgrouppolicyattachment/controller_test.go b/pkg/controller/identity/iamgrouppolicyattachment/controller_test.go index 35e567df59..f56a3c6ae9 100644 --- a/pkg/controller/identity/iamgrouppolicyattachment/controller_test.go +++ b/pkg/controller/identity/iamgrouppolicyattachment/controller_test.go @@ -205,7 +205,6 @@ func TestCreate(t *testing.T) { withSpecGroupName(groupName), withSpecPolicyArn(policyArn), withExternalName(groupName+"/"+policyArn)), - result: managed.ExternalCreation{ExternalNameAssigned: true}, }, }, "InValidInput": { diff --git a/pkg/controller/identity/iamgroupusermembership/controller.go b/pkg/controller/identity/iamgroupusermembership/controller.go index 70d9d4e96f..f1024f1e1a 100644 --- a/pkg/controller/identity/iamgroupusermembership/controller.go +++ b/pkg/controller/identity/iamgroupusermembership/controller.go @@ -23,11 +23,8 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" awsiam "github.com/aws/aws-sdk-go-v2/service/iam" -<<<<<<< HEAD awsiamtypes "github.com/aws/aws-sdk-go-v2/service/iam/types" -======= "github.com/crossplane/crossplane-runtime/pkg/meta" ->>>>>>> upstream/master "github.com/pkg/errors" "k8s.io/client-go/util/workqueue" ctrl "sigs.k8s.io/controller-runtime" @@ -62,7 +59,7 @@ func SetupIAMGroupUserMembership(mgr ctrl.Manager, l logging.Logger, rl workqueu return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.IAMGroupUserMembership{}). Complete(managed.NewReconciler(mgr, @@ -70,7 +67,7 @@ func SetupIAMGroupUserMembership(mgr ctrl.Manager, l logging.Logger, rl workqueu managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: iam.NewGroupUserMembershipClient}), managed.WithConnectionPublishers(), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -100,11 +97,6 @@ func (e *external) Observe(ctx context.Context, mgd resource.Managed) (managed.E return managed.ExternalObservation{}, errors.New(errUnexpectedObject) } -<<<<<<< HEAD - observed, err := e.client.ListGroupsForUser(ctx, &awsiam.ListGroupsForUserInput{ - UserName: &cr.Spec.ForProvider.UserName, - }) -======= if meta.GetExternalName(cr) == "" { return managed.ExternalObservation{ResourceExists: false}, nil } @@ -116,21 +108,16 @@ func (e *external) Observe(ctx context.Context, mgd resource.Managed) (managed.E } groupName, userName := nn[0], nn[1] - observed, err := e.client.ListGroupsForUserRequest(&awsiam.ListGroupsForUserInput{ + observed, err := e.client.ListGroupsForUser(ctx, &awsiam.ListGroupsForUserInput{ UserName: &userName, - }).Send(ctx) ->>>>>>> upstream/master + }) if err != nil { return managed.ExternalObservation{}, awsclient.Wrap(err, errGet) } var attachedGroupObject *awsiamtypes.Group for i, group := range observed.Groups { -<<<<<<< HEAD - if cr.Spec.ForProvider.GroupName == aws.ToString(group.GroupName) { -======= - if groupName == aws.StringValue(group.GroupName) { ->>>>>>> upstream/master + if groupName == aws.ToString(group.GroupName) { attachedGroupObject = &observed.Groups[i] break } @@ -160,18 +147,10 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex return managed.ExternalCreation{}, errors.New(errUnexpectedObject) } -<<<<<<< HEAD - cr.SetConditions(xpv1.Creating()) - _, err := e.client.AddUserToGroup(ctx, &awsiam.AddUserToGroupInput{ GroupName: &cr.Spec.ForProvider.GroupName, UserName: &cr.Spec.ForProvider.UserName, }) -======= - _, err := e.client.AddUserToGroupRequest(&awsiam.AddUserToGroupInput{ - GroupName: &cr.Spec.ForProvider.GroupName, - UserName: &cr.Spec.ForProvider.UserName, - }).Send(ctx) if err != nil { return managed.ExternalCreation{}, awsclient.Wrap(err, errAdd) } @@ -180,9 +159,8 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex // external identity. We therefore derive an external name from the // names of the group and user that are bound. meta.SetExternalName(cr, cr.Spec.ForProvider.GroupName+"/"+cr.Spec.ForProvider.UserName) ->>>>>>> upstream/master - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func (e *external) Update(_ context.Context, _ resource.Managed) (managed.ExternalUpdate, error) { diff --git a/pkg/controller/identity/iamgroupusermembership/controller_test.go b/pkg/controller/identity/iamgroupusermembership/controller_test.go index 6081215455..4fcdb5cebd 100644 --- a/pkg/controller/identity/iamgroupusermembership/controller_test.go +++ b/pkg/controller/identity/iamgroupusermembership/controller_test.go @@ -202,7 +202,7 @@ func TestCreate(t *testing.T) { withSpecGroupName(groupName), withSpecUserName(userName), withExternalName(groupName+"/"+userName)), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "InValidInput": { diff --git a/pkg/controller/identity/iampolicy/controller.go b/pkg/controller/identity/iampolicy/controller.go index f98b335e37..57c7171653 100644 --- a/pkg/controller/identity/iampolicy/controller.go +++ b/pkg/controller/identity/iampolicy/controller.go @@ -61,13 +61,13 @@ func SetupIAMPolicy(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.IAMPolicy{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.IAMPolicyGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: iam.NewPolicyClient}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithConnectionPublishers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), @@ -165,7 +165,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex meta.SetExternalName(cr, aws.ToString(createOutput.Policy.Arn)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) { diff --git a/pkg/controller/identity/iampolicy/controller_test.go b/pkg/controller/identity/iampolicy/controller_test.go index 41745731fe..93296b5d08 100644 --- a/pkg/controller/identity/iampolicy/controller_test.go +++ b/pkg/controller/identity/iampolicy/controller_test.go @@ -241,7 +241,7 @@ func TestCreate(t *testing.T) { Name: name, }), withExterName(arn)), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "InValidInput": { diff --git a/pkg/controller/identity/iamrole/controller.go b/pkg/controller/identity/iamrole/controller.go index 3de4ee44bd..2d1c3abef5 100644 --- a/pkg/controller/identity/iamrole/controller.go +++ b/pkg/controller/identity/iamrole/controller.go @@ -62,7 +62,7 @@ func SetupIAMRole(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.IAMRole{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/identity/iamrolepolicyattachment/controller.go b/pkg/controller/identity/iamrolepolicyattachment/controller.go index 2c9cc8b218..5b1c46140c 100644 --- a/pkg/controller/identity/iamrolepolicyattachment/controller.go +++ b/pkg/controller/identity/iamrolepolicyattachment/controller.go @@ -59,7 +59,7 @@ func SetupIAMRolePolicyAttachment(mgr ctrl.Manager, l logging.Logger, rl workque return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.IAMRolePolicyAttachment{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/identity/iamuser/controller.go b/pkg/controller/identity/iamuser/controller.go index fca036e2ef..53d1c1d6e9 100644 --- a/pkg/controller/identity/iamuser/controller.go +++ b/pkg/controller/identity/iamuser/controller.go @@ -61,7 +61,7 @@ func SetupIAMUser(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.IAMUser{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/identity/iamuserpolicyattachment/controller.go b/pkg/controller/identity/iamuserpolicyattachment/controller.go index 273470f86c..655dffcd94 100644 --- a/pkg/controller/identity/iamuserpolicyattachment/controller.go +++ b/pkg/controller/identity/iamuserpolicyattachment/controller.go @@ -60,7 +60,7 @@ func SetupIAMUserPolicyAttachment(mgr ctrl.Manager, l logging.Logger, rl workque return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.IAMUserPolicyAttachment{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/identity/openidconnectprovider/controller.go b/pkg/controller/identity/openidconnectprovider/controller.go index eeac9ad4aa..30f2fa551b 100644 --- a/pkg/controller/identity/openidconnectprovider/controller.go +++ b/pkg/controller/identity/openidconnectprovider/controller.go @@ -63,13 +63,13 @@ func SetupOpenIDConnectProvider(mgr ctrl.Manager, l logging.Logger, rl workqueue return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.OpenIDConnectProvider{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.OpenIDConnectProviderGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: iam.NewOpenIDConnectProviderClient}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -145,7 +145,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex } meta.SetExternalName(cr, awsgo.StringValue(observed.OpenIDConnectProviderArn)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) { @@ -158,7 +158,7 @@ func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.Ex }) if err != nil { - return managed.ExternalUpdate{}, awsclient.Wrap(resource.Ignore(iam.IsErrorNotFound, err), errGet) + return managed.ExternalUpdate{}, awsclient.Wrap(err, errGet) } if observedProvider == nil { return managed.ExternalUpdate{}, errors.New(errSDK) diff --git a/pkg/controller/identity/openidconnectprovider/controller_test.go b/pkg/controller/identity/openidconnectprovider/controller_test.go index df03425ebe..1b7926702d 100644 --- a/pkg/controller/identity/openidconnectprovider/controller_test.go +++ b/pkg/controller/identity/openidconnectprovider/controller_test.go @@ -20,6 +20,8 @@ import ( "context" "testing" + iamtypes "github.com/aws/aws-sdk-go-v2/service/iam/types" + "github.com/aws/aws-sdk-go-v2/aws" awsiam "github.com/aws/aws-sdk-go-v2/service/iam" "github.com/google/go-cmp/cmp" @@ -128,7 +130,7 @@ func TestObserve(t *testing.T) { args: args{ iam: &fake.MockOpenIDConnectProviderClient{ MockGetOpenIDConnectProvider: func(ctx context.Context, input *awsiam.GetOpenIDConnectProviderInput, opts []func(*awsiam.Options)) (*awsiam.GetOpenIDConnectProviderOutput, error) { - return nil, iam.NewErrorNotFound() + return nil, &iamtypes.NoSuchEntityException{} }, }, cr: oidcProvider(withURL(url), @@ -234,9 +236,6 @@ func TestCreate(t *testing.T) { cr: oidcProvider(withURL(url), func(provider *svcapitypes.OpenIDConnectProvider) { meta.SetExternalName(provider, providerArn) }), - result: managed.ExternalCreation{ - ExternalNameAssigned: true, - }, }, }, } @@ -309,9 +308,7 @@ func TestUpdate(t *testing.T) { args: args{ iam: &fake.MockOpenIDConnectProviderClient{ MockGetOpenIDConnectProvider: func(ctx context.Context, input *awsiam.GetOpenIDConnectProviderInput, opts []func(*awsiam.Options)) (*awsiam.GetOpenIDConnectProviderOutput, error) { - return &awsiam.GetOpenIDConnectProviderOutput{ - ThumbprintList: []string{"a"}, - }, nil + return &awsiam.GetOpenIDConnectProviderOutput{}, nil }, MockAddClientIDToOpenIDConnectProvider: func(ctx context.Context, input *awsiam.AddClientIDToOpenIDConnectProviderInput, opts []func(*awsiam.Options)) (*awsiam.AddClientIDToOpenIDConnectProviderOutput, error) { return &awsiam.AddClientIDToOpenIDConnectProviderOutput{}, errBoom diff --git a/pkg/controller/kafka/cluster/setup.go b/pkg/controller/kafka/cluster/setup.go index 0378e8b745..f8c60535bd 100644 --- a/pkg/controller/kafka/cluster/setup.go +++ b/pkg/controller/kafka/cluster/setup.go @@ -51,12 +51,12 @@ func SetupCluster(mgr ctrl.Manager, l logging.Logger, limiter workqueue.RateLimi return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(limiter), + RateLimiter: ratelimiter.NewController(limiter), }). For(&svcapitypes.Cluster{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.ClusterGroupVersionKind), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), @@ -117,7 +117,7 @@ func postCreate(_ context.Context, cr *svcapitypes.Cluster, obj *svcsdk.CreateCl return managed.ExternalCreation{}, err } meta.SetExternalName(cr, awsclients.StringValue(obj.ClusterArn)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } // LateInitialize fills the empty fields in *svcapitypes.ClusterParameters with diff --git a/pkg/controller/kms/key/setup.go b/pkg/controller/kms/key/setup.go index b5b0bfe99c..f40a26f0a4 100644 --- a/pkg/controller/kms/key/setup.go +++ b/pkg/controller/kms/key/setup.go @@ -43,7 +43,7 @@ func SetupKey(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, poll return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Key{}). Complete(managed.NewReconciler(mgr, @@ -86,7 +86,7 @@ func postCreate(_ context.Context, cr *svcapitypes.Key, obj *svcsdk.CreateKeyOut return creation, err } meta.SetExternalName(cr, awsclients.StringValue(obj.KeyMetadata.KeyId)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } type updater struct { diff --git a/pkg/controller/lambda/function/setup.go b/pkg/controller/lambda/function/setup.go index ce2b8addc0..9f35b3edb7 100644 --- a/pkg/controller/lambda/function/setup.go +++ b/pkg/controller/lambda/function/setup.go @@ -44,7 +44,7 @@ func SetupFunction(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.Function{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/notification/snssubscription/controller.go b/pkg/controller/notification/snssubscription/controller.go index 7879017c7f..f1bcc871eb 100644 --- a/pkg/controller/notification/snssubscription/controller.go +++ b/pkg/controller/notification/snssubscription/controller.go @@ -58,14 +58,14 @@ func SetupSubscription(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimi return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.SNSSubscription{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.SNSSubscriptionGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: sns.NewSubscriptionClient}), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithConnectionPublishers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), @@ -151,7 +151,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex } meta.SetExternalName(cr, aws.ToString(res.SubscriptionArn)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) { diff --git a/pkg/controller/notification/snssubscription/controller_test.go b/pkg/controller/notification/snssubscription/controller_test.go index 96e1bc1823..0204ad71ec 100644 --- a/pkg/controller/notification/snssubscription/controller_test.go +++ b/pkg/controller/notification/snssubscription/controller_test.go @@ -126,7 +126,7 @@ func TestCreate(t *testing.T) { }, want: want{ cr: subscription(withSubARN(&subName)), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "InValidInput": { diff --git a/pkg/controller/notification/snstopic/controller.go b/pkg/controller/notification/snstopic/controller.go index f92f4091f5..74fd4926d8 100644 --- a/pkg/controller/notification/snstopic/controller.go +++ b/pkg/controller/notification/snstopic/controller.go @@ -58,14 +58,14 @@ func SetupSNSTopic(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.SNSTopic{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(v1alpha1.SNSTopicGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: sns.NewTopicClient}), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithConnectionPublishers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), @@ -141,7 +141,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex } meta.SetExternalName(cr, aws.ToString(resp.TopicArn)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) { diff --git a/pkg/controller/notification/snstopic/controller_test.go b/pkg/controller/notification/snstopic/controller_test.go index 148eb98663..c31fb896dc 100644 --- a/pkg/controller/notification/snstopic/controller_test.go +++ b/pkg/controller/notification/snstopic/controller_test.go @@ -274,7 +274,7 @@ func TestCreate(t *testing.T) { cr: topic( withDisplayName(&topicDisplayName), withTopicName(&topicName)), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "InValidInput": { diff --git a/pkg/controller/rds/dbcluster/setup.go b/pkg/controller/rds/dbcluster/setup.go index ab90415d68..ad16302355 100644 --- a/pkg/controller/rds/dbcluster/setup.go +++ b/pkg/controller/rds/dbcluster/setup.go @@ -42,7 +42,7 @@ func SetupDBCluster(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.DBCluster{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/rds/dbclusterparametergroup/setup.go b/pkg/controller/rds/dbclusterparametergroup/setup.go index cbe842795e..62b25ad544 100644 --- a/pkg/controller/rds/dbclusterparametergroup/setup.go +++ b/pkg/controller/rds/dbclusterparametergroup/setup.go @@ -40,7 +40,7 @@ func SetupDBClusterParameterGroup(mgr ctrl.Manager, l logging.Logger, rl workque return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.DBClusterParameterGroup{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/rds/dbinstance/setup.go b/pkg/controller/rds/dbinstance/setup.go index af2471c2e3..00fb63913e 100644 --- a/pkg/controller/rds/dbinstance/setup.go +++ b/pkg/controller/rds/dbinstance/setup.go @@ -64,7 +64,7 @@ func SetupDBInstance(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimite return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.DBInstance{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/rds/dbparametergroup/setup.go b/pkg/controller/rds/dbparametergroup/setup.go index 3e0e81bcb1..74c3edee95 100644 --- a/pkg/controller/rds/dbparametergroup/setup.go +++ b/pkg/controller/rds/dbparametergroup/setup.go @@ -41,7 +41,7 @@ func SetupDBParameterGroup(mgr ctrl.Manager, l logging.Logger, rl workqueue.Rate return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.DBParameterGroup{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/rds/globalcluster/setup.go b/pkg/controller/rds/globalcluster/setup.go index 4f63682699..2533076004 100644 --- a/pkg/controller/rds/globalcluster/setup.go +++ b/pkg/controller/rds/globalcluster/setup.go @@ -36,7 +36,7 @@ func SetupGlobalCluster(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLim return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.GlobalCluster{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/redshift/controller.go b/pkg/controller/redshift/controller.go index 1c0d3ff415..bc7d4dba54 100644 --- a/pkg/controller/redshift/controller.go +++ b/pkg/controller/redshift/controller.go @@ -60,7 +60,7 @@ func SetupCluster(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.Cluster{}). Complete(managed.NewReconciler( diff --git a/pkg/controller/route53/hostedzone/controller.go b/pkg/controller/route53/hostedzone/controller.go index dd20a51057..514494a2f8 100644 --- a/pkg/controller/route53/hostedzone/controller.go +++ b/pkg/controller/route53/hostedzone/controller.go @@ -59,7 +59,7 @@ func SetupHostedZone(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimite return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.HostedZone{}). Complete(managed.NewReconciler( @@ -67,7 +67,7 @@ func SetupHostedZone(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimite managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: hostedzone.NewClient}), managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())), managed.WithConnectionPublishers(), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name)))), @@ -138,7 +138,7 @@ func (e *external) Create(ctx context.Context, mg resource.Managed) (managed.Ext return managed.ExternalCreation{}, errors.Wrap(errors.New("returned id does not contain /hostedzone/ prefix"), errCreate) } meta.SetExternalName(cr, id[1]) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func (e *external) Update(ctx context.Context, mg resource.Managed) (managed.ExternalUpdate, error) { diff --git a/pkg/controller/route53/hostedzone/controller_test.go b/pkg/controller/route53/hostedzone/controller_test.go index 9fae1bad94..da45861214 100644 --- a/pkg/controller/route53/hostedzone/controller_test.go +++ b/pkg/controller/route53/hostedzone/controller_test.go @@ -254,7 +254,7 @@ func TestCreate(t *testing.T) { want: want{ cr: instance( withExternalName(strings.SplitAfter(id, hostedzone.IDPrefix)[1])), - result: managed.ExternalCreation{ExternalNameAssigned: true}, + result: managed.ExternalCreation{}, }, }, "InValidInput": { diff --git a/pkg/controller/route53/resourcerecordset/controller.go b/pkg/controller/route53/resourcerecordset/controller.go index b5b40ba3fa..33b9a63b3a 100644 --- a/pkg/controller/route53/resourcerecordset/controller.go +++ b/pkg/controller/route53/resourcerecordset/controller.go @@ -58,7 +58,7 @@ func SetupResourceRecordSet(mgr ctrl.Manager, l logging.Logger, rl workqueue.Rat return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.ResourceRecordSet{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/route53resolver/resolverendpoint/hooks.go b/pkg/controller/route53resolver/resolverendpoint/hooks.go index d4bd1f5827..1c472201d5 100644 --- a/pkg/controller/route53resolver/resolverendpoint/hooks.go +++ b/pkg/controller/route53resolver/resolverendpoint/hooks.go @@ -37,13 +37,13 @@ func SetupResolverEndpoint(mgr ctrl.Manager, l logging.Logger, rl workqueue.Rate return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.ResolverEndpoint{}). Complete(managed.NewReconciler(mgr, cpresource.ManagedKind(v1alpha1.ResolverEndpointGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -75,7 +75,6 @@ func preCreate(_ context.Context, cr *v1alpha1.ResolverEndpoint, obj *svcsdk.Cre func postCreate(_ context.Context, cr *v1alpha1.ResolverEndpoint, obj *svcsdk.CreateResolverEndpointOutput, cre managed.ExternalCreation, err error) (managed.ExternalCreation, error) { meta.SetExternalName(cr, aws.StringValue(obj.ResolverEndpoint.Id)) - cre.ExternalNameAssigned = true return cre, err } diff --git a/pkg/controller/route53resolver/resolverrule/hooks.go b/pkg/controller/route53resolver/resolverrule/hooks.go index 971b286f53..cd069f1d3e 100644 --- a/pkg/controller/route53resolver/resolverrule/hooks.go +++ b/pkg/controller/route53resolver/resolverrule/hooks.go @@ -37,13 +37,13 @@ func SetupResolverRule(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimi return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha1.ResolverRule{}). Complete(managed.NewReconciler(mgr, cpresource.ManagedKind(v1alpha1.ResolverRuleGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -61,7 +61,6 @@ func preCreate(_ context.Context, cr *v1alpha1.ResolverRule, obj *svcsdk.CreateR func postCreate(_ context.Context, cr *v1alpha1.ResolverRule, obj *svcsdk.CreateResolverRuleOutput, cre managed.ExternalCreation, err error) (managed.ExternalCreation, error) { meta.SetExternalName(cr, aws.StringValue(obj.ResolverRule.Id)) - cre.ExternalNameAssigned = true return cre, err } diff --git a/pkg/controller/s3/bucket.go b/pkg/controller/s3/bucket.go index 955061f0e6..32632b437c 100644 --- a/pkg/controller/s3/bucket.go +++ b/pkg/controller/s3/bucket.go @@ -60,7 +60,7 @@ func SetupBucket(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, p return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.Bucket{}). Complete(managed.NewReconciler(mgr, @@ -162,7 +162,6 @@ func (e *external) Create(ctx context.Context, mg resource.Managed) (managed.Ext if !ok { return managed.ExternalCreation{}, errors.New(errUnexpectedObject) } - cr.Status.SetConditions(xpv1.Creating()) _, err := e.s3client.CreateBucket(ctx, s3.GenerateCreateBucketInput(meta.GetExternalName(cr), cr.Spec.ForProvider)) if resource.Ignore(s3.IsAlreadyExists, err) != nil { diff --git a/pkg/controller/s3/bucket/CORSConfig.go b/pkg/controller/s3/bucket/CORSConfig.go index 845cf21e73..60e2494f2b 100644 --- a/pkg/controller/s3/bucket/CORSConfig.go +++ b/pkg/controller/s3/bucket/CORSConfig.go @@ -16,7 +16,6 @@ package bucket import ( "context" - "github.com/aws/aws-sdk-go-v2/aws" awss3 "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/crossplane/crossplane-runtime/pkg/meta" @@ -124,7 +123,7 @@ func GeneratePutBucketCorsInput(name string, config *v1beta1.CORSConfiguration) AllowedMethods: cors.AllowedMethods, AllowedOrigins: cors.AllowedOrigins, ExposeHeaders: cors.ExposeHeaders, - MaxAgeSeconds: aws.ToInt32(cors.MaxAgeSeconds), + MaxAgeSeconds: cors.MaxAgeSeconds, }) } return bci @@ -147,7 +146,7 @@ func CompareCORS(local []v1beta1.CORSRule, external []types.CORSRule) ResourceSt cmp.Equal(local[i].AllowedMethods, outputRule.AllowedMethods) && cmp.Equal(local[i].AllowedOrigins, outputRule.AllowedOrigins) && cmp.Equal(local[i].ExposeHeaders, outputRule.ExposeHeaders) && - cmp.Equal(local[i].MaxAgeSeconds, outputRule.MaxAgeSeconds)) { + local[i].MaxAgeSeconds == outputRule.MaxAgeSeconds) { return NeedsUpdate } } @@ -164,7 +163,7 @@ func GenerateCORSRule(config []types.CORSRule) []v1beta1.CORSRule { AllowedMethods: cors.AllowedMethods, AllowedOrigins: cors.AllowedOrigins, ExposeHeaders: cors.ExposeHeaders, - MaxAgeSeconds: aws.Int32(cors.MaxAgeSeconds), + MaxAgeSeconds: cors.MaxAgeSeconds, } } return output diff --git a/pkg/controller/s3/bucket/CORSConfig_test.go b/pkg/controller/s3/bucket/CORSConfig_test.go index 3ea7389f85..64eeff8472 100644 --- a/pkg/controller/s3/bucket/CORSConfig_test.go +++ b/pkg/controller/s3/bucket/CORSConfig_test.go @@ -42,7 +42,7 @@ func generateCORSConfig() *v1beta1.CORSConfiguration { AllowedMethods: []string{"GET"}, AllowedOrigins: []string{"test.origin"}, ExposeHeaders: []string{"test.expose"}, - MaxAgeSeconds: awsclient.Int32(10), + MaxAgeSeconds: 10, }, }, } @@ -157,7 +157,6 @@ func TestCORSObserve(t *testing.T) { }, want: want{ status: Updated, - err: nil, }, }, } diff --git a/pkg/controller/s3/bucket/lifecycleConfig.go b/pkg/controller/s3/bucket/lifecycleConfig.go index 1b69beb553..82a63e1e37 100644 --- a/pkg/controller/s3/bucket/lifecycleConfig.go +++ b/pkg/controller/s3/bucket/lifecycleConfig.go @@ -19,6 +19,8 @@ package bucket import ( "context" + "github.com/aws/smithy-go/document" + "github.com/aws/aws-sdk-go-v2/aws" awss3 "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -73,7 +75,7 @@ func (in *LifecycleConfigurationClient) Observe(ctx context.Context, bucket *v1b // and we don't have late-init for this subresource. Besides, a change in ID // is almost never expected. case cmp.Equal(external, GenerateLifecycleRules(local), - cmpopts.IgnoreFields(types.LifecycleRule{}, "ID")): + cmpopts.IgnoreFields(types.LifecycleRule{}, "ID"), cmpopts.IgnoreTypes(document.NoSerde{})): return Updated, nil default: return NeedsUpdate, nil @@ -159,21 +161,21 @@ func GenerateLifecycleRules(in []v1beta1.LifecycleRule) []types.LifecycleRule { } if local.Expiration != nil { rule.Expiration = &types.LifecycleExpiration{ - Days: aws.ToInt32(local.Expiration.Days), - ExpiredObjectDeleteMarker: aws.ToBool(local.Expiration.ExpiredObjectDeleteMarker), + Days: local.Expiration.Days, + ExpiredObjectDeleteMarker: local.Expiration.ExpiredObjectDeleteMarker, } if local.Expiration.Date != nil { rule.Expiration.Date = &local.Expiration.Date.Time } } if local.NoncurrentVersionExpiration != nil { - rule.NoncurrentVersionExpiration = &types.NoncurrentVersionExpiration{NoncurrentDays: aws.ToInt32(local.NoncurrentVersionExpiration.NoncurrentDays)} + rule.NoncurrentVersionExpiration = &types.NoncurrentVersionExpiration{NoncurrentDays: local.NoncurrentVersionExpiration.NoncurrentDays} } if local.NoncurrentVersionTransitions != nil { rule.NoncurrentVersionTransitions = make([]types.NoncurrentVersionTransition, len(local.NoncurrentVersionTransitions)) for tIndex, transition := range local.NoncurrentVersionTransitions { rule.NoncurrentVersionTransitions[tIndex] = types.NoncurrentVersionTransition{ - NoncurrentDays: aws.ToInt32(transition.NoncurrentDays), + NoncurrentDays: transition.NoncurrentDays, StorageClass: types.TransitionStorageClass(transition.StorageClass), } } @@ -182,7 +184,7 @@ func GenerateLifecycleRules(in []v1beta1.LifecycleRule) []types.LifecycleRule { rule.Transitions = make([]types.Transition, len(local.Transitions)) for tIndex, transition := range local.Transitions { rule.Transitions[tIndex] = types.Transition{ - Days: aws.ToInt32(transition.Days), + Days: transition.Days, StorageClass: types.TransitionStorageClass(transition.StorageClass), } if transition.Date != nil { @@ -232,8 +234,8 @@ func createLifecycleRulesFromExternal(external []types.LifecycleRule, config *v1 for i, rule := range external { config.Rules[i] = v1beta1.LifecycleRule{ - ID: awsclient.LateInitializeStringPtr(config.Rules[i].ID, rule.ID), - Status: awsclient.LateInitializeString(config.Rules[i].Status, awsclient.String(string(rule.Status))), + ID: rule.ID, + Status: string(rule.Status), } if rule.Filter != nil { @@ -245,17 +247,17 @@ func createLifecycleRulesFromExternal(external []types.LifecycleRule, config *v1 case *types.LifecycleRuleFilterMemberAnd: // Value is types.ReplicationRuleAndOperator config.Rules[i].Filter.And = &v1beta1.LifecycleRuleAndOperator{} - config.Rules[i].Filter.And.Prefix = awsclient.LateInitializeStringPtr(config.Rules[i].Filter.And.Prefix, v.Value.Prefix) + config.Rules[i].Filter.And.Prefix = v.Value.Prefix config.Rules[i].Filter.And.Tags = GenerateLocalTagging(v.Value.Tags).TagSet case *types.LifecycleRuleFilterMemberPrefix: // Value is string config.Rules[i].Filter = &v1beta1.LifecycleRuleFilter{} - config.Rules[i].Filter.Prefix = awsclient.LateInitializeStringPtr(config.Rules[i].Filter.Prefix, aws.String(v.Value)) + config.Rules[i].Filter.Prefix = aws.String(v.Value) case *types.LifecycleRuleFilterMemberTag: // Value is types.Tag config.Rules[i].Filter.Tag = &v1beta1.Tag{} - config.Rules[i].Filter.Tag.Key = awsclient.LateInitializeString(config.Rules[i].Filter.Tag.Key, v.Value.Key) - config.Rules[i].Filter.Tag.Value = awsclient.LateInitializeString(config.Rules[i].Filter.Tag.Value, v.Value.Value) + config.Rules[i].Filter.Tag.Key = aws.ToString(v.Value.Key) + config.Rules[i].Filter.Tag.Value = aws.ToString(v.Value.Value) case *types.UnknownUnionMember: // fmt.Println("unknown tag:", v.Tag) default: @@ -265,9 +267,7 @@ func createLifecycleRulesFromExternal(external []types.LifecycleRule, config *v1 if rule.AbortIncompleteMultipartUpload != nil { config.Rules[i].AbortIncompleteMultipartUpload = &v1beta1.AbortIncompleteMultipartUpload{} - config.Rules[i].AbortIncompleteMultipartUpload.DaysAfterInitiation = awsclient.LateInitializeInt32( - config.Rules[i].AbortIncompleteMultipartUpload.DaysAfterInitiation, - rule.AbortIncompleteMultipartUpload.DaysAfterInitiation) + config.Rules[i].AbortIncompleteMultipartUpload.DaysAfterInitiation = rule.AbortIncompleteMultipartUpload.DaysAfterInitiation } if rule.Expiration != nil { config.Rules[i].Expiration = &v1beta1.LifecycleExpiration{} @@ -275,51 +275,30 @@ func createLifecycleRulesFromExternal(external []types.LifecycleRule, config *v1 config.Rules[i].Expiration.Date, rule.Expiration.Date, ) - config.Rules[i].Expiration.Days = awsclient.LateInitializeInt32Ptr( - config.Rules[i].Expiration.Days, - &rule.Expiration.Days, - ) - config.Rules[i].Expiration.ExpiredObjectDeleteMarker = awsclient.LateInitializeBoolPtr( - config.Rules[i].Expiration.ExpiredObjectDeleteMarker, - &rule.Expiration.ExpiredObjectDeleteMarker, - ) + config.Rules[i].Expiration.Days = rule.Expiration.Days + config.Rules[i].Expiration.ExpiredObjectDeleteMarker = rule.Expiration.ExpiredObjectDeleteMarker } if rule.NoncurrentVersionExpiration != nil { config.Rules[i].NoncurrentVersionExpiration = &v1beta1.NoncurrentVersionExpiration{} - config.Rules[i].NoncurrentVersionExpiration.NoncurrentDays = awsclient.LateInitializeInt32Ptr( - config.Rules[i].NoncurrentVersionExpiration.NoncurrentDays, - &rule.NoncurrentVersionExpiration.NoncurrentDays, - ) + config.Rules[i].NoncurrentVersionExpiration.NoncurrentDays = rule.NoncurrentVersionExpiration.NoncurrentDays } if len(rule.NoncurrentVersionTransitions) != 0 { config.Rules[i].NoncurrentVersionTransitions = make([]v1beta1.NoncurrentVersionTransition, len(rule.NoncurrentVersionTransitions)) for j, nvt := range rule.NoncurrentVersionTransitions { - config.Rules[i].NoncurrentVersionTransitions[j].NoncurrentDays = awsclient.LateInitializeInt32Ptr( - config.Rules[i].NoncurrentVersionTransitions[j].NoncurrentDays, - &nvt.NoncurrentDays, - ) - config.Rules[i].NoncurrentVersionTransitions[j].StorageClass = awsclient.LateInitializeString( - config.Rules[i].NoncurrentVersionTransitions[j].StorageClass, - awsclient.String(string(nvt.StorageClass)), - ) + config.Rules[i].NoncurrentVersionTransitions[j].NoncurrentDays = nvt.NoncurrentDays + config.Rules[i].NoncurrentVersionTransitions[j].StorageClass = string(nvt.StorageClass) } } if len(rule.Transitions) != 0 { config.Rules[i].Transitions = make([]v1beta1.Transition, len(rule.Transitions)) for j, transition := range rule.Transitions { - config.Rules[i].Transitions[j].Days = awsclient.LateInitializeInt32Ptr( - config.Rules[i].Transitions[j].Days, - &transition.Days, - ) + config.Rules[i].Transitions[j].Days = transition.Days config.Rules[i].Transitions[j].Date = awsclient.LateInitializeTimePtr( config.Rules[i].Transitions[j].Date, transition.Date, ) - config.Rules[i].Transitions[j].StorageClass = awsclient.LateInitializeString( - config.Rules[i].Transitions[j].StorageClass, - awsclient.String(string(transition.StorageClass)), - ) + config.Rules[i].Transitions[j].StorageClass = string(transition.StorageClass) } } } diff --git a/pkg/controller/s3/bucket/lifecycleConfig_test.go b/pkg/controller/s3/bucket/lifecycleConfig_test.go index 1ae67c1b44..bda4870dc2 100644 --- a/pkg/controller/s3/bucket/lifecycleConfig_test.go +++ b/pkg/controller/s3/bucket/lifecycleConfig_test.go @@ -21,6 +21,9 @@ import ( "testing" "time" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/aws/aws-sdk-go-v2/service/s3" s3types "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/aws/smithy-go" @@ -36,14 +39,14 @@ import ( ) var ( - days = 1 - location, _ = time.LoadLocation("UTC") - date = metav1.Date(2020, time.September, 25, 11, 40, 0, 0, location) - awsDate = time.Date(2020, time.September, 25, 11, 40, 0, 0, location) - marker = false - prefix = "test-" - id = "test-id" - storage = "ONEZONE_IA" + days int32 = 1 + location, _ = time.LoadLocation("UTC") + date = metav1.Date(2020, time.September, 25, 11, 40, 0, 0, location) + awsDate = time.Date(2020, time.September, 25, 11, 40, 0, 0, location) + marker = false + prefix = "test-" + id = "test-id" + storage = "ONEZONE_IA" ) var _ SubresourceClient = &LifecycleConfigurationClient{} @@ -55,27 +58,25 @@ func generateLifecycleConfig() *v1beta1.BucketLifecycleConfiguration { AbortIncompleteMultipartUpload: &v1beta1.AbortIncompleteMultipartUpload{DaysAfterInitiation: 1}, Expiration: &v1beta1.LifecycleExpiration{ Date: &date, - Days: awsclient.Int32(days), - ExpiredObjectDeleteMarker: awsclient.Bool(marker), + Days: days, + ExpiredObjectDeleteMarker: marker, }, Filter: &v1beta1.LifecycleRuleFilter{ And: &v1beta1.LifecycleRuleAndOperator{ Prefix: awsclient.String(prefix), Tags: tags, }, - Prefix: awsclient.String(prefix), - Tag: &tag, }, ID: awsclient.String(id), - NoncurrentVersionExpiration: &v1beta1.NoncurrentVersionExpiration{NoncurrentDays: awsclient.Int32(days)}, + NoncurrentVersionExpiration: &v1beta1.NoncurrentVersionExpiration{NoncurrentDays: days}, NoncurrentVersionTransitions: []v1beta1.NoncurrentVersionTransition{{ - NoncurrentDays: awsclient.Int32(days), + NoncurrentDays: days, StorageClass: storage, }}, Status: enabled, Transitions: []v1beta1.Transition{{ Date: &date, - Days: awsclient.Int32(days), + Days: days, StorageClass: storage, }}, }, @@ -90,7 +91,7 @@ func generateAWSLifecycle(sortTag bool) *s3types.BucketLifecycleConfiguration { AbortIncompleteMultipartUpload: &s3types.AbortIncompleteMultipartUpload{DaysAfterInitiation: 1}, Expiration: &s3types.LifecycleExpiration{ Date: &awsDate, - Days: int32(days), + Days: days, ExpiredObjectDeleteMarker: marker, }, Filter: &s3types.LifecycleRuleFilterMemberAnd{ @@ -100,15 +101,15 @@ func generateAWSLifecycle(sortTag bool) *s3types.BucketLifecycleConfiguration { }, }, ID: awsclient.String(id), - NoncurrentVersionExpiration: &s3types.NoncurrentVersionExpiration{NoncurrentDays: int32(days)}, + NoncurrentVersionExpiration: &s3types.NoncurrentVersionExpiration{NoncurrentDays: days}, NoncurrentVersionTransitions: []s3types.NoncurrentVersionTransition{{ - NoncurrentDays: int32(days), + NoncurrentDays: days, StorageClass: s3types.TransitionStorageClassOnezoneIa, }}, Status: s3types.ExpirationStatusEnabled, Transitions: []s3types.Transition{{ Date: &awsDate, - Days: int32(days), + Days: days, StorageClass: s3types.TransitionStorageClassOnezoneIa, }}, }, @@ -146,7 +147,7 @@ func TestGenerateLifecycleConfiguration(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { generated := GenerateLifecycleRules(tc.args.b.Spec.ForProvider.LifecycleConfiguration.Rules) - if diff := cmp.Diff(generated, tc.want.input); diff != "" { + if diff := cmp.Diff(generated, tc.want.input, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } }) @@ -260,7 +261,7 @@ func TestLifecycleObserve(t *testing.T) { if diff := cmp.Diff(tc.want.err, err, test.EquateErrors()); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } - if diff := cmp.Diff(tc.want.status, status); diff != "" { + if diff := cmp.Diff(tc.want.status, status, cmpopts.IgnoreTypes(document.NoSerde{})); diff != "" { t.Errorf("r: -want, +got:\n%s", diff) } }) diff --git a/pkg/controller/s3/bucket/loggingConfig.go b/pkg/controller/s3/bucket/loggingConfig.go index 5e99e47213..c93101ac16 100644 --- a/pkg/controller/s3/bucket/loggingConfig.go +++ b/pkg/controller/s3/bucket/loggingConfig.go @@ -19,6 +19,8 @@ package bucket import ( "context" + "github.com/aws/smithy-go/document" + awss3 "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" @@ -53,7 +55,7 @@ func (in *LoggingConfigurationClient) Observe(ctx context.Context, bucket *v1bet return NeedsUpdate, awsclient.Wrap(err, loggingGetFailed) } if !cmp.Equal(GenerateAWSLogging(bucket.Spec.ForProvider.LoggingConfiguration), external.LoggingEnabled, - cmpopts.IgnoreTypes(&xpv1.Reference{}, &xpv1.Selector{})) { + cmpopts.IgnoreTypes(&xpv1.Reference{}, &xpv1.Selector{}), cmpopts.IgnoreTypes(document.NoSerde{})) { return NeedsUpdate, nil } return Updated, nil diff --git a/pkg/controller/s3/bucket/notificationConfig.go b/pkg/controller/s3/bucket/notificationConfig.go index 55a4d212c1..2f6c35b551 100644 --- a/pkg/controller/s3/bucket/notificationConfig.go +++ b/pkg/controller/s3/bucket/notificationConfig.go @@ -19,6 +19,9 @@ package bucket import ( "context" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + awss3 "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/crossplane/crossplane-runtime/pkg/meta" @@ -60,9 +63,9 @@ func (in *NotificationConfigurationClient) Observe(ctx context.Context, bucket * generated := GenerateConfiguration(config) - if cmp.Equal(external.LambdaFunctionConfigurations, generated.LambdaFunctionConfigurations) && - cmp.Equal(external.QueueConfigurations, generated.QueueConfigurations) && - cmp.Equal(external.TopicConfigurations, generated.TopicConfigurations) { + if cmp.Equal(external.LambdaFunctionConfigurations, generated.LambdaFunctionConfigurations, cmpopts.IgnoreTypes(document.NoSerde{})) && + cmp.Equal(external.QueueConfigurations, generated.QueueConfigurations, cmpopts.IgnoreTypes(document.NoSerde{})) && + cmp.Equal(external.TopicConfigurations, generated.TopicConfigurations, cmpopts.IgnoreTypes(document.NoSerde{})) { return Updated, nil } diff --git a/pkg/controller/s3/bucket/publicAccessBlock.go b/pkg/controller/s3/bucket/publicAccessBlock.go index 7e1eff2452..bab8b7acba 100644 --- a/pkg/controller/s3/bucket/publicAccessBlock.go +++ b/pkg/controller/s3/bucket/publicAccessBlock.go @@ -104,6 +104,9 @@ func (in *PublicAccessBlockClient) LateInitialize(ctx context.Context, cr *v1bet if err != nil { return awsclient.Wrap(resource.Ignore(s3.PublicAccessBlockConfigurationNotFound, err), publicAccessBlockGetFailed) } + if external.PublicAccessBlockConfiguration == nil { + return nil + } if cr.Spec.ForProvider.PublicAccessBlockConfiguration == nil { cr.Spec.ForProvider.PublicAccessBlockConfiguration = &v1beta1.PublicAccessBlockConfiguration{} diff --git a/pkg/controller/s3/bucket/replicationConfig.go b/pkg/controller/s3/bucket/replicationConfig.go index cf2e78b506..40c0c5bb33 100644 --- a/pkg/controller/s3/bucket/replicationConfig.go +++ b/pkg/controller/s3/bucket/replicationConfig.go @@ -22,9 +22,11 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" awss3 "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" + "github.com/aws/smithy-go/document" "github.com/crossplane/crossplane-runtime/pkg/meta" "github.com/crossplane/crossplane-runtime/pkg/resource" "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" "github.com/crossplane/provider-aws/apis/s3/v1beta1" awsclient "github.com/crossplane/provider-aws/pkg/clients" @@ -71,7 +73,7 @@ func (in *ReplicationConfigurationClient) Observe(ctx context.Context, bucket *v sortReplicationRules(external.ReplicationConfiguration.Rules) - if cmp.Equal(external.ReplicationConfiguration, source) { + if cmp.Equal(external.ReplicationConfiguration, source, cmpopts.IgnoreTypes(document.NoSerde{})) { return Updated, nil } @@ -135,9 +137,9 @@ func createReplicationRulesFromExternal(external *types.ReplicationConfiguration for i, rule := range external.Rules { config.Rules[i] = v1beta1.ReplicationRule{ - ID: awsclient.LateInitializeStringPtr(config.Rules[i].ID, rule.ID), - Priority: awsclient.LateInitializeInt32Ptr(config.Rules[i].Priority, aws.Int32(rule.Priority)), - Status: awsclient.LateInitializeString(config.Rules[i].Status, awsclient.String(string(rule.Status))), + ID: rule.ID, + Priority: rule.Priority, + Status: string(rule.Status), } if rule.Filter != nil { @@ -149,17 +151,17 @@ func createReplicationRulesFromExternal(external *types.ReplicationConfiguration case *types.ReplicationRuleFilterMemberAnd: // Value is types.ReplicationRuleAndOperator config.Rules[i].Filter.And = &v1beta1.ReplicationRuleAndOperator{} - config.Rules[i].Filter.And.Prefix = awsclient.LateInitializeStringPtr(config.Rules[i].Filter.And.Prefix, v.Value.Prefix) + config.Rules[i].Filter.And.Prefix = v.Value.Prefix config.Rules[i].Filter.And.Tags = GenerateLocalTagging(v.Value.Tags).TagSet case *types.ReplicationRuleFilterMemberPrefix: // Value is string config.Rules[i].Filter = &v1beta1.ReplicationRuleFilter{} - config.Rules[i].Filter.Prefix = awsclient.LateInitializeStringPtr(config.Rules[i].Filter.Prefix, aws.String(v.Value)) + config.Rules[i].Filter.Prefix = aws.String(v.Value) case *types.ReplicationRuleFilterMemberTag: // Value is types.Tag config.Rules[i].Filter.Tag = &v1beta1.Tag{} - config.Rules[i].Filter.Tag.Key = awsclient.LateInitializeString(config.Rules[i].Filter.Tag.Key, v.Value.Key) - config.Rules[i].Filter.Tag.Value = awsclient.LateInitializeString(config.Rules[i].Filter.Tag.Value, v.Value.Value) + config.Rules[i].Filter.Tag.Key = aws.ToString(v.Value.Key) + config.Rules[i].Filter.Tag.Value = aws.ToString(v.Value.Value) case *types.UnknownUnionMember: // fmt.Println("unknown tag:", v.Tag) default: @@ -169,70 +171,42 @@ func createReplicationRulesFromExternal(external *types.ReplicationConfiguration if rule.DeleteMarkerReplication != nil { config.Rules[i].DeleteMarkerReplication = &v1beta1.DeleteMarkerReplication{} - config.Rules[i].DeleteMarkerReplication.Status = awsclient.LateInitializeString( - config.Rules[i].DeleteMarkerReplication.Status, - awsclient.String(string(rule.DeleteMarkerReplication.Status)), - ) + config.Rules[i].DeleteMarkerReplication.Status = string(rule.DeleteMarkerReplication.Status) } if rule.Destination != nil { - config.Rules[i].Destination.Account = awsclient.LateInitializeStringPtr(config.Rules[i].Destination.Account, rule.Destination.Account) - config.Rules[i].Destination.Bucket = awsclient.LateInitializeStringPtr(config.Rules[i].Destination.Bucket, rule.Destination.Bucket) - config.Rules[i].Destination.StorageClass = awsclient.LateInitializeStringPtr( - config.Rules[i].Destination.StorageClass, - awsclient.String(string(rule.Destination.StorageClass)), - ) + config.Rules[i].Destination.Account = rule.Destination.Account + config.Rules[i].Destination.Bucket = rule.Destination.Bucket + config.Rules[i].Destination.StorageClass = awsclient.String(string(rule.Destination.StorageClass)) if rule.Destination.AccessControlTranslation != nil { config.Rules[i].Destination.AccessControlTranslation = &v1beta1.AccessControlTranslation{} - config.Rules[i].Destination.AccessControlTranslation.Owner = awsclient.LateInitializeString( - config.Rules[i].Destination.AccessControlTranslation.Owner, - awsclient.String(string(rule.Destination.AccessControlTranslation.Owner)), - ) + config.Rules[i].Destination.AccessControlTranslation.Owner = string(rule.Destination.AccessControlTranslation.Owner) } if rule.Destination.EncryptionConfiguration != nil { config.Rules[i].Destination.EncryptionConfiguration = &v1beta1.EncryptionConfiguration{} - config.Rules[i].Destination.EncryptionConfiguration.ReplicaKmsKeyID = awsclient.LateInitializeString( - config.Rules[i].Destination.EncryptionConfiguration.ReplicaKmsKeyID, - rule.Destination.EncryptionConfiguration.ReplicaKmsKeyID, - ) + config.Rules[i].Destination.EncryptionConfiguration.ReplicaKmsKeyID = rule.Destination.EncryptionConfiguration.ReplicaKmsKeyID } if rule.Destination.Metrics != nil { config.Rules[i].Destination.Metrics = &v1beta1.Metrics{} if rule.Destination.Metrics.EventThreshold != nil { - config.Rules[i].Destination.Metrics.EventThreshold.Minutes = awsclient.LateInitializeInt32( - config.Rules[i].Destination.Metrics.EventThreshold.Minutes, - rule.Destination.Metrics.EventThreshold.Minutes) + config.Rules[i].Destination.Metrics.EventThreshold.Minutes = rule.Destination.Metrics.EventThreshold.Minutes } - config.Rules[i].Destination.Metrics.Status = awsclient.LateInitializeString( - config.Rules[i].Destination.Metrics.Status, - awsclient.String(string(rule.Destination.Metrics.Status)), - ) + config.Rules[i].Destination.Metrics.Status = string(rule.Destination.Metrics.Status) } if rule.Destination.ReplicationTime != nil { config.Rules[i].Destination.ReplicationTime = &v1beta1.ReplicationTime{} - config.Rules[i].Destination.ReplicationTime.Status = awsclient.LateInitializeString( - config.Rules[i].Destination.ReplicationTime.Status, - awsclient.String(string(rule.Destination.ReplicationTime.Status)), - ) + config.Rules[i].Destination.ReplicationTime.Status = string(rule.Destination.ReplicationTime.Status) if rule.Destination.ReplicationTime.Time != nil { - config.Rules[i].Destination.ReplicationTime.Time.Minutes = awsclient.LateInitializeInt32( - config.Rules[i].Destination.ReplicationTime.Time.Minutes, - rule.Destination.ReplicationTime.Time.Minutes) + config.Rules[i].Destination.ReplicationTime.Time.Minutes = rule.Destination.ReplicationTime.Time.Minutes } } } if rule.ExistingObjectReplication != nil { config.Rules[i].ExistingObjectReplication = &v1beta1.ExistingObjectReplication{} - config.Rules[i].ExistingObjectReplication.Status = awsclient.LateInitializeString( - config.Rules[i].ExistingObjectReplication.Status, - awsclient.String(string(rule.ExistingObjectReplication.Status)), - ) + config.Rules[i].ExistingObjectReplication.Status = string(rule.ExistingObjectReplication.Status) } if rule.SourceSelectionCriteria != nil && rule.SourceSelectionCriteria.SseKmsEncryptedObjects != nil { config.Rules[i].SourceSelectionCriteria = &v1beta1.SourceSelectionCriteria{} - config.Rules[i].SourceSelectionCriteria.SseKmsEncryptedObjects.Status = awsclient.LateInitializeString( - config.Rules[i].SourceSelectionCriteria.SseKmsEncryptedObjects.Status, - awsclient.String(string(rule.SourceSelectionCriteria.SseKmsEncryptedObjects.Status)), - ) + config.Rules[i].SourceSelectionCriteria.SseKmsEncryptedObjects.Status = string(rule.SourceSelectionCriteria.SseKmsEncryptedObjects.Status) } } } @@ -263,7 +237,7 @@ func copyDestination(input *v1beta1.ReplicationRule, newRule *types.ReplicationR } if input.Destination.EncryptionConfiguration != nil { newRule.Destination.EncryptionConfiguration = &types.EncryptionConfiguration{ - ReplicaKmsKeyID: awsclient.String(input.Destination.EncryptionConfiguration.ReplicaKmsKeyID), + ReplicaKmsKeyID: input.Destination.EncryptionConfiguration.ReplicaKmsKeyID, } } if input.Destination.Metrics != nil { @@ -289,7 +263,7 @@ func createRule(input v1beta1.ReplicationRule) types.ReplicationRule { Rule := input newRule := types.ReplicationRule{ ID: Rule.ID, - Priority: aws.ToInt32(Rule.Priority), + Priority: Rule.Priority, Status: types.ReplicationRuleStatus(Rule.Status), } if Rule.Filter != nil { @@ -307,8 +281,6 @@ func createRule(input v1beta1.ReplicationRule) types.ReplicationRule { case Rule.Filter.Prefix != nil: newRule.Filter = &types.ReplicationRuleFilterMemberPrefix{Value: *Rule.Filter.Prefix} } - } else { - newRule.Filter = &awss3.ReplicationRuleFilter{} } if Rule.SourceSelectionCriteria != nil { newRule.SourceSelectionCriteria = &types.SourceSelectionCriteria{ diff --git a/pkg/controller/s3/bucket/replicationConfig_test.go b/pkg/controller/s3/bucket/replicationConfig_test.go index a9a2bcfad5..b48922d59a 100644 --- a/pkg/controller/s3/bucket/replicationConfig_test.go +++ b/pkg/controller/s3/bucket/replicationConfig_test.go @@ -39,7 +39,7 @@ var ( accountID = "test-account-id" kmsID = "encKmsID" replicationTime = 15 - priority = 1 + priority int32 = 1 _ SubresourceClient = &ReplicationConfigurationClient{} ) @@ -52,7 +52,7 @@ func generateReplicationConfig() *v1beta1.ReplicationConfiguration { AccessControlTranslation: &v1beta1.AccessControlTranslation{Owner: owner}, Account: &accountID, Bucket: &bucketName, - EncryptionConfiguration: &v1beta1.EncryptionConfiguration{ReplicaKmsKeyID: kmsID}, + EncryptionConfiguration: &v1beta1.EncryptionConfiguration{ReplicaKmsKeyID: &kmsID}, Metrics: &v1beta1.Metrics{ EventThreshold: v1beta1.ReplicationTimeValue{Minutes: int32(replicationTime)}, Status: enabled, @@ -69,11 +69,9 @@ func generateReplicationConfig() *v1beta1.ReplicationConfiguration { Prefix: &prefix, Tags: tags, }, - Prefix: &prefix, - Tag: &tag, }, ID: &id, - Priority: awsclient.Int32(priority), + Priority: priority, SourceSelectionCriteria: &v1beta1.SourceSelectionCriteria{SseKmsEncryptedObjects: v1beta1.SseKmsEncryptedObjects{Status: enabled}}, Status: enabled, }}, @@ -108,7 +106,7 @@ func generateAWSReplication() *s3types.ReplicationConfiguration { }, }, ID: &id, - Priority: int32(priority), + Priority: priority, SourceSelectionCriteria: &s3types.SourceSelectionCriteria{SseKmsEncryptedObjects: &s3types.SseKmsEncryptedObjects{Status: s3types.SseKmsEncryptedObjectsStatusEnabled}}, Status: s3types.ReplicationRuleStatusEnabled, }}, diff --git a/pkg/controller/s3/bucket/taggingConfig.go b/pkg/controller/s3/bucket/taggingConfig.go index c3b0d5fd0d..0d38e0611f 100644 --- a/pkg/controller/s3/bucket/taggingConfig.go +++ b/pkg/controller/s3/bucket/taggingConfig.go @@ -19,6 +19,9 @@ package bucket import ( "context" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + awss3 "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/crossplane/crossplane-runtime/pkg/meta" @@ -62,7 +65,7 @@ func (in *TaggingConfigurationClient) Observe(ctx context.Context, bucket *v1bet return Updated, nil case config == nil && len(external.TagSet) != 0: return NeedsDeletion, nil - case cmp.Equal(s3.SortS3TagSet(external.TagSet), s3.SortS3TagSet(GenerateTagging(config).TagSet)): + case cmp.Equal(s3.SortS3TagSet(external.TagSet), s3.SortS3TagSet(GenerateTagging(config).TagSet), cmpopts.IgnoreTypes(document.NoSerde{})): return Updated, nil default: return NeedsUpdate, nil diff --git a/pkg/controller/s3/bucket/websiteConfig.go b/pkg/controller/s3/bucket/websiteConfig.go index 324a5c14a6..408714fb31 100644 --- a/pkg/controller/s3/bucket/websiteConfig.go +++ b/pkg/controller/s3/bucket/websiteConfig.go @@ -19,6 +19,9 @@ package bucket import ( "context" + "github.com/aws/smithy-go/document" + "github.com/google/go-cmp/cmp/cmpopts" + awss3 "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/crossplane/crossplane-runtime/pkg/meta" @@ -72,7 +75,7 @@ func (in *WebsiteConfigurationClient) Observe(ctx context.Context, bucket *v1bet RoutingRules: external.RoutingRules, } - if cmp.Equal(confBody, source) { + if cmp.Equal(confBody, source, cmpopts.IgnoreTypes(document.NoSerde{})) { return Updated, nil } diff --git a/pkg/controller/s3/bucket_test.go b/pkg/controller/s3/bucket_test.go index 325a043b3f..7abb8bd60f 100644 --- a/pkg/controller/s3/bucket_test.go +++ b/pkg/controller/s3/bucket_test.go @@ -95,8 +95,7 @@ func TestObserve(t *testing.T) { args: args{ s3: &fake.MockBucketClient{ MockHeadBucket: func(ctx context.Context, input *awss3.HeadBucketInput, opts []func(*awss3.Options)) (*awss3.HeadBucketOutput, error) { - return nil, &smithy.GenericAPIError{Code: clients3.BucketNotFoundErrCode} - + return nil, &awss3types.NoSuchBucket{} }, }, cr: s3Testing.Bucket(), @@ -281,7 +280,7 @@ func TestCreate(t *testing.T) { cr: s3Testing.Bucket(), }, want: want{ - cr: s3Testing.Bucket(s3Testing.WithConditions(xpv1.Creating())), + cr: s3Testing.Bucket(), }, }, "InValidInput": { @@ -307,7 +306,7 @@ func TestCreate(t *testing.T) { cr: s3Testing.Bucket(), }, want: want{ - cr: s3Testing.Bucket(s3Testing.WithConditions(xpv1.Creating())), + cr: s3Testing.Bucket(), err: awsclient.Wrap(errors.New("api error boom: "), errCreate), }, }, @@ -328,7 +327,7 @@ func TestCreate(t *testing.T) { }, want: want{ cr: s3Testing.Bucket( - s3Testing.WithConditions(xpv1.Creating()), + s3Testing.WithPayerConfig(&v1beta1.PaymentConfiguration{Payer: "Requester"}), ), result: managed.ExternalCreation{}, @@ -344,18 +343,16 @@ func TestCreate(t *testing.T) { return &awss3.CreateBucketOutput{}, nil }), s3Testing.WithGetRequestPayment(func(ctx context.Context, input *awss3.GetBucketRequestPaymentInput, opts []func(*awss3.Options)) (*awss3.GetBucketRequestPaymentOutput, error) { - return &awss3.GetBucketRequestPaymentOutput{Payer: awss3types.PayerRequester}, nil + return &awss3.GetBucketRequestPaymentOutput{}, errBoom }), s3Testing.WithGetSSE(func(ctx context.Context, input *awss3.GetBucketEncryptionInput, opts []func(*awss3.Options)) (*awss3.GetBucketEncryptionOutput, error) { - return &awss3.GetBucketEncryptionOutput{}, nil + return &awss3.GetBucketEncryptionOutput{}, errBoom }), ), cr: s3Testing.Bucket(), }, want: want{ - cr: s3Testing.Bucket( - s3Testing.WithConditions(xpv1.Creating()), - ), + cr: s3Testing.Bucket(), result: managed.ExternalCreation{}, err: k8serrors.NewAggregate([]error{awsclient.Wrap(errBoom, "cannot get request payment configuration"), awsclient.Wrap(errBoom, "cannot get encryption configuration")}), }, @@ -400,7 +397,6 @@ func TestCreate(t *testing.T) { }, want: want{ cr: s3Testing.Bucket( - s3Testing.WithConditions(xpv1.Creating()), s3Testing.WithSSEConfig(&v1beta1.ServerSideEncryptionConfiguration{ Rules: []v1beta1.ServerSideEncryptionRule{ { @@ -434,7 +430,6 @@ func TestCreate(t *testing.T) { want: want{ cr: s3Testing.Bucket( s3Testing.WithPayerConfig(&v1beta1.PaymentConfiguration{Payer: "Requester"}), - s3Testing.WithConditions(xpv1.Creating()), ), result: managed.ExternalCreation{}, err: k8serrors.NewAggregate([]error{awsclient.Wrap(errBoom, errKubeUpdateFailed)}), @@ -710,7 +705,7 @@ func TestDelete(t *testing.T) { args: args{ s3: &fake.MockBucketClient{ MockDeleteBucket: func(ctx context.Context, input *awss3.DeleteBucketInput, opts []func(*awss3.Options)) (*awss3.DeleteBucketOutput, error) { - return nil, &smithy.GenericAPIError{Code: clients3.BucketNotFoundErrCode} + return nil, &awss3types.NoSuchBucket{} }, }, cr: s3Testing.Bucket(), diff --git a/pkg/controller/s3/bucketpolicy/bucketpolicy.go b/pkg/controller/s3/bucketpolicy/bucketpolicy.go index 0bad4f6361..4667b7effb 100644 --- a/pkg/controller/s3/bucketpolicy/bucketpolicy.go +++ b/pkg/controller/s3/bucketpolicy/bucketpolicy.go @@ -59,7 +59,7 @@ func SetupBucketPolicy(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimi return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1alpha3.BucketPolicy{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/secretsmanager/secret/setup.go b/pkg/controller/secretsmanager/secret/setup.go index 5c943ff408..39366ea18a 100644 --- a/pkg/controller/secretsmanager/secret/setup.go +++ b/pkg/controller/secretsmanager/secret/setup.go @@ -71,7 +71,7 @@ func SetupSecret(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, p return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Secret{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/servicediscovery/httpnamespace/setup.go b/pkg/controller/servicediscovery/httpnamespace/setup.go index a03571d9f6..bedada2046 100644 --- a/pkg/controller/servicediscovery/httpnamespace/setup.go +++ b/pkg/controller/servicediscovery/httpnamespace/setup.go @@ -50,13 +50,13 @@ func SetupHTTPNamespace(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLim return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.HTTPNamespace{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.HTTPNamespaceGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) diff --git a/pkg/controller/servicediscovery/privatednsnamespace/setup.go b/pkg/controller/servicediscovery/privatednsnamespace/setup.go index 3fb20078e4..1218462f41 100644 --- a/pkg/controller/servicediscovery/privatednsnamespace/setup.go +++ b/pkg/controller/servicediscovery/privatednsnamespace/setup.go @@ -51,7 +51,7 @@ func SetupPrivateDNSNamespace(mgr ctrl.Manager, l logging.Logger, rl workqueue.R return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.PrivateDNSNamespace{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/servicediscovery/publicdnsnamespace/setup.go b/pkg/controller/servicediscovery/publicdnsnamespace/setup.go index 77ea9f6d4f..099b38dbd8 100644 --- a/pkg/controller/servicediscovery/publicdnsnamespace/setup.go +++ b/pkg/controller/servicediscovery/publicdnsnamespace/setup.go @@ -50,13 +50,13 @@ func SetupPublicDNSNamespace(mgr ctrl.Manager, l logging.Logger, rl workqueue.Ra return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.PublicDNSNamespace{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.PublicDNSNamespaceGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) diff --git a/pkg/controller/sfn/activity/hooks.go b/pkg/controller/sfn/activity/hooks.go index 176d85b549..5721a56a10 100644 --- a/pkg/controller/sfn/activity/hooks.go +++ b/pkg/controller/sfn/activity/hooks.go @@ -51,13 +51,13 @@ func SetupActivity(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Activity{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.ActivityGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -81,7 +81,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Activity, resp *svcsdk.Create return managed.ExternalCreation{}, err } meta.SetExternalName(cr, aws.StringValue(resp.ActivityArn)) - cre.ExternalNameAssigned = true return cre, nil } diff --git a/pkg/controller/sfn/statemachine/hooks.go b/pkg/controller/sfn/statemachine/hooks.go index b0a5368a2f..82518a720a 100644 --- a/pkg/controller/sfn/statemachine/hooks.go +++ b/pkg/controller/sfn/statemachine/hooks.go @@ -52,13 +52,13 @@ func SetupStateMachine(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimi return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.StateMachine{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.StateMachineGroupVersionKind), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))))) @@ -93,7 +93,6 @@ func postCreate(_ context.Context, cr *svcapitypes.StateMachine, resp *svcsdk.Cr return managed.ExternalCreation{}, err } meta.SetExternalName(cr, aws.StringValue(resp.StateMachineArn)) - cre.ExternalNameAssigned = true return cre, nil } diff --git a/pkg/controller/sqs/queue/controller.go b/pkg/controller/sqs/queue/controller.go index 30fdaf40fb..c5ebbdaef5 100644 --- a/pkg/controller/sqs/queue/controller.go +++ b/pkg/controller/sqs/queue/controller.go @@ -62,7 +62,7 @@ func SetupQueue(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, po return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&v1beta1.Queue{}). Complete(managed.NewReconciler(mgr, diff --git a/pkg/controller/transfer/server/setup.go b/pkg/controller/transfer/server/setup.go index 0c40b5c7d5..e7c28af586 100644 --- a/pkg/controller/transfer/server/setup.go +++ b/pkg/controller/transfer/server/setup.go @@ -50,12 +50,12 @@ func SetupServer(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, p return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.Server{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.ServerGroupVersionKind), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), @@ -63,7 +63,7 @@ func SetupServer(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, p } func preObserve(_ context.Context, cr *svcapitypes.Server, obj *svcsdk.DescribeServerInput) error { - if cr.Name != *awsclients.String(meta.GetExternalName(cr)) { + if meta.GetExternalName(cr) != "" { obj.ServerId = awsclients.String(meta.GetExternalName(cr)) } return nil @@ -106,7 +106,7 @@ func postCreate(_ context.Context, cr *svcapitypes.Server, obj *svcsdk.CreateSer return managed.ExternalCreation{}, err } meta.SetExternalName(cr, awsclients.StringValue(obj.ServerId)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func preCreate(_ context.Context, cr *svcapitypes.Server, obj *svcsdk.CreateServerInput) error { diff --git a/pkg/controller/transfer/user/setup.go b/pkg/controller/transfer/user/setup.go index 8714a810f3..6867cdd762 100644 --- a/pkg/controller/transfer/user/setup.go +++ b/pkg/controller/transfer/user/setup.go @@ -50,12 +50,12 @@ func SetupUser(mgr ctrl.Manager, l logging.Logger, rl workqueue.RateLimiter, pol return ctrl.NewControllerManagedBy(mgr). Named(name). WithOptions(controller.Options{ - RateLimiter: ratelimiter.NewDefaultManagedRateLimiter(rl), + RateLimiter: ratelimiter.NewController(rl), }). For(&svcapitypes.User{}). Complete(managed.NewReconciler(mgr, resource.ManagedKind(svcapitypes.UserGroupVersionKind), - managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())), + managed.WithInitializers(), managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}), managed.WithPollInterval(poll), managed.WithLogger(l.WithValues("controller", name)), @@ -89,7 +89,7 @@ func postCreate(_ context.Context, cr *svcapitypes.User, obj *svcsdk.CreateUserO return managed.ExternalCreation{}, err } meta.SetExternalName(cr, awsclients.StringValue(obj.UserName)) - return managed.ExternalCreation{ExternalNameAssigned: true}, nil + return managed.ExternalCreation{}, nil } func preCreate(_ context.Context, cr *svcapitypes.User, obj *svcsdk.CreateUserInput) error {