Fix the keyfile unmarshal error (#339)

--- *Motivation* Fix the keyfile unmarshal error: ``` open test_credential.json: unsupported format ```
apache · Aug 3, 2020 · 570d5ce · 570d5ce
1 parent 27a9c06
commit 570d5ce
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/oauth2/client_credentials_provider.go b/oauth2/client_credentials_provider.go
@@ -19,14 +19,9 @@ package oauth2
 
 import (
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 )
 
-const (
-	KeyFileTypeServiceAccount = "sn_service_account"
-)
-
 type KeyFileProvider struct {
 	KeyFile string
 }
@@ -58,9 +53,6 @@ func (k *KeyFileProvider) GetClientCredentials() (*KeyFile, error) {
 	if err != nil {
 		return nil, err
 	}
-	if v.Type != KeyFileTypeServiceAccount {
-		return nil, fmt.Errorf("open %s: unsupported format", k.KeyFile)
-	}
 
 	return &v, nil
 }
diff --git a/pulsar/client_impl_test.go b/pulsar/client_impl_test.go
@@ -266,7 +266,7 @@ func mockKeyFile(server string) (string, error) {
 		return "", err
 	}
 	_, err = kf.WriteString(fmt.Sprintf(`{
-  "type":"sn_service_account",
+  "type":"resource",
   "client_id":"client-id",
   "client_secret":"client-secret",
   "client_email":"oauth@test.org",

diff --git a/pulsar/internal/auth/oauth2_test.go b/pulsar/internal/auth/oauth2_test.go
@@ -69,7 +69,7 @@ func mockKeyFile(server string) (string, error) {
 		return "", err
 	}
 	_, err = kf.WriteString(fmt.Sprintf(`{
-  "type":"sn_service_account",
+  "type":"resource",
   "client_id":"client-id",
   "client_secret":"client-secret",
   "client_email":"oauth@test.org",