修复bucket origin布尔类型参数为false时不传递的问题

Author: tencentyuncos

bucket_origin.go

@@ -30,16 +30,16 @@ type BucketOriginCondition struct {
 
 type BucketOriginParameter struct {
 	Protocol          string                  `xml:"Protocol,omitempty"`
-	FollowQueryString bool                    `xml:"FollowQueryString,omitempty"`
+	FollowQueryString *bool                   `xml:"FollowQueryString,omitempty"`
 	HttpHeader        *BucketOriginHttpHeader `xml:"HttpHeader,omitempty"`
-	FollowRedirection bool                    `xml:"FollowRedirection,omitempty"`
+	FollowRedirection *bool                   `xml:"FollowRedirection,omitempty"`
 	HttpRedirectCode  string                  `xml:"HttpRedirectCode,omitempty"`
-	CopyOriginData    bool                    `xml:"CopyOriginData,omitempty"`
+	CopyOriginData    *bool                   `xml:"CopyOriginData,omitempty"`
 }
 
 type BucketOriginHttpHeader struct {
 	// 目前还不支持 FollowAllHeaders
-	FollowAllHeaders    bool               `xml:"FollowAllHeaders,omitempty"`
+	FollowAllHeaders    *bool              `xml:"FollowAllHeaders,omitempty"`
 	NewHttpHeaders      []OriginHttpHeader `xml:"NewHttpHeaders>Header,omitempty"`
 	FollowHttpHeaders   []OriginHttpHeader `xml:"FollowHttpHeaders>Header,omitempty"`
 	ForbidFollowHeaders []OriginHttpHeader `xml:"ForbidFollowHeaders>Header,omitempty"`

bucket_origin_test.go

@@ -29,7 +29,7 @@ func TestBucketService_GetOrigin(t *testing.T) {
             </OriginCondition>
             <OriginParameter>
                 <Protocol>HTTP</Protocol>
-                <FollowQueryString>true</FollowQueryString>
+                <FollowQueryString>false</FollowQueryString>
                 <HttpHeader>
                     <NewHttpHeaders>
                         <Header>
@@ -75,7 +75,7 @@ func TestBucketService_GetOrigin(t *testing.T) {
 				},
 				OriginParameter: &BucketOriginParameter{
 					Protocol:          "HTTP",
-					FollowQueryString: true,
+					FollowQueryString: Bool(false),
 					HttpHeader: &BucketOriginHttpHeader{
 						FollowHttpHeaders: []OriginHttpHeader{
 							{
@@ -89,7 +89,7 @@ func TestBucketService_GetOrigin(t *testing.T) {
 							},
 						},
 					},
-					FollowRedirection: true,
+					FollowRedirection: Bool(true),
 					HttpRedirectCode:  "302",
 				},
 				OriginInfo: &BucketOriginInfo{
@@ -123,7 +123,7 @@ func TestBucketService_PutOrigin(t *testing.T) {
 				},
 				OriginParameter: &BucketOriginParameter{
 					Protocol:          "HTTP",
-					FollowQueryString: true,
+					FollowQueryString: Bool(true),
 					HttpHeader: &BucketOriginHttpHeader{
 						FollowHttpHeaders: []OriginHttpHeader{
 							{
@@ -137,7 +137,7 @@ func TestBucketService_PutOrigin(t *testing.T) {
 							},
 						},
 					},
-					FollowRedirection: true,
+					FollowRedirection: Bool(true),
 					HttpRedirectCode:  "302",
 				},
 				OriginInfo: &BucketOriginInfo{

example/bucket/origin.go

@@ -58,7 +58,7 @@ func main() {
 				},
 				OriginParameter: &cos.BucketOriginParameter{
 					Protocol:          "FOLLOW",
-					FollowQueryString: true,
+					FollowQueryString: cos.Bool(true),
 					HttpHeader: &cos.BucketOriginHttpHeader{
 						NewHttpHeaders: []cos.OriginHttpHeader{
 							{
@@ -72,7 +72,7 @@ func main() {
 							},
 						},
 					},
-					FollowRedirection: true,
+					FollowRedirection: cos.Bool(true),
 				},
 				OriginInfo: &cos.BucketOriginInfo{
 					HostInfo: &cos.BucketOriginHostInfo{

helper.go

@@ -474,3 +474,7 @@ func GetBucketRegionFromUrl(u *url.URL) (string, string) {
 	}
 	return vec[0], vec[2]
 }
+
+func Bool(v bool) *bool {
+	return &v
+}