fix: use new API for network auto detection (#131)

Network auto detection in GKE was not working due to deprecated API.
This commit updates the code by using the new ones.

Signed-off-by: Elis Lulja <[email protected]>

Author: asimpleidea

pkg/cluster/network.go

@@ -20,7 +20,10 @@ package cluster
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"net/http"
+	"path"
 	"strings"
 	"time"
 
@@ -30,6 +33,7 @@ import (
 	awssess "github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	gccontainer "google.golang.org/api/container/v1"
+	"google.golang.org/api/googleapi"
 	gcoption "google.golang.org/api/option"
 )
 
@@ -121,9 +125,32 @@ func GetNetworkFromGKE(ctx context.Context, opts ...gcoption.ClientOption) (*Net
 		return nil, err
 	}
 
-	cluster, err := cli.Projects.Zones.Clusters.Get(projectID, zone, clusterName).Do()
+	plcs := gccontainer.NewProjectsLocationsClustersService(cli)
+	cluster, err := plcs.Get(path.Join("projects", projectID, "locations", zone, "clusters", clusterName)).Do()
 	if err != nil {
-		return nil, err
+		var e *googleapi.Error
+		if errors.As(err, &e) {
+			if e.Code != http.StatusNotFound {
+				return nil, err
+			}
+		}
+
+		// Retry with a region, not with a zone.
+		// TODO: check if this always applies or it is just a special case.
+		// My guess is that this does not happen when running GKE in single
+		// zone, but only in multi-zone, e.g. when using autopilot.
+		// TODO: remove this fmt line after checking the above.
+		// See #131.
+		fmt.Println("could not get cluster data, retrying with region...")
+		lastDash := strings.LastIndex(zone, "-")
+		if lastDash == -1 {
+			return nil, err
+		}
+
+		cluster, err = plcs.Get(path.Join("projects", projectID, "locations", zone[:lastDash], "clusters", clusterName)).Do()
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	return &NetworkConfiguration{cluster.Network, cluster.Subnetwork}, nil