rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-07-06 18:26:13 +00:00
Code Issues Releases Wiki Activity

change pointer to struct for types

Browse Source
This commit is contained in:
gitlawr 2018-02-22 09:57:20 +08:00
parent 9023aa6af4
commit 9e21d9c9ce
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apis/management.cattle.io/v3/pipeline_types.go
View File

@ -78,7 +78,7 @@ type GithubClusterConfig struct {
}
type PipelineStatus struct {
State string `json:"state,omitempty" norman:"required,options=active|inactive,default=active"`
PipelineState string `json:"pipelineState,omitempty" norman:"required,options=active|inactive,default=active"`
NextRun int `json:"nextRun" yaml:"nextRun,omitempty" norman:"default=1,min=1"`
LastExecutionID string `json:"lastExecutionId,omitempty" yaml:"lastExecutionId,omitempty"`
LastRunState string `json:"lastRunState,omitempty" yaml:"lastRunState,omitempty"`
@ -144,11 +144,11 @@ type PipelineExecutionSpec struct {
}
type PipelineExecutionStatus struct {
Commit string `json:"commit,omitempty"`
State string `json:"state,omitempty"`
Started string `json:"started,omitempty"`
Ended string `json:"ended,omitempty"`
Stages []StageStatus `json:"stages,omitempty"`
Commit string `json:"commit,omitempty"`
ExecutionState string `json:"executionState,omitempty"`
Started string `json:"started,omitempty"`
Ended string `json:"ended,omitempty"`
Stages []StageStatus `json:"stages,omitempty"`
}
type StageStatus struct {

17
apis/management.cattle.io/v3/schema/schema.go
View File

@ -365,18 +365,15 @@ func alertTypes(schema *types.Schemas) *types.Schemas {
func pipelineTypes(schema *types.Schemas) *types.Schemas {
return schema.
AddMapperForType(&Version, &v3.ClusterPipeline{},
m.DisplayName{}).
AddMapperForType(&Version, &v3.Pipeline{},
AddMapperForType(&Version, v3.ClusterPipeline{}).
AddMapperForType(&Version, v3.Pipeline{},
&m.Embed{Field: "status"},
m.DisplayName{}).
AddMapperForType(&Version, &v3.PipelineExecution{},
&m.Embed{Field: "status"},
m.DisplayName{}).
AddMapperForType(&Version, &v3.SourceCodeCredential{},
m.DisplayName{}).
AddMapperForType(&Version, &v3.SourceCodeRepository{}, m.DisplayName{}).
AddMapperForType(&Version, &v3.PipelineExecutionLog{}).
AddMapperForType(&Version, v3.PipelineExecution{},
&m.Embed{Field: "status"}).
AddMapperForType(&Version, v3.SourceCodeCredential{}).
AddMapperForType(&Version, v3.SourceCodeRepository{}).
AddMapperForType(&Version, v3.PipelineExecutionLog{}).
MustImport(&Version, v3.AuthAppInput{}).
MustImport(&Version, v3.AuthUserInput{}).
MustImportAndCustomize(&Version, v3.SourceCodeCredential{}, func(schema *types.Schema) {