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

feat: added validation for create app workflow API #3842

Merged
merged 11 commits into from
Sep 6, 2023
Merged

feat: added validation for create app workflow API #3842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
eabed57
feat: added validation for create app workflow
Ash-exp Aug 29, 2023
e8792eb
fixed: CiPipelineDetails validation
Ash-exp Aug 29, 2023
0ab6368
fixed: virtual env validation
Ash-exp Aug 29, 2023
ab25035
fixed: validation struct
Ash-exp Aug 29, 2023
ee12a96
fixed: validation struct
Ash-exp Aug 29, 2023
9788481
fixed: validation struct
Ash-exp Aug 29, 2023
0427667
Merge branch 'main' into fix-clone-workflow
Ash-exp Aug 29, 2023
fafbda3
chore: renamed a function
Ash-exp Aug 30, 2023
d57a187
fixed: updated validation
Ash-exp Sep 4, 2023
f88622e
Merge branch 'main' into fix-clone-workflow
Ash-exp Sep 4, 2023
0ff251d
updated: validation for linked CI
Ash-exp Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 20 additions & 20 deletions api/appbean/AppDetail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ import (
)

type AppDetail struct {
Metadata *AppMetadata `json:"metadata,notnull" validate:"required"`
GitMaterials []*GitMaterial `json:"gitMaterials,notnull"`
DockerConfig *DockerConfig `json:"dockerConfig"`
GlobalDeploymentTemplate *DeploymentTemplate `json:"globalDeploymentTemplate,notnull"`
AppWorkflows []*AppWorkflow `json:"workflows"`
GlobalConfigMaps []*ConfigMap `json:"globalConfigMaps"`
GlobalSecrets []*Secret `json:"globalSecrets"`
EnvironmentOverrides map[string]*EnvironmentOverride `json:"environmentOverride"`
Metadata *AppMetadata `json:"metadata,notnull" validate:"dive,required"`
GitMaterials []*GitMaterial `json:"gitMaterials,notnull" validate:"dive,min=1"`
DockerConfig *DockerConfig `json:"dockerConfig" validate:"dive"`
GlobalDeploymentTemplate *DeploymentTemplate `json:"globalDeploymentTemplate,notnull" validate:"dive"`
AppWorkflows []*AppWorkflow `json:"workflows,omitempty" validate:"dive"`
GlobalConfigMaps []*ConfigMap `json:"globalConfigMaps,omitempty" validate:"dive"`
GlobalSecrets []*Secret `json:"globalSecrets,omitempty" validate:"dive"`
EnvironmentOverrides map[string]*EnvironmentOverride `json:"environmentOverride,omitempty" validate:"dive"`
}

type AppWorkflowCloneDto struct {
AppId int `json:"appId"`
AppName string `json:"appName"`
AppWorkflows []*AppWorkflow `json:"workflows"`
EnvironmentOverrides map[string]*EnvironmentOverride `json:"environmentOverride"`
AppName string `json:"appName" validate:"required"`
AppWorkflows []*AppWorkflow `json:"workflows,omitempty" validate:"dive"`
EnvironmentOverrides map[string]*EnvironmentOverride `json:"environmentOverride,omitempty" validate:"dive"`
}

type AppMetadata struct {
Expand Down Expand Up @@ -71,15 +71,15 @@ type DeploymentTemplate struct {
}

type AppWorkflow struct {
Name string `json:"name"`
CiPipeline *CiPipelineDetails `json:"ciPipeline"`
CdPipelines []*CdPipelineDetails `json:"cdPipelines"`
Name string `json:"name" validate:"required"`
CiPipeline *CiPipelineDetails `json:"ciPipeline" validate:"dive,required"`
CdPipelines []*CdPipelineDetails `json:"cdPipelines,omitempty" validate:"dive"`
}

type CiPipelineDetails struct {
Name string `json:"name" validate:"required"` //name suffix of corresponding pipeline
IsManual bool `json:"isManual" validate:"required"`
CiPipelineMaterialsConfig []*CiPipelineMaterialConfig `json:"ciPipelineMaterialsConfig"`
IsManual bool `json:"isManual"`
CiPipelineMaterialsConfig []*CiPipelineMaterialConfig `json:"ciPipelineMaterialsConfig" validate:"dive,min=1"`
DockerBuildArgs map[string]string `json:"dockerBuildArgs"`
BeforeDockerBuildScripts []*BuildScript `json:"beforeDockerBuildScripts"`
AfterDockerBuildScripts []*BuildScript `json:"afterDockerBuildScripts"`
Expand All @@ -93,7 +93,7 @@ type CiPipelineDetails struct {
}

type CiPipelineMaterialConfig struct {
Type pipelineConfig.SourceType `json:"type,omitempty" validate:"oneof=SOURCE_TYPE_BRANCH_FIXED WEBHOOK"`
Type pipelineConfig.SourceType `json:"type,omitempty" validate:"oneof=SOURCE_TYPE_BRANCH_FIXED SOURCE_TYPE_BRANCH_REGEX SOURCE_TYPE_TAG_ANY WEBHOOK"`
Value string `json:"value,omitempty" `
CheckoutPath string `json:"checkoutPath"`
GitMaterialId int `json:"gitMaterialId"`
Expand All @@ -107,9 +107,9 @@ type BuildScript struct {
}

type CdPipelineDetails struct {
Name string `json:"name"` //pipelineName
EnvironmentName string `json:"environmentName" `
TriggerType pipelineConfig.TriggerType `json:"triggerType" validate:"required"`
Name string `json:"name" validate:"required"` //pipelineName
EnvironmentName string `json:"environmentName" validate:"required"`
TriggerType pipelineConfig.TriggerType `json:"triggerType" validate:"oneof=AUTOMATIC MANUAL"`
DeploymentAppType string `json:"deploymentAppType"`
DeploymentStrategyType chartRepoRepository.DeploymentStrategy `json:"deploymentType,omitempty"` //
DeploymentStrategies []*DeploymentStrategy `json:"deploymentStrategies"`
Expand Down