Add support for 'Prefix' field in Bucket Spec (#129)

linode · Jan 9, 2024 · 31f7709 · 31f7709
1 parent 98de5dd
commit 31f7709
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/apis/provider-ceph/v1alpha1/lifecycleconfiguration_types.go b/apis/provider-ceph/v1alpha1/lifecycleconfiguration_types.go
@@ -79,6 +79,12 @@ type LifecycleRule struct {
 	// Specifies when an Amazon S3 object transitions to a specified storage class.
 	// +optional
 	Transitions []Transition `json:"transitions,omitempty"`
+
+	// Prefix identifying one or more objects to which the rule applies.
+	// Deprecated: Use Filter instead.
+	// This field is still supported as it is a required field in PutBucketLifecycle v1.
+	// +optional
+	Prefix *string `json:"prefix,omitempty"`
 }
 
 // AbortIncompleteMultipartUpload specifies the days since the initiation of an incomplete multipart upload

diff --git a/apis/provider-ceph/v1alpha1/zz_generated.deepcopy.go b/apis/provider-ceph/v1alpha1/zz_generated.deepcopy.go
diff --git a/internal/s3/lifecycleconfig_helpers.go b/internal/s3/lifecycleconfig_helpers.go
@@ -33,6 +33,9 @@ func GenerateLifecycleRules(in []v1alpha1.LifecycleRule) []types.LifecycleRule {
 			ID:     local.ID,
 			Status: types.ExpirationStatus(local.Status),
 		}
+		if local.Prefix != nil {
+			rule.Prefix = local.Prefix //nolint:staticcheck // Support deprecated field.
+		}
 		if local.AbortIncompleteMultipartUpload != nil {
 			rule.AbortIncompleteMultipartUpload = &types.AbortIncompleteMultipartUpload{
 				DaysAfterInitiation: local.AbortIncompleteMultipartUpload.DaysAfterInitiation,

diff --git a/internal/s3/lifecycleconfig_test.go b/internal/s3/lifecycleconfig_test.go
@@ -14,7 +14,7 @@ import (
 
 func TestGenerateLifecycleConfigurationInput(t *testing.T) {
 	bucketname := "bucket"
-	filterPrefix := "someprefix/"
+	prefix := "someprefix/"
 	days90 := int32(90)
 	days365 := int32(365)
 	days3650 := int32(3650)
@@ -41,6 +41,7 @@ func TestGenerateLifecycleConfigurationInput(t *testing.T) {
 					Rules: []v1alpha1.LifecycleRule{
 						{
 							Status: "Enabled",
+							Prefix: &prefix,
 							Expiration: &v1alpha1.LifecycleExpiration{
 								Days: &days365,
 							},
@@ -55,6 +56,7 @@ func TestGenerateLifecycleConfigurationInput(t *testing.T) {
 						Rules: []types.LifecycleRule{
 							{
 								Status: "Enabled",
+								Prefix: &prefix,
 								Expiration: &types.LifecycleExpiration{
 									Days: days365,
 								},
@@ -72,11 +74,12 @@ func TestGenerateLifecycleConfigurationInput(t *testing.T) {
 					Rules: []v1alpha1.LifecycleRule{
 						{
 							Status: "Enabled",
+							Prefix: &prefix,
 							Expiration: &v1alpha1.LifecycleExpiration{
 								Days: &days3650,
 							},
 							Filter: &v1alpha1.LifecycleRuleFilter{
-								Prefix: &filterPrefix,
+								Prefix: &prefix,
 							},
 							Transitions: []v1alpha1.Transition{
 								{
@@ -87,6 +90,8 @@ func TestGenerateLifecycleConfigurationInput(t *testing.T) {
 						},
 						{
 							Status: "Enabled",
+							Prefix: &prefix,
+
 							Expiration: &v1alpha1.LifecycleExpiration{
 								Days: &days3650,
 							},
@@ -99,11 +104,12 @@ func TestGenerateLifecycleConfigurationInput(t *testing.T) {
 						},
 						{
 							Status: "Enabled",
+							Prefix: &prefix,
 							Expiration: &v1alpha1.LifecycleExpiration{
 								Days: &days365,
 							},
 							Filter: &v1alpha1.LifecycleRuleFilter{
-								Prefix: &filterPrefix,
+								Prefix: &prefix,
 							},
 							Transitions: []v1alpha1.Transition{
 								{
@@ -122,11 +128,12 @@ func TestGenerateLifecycleConfigurationInput(t *testing.T) {
 						Rules: []types.LifecycleRule{
 							{
 								Status: "Enabled",
+								Prefix: &prefix,
 								Expiration: &types.LifecycleExpiration{
 									Days: days3650,
 								},
 								Filter: &types.LifecycleRuleFilterMemberPrefix{
-									Value: filterPrefix,
+									Value: prefix,
 								},
 								Transitions: []types.Transition{
 									{
@@ -137,6 +144,7 @@ func TestGenerateLifecycleConfigurationInput(t *testing.T) {
 							},
 							{
 								Status: "Enabled",
+								Prefix: &prefix,
 								Expiration: &types.LifecycleExpiration{
 									Days: days3650,
 								},
@@ -150,11 +158,12 @@ func TestGenerateLifecycleConfigurationInput(t *testing.T) {
 							},
 							{
 								Status: "Enabled",
+								Prefix: &prefix,
 								Expiration: &types.LifecycleExpiration{
 									Days: days365,
 								},
 								Filter: &types.LifecycleRuleFilterMemberPrefix{
-									Value: filterPrefix,
+									Value: prefix,
 								},
 								Transitions: []types.Transition{
 									{

diff --git a/package/crds/provider-ceph.ceph.crossplane.io_buckets.yaml b/package/crds/provider-ceph.ceph.crossplane.io_buckets.yaml
@@ -300,6 +300,12 @@ spec:
                                 - storageClass
                                 type: object
                               type: array
+                            prefix:
+                              description: 'Prefix identifying one or more objects
+                                to which the rule applies. Deprecated: Use Filter
+                                instead. This field is still supported as it is a
+                                required field in PutBucketLifecycle v1.'
+                              type: string
                             status:
                               description: "If 'Enabled', the rule is currently being
                                 applied. If 'Disabled', the rule is not currently