make helper function more intuitive

OpenNebula · Jul 10, 2023 · b7a1775 · b7a1775
1 parent ce63a4f
commit b7a1775
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 30 deletions.
diff --git a/opennebula/helpers.go b/opennebula/helpers.go
@@ -11,14 +11,13 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func inArray(val string, array []string) (index int) {
-	var ok bool
-	for i := range array {
-		if ok = array[i] == val; ok {
-			return i
+func contains(value string, values []string) bool {
+	for i := range values {
+		if values[i] == value {
+			return true
 		}
 	}
-	return -1
+	return false
 }
 
 func ArrayToString(list []interface{}, delim string) string {

diff --git a/opennebula/resource_opennebula_datastore.go b/opennebula/resource_opennebula_datastore.go
@@ -49,7 +49,7 @@ func resourceOpennebulaDatastore() *schema.Resource {
 					for k := range datastoreTypes {
 						keys = append(keys, k)
 					}
-					if inArray(value, keys) < 0 {
+					if !contains(value, keys) {
 						errors = append(errors, fmt.Errorf("Type %q must be one of: %s", k, strings.Join(keys, ",")))
 					}
 

diff --git a/opennebula/resource_opennebula_group.go b/opennebula/resource_opennebula_group.go
@@ -98,7 +98,7 @@ func resourceOpennebulaGroup() *schema.Resource {
 							ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
 								value := v.(string)
 
-								if inArray(value, yesNo) < 0 {
+								if !contains(value, yesNo) {
 									errors = append(errors, fmt.Errorf("Type %q must be one of: %s", k, strings.Join(apiListOrder, ",")))
 								}
 
@@ -112,7 +112,7 @@ func resourceOpennebulaGroup() *schema.Resource {
 							ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
 								value := v.(string)
 
-								if inArray(value, yesNo) < 0 {
+								if !contains(value, yesNo) {
 									errors = append(errors, fmt.Errorf("Type %q must be one of: %s", k, strings.Join(apiListOrder, ",")))
 								}
 
@@ -126,7 +126,7 @@ func resourceOpennebulaGroup() *schema.Resource {
 							ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
 								value := v.(string)
 
-								if inArray(value, apiListOrder) < 0 {
+								if !contains(value, apiListOrder) {
 									errors = append(errors, fmt.Errorf("Type %q must be one of: %s", k, strings.Join(apiListOrder, ",")))
 								}
 

diff --git a/opennebula/resource_opennebula_host.go b/opennebula/resource_opennebula_host.go
@@ -60,7 +60,7 @@ func resourceOpennebulaHost() *schema.Resource {
 				Description: "Type of the new host: kvm, qemu, lxd, lxc, firecracker, custom",
 				ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
 
-					if inArray(v.(string), hostTypes) < 0 {
+					if !contains(v.(string), hostTypes) {
 						errors = append(errors, fmt.Errorf("host \"type\" must be one of: %s", strings.Join(hostTypes, ",")))
 					}
 

diff --git a/opennebula/resource_opennebula_image.go b/opennebula/resource_opennebula_image.go
@@ -134,7 +134,7 @@ func resourceOpennebulaImage() *schema.Resource {
 				ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
 					value := v.(string)
 
-					if inArray(value, imagetypes) < 0 {
+					if !contains(value, imagetypes) {
 						errors = append(errors, fmt.Errorf("Type %q must be one of: %s", k, strings.Join(imagetypes, ",")))
 					}
 
@@ -496,7 +496,7 @@ func resourceOpennebulaImageRead(ctx context.Context, d *schema.ResourceData, me
 	}
 	d.Set("path", image.Path)
 
-	if inArray(image.Type, imagetypes) >= 0 {
+	if contains(image.Type, imagetypes) {
 		d.Set("type", image.Type)
 	}
 

diff --git a/opennebula/resource_opennebula_security_group.go b/opennebula/resource_opennebula_security_group.go
@@ -100,7 +100,7 @@ func resourceOpennebulaSecurityGroup() *schema.Resource {
 								validprotos := []string{"ALL", "TCP", "UDP", "ICMP", "IPSEC"}
 								value := v.(string)
 
-								if inArray(value, validprotos) < 0 {
+								if !contains(value, validprotos) {
 									errors = append(errors, fmt.Errorf("Protocol %q must be one of: %s", k, strings.Join(validprotos, ",")))
 								}
 
@@ -115,7 +115,7 @@ func resourceOpennebulaSecurityGroup() *schema.Resource {
 								validtypes := []string{"INBOUND", "OUTBOUND"}
 								value := v.(string)
 
-								if inArray(value, validtypes) < 0 {
+								if !contains(value, validtypes) {
 									errors = append(errors, fmt.Errorf("Rule type %q must be one of: %s", k, strings.Join(validtypes, ",")))
 								}
 

diff --git a/opennebula/resource_opennebula_template.go b/opennebula/resource_opennebula_template.go
@@ -112,7 +112,7 @@ func FeaturesFields() map[string]*schema.Schema {
 				validtypes := []string{"YES", "NO"}
 				value := v.(string)
 
-				if inArray(value, validtypes) < 0 {
+				if !contains(value, validtypes) {
 					errors = append(errors, fmt.Errorf("PAE must be one of: %s", strings.Join(validtypes, ", ")))
 				}
 
@@ -127,7 +127,7 @@ func FeaturesFields() map[string]*schema.Schema {
 				validtypes := []string{"YES", "NO"}
 				value := v.(string)
 
-				if inArray(value, validtypes) < 0 {
+				if !contains(value, validtypes) {
 					errors = append(errors, fmt.Errorf("ACPI must be one of: %s", strings.Join(validtypes, ", ")))
 				}
 
@@ -142,7 +142,7 @@ func FeaturesFields() map[string]*schema.Schema {
 				validtypes := []string{"YES", "NO"}
 				value := v.(string)
 
-				if inArray(value, validtypes) < 0 {
+				if !contains(value, validtypes) {
 					errors = append(errors, fmt.Errorf("APIC must be one of: %s", strings.Join(validtypes, ", ")))
 				}
 
@@ -157,7 +157,7 @@ func FeaturesFields() map[string]*schema.Schema {
 				validtypes := []string{"YES", "NO"}
 				value := v.(string)
 
-				if inArray(value, validtypes) < 0 {
+				if !contains(value, validtypes) {
 					errors = append(errors, fmt.Errorf("LOCALTIME must be one of: %s", strings.Join(validtypes, ", ")))
 				}
 
@@ -177,7 +177,7 @@ func FeaturesFields() map[string]*schema.Schema {
 				validtypes := []string{"YES", "NO"}
 				value := v.(string)
 
-				if inArray(value, validtypes) < 0 {
+				if !contains(value, validtypes) {
 					errors = append(errors, fmt.Errorf("GUEST_AGENT must be one of: %s", strings.Join(validtypes, ", ")))
 				}
 

diff --git a/opennebula/resource_opennebula_user.go b/opennebula/resource_opennebula_user.go
@@ -49,7 +49,7 @@ func resourceOpennebulaUser() *schema.Resource {
 				ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
 					value := v.(string)
 
-					if inArray(value, authTypes) < 0 {
+					if !contains(value, authTypes) {
 						errors = append(errors, fmt.Errorf("Auth driver %q must be one of: %s", k, strings.Join(locktypes, ",")))
 					}
 

diff --git a/opennebula/resource_opennebula_virtual_network.go b/opennebula/resource_opennebula_virtual_network.go
@@ -125,7 +125,7 @@ func resourceOpennebulaVirtualNetwork() *schema.Resource {
 					validtypes := []string{"dummy", "bridge", "fw", "ebtables", "802.1Q", "vxlan", "ovswitch"}
 					value := v.(string)
 
-					if inArray(value, validtypes) < 0 {
+					if !contains(value, validtypes) {
 						errors = append(errors, fmt.Errorf("Type %q must be one of: %s", k, strings.Join(validtypes, ",")))
 					}
 
@@ -296,7 +296,7 @@ func ARFields() map[string]*schema.Schema {
 				validtypes := []string{"IP4", "IP6", "IP6_STATIC", "IP4_6", "IP4_6_STATIC", "ETHER"}
 				value := v.(string)
 
-				if inArray(value, validtypes) < 0 {
+				if !contains(value, validtypes) {
 					errors = append(errors, fmt.Errorf("Address Range type %q must be one of: %s", k, strings.Join(validtypes, ",")))
 				}
 
@@ -402,7 +402,7 @@ func changeVNetGroup(d *schema.ResourceData, meta interface{}) error {
 }
 
 func mandatoryVLAN(intype string) bool {
-	return inArray(intype, []string{"802.1Q", "vxlan"}) >= 0
+	return contains(intype, []string{"802.1Q", "vxlan"})
 }
 
 func resourceOpennebulaVirtualNetworkCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {

diff --git a/opennebula/resource_opennebula_virtual_network_address_range.go b/opennebula/resource_opennebula_virtual_network_address_range.go
@@ -47,7 +47,7 @@ func resourceOpennebulaVirtualNetworkAddressRange() *schema.Resource {
 					validtypes := []string{"IP4", "IP6", "IP6_STATIC", "IP4_6", "IP4_6_STATIC", "ETHER"}
 					value := v.(string)
 
-					if inArray(value, validtypes) < 0 {
+					if !contains(value, validtypes) {
 						errors = append(errors, fmt.Errorf("Address Range type %q must be one of: %s", k, strings.Join(validtypes, ",")))
 					}
 

diff --git a/opennebula/resource_opennebula_vm_group.go b/opennebula/resource_opennebula_vm_group.go
@@ -74,7 +74,7 @@ func resourceOpennebulaVMGroup() *schema.Resource {
 								validpolicies := []string{"NONE", "AFFINED", "ANTI_AFFINED"}
 								value := v.(string)
 
-								if inArray(value, validpolicies) < 0 {
+								if contains(value, validpolicies) {
 									errors = append(errors, fmt.Errorf("Policy value %q must be one of: %s", k, strings.Join(validpolicies, ",")))
 								}
 

diff --git a/opennebula/shared_schemas.go b/opennebula/shared_schemas.go
@@ -55,7 +55,7 @@ func commonVMSchemas() map[string]*schema.Schema {
 				Default:  "swap", //"recreate" or "swap",
 				ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
 					value := strings.ToUpper(v.(string))
-					if inArray(value, vmDiskOnChangeValues) == -1 {
+					if !contains(value, vmDiskOnChangeValues) {
 						errors = append(errors, fmt.Errorf("%q must be one of %s", k, strings.Join(vmDiskOnChangeValues, ", ")))
 					}
 					return
@@ -251,7 +251,7 @@ func diskFields(customFields ...map[string]*schema.Schema) map[string]*schema.Sc
 				validtypes := []string{"swap", "fs"}
 				value := v.(string)
 
-				if inArray(value, validtypes) < 0 {
+				if !contains(value, validtypes) {
 					errors = append(errors, fmt.Errorf("Type %q must be one of: %s", k, strings.Join(validtypes, ",")))
 				}
 
@@ -266,7 +266,7 @@ func diskFields(customFields ...map[string]*schema.Schema) map[string]*schema.Sc
 				validtypes := []string{"raw", "qcow2"}
 				value := v.(string)
 
-				if inArray(value, validtypes) < 0 {
+				if !contains(value, validtypes) {
 					errors = append(errors, fmt.Errorf("Format %q must be one of: %s", k, strings.Join(validtypes, ",")))
 				}
 
@@ -424,7 +424,7 @@ func lockSchema() *schema.Schema {
 		ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
 			value := v.(string)
 
-			if inArray(value, locktypes) < 0 {
+			if !contains(value, locktypes) {
 				errors = append(errors, fmt.Errorf("Type %q must be one of: %s", k, strings.Join(locktypes, ",")))
 			}