Merge pull request #66 from ydb-platform/credentials

public credentials constructors

Author: asmyasnikov

.github/workflows/changelog.yml

@@ -1,8 +1,6 @@
+name: changelog
 on:
   pull_request_target:
-
-name: changelog
-
 jobs:
   changelog:
     name: changelog
@@ -14,6 +12,6 @@ jobs:
       - name: Changelog updated
         uses: Zomzog/[email protected]
         with:
-          fileName: CHANGELOG\.md
+          fileName: CHANGELOG.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/version.yml

@@ -1,8 +1,6 @@
+name: version
 on:
   pull_request_target:
-
-name: version
-
 jobs:
   changelog:
     name: version
@@ -14,6 +12,6 @@ jobs:
       - name: Version updated
         uses: Zomzog/[email protected]
         with:
-          fileName: internal\/meta\/version\.go
+          fileName: internal/meta/version.go
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -17,8 +17,8 @@
 * Added `DoTx()` API method into `table.Client`
 * Added `String()` method into `ConnectParams` for serialize params to connection string
 * Added early exit from Rollback for committed transaction
-* Moved `HasNextResultSet()` method from `Result` interface to common `result` interface.
-  It provides access to `HasNextResultSet()` on both result interfaces (unary and stream results)
+* Moved `HasNextResultSet()` method from `Result` interface to common `result` interface. It provides access to `HasNextResultSet()` on both result interfaces (unary and stream results)
+* Added public credentials constructors `credentials.NewAnonymousCredentials()` and `credentials.NewAccessTokenCredentials(token)`
 
 ## 3.4.4
 * Prefer `ydb.table.types.Scanner` scanner implementation over `sql.Scanner`, when both available.

credentials/context.go

@@ -3,3 +3,35 @@ package credentials
 import "github.com/ydb-platform/ydb-go-sdk/v3/internal/meta/credentials"
 
 type Credentials = credentials.Credentials
+
+type optionsHolder struct {
+	sourceInfo string
+}
+
+type option func(h *optionsHolder)
+
+func WithSourceInfo(sourceInfo string) option {
+	return func(h *optionsHolder) {
+		h.sourceInfo = sourceInfo
+	}
+}
+
+func NewAccessTokenCredentials(accessToken string, opts ...option) Credentials {
+	h := &optionsHolder{
+		sourceInfo: "credentials.NewAccessTokenCredentials(token)",
+	}
+	for _, o := range opts {
+		o(h)
+	}
+	return credentials.NewAccessTokenCredentials(accessToken, h.sourceInfo)
+}
+
+func NewAnonymousCredentials(opts ...option) Credentials {
+	h := &optionsHolder{
+		sourceInfo: "credentials.NewAnonymousCredentials()",
+	}
+	for _, o := range opts {
+		o(h)
+	}
+	return credentials.NewAnonymousCredentials(h.sourceInfo)
+}

credentials/credentials.go

@@ -40,9 +40,9 @@ type AccessTokenCredentials struct {
 	sourceInfo string
 }
 
-func NewAccessTokenCredentials(AccessToken string, sourceInfo string) *AccessTokenCredentials {
+func NewAccessTokenCredentials(accessToken string, sourceInfo string) *AccessTokenCredentials {
 	return &AccessTokenCredentials{
-		AccessToken: AccessToken,
+		AccessToken: accessToken,
 		sourceInfo:  sourceInfo,
 	}
 }

internal/meta/credentials/credentials.go

@@ -12,7 +12,6 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/credentials"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/logger"
-	internal "github.com/ydb-platform/ydb-go-sdk/v3/internal/meta/credentials"
 	"github.com/ydb-platform/ydb-go-sdk/v3/log"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
@@ -21,7 +20,7 @@ type Option func(ctx context.Context, db *db) error
 
 func WithAccessTokenCredentials(accessToken string) Option {
 	return WithCredentials(
-		internal.NewAccessTokenCredentials(accessToken, "ydb.WithAccessTokenCredentials(accessToken)"), // hide access token for logs
+		credentials.NewAccessTokenCredentials(accessToken, credentials.WithSourceInfo("ydb.WithAccessTokenCredentials(accessToken)")), // hide access token for logs
 	)
 }
 
@@ -100,15 +99,15 @@ func WithConnectParams(params ConnectParams) Option {
 		db.options = append(db.options, config.WithDatabase(params.Database()))
 		db.options = append(db.options, config.WithSecure(params.Secure()))
 		if params.Token() != "" {
-			db.options = append(db.options, config.WithCredentials(internal.NewAccessTokenCredentials(params.Token(), "config.WithConnectParams()")))
+			db.options = append(db.options, config.WithCredentials(credentials.NewAccessTokenCredentials(params.Token(), credentials.WithSourceInfo("config.WithConnectParams()"))))
 		}
 		return nil
 	}
 }
 
 func WithAnonymousCredentials() Option {
 	return WithCredentials(
-		internal.NewAnonymousCredentials("ydb.WithAnonymousCredentials()"),
+		credentials.NewAnonymousCredentials(credentials.WithSourceInfo("ydb.WithAnonymousCredentials()")),
 	)
 }