modify lifecycle node

Author: yangzong18

oss/client_test.go

@@ -1430,6 +1430,11 @@ func (s *OssClientSuite) TestBucketLifecycleWithFilterSize(c *C) {
 		},
 		Filter: &filter,
 	}
+	config4 := LifecycleConfiguration{
+		Rules: []LifecycleRule{rule1},
+	}
+	xmlData4, err := xml.Marshal(config4)
+	testLogger.Println(string(xmlData4))
 
 	rules := []LifecycleRule{rule1}
 	client, err := New(endpoint, accessID, accessKey)
@@ -1446,7 +1451,37 @@ func (s *OssClientSuite) TestBucketLifecycleWithFilterSize(c *C) {
 
 	err = client.DeleteBucketLifecycle(bucketNameTest)
 	c.Assert(err, IsNil)
+	tag := Tag{Key: "key1", Value: "val1"}
+	filter2 := LifecycleFilter{
+		ObjectSizeGreaterThan: &greater,
+		ObjectSizeLessThan:    &less,
+		Not: []LifecycleFilterNot{
+			{
+				Tag: &tag,
+			},
+		},
+	}
+	rule2 := LifecycleRule{
+		ID:     "rs2",
+		Prefix: "",
+		Status: "Enabled",
+		Transitions: []LifecycleTransition{
+			{
+				Days:         30,
+				StorageClass: StorageIA,
+			},
+		},
+		Filter: &filter2,
+	}
+	rules2 := []LifecycleRule{rule2}
 
+	err = client.SetBucketLifecycle(bucketNameTest, rules2)
+	c.Assert(err, IsNil)
+
+	_, err = client.GetBucketLifecycle(bucketNameTest)
+	c.Assert(err, IsNil)
+
+	err = client.DeleteBucketLifecycle(bucketNameTest)
 	err = client.DeleteBucket(bucketNameTest)
 	c.Assert(err, IsNil)
 

oss/type.go

@@ -137,8 +137,8 @@ type LifecycleFilter struct {
 // LifecycleFilterNot defines the rule's Filter Not propery
 type LifecycleFilterNot struct {
 	XMLName xml.Name `xml:"Not"`
-	Prefix  string   `xml:"Prefix,omitempty"` //Object prefix applicable to this exclusion rule
-	Tag     *Tag     `xml:"Tag,omitempty"`    //the tags applicable to this exclusion rule
+	Prefix  string   `xml:"Prefix"`        //Object prefix applicable to this exclusion rule
+	Tag     *Tag     `xml:"Tag,omitempty"` //the tags applicable to this exclusion rule
 }
 
 const iso8601DateFormat = "2006-01-02T15:04:05.000Z"

oss/type_test.go

@@ -1139,13 +1139,66 @@ func (s *OssTypeSuite) TestLifecycleConfiguration(c *C) {
 			},
 		},
 	}
-	rules := []LifecycleRule{rule0, rule1, rule2}
+	tag := Tag{
+		Key:   "key1",
+		Value: "val1",
+	}
+	filter3 := LifecycleFilter{
+		ObjectSizeGreaterThan: &greater,
+		ObjectSizeLessThan:    &less,
+		Not: []LifecycleFilterNot{
+			{
+				Tag: &tag,
+			},
+		},
+	}
+	rule3 := LifecycleRule{
+		ID:                   "r4",
+		Prefix:               "",
+		Status:               "Enabled",
+		Expiration:           &expiration,
+		AbortMultipartUpload: &abortMPU,
+		NonVersionTransitions: []LifecycleVersionTransition{
+			{
+				NoncurrentDays:       10,
+				StorageClass:         StorageIA,
+				IsAccessTime:         &isTrue,
+				ReturnToStdWhenVisit: &isFalse,
+			},
+		},
+		Filter: &filter3,
+	}
+	rules := []LifecycleRule{rule0, rule1, rule2, rule3}
 	config := LifecycleConfiguration{
 		Rules: rules,
 	}
 	xmlData, err := xml.Marshal(config)
