cybercyst/drone
1
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-05 15:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: [CDE-632]: Fixing marshalling and unmarshalling logic for features and mounts. (#3405)

Browse Source 
* fix: [CDE-632]: Fixing marshalling and unmarshalling logic for features and mounts.
This commit is contained in:
Dhruv Dhruv 2025-02-11 10:06:20 +00:00 committed by Harness
parent 5116297202
commit d9c8d1c4d1
2 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
types/devcontainer_config.go
View File

@ -188,6 +188,10 @@ func (f *FeatureValue) UnmarshalJSON(data []byte) error {
return nil
}
func (f *FeatureValue) MarshalJSON() ([]byte, error) {
return json.Marshal(f.Options)
}
func (f *Features) UnmarshalJSON(data []byte) error {
if *f == nil {
*f = make(Features)
@ -248,15 +252,27 @@ type Mount struct {
}
func (m *Mount) UnmarshalJSON(data []byte) error {
if err := json.Unmarshal(data, m); err == nil {
type Alias Mount
aux := &struct {
*Alias
}{
Alias: (*Alias)(m),
}
if err := json.Unmarshal(data, &aux); err == nil {
return nil
}
dst, err := stringToObject(string(data))
if err != nil {
return err
var str string
if err := json.Unmarshal(data, &str); err == nil {
dst, err := stringToObject(str)
if err != nil {
return err
}
*m = *dst
return nil
}
*m = *dst
return nil
return fmt.Errorf("failed to unmarshal JSON: %s", string(data))
}
func ParseMountsFromRawSlice(values []any) ([]*Mount, error) {
@ -318,8 +334,6 @@ func stringToObject(mountStr string) (*Mount, error) {
}
case "target", "dst", "destination":
newMount.Target = val
default:
return nil, fmt.Errorf("unexpected key '%s' in '%s'", key, field)
}
}
return &newMount, nil

15
types/devcontainer_feature_config.go
View File

@ -58,11 +58,18 @@ func (o *OptionDefinition) ValidateValue(optionValue any, optionKey string, feat
switch o.Type {
case enum.FeatureOptionValueTypeBoolean:
boolValue, ok := optionValue.(bool)
if !ok {
return "", fmt.Errorf("error during resolving feature %s, option Id %s "+
"expects boolean, got %s ", featureSource, optionKey, optionValue)
if ok {
return strconv.FormatBool(boolValue), nil
}
return strconv.FormatBool(boolValue), nil
stringValue, ok := optionValue.(string)
if ok {
parsedBoolValue, err := strconv.ParseBool(stringValue)
if err == nil {
return strconv.FormatBool(parsedBoolValue), nil
}
}
return "", fmt.Errorf("error during resolving feature %s, option Id %s "+
"expects boolean, got %s ", featureSource, optionKey, optionValue)
case enum.FeatureOptionValueTypeString:
stringValue, ok := optionValue.(string)
if !ok {