Update IPSecESPLifetime

This commit is contained in:
appkins
2025-04-13 22:23:08 -05:00
parent 39c704d3ec
commit 73d68d5ac1
8 changed files with 19 additions and 19 deletions

View File

@@ -139,7 +139,7 @@ func extractJSON(jarFile, fieldsDir string) error {
return fmt.Errorf("unable to open settings file: %w", err)
}
var settings map[string]interface{}
var settings map[string]any
err = json.Unmarshal(settingsData, &settings)
if err != nil {
return fmt.Errorf("unable to unmarshal settings: %w", err)

View File

@@ -54,7 +54,7 @@ func (l firmwareUpdateApiResponseEmbeddedFirmwareDataLink) MarshalJSON() ([]byte
}
func (l *firmwareUpdateApiResponseEmbeddedFirmwareDataLink) UnmarshalJSON(j []byte) error {
var m map[string]interface{}
var m map[string]any
err := json.Unmarshal(j, &m)
if err != nil {

View File

@@ -482,7 +482,7 @@ func (r *Resource) IsSetting() bool {
return strings.HasPrefix(r.StructName, "Setting")
}
func (r *Resource) processFields(fields map[string]interface{}) {
func (r *Resource) processFields(fields map[string]any) {
t := r.Types[r.StructName]
for name, validation := range fields {
fieldInfo, err := r.fieldInfoFromValidation(name, validation)
@@ -494,7 +494,7 @@ func (r *Resource) processFields(fields map[string]interface{}) {
}
}
func (r *Resource) fieldInfoFromValidation(name string, validation interface{}) (*FieldInfo, error) {
func (r *Resource) fieldInfoFromValidation(name string, validation any) (*FieldInfo, error) {
fieldName := strcase.ToCamel(name)
fieldName = cleanName(fieldName, fieldReps)
@@ -502,7 +502,7 @@ func (r *Resource) fieldInfoFromValidation(name string, validation interface{})
var fieldInfo *FieldInfo
switch validation := validation.(type) {
case []interface{}:
case []any:
if len(validation) == 0 {
fieldInfo = NewFieldInfo(fieldName, name, "string", "", false, true, "")
err := r.FieldProcessor(fieldName, fieldInfo)
@@ -523,7 +523,7 @@ func (r *Resource) fieldInfoFromValidation(name string, validation interface{})
err = r.FieldProcessor(fieldName, fieldInfo)
return fieldInfo, err
case map[string]interface{}:
case map[string]any:
typeName := r.StructName + fieldName
result := NewFieldInfo(fieldName, name, typeName, "", true, false, "")
@@ -587,7 +587,7 @@ func (r *Resource) fieldInfoFromValidation(name string, validation interface{})
}
func (r *Resource) processJSON(b []byte) error {
var fields map[string]interface{}
var fields map[string]any
err := json.Unmarshal(b, &fields)
if err != nil {
return err

View File

@@ -12,7 +12,7 @@ func TestFieldInfoFromValidation(t *testing.T) {
expectedType string
expectedComment string
expectedOmitEmpty bool
validation interface{}
validation any
}{
{"string", "", true, ""},
{"string", "default|custom", true, "default|custom"},