Skip to content

Commit

Permalink
fix: change k8s flavor list return type FlavorsAvailable (#65)
Browse files Browse the repository at this point in the history
* chore: k8s flavor list

* chore: k8s flavor list
  • Loading branch information
geffersonFerraz authored Feb 26, 2025
1 parent 61b92ac commit e7a5c37
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
4 changes: 2 additions & 2 deletions cmd/examples/kubernetes/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,10 @@ func ExampleListFlavorsAndVersions(k8sClient *kubernetes.KubernetesClient) {
}

fmt.Println("\nFlavors para Node Pools:")
for _, f := range (*flavors)[0].ControlPlane {
for _, f := range flavors.ControlPlane {
fmt.Printf("CP - %s (%d vCPUs, %dMB RAM)\n", f.Name, f.VCPU, f.RAM)
}
for _, f := range (*flavors)[0].NodePool {
for _, f := range flavors.NodePool {
fmt.Printf("NP - %s (%d vCPUs, %dMB RAM)\n", f.Name, f.VCPU, f.RAM)
}
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/examples/kubernetes_small/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -347,10 +347,10 @@ func ExampleListFlavorsAndVersions(k8sClient *kubernetes.KubernetesClient) {
}

fmt.Println("\nFlavors para Node Pools:")
for _, f := range (*flavors)[0].ControlPlane {
for _, f := range flavors.ControlPlane {
fmt.Printf("CP - %s (%d vCPUs, %dMB RAM)\n", f.Name, f.VCPU, f.RAM)
}
for _, f := range (*flavors)[0].NodePool {
for _, f := range flavors.NodePool {
fmt.Printf("NP - %s (%d vCPUs, %dMB RAM)\n", f.Name, f.VCPU, f.RAM)
}
}
Expand Down
11 changes: 8 additions & 3 deletions kubernetes/flavor.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package kubernetes

import (
"context"
"errors"
"net/http"
"net/url"
"strconv"
Expand All @@ -12,7 +13,7 @@ import (

type (
FlavorService interface {
List(ctx context.Context, opts ListOptions) (*[]FlavorsAvailable, error)
List(ctx context.Context, opts ListOptions) (*FlavorsAvailable, error)
}

FlavorList struct {
Expand All @@ -37,7 +38,7 @@ type (
}
)

func (s *flavorService) List(ctx context.Context, opts ListOptions) (*[]FlavorsAvailable, error) {
func (s *flavorService) List(ctx context.Context, opts ListOptions) (*FlavorsAvailable, error) {
query := url.Values{}
if opts.Limit != nil {
query.Add("_limit", strconv.Itoa(*opts.Limit))
Expand All @@ -57,5 +58,9 @@ func (s *flavorService) List(ctx context.Context, opts ListOptions) (*[]FlavorsA
return nil, err
}

return &response.Results, nil
if len(response.Results) == 0 {
return nil, errors.New("no flavors available")
}

return &response.Results[0], nil
}
11 changes: 4 additions & 7 deletions kubernetes/flavor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func TestFlavorService_List(t *testing.T) {
}

if !tt.wantErr {
total := len((*result)[0].NodePool) + len((*result)[0].ControlPlane)
total := len(result.NodePool) + len(result.ControlPlane)
if total != tt.want {
t.Errorf("List() got = %d, want %d", total, tt.want)
}
Expand Down Expand Up @@ -127,15 +127,12 @@ func TestFlavorService_List_EmptyResults(t *testing.T) {
defer server.Close()

client := testClient(server.URL)
result, err := client.Flavors().List(context.Background(), ListOptions{})
_, err := client.Flavors().List(context.Background(), ListOptions{})

if err != nil {
t.Fatalf("Erro inesperado: %v", err)
if err == nil {
t.Fatalf("Esperado erro, obtido nil")
}

if len(*result) != 0 {
t.Errorf("Esperado 0 resultados, obtido %d", len(*result))
}
}

func TestFlavorService_List_AuthorizationError(t *testing.T) {
Expand Down

0 comments on commit e7a5c37

Please sign in to comment.