Update flag to use pointers

Author: Sneha-at

cmd/gce-pd-csi-driver/main.go

@@ -70,8 +70,8 @@ var (
 	formatAndMountTimeout       = flag.Duration("format-and-mount-timeout", 1*time.Minute, "The maximum duration of a format and mount operation before another such operation will be started. Used only if --serialize-format-and-mount")
 	fallbackRequisiteZonesFlag  = flag.String("fallback-requisite-zones", "", "Comma separated list of requisite zones that will be used if there are not sufficient zones present in requisite topologies when provisioning a disk")
 
-	computeEnvironment        gce.Environment = "production"
-	computeEndpoint           url.URL
+	computeEnvironment        gce.Environment = gce.EnvironmentProduction
+	computeEndpoint           *url.URL
 	version                   string
 	allowedComputeEnvironment = []gce.Environment{gce.EnvironmentStaging, gce.EnvironmentProduction}
 )
@@ -87,7 +87,7 @@ func init() {
 	// Use V(5) for GCE Cloud Provider Call informational logging
 	// Use V(6) for extra repeated/polling information
 	enumFlag(&computeEnvironment, "compute-environment", allowedComputeEnvironment, "Operating compute environment")
-	urlFlag(&computeEndpoint, "compute-endpoint", "Compute endpoint")
+	urlFlag(computeEndpoint, "compute-endpoint", "Compute endpoint")
 	klog.InitFlags(flag.CommandLine)
 	flag.Set("logtostderr", "true")
 }
@@ -211,7 +211,7 @@ func urlFlag(target *url.URL, name string, usage string) {
 	flag.Func(name, usage, func(flagValue string) error {
 		computeURL, err := url.ParseRequestURI(flagValue)
 		if err == nil {
-			*target = *computeURL
+			target = computeURL
 			return nil
 		}
 		return err

pkg/gce-cloud-provider/compute/gce.go

@@ -80,7 +80,7 @@ type ConfigGlobal struct {
 	Zone      string `gcfg:"zone"`
 }
 
-func CreateCloudProvider(ctx context.Context, vendorVersion string, configPath string, computeEndpoint url.URL, computeEnvironment Environment) (*CloudProvider, error) {
+func CreateCloudProvider(ctx context.Context, vendorVersion string, configPath string, computeEndpoint *url.URL, computeEnvironment Environment) (*CloudProvider, error) {
 	configFile, err := readConfig(configPath)
 	if err != nil {
 		return nil, err
@@ -174,7 +174,7 @@ func readConfig(configPath string) (*ConfigFile, error) {
 	return cfg, nil
 }
 
-func createAlphaCloudService(ctx context.Context, vendorVersion string, tokenSource oauth2.TokenSource, computeEndpoint url.URL, computeEnvironment Environment) (*computealpha.Service, error) {
+func createAlphaCloudService(ctx context.Context, vendorVersion string, tokenSource oauth2.TokenSource, computeEndpoint *url.URL, computeEnvironment Environment) (*computealpha.Service, error) {
 	computeOpts, err := getComputeVersion(ctx, tokenSource, computeEndpoint, computeEnvironment, versionAlpha)
 	if err != nil {
 		klog.Errorf("Failed to get compute endpoint: %s", err)
@@ -187,7 +187,7 @@ func createAlphaCloudService(ctx context.Context, vendorVersion string, tokenSou
 	return service, nil
 }
 
-func createBetaCloudService(ctx context.Context, vendorVersion string, tokenSource oauth2.TokenSource, computeEndpoint url.URL, computeEnvironment Environment) (*computebeta.Service, error) {
+func createBetaCloudService(ctx context.Context, vendorVersion string, tokenSource oauth2.TokenSource, computeEndpoint *url.URL, computeEnvironment Environment) (*computebeta.Service, error) {
 	computeOpts, err := getComputeVersion(ctx, tokenSource, computeEndpoint, computeEnvironment, versionBeta)
 	if err != nil {
 		klog.Errorf("Failed to get compute endpoint: %s", err)
@@ -200,7 +200,7 @@ func createBetaCloudService(ctx context.Context, vendorVersion string, tokenSour
 	return service, nil
 }
 
-func createCloudService(ctx context.Context, vendorVersion string, tokenSource oauth2.TokenSource, computeEndpoint url.URL, computeEnvironment Environment) (*compute.Service, error) {
+func createCloudService(ctx context.Context, vendorVersion string, tokenSource oauth2.TokenSource, computeEndpoint *url.URL, computeEnvironment Environment) (*compute.Service, error) {
 	computeOpts, err := getComputeVersion(ctx, tokenSource, computeEndpoint, computeEnvironment, versionV1)
 	if err != nil {
 		klog.Errorf("Failed to get compute endpoint: %s", err)
@@ -213,14 +213,14 @@ func createCloudService(ctx context.Context, vendorVersion string, tokenSource o
 	return service, nil
 }
 
-func getComputeVersion(ctx context.Context, tokenSource oauth2.TokenSource, computeEndpoint url.URL, computeEnvironment Environment, computeVersion Version) ([]option.ClientOption, error) {
+func getComputeVersion(ctx context.Context, tokenSource oauth2.TokenSource, computeEndpoint *url.URL, computeEnvironment Environment, computeVersion Version) ([]option.ClientOption, error) {
 	client, err := newOauthClient(ctx, tokenSource)
 	if err != nil {
 		return nil, err
 	}
 	computeOpts := []option.ClientOption{option.WithHTTPClient(client)}
 
-	if computeEndpoint.String() != "" {
+	if computeEndpoint != nil {
 		computeEnvironmentSuffix := constructComputeEndpointPath(computeEnvironment, computeVersion)
 		computeEndpoint.Path = computeEnvironmentSuffix
 		endpoint := computeEndpoint.String()

pkg/gce-cloud-provider/compute/gce_test.go

@@ -104,7 +104,7 @@ func TestIsGCEError(t *testing.T) {
 func TestGetComputeVersion(t *testing.T) {
 	testCases := []struct {
 		name               string
-		computeEndpoint    url.URL
+		computeEndpoint    *url.URL
 		computeEnvironment Environment
 		computeVersion     Version
 		expectedEndpoint   string
@@ -129,7 +129,7 @@ func TestGetComputeVersion(t *testing.T) {
 		},
 		{
 			name:               "check for random string as endpoint",
-			computeEndpoint:    url.URL{},
+			computeEndpoint:    convertStringToURL(""),
 			computeEnvironment: "prod",
 			computeVersion:     "v1",
 			expectedEndpoint:   "compute/v1/",
@@ -151,10 +151,10 @@ func TestGetComputeVersion(t *testing.T) {
 
 }
 
-func convertStringToURL(urlString string) url.URL {
+func convertStringToURL(urlString string) *url.URL {
 	parsedURL, err := url.ParseRequestURI(urlString)
 	if err != nil {
-		return url.URL{}
+		return nil
 	}
-	return *parsedURL
+	return parsedURL
 }