Merge pull request kubernetes#3667 from RainbowMango/pr_fix_create_policy_issue

[CA] update sdk version to fix scaling policy cannot create issue

Author: k8s-ci-robot

cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud-sdk-go-v3/core/converter/converters.go

@@ -1,7 +1,10 @@
 package converter
 
+import "reflect"
+
 type Converter interface {
 	CovertStringToInterface(value string) (interface{}, error)
+	CovertStringToPrimitiveTypeAndSetField(field reflect.Value, value string, isPtr bool) error
 }
 
 func StringConverterFactory(vType string) Converter {

cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud-sdk-go-v3/core/converter/types.go

@@ -1,6 +1,9 @@
 package converter
 
-import "strconv"
+import (
+	"reflect"
+	"strconv"
+)
 
 type Int32Converter struct{}
 
@@ -12,6 +15,20 @@ func (i Int32Converter) CovertStringToInterface(value string) (interface{}, erro
 	return int32(0), err
 }
 
+func (i Int32Converter) CovertStringToPrimitiveTypeAndSetField(field reflect.Value, value string, isPtr bool) error {
+	v, err := i.CovertStringToInterface(value)
+	if err != nil {
+		return err
+	}
+	val := v.(int32)
+	if isPtr {
+		field.Set(reflect.ValueOf(&val))
+	} else {
+		field.Set(reflect.ValueOf(val))
+	}
+	return nil
+}
+
 type Int64Converter struct{}
 
 func (i Int64Converter) CovertStringToInterface(value string) (interface{}, error) {
@@ -22,6 +39,20 @@ func (i Int64Converter) CovertStringToInterface(value string) (interface{}, erro
 	return int64(0), err
 }
 
+func (i Int64Converter) CovertStringToPrimitiveTypeAndSetField(field reflect.Value, value string, isPtr bool) error {
+	v, err := i.CovertStringToInterface(value)
+	if err != nil {
+		return err
+	}
+	val := v.(int64)
+	if isPtr {
+		field.Set(reflect.ValueOf(&val))
+	} else {
+		field.Set(reflect.ValueOf(val))
+	}
+	return nil
+}
+
 type Float32Converter struct{}
 
 func (i Float32Converter) CovertStringToInterface(value string) (interface{}, error) {
@@ -32,6 +63,20 @@ func (i Float32Converter) CovertStringToInterface(value string) (interface{}, er
 	return float32(0), err
 }
 
+func (i Float32Converter) CovertStringToPrimitiveTypeAndSetField(field reflect.Value, value string, isPtr bool) error {
+	v, err := i.CovertStringToInterface(value)
+	if err != nil {
+		return err
+	}
+	val := v.(float32)
+	if isPtr {
+		field.Set(reflect.ValueOf(&val))
+	} else {
+		field.Set(reflect.ValueOf(val))
+	}
+	return nil
+}
+
 type Float64Converter struct{}
 
 func (i Float64Converter) CovertStringToInterface(value string) (interface{}, error) {
@@ -42,6 +87,20 @@ func (i Float64Converter) CovertStringToInterface(value string) (interface{}, er
 	return float64(0), err
 }
 
+func (i Float64Converter) CovertStringToPrimitiveTypeAndSetField(field reflect.Value, value string, isPtr bool) error {
+	v, err := i.CovertStringToInterface(value)
+	if err != nil {
+		return err
+	}
+	val := v.(float64)
+	if isPtr {
+		field.Set(reflect.ValueOf(&val))
+	} else {
+		field.Set(reflect.ValueOf(val))
+	}
+	return nil
+}
+
 type BooleanConverter struct{}
 
 func (i BooleanConverter) CovertStringToInterface(value string) (interface{}, error) {
@@ -52,8 +111,32 @@ func (i BooleanConverter) CovertStringToInterface(value string) (interface{}, er
 	return false, err
 }
 
+func (i BooleanConverter) CovertStringToPrimitiveTypeAndSetField(field reflect.Value, value string, isPtr bool) error {
+	v, err := i.CovertStringToInterface(value)
+	if err != nil {
+		return err
+	}
+	val := v.(bool)
+	if isPtr {
+		field.Set(reflect.ValueOf(&val))
+	} else {
+		field.Set(reflect.ValueOf(val))
+	}
+	return nil
+}
+
 type StringConverter struct{}
 
 func (i StringConverter) CovertStringToInterface(value string) (interface{}, error) {
 	return value, nil
 }
+
+func (i StringConverter) CovertStringToPrimitiveTypeAndSetField(field reflect.Value, value string, isPtr bool) error {
+	val := value
+	if isPtr {
+		field.Set(reflect.ValueOf(&val))
+	} else {
+		field.Set(reflect.ValueOf(val))
+	}
+	return nil
+}

cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud-sdk-go-v3/core/def/field.go

@@ -31,6 +31,8 @@ const (
 type FieldDef struct {
 	LocationType LocationType
 	Name         string
+	JsonTag      string
+	KindName     string
 }
 
 func NewFieldDef() *FieldDef {
@@ -46,3 +48,13 @@ func (field *FieldDef) WithName(name string) *FieldDef {
 	field.Name = name
 	return field
 }
+
+func (field *FieldDef) WithJsonTag(tag string) *FieldDef {
+	field.JsonTag = tag
+	return field
+}
+
+func (field *FieldDef) WithKindName(kindName string) *FieldDef {
+	field.KindName = kindName
+	return field
+}

cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud-sdk-go-v3/core/def/http_request_def.go

@@ -20,11 +20,12 @@
 package def
 
 type HttpRequestDef struct {
-	BodyJson      interface{}
-	RequestFields []*FieldDef
-	Path          string
-	Method        string
-	ContentType   string
+	Method         string
+	Path           string
+	ContentType    string
+	RequestFields  []*FieldDef
+	ResponseFields []*FieldDef
+	Response       interface{}
 }
 
 type HttpRequestDefBuilder struct {
@@ -33,7 +34,8 @@ type HttpRequestDefBuilder struct {
 
 func NewHttpRequestDefBuilder() *HttpRequestDefBuilder {
 	httpRequestDef := &HttpRequestDef{
-		RequestFields: []*FieldDef{},
+		RequestFields:  []*FieldDef{},
+		ResponseFields: []*FieldDef{},
 	}
 	HttpRequestDefBuilder := &HttpRequestDefBuilder{
 		httpRequestDef: httpRequestDef,
@@ -56,8 +58,8 @@ func (builder *HttpRequestDefBuilder) WithContentType(contentType string) *HttpR
 	return builder
 }
 
-func (builder *HttpRequestDefBuilder) WithBodyJson(bodyJson interface{}) *HttpRequestDefBuilder {
-	builder.httpRequestDef.BodyJson = bodyJson
+func (builder *HttpRequestDefBuilder) WithResponse(response interface{}) *HttpRequestDefBuilder {
+	builder.httpRequestDef.Response = response
 	return builder
 }
 
@@ -66,6 +68,11 @@ func (builder *HttpRequestDefBuilder) WithRequestField(field *FieldDef) *HttpReq
 	return builder
 }
 
+func (builder *HttpRequestDefBuilder) WithResponseField(field *FieldDef) *HttpRequestDefBuilder {
+	builder.httpRequestDef.ResponseFields = append(builder.httpRequestDef.ResponseFields, field)
+	return builder
+}
+
 func (builder *HttpRequestDefBuilder) Build() *HttpRequestDef {
 	return builder.httpRequestDef
 }