diff --git a/api/bean/AppView.go b/api/bean/AppView.go index b1c350690ef..f12108fc8bc 100644 --- a/api/bean/AppView.go +++ b/api/bean/AppView.go @@ -68,10 +68,10 @@ type GenericNoteResponseBean struct { type JobContainer struct { JobId int `json:"jobId"` - JobName string `json:"jobName""` - JobActualName string `json:"appName""` + JobName string `json:"jobName"` + JobActualName string `json:"appName"` Description GenericNoteResponseBean `json:"description"` - JobCiPipelines []JobCIPipeline `json:"ciPipelines"'` + JobCiPipelines []JobCIPipeline `json:"ciPipelines"` ProjectId int `json:"projectId"` } diff --git a/pkg/bean/app.go b/pkg/bean/app.go index 4ac7f16d266..5ebe274945e 100644 --- a/pkg/bean/app.go +++ b/pkg/bean/app.go @@ -148,7 +148,7 @@ func (ciPipeline *CiPipeline) IsLinkedCi() bool { type DockerConfigOverride struct { DockerRegistry string `json:"dockerRegistry,omitempty"` DockerRepository string `json:"dockerRepository,omitempty"` - CiBuildConfig *CiPipeline2.CiBuildConfigBean `json:"ciBuildConfig,omitEmpty"` + CiBuildConfig *CiPipeline2.CiBuildConfigBean `json:"ciBuildConfig,omitempty"` //DockerBuildConfig *DockerBuildConfig `json:"dockerBuildConfig,omitempty"` } diff --git a/pkg/cluster/ClusterService.go b/pkg/cluster/ClusterService.go index 5417c69eaed..2c897012953 100644 --- a/pkg/cluster/ClusterService.go +++ b/pkg/cluster/ClusterService.go @@ -136,7 +136,7 @@ type UserInfo struct { } type ValidateClusterBean struct { - UserInfos map[string]*UserInfo `json:"userInfos,omitempty""` + UserInfos map[string]*UserInfo `json:"userInfos,omitempty"` *ClusterBean } diff --git a/pkg/k8s/bean.go b/pkg/k8s/bean.go index a39fba2ee80..d5587ace1f6 100644 --- a/pkg/k8s/bean.go +++ b/pkg/k8s/bean.go @@ -32,7 +32,7 @@ type ResourceRequestBean struct { DevtronAppIdentifier *bean.DevtronAppIdentifier `json:"-"` // For Devtron App Resources ClusterId int `json:"clusterId"` // clusterId is used when request is for direct cluster (not for helm release) ExternalArgoApplicationName string `json:"externalArgoApplicationName,omitempty"` - ExternalFluxAppIdentifier *bean2.FluxAppIdentifier `json: "-"` + ExternalFluxAppIdentifier *bean2.FluxAppIdentifier `json:"-"` } func (r *ResourceRequestBean) IsValidAppType() bool { diff --git a/pkg/security/bean/bean.go b/pkg/security/bean/bean.go index 0744d544cd2..0ec9c3110ab 100644 --- a/pkg/security/bean/bean.go +++ b/pkg/security/bean/bean.go @@ -118,5 +118,5 @@ type ImageScanExecutionDetail struct { ScanEnabled bool `json:"scanEnabled,notnull"` Scanned bool `json:"scanned,notnull"` ObjectType string `json:"objectType,notnull"` - ScanToolId int `json:"scanToolId,omitempty""` + ScanToolId int `json:"scanToolId,omitempty"` } diff --git a/tests/e2e/BasicTestConf.go b/tests/e2e/BasicTestConf.go index 664f034f3f3..7ffacf8f4a9 100644 --- a/tests/e2e/BasicTestConf.go +++ b/tests/e2e/BasicTestConf.go @@ -37,15 +37,15 @@ type LogInResponse struct { } type EnvironmentConf struct { - TestEnv string `json.testEnv` + TestEnv string `json:"testEnv"` EnvList []Environment `json:"environment"` } type Environment struct { EnvironmentName string `json:"envName"` - BaseServerUrl string `json:baseServerUrl` + BaseServerUrl string `json:"baseServerUrl"` LogInUserName string `json:"loginUserName"` - LogInUserPwd string `json:loginUserPwd` + LogInUserPwd string `json:"loginUserPwd"` } //Give resty client along with some basic settings like cookie etc