Skip to content

Commit

Permalink
Merge pull request #1331 from turkenf/fix-issue-885
Browse files Browse the repository at this point in the history 
Fix documentation of `rule.filter.prefix` field for `BucketLifecycleConfiguration.s3`
  • Loading branch information
@turkenf
turkenf authored May 29, 2024
2 parents 285b5e2 + 32e6945 commit 40abec2
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 33 deletions.
12 changes: 6 additions & 6 deletions apis/s3/v1beta1/zz_bucketlifecycleconfiguration_types.go
View file

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

5 changes: 5 additions & 0 deletions config/s3/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.`
})
}
42 changes: 15 additions & 27 deletions package/crds/s3.aws.upbound.io_bucketlifecycleconfigurations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down

0 comments on commit 40abec2

Please sign in to comment.