From adab25b95c59a5fff53d5255bbb1984ec672115a Mon Sep 17 00:00:00 2001
From: Xuanwo <github@xuanwo.io>
Date: Wed, 18 Aug 2021 11:46:44 +0800
Subject: [PATCH] refactor: Rewrite credential parse in more directly way (#59)

Signed-off-by: Xuanwo <github@xuanwo.io>
---
 service.go |  4 +++-
 storage.go |  3 ++-
 utils.go   | 40 ++++++++++++++++++++++------------------
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/service.go b/service.go
index 93deb68..3e1555b 100644
--- a/service.go
+++ b/service.go
@@ -2,9 +2,11 @@ package gcs
 
 import (
 	"context"
+
+	"google.golang.org/api/iterator"
+
 	ps "github.com/beyondstorage/go-storage/v4/pairs"
 	typ "github.com/beyondstorage/go-storage/v4/types"
-	"google.golang.org/api/iterator"
 )
 
 func (s *Service) create(ctx context.Context, name string, opt pairServiceCreate) (store typ.Storager, err error) {
diff --git a/storage.go b/storage.go
index 0387166..3befa9c 100644
--- a/storage.go
+++ b/storage.go
@@ -6,11 +6,12 @@ import (
 	"io"
 
 	gs "cloud.google.com/go/storage"
+	"google.golang.org/api/iterator"
+
 	ps "github.com/beyondstorage/go-storage/v4/pairs"
 	"github.com/beyondstorage/go-storage/v4/pkg/iowrap"
 	"github.com/beyondstorage/go-storage/v4/services"
 	. "github.com/beyondstorage/go-storage/v4/types"
-	"google.golang.org/api/iterator"
 )
 
 func (s *Storage) create(path string, opt pairStorageCreate) (o *Object) {
diff --git a/utils.go b/utils.go
index acc18a5..b303014 100644
--- a/utils.go
+++ b/utils.go
@@ -10,15 +10,16 @@ import (
 	"strings"
 
 	gs "cloud.google.com/go/storage"
+	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/google"
+	"google.golang.org/api/googleapi"
+	"google.golang.org/api/option"
+
 	ps "github.com/beyondstorage/go-storage/v4/pairs"
 	"github.com/beyondstorage/go-storage/v4/pkg/credential"
 	"github.com/beyondstorage/go-storage/v4/pkg/httpclient"
 	"github.com/beyondstorage/go-storage/v4/services"
 	typ "github.com/beyondstorage/go-storage/v4/types"
-	"golang.org/x/oauth2"
-	"golang.org/x/oauth2/google"
-	"google.golang.org/api/googleapi"
-	"google.golang.org/api/option"
 )
 
 // Service is the gcs config.
@@ -92,7 +93,7 @@ func newServicer(pairs ...typ.Pair) (srv *Service, err error) {
 
 	hc := httpclient.New(opt.HTTPClientOptions)
 
-	var credJSON []byte
+	var creds *google.Credentials
 
 	cp, err := credential.Parse(opt.Credential)
 	if err != nil {
@@ -100,34 +101,37 @@ func newServicer(pairs ...typ.Pair) (srv *Service, err error) {
 	}
 	switch cp.Protocol() {
 	case credential.ProtocolFile:
-		credJSON, err = ioutil.ReadFile(cp.File())
+		credJSON, err := ioutil.ReadFile(cp.File())
+		if err != nil {
+			return nil, err
+		}
+		creds, err = google.CredentialsFromJSON(ctx, credJSON, gs.ScopeFullControl)
 		if err != nil {
 			return nil, err
 		}
 	case credential.ProtocolBase64:
-		credJSON, err = base64.StdEncoding.DecodeString(cp.Base64())
+		credJSON, err := base64.StdEncoding.DecodeString(cp.Base64())
 		if err != nil {
 			return nil, err
 		}
-	case credential.ProtocolEnv:
-		// Let the GCS client fetch the creds from the env
-	default:
-		return nil, services.PairUnsupportedError{Pair: ps.WithCredential(opt.Credential)}
-	}
-
-	var creds *google.Credentials
-	if len(credJSON) > 0 {
-		// Loading token source from binary data.
 		creds, err = google.CredentialsFromJSON(ctx, credJSON, gs.ScopeFullControl)
 		if err != nil {
 			return nil, err
 		}
-	} else {
-		// Loading token source from environment.
+	case credential.ProtocolEnv:
+		// Google provide DefaultCredentials support via env.
+		// It will read credentials via:
+		// - file path in GOOGLE_APPLICATION_CREDENTIALS
+		// - Well known files on different platforms
+		//   - On unix platform: `~/.config/gcloud/application_default_credentials.json`
+		//   - On windows platform: `$APPDATA/gcloud/application_default_credentials.json`
+		// - Metadata server in Google App Engine or Google Compute Engine
 		creds, err = google.FindDefaultCredentials(ctx, gs.ScopeFullControl)
 		if err != nil {
 			return nil, err
 		}
+	default:
+		return nil, services.PairUnsupportedError{Pair: ps.WithCredential(opt.Credential)}
 	}
 
 	ot := &oauth2.Transport{