github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-02-14 18:10:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix naming in json of struct fields

Browse Source 
almost all of names in `json` of struct fileds
should be in `lowerUpper` format
This commit is contained in:
zzxwill
2020-09-25 14:53:39 +08:00
parent 8b480df72d
commit 60e34d5b03
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/oam/trait.go
View File

@@ -245,7 +245,7 @@ func AttachTrait(c *gin.Context, body apis.TraitBody) (string, error) {
return "", err
}
appObj, err = AddOrUpdateTrait(env, body.AppGroup, body.WorkloadName, fs, template)
appObj, err = AddOrUpdateTrait(env, body.AppName, body.WorkloadName, fs, template)
if err != nil {
return "", err
}

2
pkg/plugins/capcenter.go
View File

@@ -108,7 +108,7 @@ func Parse(addr string) (string, *GithubContent, error) {
type RemoteCapability struct {
// Name MUST be xxx.yaml
Name string `json:"name"`
URL string `json:"download_url"`
URL string `json:"downloadUrl"`
Sha string `json:"sha"`
// Type MUST be file
Type string `json:"type"`

26
pkg/server/apis/types.go
View File

@@ -37,10 +37,10 @@ type CommonFlag struct {
}
type WorkloadRunBody struct {
EnvName string `json:"env_name"`
WorkloadType string `json:"workload_type"`
WorkloadName string `json:"workload_name"`
AppGroup string `json:"app_group,omitempty"`
EnvName string `json:"envName"`
WorkloadType string `json:"workloadType"`
WorkloadName string `json:"workloadName"`
AppName string `json:"appName,omitempty"`
Flags []CommonFlag `json:"flags"`
Staging bool `json:"staging,omitempty"`
Traits []TraitBody `json:"traits,omitempty"`
@@ -55,28 +55,28 @@ type WorkloadMeta struct {
type TraitMeta struct {
Name string `json:"name"`
Definition string `json:"definition,omitempty"`
AppliesTo []string `json:"applies_to,omitempty"`
AppliesTo []string `json:"appliesTo,omitempty"`
}
//used to present trait which is to be attached and, of which parameters are set
type TraitBody struct {
EnvName string `json:"env_name"`
EnvName string `json:"envName"`
Name string `json:"name"`
Flags []CommonFlag `json:"flags"`
WorkloadName string `json:"workload_name"`
AppGroup string `json:"app_group,omitempty"`
WorkloadName string `json:"workloadName"`
AppName string `json:"appName,omitempty"`
Staging string `json:"staging,omitempty"`
}
type ApplicationStatusMeta struct {
Status string `json:"Status,omitempty"`
Workload corev1alpha2.ComponentSpec `json:"Workload,omitempty"`
Traits []corev1alpha2.ComponentTrait `json:"Traits,omitempty"`
Status string `json:"status,omitempty"`
Workload corev1alpha2.ComponentSpec `json:"workload,omitempty"`
Traits []corev1alpha2.ComponentTrait `json:"traits,omitempty"`
}
type CapabilityMeta struct {
CapabilityName string `json:"capability_name"`
CapabilityCenterName string `json:"capability_center_name,omitempty"`
CapabilityName string `json:"capabilityName"`
CapabilityCenterName string `json:"capabilityCenterName,omitempty"`
}
type CapabilityCenterMeta struct {

2
pkg/server/handler/workloadHandler.go
View File

@@ -26,7 +26,7 @@ func CreateWorkload(c *gin.Context) {
}
evnName := body.EnvName
appObj, err := oam.BaseComplete(evnName, body.WorkloadName, body.AppGroup, fs, body.WorkloadType)
appObj, err := oam.BaseComplete(evnName, body.WorkloadName, body.AppName, fs, body.WorkloadType)
if err != nil {
util.HandleError(c, util.StatusInternalServerError, err.Error())
return