Remove powervs-utils dependency (#759)

Signed-off-by: Prajyot-Parab <[email protected]>

Author: Prajyot-Parab

cloud/scope/powervs_cluster.go

@@ -25,7 +25,6 @@ import (
 	"github.com/IBM/platform-services-go-sdk/resourcecontrollerv2"
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
-	utils "github.com/ppc64le-cloud/powervs-utils"
 	"k8s.io/klog/v2/klogr"
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/patch"
@@ -121,23 +120,16 @@ func NewPowerVSClusterScope(params PowerVSClusterScopeParams) (scope *PowerVSClu
 		return
 	}
 
-	region, err := utils.GetRegion(*res.RegionID)
-	if err != nil {
-		err = errors.Wrap(err, "failed to get region")
-		return
-	}
-
 	options := powervs.ServiceOptions{
 		IBMPIOptions: &ibmpisession.IBMPIOptions{
-			Debug:  params.Logger.V(DEBUGLEVEL).Enabled(),
-			Region: region,
-			Zone:   *res.RegionID,
+			Debug: params.Logger.V(DEBUGLEVEL).Enabled(),
+			Zone:  *res.RegionID,
 		},
 		CloudInstanceID: spec.ServiceInstanceID,
 	}
 
 	// Fetch the service endpoint.
-	if svcEndpoint := endpoints.FetchPVSEndpoint(region, params.ServiceEndpoint); svcEndpoint != "" {
+	if svcEndpoint := endpoints.FetchPVSEndpoint(endpoints.CostructRegionFromZone(*res.RegionID), params.ServiceEndpoint); svcEndpoint != "" {
 		options.IBMPIOptions.URL = svcEndpoint
 		scope.Logger.V(3).Info("overriding the default powervs service endpoint")
 	}

cloud/scope/powervs_image.go

@@ -26,7 +26,6 @@ import (
 	"github.com/IBM/platform-services-go-sdk/resourcecontrollerv2"
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
-	utils "github.com/ppc64le-cloud/powervs-utils"
 	"k8s.io/klog/v2/klogr"
 	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -114,17 +113,10 @@ func NewPowerVSImageScope(params PowerVSImageScopeParams) (scope *PowerVSImageSc
 		return
 	}
 
-	region, err := utils.GetRegion(*res.RegionID)
-	if err != nil {
-		err = errors.Wrap(err, "failed to get region")
-		return
-	}
-
 	options := powervs.ServiceOptions{
 		IBMPIOptions: &ibmpisession.IBMPIOptions{
-			Debug:  params.Logger.V(DEBUGLEVEL).Enabled(),
-			Region: region,
-			Zone:   *res.RegionID,
+			Debug: params.Logger.V(DEBUGLEVEL).Enabled(),
+			Zone:  *res.RegionID,
 		},
 		CloudInstanceID: spec.ServiceInstanceID,
 	}
@@ -136,7 +128,7 @@ func NewPowerVSImageScope(params PowerVSImageScopeParams) (scope *PowerVSImageSc
 	scope.IBMPowerVSCluster = params.IBMPowerVSCluster
 
 	// Fetch the service endpoint.
-	if svcEndpoint := endpoints.FetchPVSEndpoint(region, params.ServiceEndpoint); svcEndpoint != "" {
+	if svcEndpoint := endpoints.FetchPVSEndpoint(endpoints.CostructRegionFromZone(*res.RegionID), params.ServiceEndpoint); svcEndpoint != "" {
 		options.IBMPIOptions.URL = svcEndpoint
 		scope.Logger.V(3).Info("overriding the default powervs service endpoint")
 	}

cloud/scope/powervs_machine.go

@@ -30,7 +30,6 @@ import (
 	"github.com/IBM/platform-services-go-sdk/resourcecontrollerv2"
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
-	powerVSUtils "github.com/ppc64le-cloud/powervs-utils"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/cache"
@@ -144,19 +143,14 @@ func NewPowerVSMachineScope(params PowerVSMachineScopeParams) (scope *PowerVSMac
 		return
 	}
 
-	region, err := powerVSUtils.GetRegion(*res.RegionID)
-	if err != nil {
-		err = errors.Wrap(err, "failed to get region")
-		return
-	}
+	region := endpoints.CostructRegionFromZone(*res.RegionID)
 	scope.SetRegion(region)
 	scope.SetZone(*res.RegionID)
 
 	serviceOptions := powervs.ServiceOptions{
 		IBMPIOptions: &ibmpisession.IBMPIOptions{
-			Debug:  params.Logger.V(DEBUGLEVEL).Enabled(),
-			Region: region,
-			Zone:   *res.RegionID,
+			Debug: params.Logger.V(DEBUGLEVEL).Enabled(),
+			Zone:  *res.RegionID,
 		},
 		CloudInstanceID: m.Spec.ServiceInstanceID,
 	}

go.mod

@@ -13,7 +13,6 @@ require (
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.19.0
 	github.com/pkg/errors v0.9.1
-	github.com/ppc64le-cloud/powervs-utils v0.0.0-20220607051746-a593c549605b
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.0
 	golang.org/x/text v0.3.7

go.sum

@@ -780,8 +780,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/ppc64le-cloud/powervs-utils v0.0.0-20220607051746-a593c549605b h1:OljQqJCHS68jU3iKjhpGsD85OKOLCkApmAU3jLYMwIA=
-github.com/ppc64le-cloud/powervs-utils v0.0.0-20220607051746-a593c549605b/go.mod h1:KImYgHmvBVtAczNhyDBDSN54PGIdz0+QiPVQMmObEQY=
 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=

pkg/endpoints/endpoints.go

@@ -19,6 +19,7 @@ package endpoints
 import (
 	"errors"
 	"net/url"
+	"regexp"
 	"strings"
 )
 
@@ -142,3 +143,18 @@ func FetchRCEndpoint(serviceEndpoint []ServiceEndpoint) string {
 	}
 	return ""
 }
+
+// CostructRegionFromZone Calculate region based on location/zone.
+func CostructRegionFromZone(zone string) string {
+	var regex string
+	if strings.Contains(zone, "-") {
+		// it's a region or AZ
+		regex = "-[0-9]+$"
+	} else {
+		// it's a datacenter
+		regex = "[0-9]+$"
+	}
+
+	reg, _ := regexp.Compile(regex)
+	return reg.ReplaceAllString(zone, "")
+}

pkg/endpoints/endpoints_test.go

@@ -255,3 +255,79 @@ func TestFetchRCEndpoint(t *testing.T) {
 		})
 	}
 }
+
+func TestCostructRegionFromZone(t *testing.T) {
+	testCases := []struct {
+		name           string
+		zone           string
+		expectedRegion string
+	}{
+		{
+			name:           "Return region dal",
+			zone:           "dal12",
+			expectedRegion: "dal",
+		},
+		{
+			name:           "Return region eu-de",
+			zone:           "eu-de-1",
+			expectedRegion: "eu-de",
+		},
+		{
+			name:           "Return region lon04",
+			zone:           "lon04",
+			expectedRegion: "lon",
+		},
+		{
+			name:           "Return region mon01",
+			zone:           "mon01",
+			expectedRegion: "mon",
+		},
+		{
+			name:           "Return region osa21",
+			zone:           "osa21",
+			expectedRegion: "osa",
+		},
+		{
+			name:           "Return region sao01",
+			zone:           "sao01",
+			expectedRegion: "sao",
+		},
+		{
+			name:           "Return region syd04",
+			zone:           "syd04",
+			expectedRegion: "syd",
+		},
+		{
+			name:           "Return region tok04",
+			zone:           "tok04",
+			expectedRegion: "tok",
+		},
+		{
+			name:           "Return region tor01",
+			zone:           "tor01",
+			expectedRegion: "tor",
+		},
+		{
+			name:           "Return region wdc06",
+			zone:           "wdc06",
+			expectedRegion: "wdc",
+		},
+		{
+			name:           "Return region us-east",
+			zone:           "us-east",
+			expectedRegion: "us-east",
+		},
+		{
+			name:           "Return region us-south",
+			zone:           "us-south",
+			expectedRegion: "us-south",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			out := CostructRegionFromZone(tc.zone)
+			require.Equal(t, tc.expectedRegion, out)
+		})
+	}
+}