fix(storage): allow for Age int64* type and int64 type

storage/bucket.go

@@ -1503,6 +1503,17 @@ func toCORSFromProto(rc []*storagepb.Bucket_Cors) []CORS {
 	return out
 }
 
+// Handle ptr or int64
+func setAgeCondition(age int64, cond interface{}) {
+	c := reflect.ValueOf(cond).Elem().FieldByName("Age")
+	switch c.Kind() {
+	case reflect.Int64:
+		c.SetInt(age)
+	case reflect.Ptr:
+		c.Set(reflect.ValueOf(&age))
+	}
+}
+
 func toRawLifecycle(l Lifecycle) *raw.BucketLifecycle {
 	var rl raw.BucketLifecycle
 	if len(l.Rules) == 0 {
@@ -1525,6 +1536,8 @@ func toRawLifecycle(l Lifecycle) *raw.BucketLifecycle {
 			},
 		}
 
+		setAgeCondition(r.Condition.AgeInDays, rr.Condition)
+
 		switch r.Condition.Liveness {
 		case LiveAndArchived:
 			rr.Condition.IsLive = nil
@@ -1595,6 +1608,19 @@ func toProtoLifecycle(l Lifecycle) *storagepb.Bucket_Lifecycle {
 	return &rl
 }
 
+// Handle ptr or int64
+func getAgeCondition(cond interface{}) int64 {
+	v := reflect.ValueOf(cond).Elem().FieldByName("Age")
+	if v.Kind() == reflect.Int64 {
+		return v.Interface().(int64)
+	} else if v.Kind() == reflect.Pointer {
+		if v.Interface() != nil {
+			return *(v.Interface().(*int64))
+		}
+	}
+	return 0
+}
+
 func toLifecycle(rl *raw.BucketLifecycle) Lifecycle {
 	var l Lifecycle
 	if rl == nil {
@@ -1607,7 +1633,6 @@ func toLifecycle(rl *raw.BucketLifecycle) Lifecycle {
 				StorageClass: rr.Action.StorageClass,
 			},
 			Condition: LifecycleCondition{
-				AgeInDays:               rr.Condition.Age,
 				DaysSinceCustomTime:     rr.Condition.DaysSinceCustomTime,
 				DaysSinceNoncurrentTime: rr.Condition.DaysSinceNoncurrentTime,
 				MatchesPrefix:           rr.Condition.MatchesPrefix,
@@ -1616,6 +1641,7 @@ func toLifecycle(rl *raw.BucketLifecycle) Lifecycle {
 				NumNewerVersions:        rr.Condition.NumNewerVersions,
 			},
 		}
+		r.Condition.AgeInDays = getAgeCondition(rr.Condition)
 
 		if rr.Condition.IsLive == nil {
 			r.Condition.Liveness = LiveAndArchived

storage/bucket_test.go

@@ -561,6 +561,30 @@ func TestBucketAttrsToUpdateToRawBucket(t *testing.T) {
 	}
 }
 
+func TestAgeConditionBackwardCompat(t *testing.T) {
+	type testPointer struct {
+		Age *int64
+	}
+
+	type testInt64 struct {
+		Age int64
+	}
+
+	var tp testPointer
+	var want int64 = 10
+	setAgeCondition(want, &tp)
+	if getAgeCondition(&tp) != want {
+		t.Fatalf("got %v, want 10", *tp.Age)
+	}
+
+	var ti testInt64
+	want = 100
+	setAgeCondition(100, &ti)
+	if getAgeCondition(&ti) != want {
+		t.Fatalf("got %v, want %v", ti.Age, want)
+	}
+}
+
 func TestCallBuilders(t *testing.T) {
 	rc, err := raw.NewService(context.Background())
 	if err != nil {