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

fix: Fix malformed struct tags #6028

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Fix malformed struct tags #6028

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
6 changes: 3 additions & 3 deletions api/bean/AppView.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/bean/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/cluster/ClusterService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/k8s/bean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/security/bean/bean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}
6 changes: 3 additions & 3 deletions tests/e2e/BasicTestConf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down