fix: rename appId to clientId (#155)

* fix: rename appId to clientId * fix: using clientID instead of clientId
tigrisdata-archive · Sep 22, 2022 · 9caad1c · 9caad1c
1 parent 91c39e1
commit 9caad1c
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 34 deletions.
diff --git a/config/config.go b/config/config.go
@@ -19,11 +19,11 @@ import "crypto/tls"
 
 // Driver contains connection and transport configuration
 type Driver struct {
-	TLS               *tls.Config `json:"tls,omitempty"`
-	ApplicationId     string      `json:"application_id,omitempty"`
-	ApplicationSecret string      `json:"application_secret,omitempty"`
-	Token             string      `json:"token,omitempty"`
-	URL               string      `json:"url,omitempty"`
+	TLS          *tls.Config `json:"tls,omitempty"`
+	ClientID     string      `json:"client_id,omitempty"`
+	ClientSecret string      `json:"client_secret,omitempty"`
+	Token        string      `json:"token,omitempty"`
+	URL          string      `json:"url,omitempty"`
 }
 
 // Database contains database and connection config

diff --git a/driver/driver.go b/driver/driver.go
@@ -285,7 +285,7 @@ func initConfig(cfg *config.Driver) *config.Driver {
 		cfg = &config.Driver{}
 	}
 
-	if cfg.TLS == nil && (cfg.ApplicationId != "" || cfg.ApplicationSecret != "" || cfg.Token != "") {
+	if cfg.TLS == nil && (cfg.ClientID != "" || cfg.ClientSecret != "" || cfg.Token != "") {
 		cfg.TLS = &tls.Config{MinVersion: tls.VersionTLS12}
 	}
 

diff --git a/driver/driver_test.go b/driver/driver_test.go
@@ -1009,7 +1009,7 @@ func TestNewDriver(t *testing.T) {
 	_, err = NewDriver(context.Background(), nil)
 	require.Error(t, err)
 
-	cfg1 := &config.Driver{URL: test.GRPCURL(4), ApplicationSecret: "aaaa"}
+	cfg1 := &config.Driver{URL: test.GRPCURL(4), ClientSecret: "aaaa"}
 	cfg1 = initConfig(cfg1)
 	require.NotNil(t, cfg1.TLS)
 }

diff --git a/driver/grpc.go b/driver/grpc.go
@@ -464,7 +464,7 @@ func (c *grpcDriver) ListApplications(ctx context.Context) ([]*Application, erro
 	return applications, nil
 }
 
-func (c *grpcDriver) RotateApplicationSecret(ctx context.Context, id string) (*Application, error) {
+func (c *grpcDriver) RotateClientSecret(ctx context.Context, id string) (*Application, error) {
 	r, err := c.mgmt.RotateApplicationSecret(ctx, &api.RotateApplicationSecretRequest{Id: id})
 	if err != nil {
 		return nil, GRPCError(err)
@@ -477,7 +477,7 @@ func (c *grpcDriver) RotateApplicationSecret(ctx context.Context, id string) (*A
 	return (*Application)(r.Application), nil
 }
 
-func (c *grpcDriver) GetAccessToken(ctx context.Context, applicationID string, applicationSecret string, refreshToken string) (*TokenResponse, error) {
+func (c *grpcDriver) GetAccessToken(ctx context.Context, clientId string, clientSecret string, refreshToken string) (*TokenResponse, error) {
 	tp := api.GrantType_CLIENT_CREDENTIALS
 	if refreshToken != "" {
 		tp = api.GrantType_REFRESH_TOKEN
@@ -486,8 +486,8 @@ func (c *grpcDriver) GetAccessToken(ctx context.Context, applicationID string, a
 	r, err := c.auth.GetAccessToken(ctx, &api.GetAccessTokenRequest{
 		GrantType:    tp,
 		RefreshToken: refreshToken,
-		ClientId:     applicationID,
-		ClientSecret: applicationSecret,
+		ClientId:     clientId,
+		ClientSecret: clientSecret,
 	})
 	if err != nil {
 		return nil, GRPCError(err)

diff --git a/driver/http.go b/driver/http.go
@@ -718,7 +718,7 @@ func (c *httpDriver) ListApplications(ctx context.Context) ([]*Application, erro
 	return apps.Applications, nil
 }
 
-func (c *httpDriver) RotateApplicationSecret(ctx context.Context, id string) (*Application, error) {
+func (c *httpDriver) RotateClientSecret(ctx context.Context, id string) (*Application, error) {
 	resp, err := c.api.ManagementRotateApplicationSecret(ctx, apiHTTP.ManagementRotateApplicationSecretJSONBody{Id: &id})
 	if err := HTTPError(err, resp); err != nil {
 		return nil, err
@@ -735,21 +735,21 @@ func (c *httpDriver) RotateApplicationSecret(ctx context.Context, id string) (*A
 	return &app.Application, nil
 }
 
-func (c *httpDriver) GetAccessToken(ctx context.Context, applicationID string, applicationSecret string, refreshToken string) (*TokenResponse, error) {
-	return getAccessToken(ctx, c.tokenURL, c.cfg, applicationID, applicationSecret, refreshToken)
+func (c *httpDriver) GetAccessToken(ctx context.Context, clientId string, clientSecret string, refreshToken string) (*TokenResponse, error) {
+	return getAccessToken(ctx, c.tokenURL, c.cfg, clientId, clientSecret, refreshToken)
 }
 
-func getAccessToken(ctx context.Context, tokenURL string, cfg *config.Driver, applicationID string, applicationSecret string, refreshToken string) (*TokenResponse, error) {
+func getAccessToken(ctx context.Context, tokenURL string, cfg *config.Driver, clientId string, clientSecret string, refreshToken string) (*TokenResponse, error) {
 	data := url.Values{
-		"client_id":     {applicationID},
-		"client_secret": {applicationSecret},
+		"client_id":     {clientId},
+		"client_secret": {clientSecret},
 		"grant_type":    {grantTypeClientCredentials},
 		"scope":         {scope},
 	}
 	if refreshToken != "" {
 		data = url.Values{
 			"refresh_token": {refreshToken},
-			"client_id":     {applicationID},
+			"client_id":     {clientId},
 			"grant_type":    {grantTypeRefreshToken},
 			"scope":         {scope},
 		}

diff --git a/driver/internal.go b/driver/internal.go
@@ -60,14 +60,14 @@ type txWithOptions interface {
 
 //func configAuth(config *config.Driver) (*clientcredentials.Config, context.Context) {
 func configAuth(config *config.Driver) (oauth2.TokenSource, *http.Client, string) {
-	appID := config.ApplicationId
+	clientId := config.ClientID
 	if os.Getenv(ApplicationID) != "" {
-		appID = os.Getenv(ApplicationID)
+		clientId = os.Getenv(ApplicationID)
 	}
 
-	appSecret := config.ApplicationSecret
+	clientSecret := config.ClientSecret
 	if os.Getenv(ApplicationSecret) != "" {
-		appSecret = os.Getenv(ApplicationSecret)
+		clientSecret = os.Getenv(ApplicationSecret)
 	}
 
 	token := config.Token
@@ -101,8 +101,8 @@ func configAuth(config *config.Driver) (oauth2.TokenSource, *http.Client, string
 		ocfg1 := &oauth2.Config{Endpoint: oauth2.Endpoint{TokenURL: tokenURL}}
 		client = ocfg1.Client(ctxClient, t)
 		ts = ocfg1.TokenSource(ctxClient, t)
-	} else if appID != "" || appSecret != "" {
-		oCfg := &clientcredentials.Config{TokenURL: tokenURL, ClientID: appID, ClientSecret: appSecret, AuthStyle: oauth2.AuthStyleInParams}
+	} else if clientId != "" || clientSecret != "" {
+		oCfg := &clientcredentials.Config{TokenURL: tokenURL, ClientID: clientId, ClientSecret: clientSecret, AuthStyle: oauth2.AuthStyleInParams}
 		client = oCfg.Client(ctxClient)
 		ts = oCfg.TokenSource(ctxClient)
 	}

diff --git a/driver/management.go b/driver/management.go
@@ -13,8 +13,8 @@ type Management interface {
 	DeleteApplication(ctx context.Context, id string) error
 	UpdateApplication(ctx context.Context, id string, name string, description string) (*Application, error)
 	ListApplications(ctx context.Context) ([]*Application, error)
-	RotateApplicationSecret(ctx context.Context, id string) (*Application, error)
-	GetAccessToken(ctx context.Context, applicationID string, applicationSecret string, refreshToken string) (*TokenResponse, error)
+	RotateClientSecret(ctx context.Context, id string) (*Application, error)
+	GetAccessToken(ctx context.Context, clientId string, clientSecret string, refreshToken string) (*TokenResponse, error)
 
 	Close() error
 }

diff --git a/driver/management_test.go b/driver/management_test.go
@@ -52,7 +52,7 @@ func testDriverAuthNegative(t *testing.T, c Management, mc *mock.MockManagementS
 		pm(&api.RotateApplicationSecretRequest{Id: "ras_id1"})).Return(
 		&api.RotateApplicationSecretResponse{Application: nil}, nil)
 
-	_, err = c.RotateApplicationSecret(ctx, "ras_id1")
+	_, err = c.RotateClientSecret(ctx, "ras_id1")
 	require.Error(t, err)
 }
 
@@ -117,7 +117,7 @@ func testDriverAuth(t *testing.T, c Management, mc *mock.MockManagementServer, m
 		pm(&api.RotateApplicationSecretRequest{Id: "ras_id1"})).Return(
 		&api.RotateApplicationSecretResponse{Application: lapp2}, nil)
 
-	app, err = c.RotateApplicationSecret(ctx, "ras_id1")
+	app, err = c.RotateClientSecret(ctx, "ras_id1")
 	require.NoError(t, err)
 
 	appEqual(t, lapp2, app)
@@ -208,9 +208,9 @@ func TestGRPCDriverCredentials(t *testing.T) {
 	t.Run("config", func(t *testing.T) {
 		TokenURLOverride = testTokenURLOverride
 		client, _, mockServers, cancel := SetupMgmtGRPCTests(t, &config.Driver{
-			URL:               test.GRPCURL(0),
-			ApplicationId:     "client_id_test",
-			ApplicationSecret: "client_secret_test",
+			URL:          test.GRPCURL(0),
+			ClientID:     "client_id_test",
+			ClientSecret: "client_secret_test",
 		})
 		defer cancel()
 
@@ -249,9 +249,9 @@ func TestHTTPDriverCredentials(t *testing.T) {
 	t.Run("config", func(t *testing.T) {
 		TokenURLOverride = ""
 		client, _, mockServers, cancel := SetupMgmtHTTPTests(t, &config.Driver{
-			URL:               test.HTTPURL(2),
-			ApplicationId:     "client_id_test",
-			ApplicationSecret: "client_secret_test",
+			URL:          test.HTTPURL(2),
+			ClientID:     "client_id_test",
+			ClientSecret: "client_secret_test",
 		})
 		defer cancel()