+	testLogger.Println(string(xmlData))
+	c.Assert(err, IsNil)
+	c.Assert(string(xmlData), Equals, "<LifecycleConfiguration><Rule><ID>r0</ID><Prefix>prefix0</Prefix><Status>Enabled</Status><Expiration><Days>30</Days><CreatedBeforeDate>2015-11-11T00:00:00.000Z</CreatedBeforeDate></Expiration></Rule><Rule><ID>r1</ID><Prefix>prefix1</Prefix><Status>Enabled</Status><Expiration><Days>30</Days><CreatedBeforeDate>2015-11-11T00:00:00.000Z</CreatedBeforeDate></Expiration><Transition><Days>30</Days><StorageClass>IA</StorageClass><IsAccessTime>false</IsAccessTime></Transition><Filter><ObjectSizeGreaterThan>500</ObjectSizeGreaterThan><ObjectSizeLessThan>645000</ObjectSizeLessThan></Filter></Rule><Rule><ID>r3</ID><Prefix>prefix3</Prefix><Status>Enabled</Status><Expiration><Days>30</Days><CreatedBeforeDate>2015-11-11T00:00:00.000Z</CreatedBeforeDate></Expiration><AbortMultipartUpload><Days>30</Days><CreatedBeforeDate>2015-11-11T00:00:00.000Z</CreatedBeforeDate></AbortMultipartUpload><NoncurrentVersionTransition><NoncurrentDays>10</NoncurrentDays><StorageClass>IA</StorageClass><IsAccessTime>true</IsAccessTime><ReturnToStdWhenVisit>false</ReturnToStdWhenVisit></NoncurrentVersionTransition></Rule><Rule><ID>r4</ID><Prefix></Prefix><Status>Enabled</Status><Expiration><Days>30</Days><CreatedBeforeDate>2015-11-11T00:00:00.000Z</CreatedBeforeDate></Expiration><AbortMultipartUpload><Days>30</Days><CreatedBeforeDate>2015-11-11T00:00:00.000Z</CreatedBeforeDate></AbortMultipartUpload><NoncurrentVersionTransition><NoncurrentDays>10</NoncurrentDays><StorageClass>IA</StorageClass><IsAccessTime>true</IsAccessTime><ReturnToStdWhenVisit>false</ReturnToStdWhenVisit></NoncurrentVersionTransition><Filter><Not><Prefix></Prefix><Tag><Key>key1</Key><Value>val1</Value></Tag></Not><ObjectSizeGreaterThan>500</ObjectSizeGreaterThan><ObjectSizeLessThan>645000</ObjectSizeLessThan></Filter></Rule></LifecycleConfiguration>")
+
+	filter4 := LifecycleFilter{
+		ObjectSizeGreaterThan: &greater,
+		ObjectSizeLessThan:    &less,
+		Not: []LifecycleFilterNot{
+			{},
+		},
+	}
+	rule4 := LifecycleRule{
+		ID:         "r5",
+		Prefix:     "",
+		Status:     "Enabled",
+		Expiration: &expiration,
+		Filter:     &filter4,
+	}
+	rules4 := []LifecycleRule{rule4}
+	config4 := LifecycleConfiguration{
+		Rules: rules4,
+	}
+	xmlData4, err := xml.Marshal(config4)
+	testLogger.Println(string(xmlData4))
 	c.Assert(err, IsNil)
-	c.Assert(string(xmlData), Equals, "<LifecycleConfiguration><Rule><ID>r0</ID><Prefix>prefix0</Prefix><Status>Enabled</Status><Expiration><Days>30</Days><CreatedBeforeDate>2015-11-11T00:00:00.000Z</CreatedBeforeDate></Expiration></Rule><Rule><ID>r1</ID><Prefix>prefix1</Prefix><Status>Enabled</Status><Expiration><Days>30</Days><CreatedBeforeDate>2015-11-11T00:00:00.000Z</CreatedBeforeDate></Expiration><Transition><Days>30</Days><StorageClass>IA</StorageClass><IsAccessTime>false</IsAccessTime></Transition><Filter><ObjectSizeGreaterThan>500</ObjectSizeGreaterThan><ObjectSizeLessThan>645000</ObjectSizeLessThan></Filter></Rule><Rule><ID>r3</ID><Prefix>prefix3</Prefix><Status>Enabled</Status><Expiration><Days>30</Days><CreatedBeforeDate>2015-11-11T00:00:00.000Z</CreatedBeforeDate></Expiration><AbortMultipartUpload><Days>30</Days><CreatedBeforeDate>2015-11-11T00:00:00.000Z</CreatedBeforeDate></AbortMultipartUpload><NoncurrentVersionTransition><NoncurrentDays>10</NoncurrentDays><StorageClass>IA</StorageClass><IsAccessTime>true</IsAccessTime><ReturnToStdWhenVisit>false</ReturnToStdWhenVisit></NoncurrentVersionTransition></Rule></LifecycleConfiguration>")
+	c.Assert(string(xmlData4), Equals, "<LifecycleConfiguration><Rule><ID>r5</ID><Prefix></Prefix><Status>Enabled</Status><Expiration><Days>30</Days><CreatedBeforeDate>2015-11-11T00:00:00.000Z</CreatedBeforeDate></Expiration><Filter><Not><Prefix></Prefix></Not><ObjectSizeGreaterThan>500</ObjectSizeGreaterThan><ObjectSizeLessThan>645000</ObjectSizeLessThan></Filter></Rule></LifecycleConfiguration>")
 }
 
 // Test Bucket Resource Group