Fix errors reported by the new golangci-lint version

PaloAltoNetworks · Aug 16, 2024 · a4e219a · a4e219a
1 parent cdaed09
commit a4e219a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/pkg/properties/normalized.go b/pkg/properties/normalized.go
@@ -329,11 +329,11 @@ func schemaParameterToSpecParameter(schemaSpec *parameter.Parameter) (*SpecParam
 		for _, v := range schemaSpec.Validators {
 			switch spec := v.Spec.(type) {
 			case *validator.CountSpec:
-				min := int64(spec.Min)
-				max := int64(spec.Max)
+				minValue := int64(spec.Min)
+				maxValue := int64(spec.Max)
 				itemsSpec.Length = &SpecParamItemsLength{
-					Min: &min,
-					Max: &max,
+					Min: &minValue,
+					Max: &maxValue,
 				}
 			}
 		}
@@ -393,18 +393,18 @@ func schemaParameterToSpecParameter(schemaSpec *parameter.Parameter) (*SpecParam
 		case *validator.RegexpSpec:
 			specParameter.Regex = spec.Expr
 		case *validator.StringLengthSpec:
-			min := int64(spec.Min)
-			max := int64(spec.Max)
+			minValue := int64(spec.Min)
+			maxValue := int64(spec.Max)
 			specParameter.Length = &SpecParamLength{
-				Min: &min,
-				Max: &max,
+				Min: &minValue,
+				Max: &maxValue,
 			}
 		case *validator.CountSpec:
-			min := int64(spec.Min)
-			max := int64(spec.Max)
+			minValue := int64(spec.Min)
+			maxValue := int64(spec.Max)
 			specParameter.Count = &SpecParamCount{
-				Min: &min,
-				Max: &max,
+				Min: &minValue,
+				Max: &maxValue,
 			}
 		}
 	}
@@ -547,11 +547,11 @@ func schemaToSpec(object object.Object) (*Normalization, error) {
 			for _, v := range entry.Validators {
 				switch spec := v.Spec.(type) {
 				case *validator.StringLengthSpec:
-					min := int64(spec.Min)
-					max := int64(spec.Max)
+					minValue := int64(spec.Min)
+					maxValue := int64(spec.Max)
 					specEntry.Name.Length = &EntryNameLength{
-						Min: &min,
-						Max: &max,
+						Min: &minValue,
+						Max: &maxValue,
 					}
 				}
 			}

diff --git a/pkg/translate/structs.go b/pkg/translate/structs.go
@@ -132,7 +132,7 @@ func calculateNestedXmlSpecType(parent string, param *properties.SpecParam) stri
 
 // XmlName creates a string with xml name (e.g. `description`).
 func XmlName(param *properties.SpecParam) string {
-	if param.Profiles != nil && len(param.Profiles) > 0 {
+	if len(param.Profiles) > 0 {
 		return strings.Join(param.Profiles[0].Xpath, ">")
 	}
 
@@ -141,7 +141,7 @@ func XmlName(param *properties.SpecParam) string {
 
 // XmlTag creates a string with xml tag (e.g. `xml:"description,omitempty"`).
 func XmlTag(param *properties.SpecParam) string {
-	if param.Profiles != nil && len(param.Profiles) > 0 {
+	if len(param.Profiles) > 0 {
 		suffix := ""
 
 		if param.Name != nil && (param.Name.Underscore == "uuid" || param.Name.Underscore == "name") {