From b1ca1f9f8561b5d04eef0c06dddad242c1e19913 Mon Sep 17 00:00:00 2001 From: Geoffrey Mersch Date: Tue, 19 Nov 2024 00:25:09 +0100 Subject: [PATCH] fix(s3): Add missing GLACIER_IR storage type in replication and lifecycle Configuration types Signed-off-by: Geoffrey Mersch (cherry picked from commit 28eb2f2165733b5b19e0535d7c56c0f099ea71cb) --- apis/s3/v1beta1/lifecycleConfiguration_types.go | 10 +++++----- apis/s3/v1beta1/replicationConfiguration_types.go | 2 +- package/crds/s3.aws.crossplane.io_buckets.yaml | 9 ++++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/apis/s3/v1beta1/lifecycleConfiguration_types.go b/apis/s3/v1beta1/lifecycleConfiguration_types.go index 019639c751..9a1e2f153f 100644 --- a/apis/s3/v1beta1/lifecycleConfiguration_types.go +++ b/apis/s3/v1beta1/lifecycleConfiguration_types.go @@ -149,7 +149,7 @@ type NoncurrentVersionExpiration struct { } // NoncurrentVersionTransition contains the transition rule that describes when noncurrent objects -// transition to the STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, +// transition to the STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, GLACIER_IR // or DEEP_ARCHIVE storage class. If your bucket is versioning-enabled (or versioning // is suspended), you can set this action to request that Amazon S3 transition // noncurrent object versions to the STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, @@ -164,8 +164,8 @@ type NoncurrentVersionTransition struct { 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 - // +kubebuilder:validation:Enum=GLACIER;STANDARD_IA;ONEZONE_IA;INTELLIGENT_TIERING;DEEP_ARCHIVE + // Valid values are: GLACIER, GLACIER_IR, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, DEEP_ARCHIVE + // +kubebuilder:validation:Enum=GLACIER;GLACIER_IR;STANDARD_IA;ONEZONE_IA;INTELLIGENT_TIERING;DEEP_ARCHIVE StorageClass string `json:"storageClass"` } @@ -184,7 +184,7 @@ type Transition struct { 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 - // +kubebuilder:validation:Enum=GLACIER;STANDARD_IA;ONEZONE_IA;INTELLIGENT_TIERING;DEEP_ARCHIVE + // Valid values are: GLACIER, GLACIER_IR, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, DEEP_ARCHIVE + // +kubebuilder:validation:Enum=GLACIER;GLACIER_IR;STANDARD_IA;ONEZONE_IA;INTELLIGENT_TIERING;DEEP_ARCHIVE StorageClass string `json:"storageClass"` } diff --git a/apis/s3/v1beta1/replicationConfiguration_types.go b/apis/s3/v1beta1/replicationConfiguration_types.go index 08777d3be8..a78ddff249 100644 --- a/apis/s3/v1beta1/replicationConfiguration_types.go +++ b/apis/s3/v1beta1/replicationConfiguration_types.go @@ -186,7 +186,7 @@ type Destination struct { // For valid values, see the StorageClass element of the PUT Bucket replication // (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTreplication.html) // action in the Amazon Simple Storage Service API Reference. - // +kubebuilder:validation:Enum=STANDARD;GLACIER;STANDARD_IA;ONEZONE_IA;INTELLIGENT_TIERING;DEEP_ARCHIVE + // +kubebuilder:validation:Enum=STANDARD;GLACIER;GLACIER_IR;STANDARD_IA;ONEZONE_IA;INTELLIGENT_TIERING;DEEP_ARCHIVE // +optional StorageClass *string `json:"storageClass"` } diff --git a/package/crds/s3.aws.crossplane.io_buckets.yaml b/package/crds/s3.aws.crossplane.io_buckets.yaml index 55e6cba6d0..6a0ec14b56 100644 --- a/package/crds/s3.aws.crossplane.io_buckets.yaml +++ b/package/crds/s3.aws.crossplane.io_buckets.yaml @@ -333,7 +333,7 @@ spec: items: description: |- NoncurrentVersionTransition contains the transition rule that describes when noncurrent objects - transition to the STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, + transition to the STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, GLACIER_IR or DEEP_ARCHIVE storage class. If your bucket is versioning-enabled (or versioning is suspended), you can set this action to request that Amazon S3 transition noncurrent object versions to the STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, @@ -352,9 +352,10 @@ spec: storageClass: description: |- The class of storage used to store the object. - Valid values are: GLACIER, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, DEEP_ARCHIVE + Valid values are: GLACIER, GLACIER_IR, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, DEEP_ARCHIVE enum: - GLACIER + - GLACIER_IR - STANDARD_IA - ONEZONE_IA - INTELLIGENT_TIERING @@ -401,9 +402,10 @@ spec: storageClass: description: |- The storage class to which you want the object to transition. - Valid values are: GLACIER, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, DEEP_ARCHIVE + Valid values are: GLACIER, GLACIER_IR, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, DEEP_ARCHIVE enum: - GLACIER + - GLACIER_IR - STANDARD_IA - ONEZONE_IA - INTELLIGENT_TIERING @@ -2046,6 +2048,7 @@ spec: enum: - STANDARD - GLACIER + - GLACIER_IR - STANDARD_IA - ONEZONE_IA - INTELLIGENT_TIERING