fix: sorting resources without locality when listing multiple localities (#1691)

Author: Codelax

internal/generic/fields.go

@@ -0,0 +1,17 @@
+package generic
+
+import "reflect"
+
+// HasField returns true if given struct has a field with given name
+// Also allow a slice, it will use the underlying type
+func HasField(i interface{}, fieldName string) bool {
+	value := reflect.Indirect(reflect.ValueOf(i))
+	typ := value.Type()
+
+	if value.Kind() == reflect.Slice {
+		typ = indirectType(typ.Elem())
+	}
+
+	_, fieldExists := typ.FieldByName(fieldName)
+	return fieldExists
+}

internal/generic/fields_test.go

@@ -0,0 +1,60 @@
+package generic
+
+import "testing"
+
+func TestHasField(t *testing.T) {
+	tests := []struct {
+		name      string
+		i         interface{}
+		fieldName string
+		want      bool
+	}{
+		{
+			"native type",
+			struct {
+				Zone string
+			}{},
+			"Zone",
+			true,
+		},
+		{
+			"ptr type",
+			struct {
+				Zone *string
+			}{},
+			"Zone",
+			true,
+		},
+		{
+			"invalid case",
+			struct {
+				Zone *string
+			}{},
+			"zone",
+			false,
+		},
+		{
+			"slice",
+			[]struct {
+				Zone string
+			}{},
+			"Zone",
+			true,
+		},
+		{
+			"slice invalid case",
+			[]struct {
+				Zone string
+			}{},
+			"zone",
+			false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := HasField(tt.i, tt.fieldName); got != tt.want {
+				t.Errorf("HasField() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

internal/generic/ptr.go

@@ -0,0 +1,11 @@
+package generic
+
+import "reflect"
+
+func indirectType(typ reflect.Type) reflect.Type {
+	if typ.Kind() == reflect.Ptr {
+		return typ.Elem()
+	}
+
+	return typ
+}

scw/client.go

@@ -472,6 +472,10 @@ func (c *Client) doListRegions(req *ScalewayRequest, res interface{}, regions []
 
 // sortSliceByZones sorts a slice of struct using a Zone field that should exist
 func sortSliceByZones(list interface{}, zones []Zone) {
+	if !generic.HasField(list, "Zone") {
+		return
+	}
+
 	zoneMap := map[Zone]int{}
 	for i, zone := range zones {
 		zoneMap[zone] = i
@@ -483,6 +487,10 @@ func sortSliceByZones(list interface{}, zones []Zone) {
 
 // sortSliceByRegions sorts a slice of struct using a Region field that should exist
 func sortSliceByRegions(list interface{}, regions []Region) {
+	if !generic.HasField(list, "Region") {
+		return
+	}
+
 	regionMap := map[Region]int{}
 	for i, region := range regions {
 		regionMap[region] = i