diff --git a/Taskfile.yml b/Taskfile.yml index 5feea90..f9506df 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -17,7 +17,6 @@ tasks: - GEN_OUT_DIR={{.GEN_OUT_DIR}} go run -tags=generator ./generator/... generate: cmds: - - task: get-openapi-spec - task: go-generate - task: fmt-imports test: diff --git a/generator/models.go b/generator/models.go index 18c68f3..4035bf4 100644 --- a/generator/models.go +++ b/generator/models.go @@ -202,7 +202,7 @@ func (s *Schema) init(doc *Doc, scope map[string]*Schema, name string) { s.CamelName = strcase.ToCamel(s.parent.CamelName) } - if s.Type == SchemaTypeString { + if s.Type == SchemaTypeString && s.name != "time" { parts := strings.Split(s.name, "_") switch parts[len(parts)-1] { case "at", "time": diff --git a/handler/accountauthentication/accountauthentication.go b/handler/accountauthentication/accountauthentication.go index af250ea..6d9a48c 100644 --- a/handler/accountauthentication/accountauthentication.go +++ b/handler/accountauthentication/accountauthentication.go @@ -125,6 +125,7 @@ type AccountAuthenticationMethodCreateIn struct { SamlRequestedAuthnContextEnabled *bool `json:"saml_requested_authn_context_enabled,omitempty"` SamlSignatureAlgorithm SamlSignatureAlgorithmType `json:"saml_signature_algorithm,omitempty"` SamlVariant SamlVariantType `json:"saml_variant,omitempty"` + ScimEnabled *bool `json:"scim_enabled,omitempty"` } type AccountAuthenticationMethodCreateOut struct { AccountId string `json:"account_id"` @@ -158,6 +159,8 @@ type AccountAuthenticationMethodCreateOut struct { SamlSignatureAlgorithm string `json:"saml_signature_algorithm,omitempty"` SamlSpCertificate string `json:"saml_sp_certificate,omitempty"` SamlVariant string `json:"saml_variant,omitempty"` + ScimEnabled *bool `json:"scim_enabled,omitempty"` + ScimUrl string `json:"scim_url,omitempty"` State string `json:"state"` UpdateTime time.Time `json:"update_time"` } @@ -193,6 +196,8 @@ type AccountAuthenticationMethodGetOut struct { SamlSignatureAlgorithm string `json:"saml_signature_algorithm,omitempty"` SamlSpCertificate string `json:"saml_sp_certificate,omitempty"` SamlVariant string `json:"saml_variant,omitempty"` + ScimEnabled *bool `json:"scim_enabled,omitempty"` + ScimUrl string `json:"scim_url,omitempty"` State string `json:"state"` UpdateTime time.Time `json:"update_time"` } @@ -214,6 +219,7 @@ type AccountAuthenticationMethodUpdateIn struct { SamlRequestedAuthnContextEnabled *bool `json:"saml_requested_authn_context_enabled,omitempty"` SamlSignatureAlgorithm SamlSignatureAlgorithmType `json:"saml_signature_algorithm,omitempty"` SamlVariant SamlVariantType `json:"saml_variant,omitempty"` + ScimEnabled *bool `json:"scim_enabled,omitempty"` } type AccountAuthenticationMethodUpdateOut struct { AccountId string `json:"account_id"` @@ -247,6 +253,8 @@ type AccountAuthenticationMethodUpdateOut struct { SamlSignatureAlgorithm string `json:"saml_signature_algorithm,omitempty"` SamlSpCertificate string `json:"saml_sp_certificate,omitempty"` SamlVariant string `json:"saml_variant,omitempty"` + ScimEnabled *bool `json:"scim_enabled,omitempty"` + ScimUrl string `json:"scim_url,omitempty"` State string `json:"state"` UpdateTime time.Time `json:"update_time"` } @@ -282,6 +290,8 @@ type AuthenticationMethodOut struct { SamlSignatureAlgorithm string `json:"saml_signature_algorithm,omitempty"` SamlSpCertificate string `json:"saml_sp_certificate,omitempty"` SamlVariant string `json:"saml_variant,omitempty"` + ScimEnabled *bool `json:"scim_enabled,omitempty"` + ScimUrl string `json:"scim_url,omitempty"` State string `json:"state"` UpdateTime time.Time `json:"update_time"` } diff --git a/handler/kafkatopic/kafkatopic.go b/handler/kafkatopic/kafkatopic.go index 4181702..040771d 100644 --- a/handler/kafkatopic/kafkatopic.go +++ b/handler/kafkatopic/kafkatopic.go @@ -427,6 +427,7 @@ type PartitionOut struct { Isr int `json:"isr"` LatestOffset int `json:"latest_offset"` Partition int `json:"partition"` + RemoteSize *int `json:"remote_size,omitempty"` Size int `json:"size"` } type PreallocateOut struct { diff --git a/handler/project/project.go b/handler/project/project.go index 3096360..20554d9 100644 --- a/handler/project/project.go +++ b/handler/project/project.go @@ -365,12 +365,12 @@ type EndOfLifeExtensionOut struct { Elasticsearch *ElasticsearchOut `json:"elasticsearch,omitempty"` } type EventOut struct { - Actor string `json:"actor"` - EventDesc string `json:"event_desc"` - EventType string `json:"event_type"` - Id string `json:"id"` - ServiceName string `json:"service_name"` - Time time.Time `json:"time"` + Actor string `json:"actor"` + EventDesc string `json:"event_desc"` + EventType string `json:"event_type"` + Id string `json:"id"` + ServiceName string `json:"service_name"` + Time string `json:"time"` } type GroupUserOut struct { MemberType string `json:"member_type"` diff --git a/handler/service/service.go b/handler/service/service.go index 4a9ea37..bffb590 100644 --- a/handler/service/service.go +++ b/handler/service/service.go @@ -678,17 +678,17 @@ type ListPublicServiceTypesOut struct { Any *AnyOut `json:"ANY,omitempty"` } type LogOut struct { - Msg string `json:"msg"` - Time *time.Time `json:"time,omitempty"` - Unit string `json:"unit,omitempty"` + Msg string `json:"msg"` + Time string `json:"time,omitempty"` + Unit string `json:"unit,omitempty"` } type MaintenanceIn struct { - Dow DowType `json:"dow,omitempty"` - Time *time.Time `json:"time,omitempty"` + Dow DowType `json:"dow,omitempty"` + Time string `json:"time,omitempty"` } type MaintenanceOut struct { Dow string `json:"dow"` - Time time.Time `json:"time"` + Time string `json:"time"` Updates []UpdateOut `json:"updates"` } type MetadataOut struct { diff --git a/handler/serviceuser/serviceuser.go b/handler/serviceuser/serviceuser.go index 157bc9b..30337d8 100644 --- a/handler/serviceuser/serviceuser.go +++ b/handler/serviceuser/serviceuser.go @@ -178,7 +178,7 @@ type IntegrationStatusOut struct { } type MaintenanceOut struct { Dow string `json:"dow"` - Time time.Time `json:"time"` + Time string `json:"time"` Updates []UpdateOut `json:"updates"` } type MetadataOut struct {