v3: Add more listable on Name or(not and) ID

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+Unreleased
+----------
+
+- v3: Add more listable on Name or(not and) ID #642
+
 3.1.0
 ----------
 

v3/generator/client/client.tmpl

@@ -24,13 +24,13 @@ func (c Client) GetZoneAPIEndpoint(ctx context.Context, zoneName ZoneName) (Endp
 	if err != nil {
 		return "", fmt.Errorf("get zone api endpoint: %w", err)
 	}
-	for _, zone := range resp.Zones {
-		if zone.Name == zoneName {
-			return zone.APIEndpoint, nil
-		}
+
+	zone, err := resp.FindZone(string(zoneName))
+	if err != nil {
+		return "", fmt.Errorf("get zone api endpoint: %w", err)
 	}
 
-	return "", fmt.Errorf("get zone api endpoint: zone name %s not found", zoneName)
+	return zone.APIEndpoint, nil
 }
 
 // Client represents an Exoscale API client.

v3/generator/operations/operations.go

@@ -268,22 +268,24 @@ func renderRequestParametersSchema(name string, op *v3.Operation) ([]byte, error
 }
 
 const findableTemplate = `
-// Find{{ .TypeName }} attempts to find an {{ .TypeName }} by name or ID.
-func (l {{ .ListTypeName }}) Find{{ .TypeName }}(nameOrID string) ({{ .TypeName }}, error) {
+// Find{{ .TypeName }} attempts to find an {{ .TypeName }} by {{ .ParamName }}.
+func (l {{ .ListTypeName }}) Find{{ .TypeName }}({{ .ParamName }} string) ({{ .TypeName }}, error) {
 	for i, elem := range l.{{ .ListFieldName }} {
-		if elem.Name == nameOrID || elem.ID.String() == nameOrID {
+		if {{ .Condition }} {
 			return l.{{ .ListFieldName }}[i], nil
 		}
 	}
 
-	return {{ .TypeName }}{}, fmt.Errorf("%q not found in {{ .ListTypeName }}: %w", nameOrID, ErrNotFound)
+	return {{ .TypeName }}{}, fmt.Errorf("%q not found in {{ .ListTypeName }}: %w", {{ .ParamName }}, ErrNotFound)
 }
 `
 
 type Findable struct {
+	ParamName     string
 	TypeName      string
 	ListTypeName  string
 	ListFieldName string
+	Condition     string
 }
 
 // renderFindable renders a find method on listable resource.
@@ -343,16 +345,28 @@ func renderFindable(funcName string, s *base.SchemaProxy) ([]byte, error) {
 		}
 		_, hasName := item.Properties.Get("name")
 		_, hasID := item.Properties.Get("id")
-		if hasName && hasID {
+		if hasName || hasID {
 			output := bytes.NewBuffer([]byte{})
 			t, err := template.New("Findable").Parse(findableTemplate)
 			if err != nil {
 				return nil, err
 			}
+			paramName := "nameOrID"
+			condition := "string(elem.Name) == nameOrID || elem.ID.String() == nameOrID"
+			if !hasID {
+				paramName = "name"
+				condition = "string(elem.Name) == " + paramName
+			}
+			if !hasName {
+				paramName = "ID"
+				condition = "elem.ID.String() == " + paramName
+			}
 			if err := t.Execute(output, Findable{
 				ListTypeName:  funcName + "Response",
 				ListFieldName: helpers.ToCamel(propName),
 				TypeName:      typeName,
+				Condition:     condition,
+				ParamName:     paramName,
 			}); err != nil {
 				return nil, err
 			}