From 32e6945a65c0fa582142317c95cce30061c2e8d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20T=C3=BCrken?= Date: Wed, 29 May 2024 13:16:25 +0300 Subject: [PATCH] Fix documentation of rule.filter.prefix field for BucketLifecycleConfiguration.s3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fatih Türken --- .../zz_bucketlifecycleconfiguration_types.go | 12 +++--- config/s3/config.go | 5 +++ ...ound.io_bucketlifecycleconfigurations.yaml | 42 +++++++------------ 3 files changed, 26 insertions(+), 33 deletions(-) diff --git a/apis/s3/v1beta1/zz_bucketlifecycleconfiguration_types.go b/apis/s3/v1beta1/zz_bucketlifecycleconfiguration_types.go index a5f6c7f8bd..542111907d 100755 --- a/apis/s3/v1beta1/zz_bucketlifecycleconfiguration_types.go +++ b/apis/s3/v1beta1/zz_bucketlifecycleconfiguration_types.go @@ -40,7 +40,7 @@ type AndInitParameters struct { // Maximum object size (in bytes) to which the rule applies. ObjectSizeLessThan *float64 `json:"objectSizeLessThan,omitempty" tf:"object_size_less_than,omitempty"` - // DEPRECATED Use filter instead. This has been deprecated by Amazon S3. Prefix identifying one or more objects to which the rule applies. Defaults to an empty string ("") if filter is not specified. + // Prefix identifying one or more objects to which the rule applies. Prefix *string `json:"prefix,omitempty" tf:"prefix,omitempty"` // Key-value map of resource tags. All of these tags must exist in the object's tag set in order for the rule to apply. @@ -56,7 +56,7 @@ type AndObservation struct { // Maximum object size (in bytes) to which the rule applies. ObjectSizeLessThan *float64 `json:"objectSizeLessThan,omitempty" tf:"object_size_less_than,omitempty"` - // DEPRECATED Use filter instead. This has been deprecated by Amazon S3. Prefix identifying one or more objects to which the rule applies. Defaults to an empty string ("") if filter is not specified. + // Prefix identifying one or more objects to which the rule applies. Prefix *string `json:"prefix,omitempty" tf:"prefix,omitempty"` // Key-value map of resource tags. All of these tags must exist in the object's tag set in order for the rule to apply. @@ -74,7 +74,7 @@ type AndParameters struct { // +kubebuilder:validation:Optional ObjectSizeLessThan *float64 `json:"objectSizeLessThan,omitempty" tf:"object_size_less_than,omitempty"` - // DEPRECATED Use filter instead. This has been deprecated by Amazon S3. Prefix identifying one or more objects to which the rule applies. Defaults to an empty string ("") if filter is not specified. + // Prefix identifying one or more objects to which the rule applies. // +kubebuilder:validation:Optional Prefix *string `json:"prefix,omitempty" tf:"prefix,omitempty"` @@ -300,7 +300,7 @@ type RuleFilterInitParameters struct { // Maximum object size (in bytes) to which the rule applies. ObjectSizeLessThan *string `json:"objectSizeLessThan,omitempty" tf:"object_size_less_than,omitempty"` - // DEPRECATED Use filter instead. This has been deprecated by Amazon S3. Prefix identifying one or more objects to which the rule applies. Defaults to an empty string ("") if filter is not specified. + // Prefix identifying one or more objects to which the rule applies. Defaults to an empty string ("") if not specified. Prefix *string `json:"prefix,omitempty" tf:"prefix,omitempty"` // Configuration block for specifying a tag key and value. See below. @@ -318,7 +318,7 @@ type RuleFilterObservation struct { // Maximum object size (in bytes) to which the rule applies. ObjectSizeLessThan *string `json:"objectSizeLessThan,omitempty" tf:"object_size_less_than,omitempty"` - // DEPRECATED Use filter instead. This has been deprecated by Amazon S3. Prefix identifying one or more objects to which the rule applies. Defaults to an empty string ("") if filter is not specified. + // Prefix identifying one or more objects to which the rule applies. Defaults to an empty string ("") if not specified. Prefix *string `json:"prefix,omitempty" tf:"prefix,omitempty"` // Configuration block for specifying a tag key and value. See below. @@ -339,7 +339,7 @@ type RuleFilterParameters struct { // +kubebuilder:validation:Optional ObjectSizeLessThan *string `json:"objectSizeLessThan,omitempty" tf:"object_size_less_than,omitempty"` - // DEPRECATED Use filter instead. This has been deprecated by Amazon S3. Prefix identifying one or more objects to which the rule applies. Defaults to an empty string ("") if filter is not specified. + // Prefix identifying one or more objects to which the rule applies. Defaults to an empty string ("") if not specified. // +kubebuilder:validation:Optional Prefix *string `json:"prefix,omitempty" tf:"prefix,omitempty"` diff --git a/config/s3/config.go b/config/s3/config.go index 5b400e534f..0762db9372 100644 --- a/config/s3/config.go +++ b/config/s3/config.go @@ -117,4 +117,9 @@ func Configure(p *config.Provider) { Extractor: `github.com/crossplane/upjet/pkg/resource.ExtractParamPath("arn",true)`, } }) + + p.AddResourceConfigurator("aws_s3_bucket_lifecycle_configuration", func(r *config.Resource) { + r.MetaResource.ArgumentDocs["rule.filter.prefix"] = `- (Optional) Prefix identifying one or more objects to which the rule applies. Defaults to an empty string ("") if not specified.` + r.MetaResource.ArgumentDocs["rule.filter.and.prefix"] = `- (Optional) Prefix identifying one or more objects to which the rule applies.` + }) } diff --git a/package/crds/s3.aws.upbound.io_bucketlifecycleconfigurations.yaml b/package/crds/s3.aws.upbound.io_bucketlifecycleconfigurations.yaml index d24ea8bf6f..93d04ebeae 100644 --- a/package/crds/s3.aws.upbound.io_bucketlifecycleconfigurations.yaml +++ b/package/crds/s3.aws.upbound.io_bucketlifecycleconfigurations.yaml @@ -228,11 +228,8 @@ spec: to which the rule applies. type: number prefix: - description: DEPRECATED Use filter instead. - This has been deprecated by Amazon S3. Prefix - identifying one or more objects to which the - rule applies. Defaults to an empty string - ("") if filter is not specified. + description: Prefix identifying one or more + objects to which the rule applies. type: string tags: additionalProperties: @@ -253,10 +250,9 @@ spec: the rule applies. type: string prefix: - description: DEPRECATED Use filter instead. This has - been deprecated by Amazon S3. Prefix identifying - one or more objects to which the rule applies. Defaults - to an empty string ("") if filter is not specified. + description: Prefix identifying one or more objects + to which the rule applies. Defaults to an empty + string ("") if not specified. type: string tag: description: Configuration block for specifying a @@ -518,11 +514,8 @@ spec: to which the rule applies. type: number prefix: - description: DEPRECATED Use filter instead. - This has been deprecated by Amazon S3. Prefix - identifying one or more objects to which the - rule applies. Defaults to an empty string - ("") if filter is not specified. + description: Prefix identifying one or more + objects to which the rule applies. type: string tags: additionalProperties: @@ -543,10 +536,9 @@ spec: the rule applies. type: string prefix: - description: DEPRECATED Use filter instead. This has - been deprecated by Amazon S3. Prefix identifying - one or more objects to which the rule applies. Defaults - to an empty string ("") if filter is not specified. + description: Prefix identifying one or more objects + to which the rule applies. Defaults to an empty + string ("") if not specified. type: string tag: description: Configuration block for specifying a @@ -900,11 +892,8 @@ spec: to which the rule applies. type: number prefix: - description: DEPRECATED Use filter instead. - This has been deprecated by Amazon S3. Prefix - identifying one or more objects to which the - rule applies. Defaults to an empty string - ("") if filter is not specified. + description: Prefix identifying one or more + objects to which the rule applies. type: string tags: additionalProperties: @@ -925,10 +914,9 @@ spec: the rule applies. type: string prefix: - description: DEPRECATED Use filter instead. This has - been deprecated by Amazon S3. Prefix identifying - one or more objects to which the rule applies. Defaults - to an empty string ("") if filter is not specified. + description: Prefix identifying one or more objects + to which the rule applies. Defaults to an empty + string ("") if not specified. type: string tag: description: Configuration block for specifying a