Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update template to adjust addtion in API specs #80

Merged
merged 1 commit into from
Jul 18, 2019
Merged

update template to adjust addtion in API specs #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion service/bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ import (
"github.com/yunify/qingstor-sdk-go/v3/utils"
)

var _ utils.Conn
var _ fmt.State
var _ io.Reader
var _ http.Header
var _ strings.Reader
var _ time.Time
var _ config.Config
var _ utils.Conn

// Bucket presents bucket.
type Bucket struct {
Expand Down
19 changes: 11 additions & 8 deletions service/object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ var _ http.Header
var _ strings.Reader
var _ time.Time
var _ config.Config
var _ utils.Conn

// AbortMultipartUpload does Abort multipart upload.
// Documentation URL: https://docs.qingcloud.com/qingstor/api/object/abort_multipart_upload.html
Expand Down Expand Up @@ -1002,20 +1003,28 @@ type PutObjectInput struct {
XQSFetchIfUnmodifiedSince *time.Time `json:"X-QS-Fetch-If-Unmodified-Since,omitempty" name:"X-QS-Fetch-If-Unmodified-Since" format:"RFC 822" location:"headers"`
// Fetch source, should be a valid url
XQSFetchSource *string `json:"X-QS-Fetch-Source,omitempty" name:"X-QS-Fetch-Source" location:"headers"`
// User-defined metadata
XQSMetaData *map[string]string `json:"X-QS-MetaData,omitempty" name:"X-QS-MetaData" location:"headers"`
// Move source, format (/<bucket-name>/<object-key>)
XQSMoveSource *string `json:"X-QS-Move-Source,omitempty" name:"X-QS-Move-Source" location:"headers"`
// Specify the storage class for object
// XQSStorageClass's available values: STANDARD, STANDARD_IA
XQSStorageClass *string `json:"X-QS-Storage-Class,omitempty" name:"X-QS-Storage-Class" location:"headers"`
// User-defined metadata
XQSMetaData *map[string]string `json:"X-QS-MetaData,omitempty" name:"X-QS-MetaData" location:"headers"`

// The request body
Body io.Reader `location:"body"`
}

// Validate validates the input for PutObject.
func (v *PutObjectInput) Validate() error {

if v.XQSMetaData != nil {
XQSMetaDataerr := utils.IsMetaDataValid(v.XQSMetaData)
if XQSMetaDataerr != nil {
return XQSMetaDataerr
}
}

if v.XQSStorageClass != nil {
xQSStorageClassValidValues := []string{"STANDARD", "STANDARD_IA"}
xQSStorageClassParameterValue := fmt.Sprint(*v.XQSStorageClass)
Expand All @@ -1035,12 +1044,6 @@ func (v *PutObjectInput) Validate() error {
}
}
}
if v.XQSMetaData != nil {
XQSMetaDataerr := utils.IsMetaDataValid(v.XQSMetaData)
if XQSMetaDataerr != nil {
return XQSMetaDataerr
}
}

return nil
}
Expand Down
6 changes: 3 additions & 3 deletions template/shared.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{{- else if eq $typeName "object" -}}
interface{}
{{- else if eq $typeName "map" -}}
interface{}
*map[string]string
{{- else if eq $typeName "any" -}}
interface{}
{{- else -}}
Expand All @@ -35,7 +35,7 @@
{{template "Type" passThrough $property.ExtraType $disablePointer}}
{{- else if eq $property.Type "array" -}}
[]{{template "Type" passThrough $property.ExtraType $disablePointer}}
{{- else if eq $property.Type "map[string]string" -}}
{{- else if eq $property.Type "map" -}}
*map[string]string
{{- else if eq $property.Type "any" -}}
{{template "Type" passThrough $property.Type $disablePointer}}
Expand Down Expand Up @@ -359,7 +359,7 @@
{{end}}
{{end}}

{{if eq $property.Type "map[string]string"}}
{{if eq $property.Type "map"}}
{{if eq $property.ID "X-QS-MetaData" }}
if v.XQSMetaData != nil {
XQSMetaDataerr := utils.IsMetaDataValid(v.XQSMetaData)
Expand Down