Logging: resolving log group names into group ids via static config (#…

…218) * Not operational * Not operational * Fix SQL Formatting * Reuse resolver * Reconfigure Logging * Validate configs * Refactor request validation * Use IAM_TOKEN * Reused metadata * Read some data from Logging * Fix linter complainings * Fix review
ydb-platform · Dec 9, 2024 · 0a7d43c · 0a7d43c
1 parent ba94605
commit 0a7d43c
Show file tree

Hide file tree

Showing 38 changed files with 1,682 additions and 500 deletions.
diff --git a/Makefile b/Makefile
@@ -1,10 +1,11 @@
 projectPath = $(shell pwd)
+serverConfig ?= ./app/server/config/config.debug.yaml
 
 build:
 	go build -o fq-connector-go ./app
 
 run: build
-	./fq-connector-go server -c ./app/server/config/config.debug.yaml	
+	./fq-connector-go server --config="$(serverConfig)"
 
 lint:
 	golangci-lint run --fix ./app/... ./common/... ./tests/... ./tools/...

diff --git a/api/common/data_source.pb.go b/api/common/data_source.pb.go
diff --git a/api/service/protos/connector.pb.go b/api/service/protos/connector.pb.go
diff --git a/app/bench/app.go b/app/bench/app.go
@@ -11,7 +11,6 @@ import (
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 
-	api_common "github.com/ydb-platform/fq-connector-go/api/common"
 	"github.com/ydb-platform/fq-connector-go/app/config"
 	"github.com/ydb-platform/fq-connector-go/common"
 )
@@ -37,17 +36,7 @@ func validateConfig(logger *zap.Logger, cfg *config.TBenchmarkConfig) error {
 		}
 	}
 
-	// securely override credentials
-	if token := os.Getenv("IAM_TOKEN"); token != "" {
-		cfg.DataSourceInstance.Credentials = &api_common.TCredentials{
-			Payload: &api_common.TCredentials_Token{
-				Token: &api_common.TCredentials_TToken{
-					Type:  "IAM",
-					Value: token,
-				},
-			},
-		}
-	}
+	common.MaybeInjectTokenToDataSourceInstance(cfg.DataSourceInstance)
 
 	return nil
 }

diff --git a/app/client/connector/client.go b/app/client/connector/client.go
@@ -68,6 +68,9 @@ func runClient(cmd *cobra.Command, _ []string) error {
 		sessionID: sessionID,
 	}
 
+	// override credentials if IAM-token provided
+	common.MaybeInjectTokenToDataSourceInstance(cfg.DataSourceInstance)
+
 	if err := callServer(logger, &cfg, tableName, api_service_protos.EDateTimeFormat(dateTimeFormat), md); err != nil {
 		return fmt.Errorf("call server: %w", err)
 	}
@@ -93,7 +96,8 @@ func callServer(
 	switch cfg.DataSourceInstance.Kind {
 	case api_common.EDataSourceKind_CLICKHOUSE, api_common.EDataSourceKind_POSTGRESQL,
 		api_common.EDataSourceKind_YDB, api_common.EDataSourceKind_MS_SQL_SERVER,
-		api_common.EDataSourceKind_MYSQL, api_common.EDataSourceKind_GREENPLUM, api_common.EDataSourceKind_ORACLE:
+		api_common.EDataSourceKind_MYSQL, api_common.EDataSourceKind_GREENPLUM,
+		api_common.EDataSourceKind_ORACLE, api_common.EDataSourceKind_LOGGING:
 		typeMappingSettings := &api_service_protos.TTypeMappingSettings{
 			DateTimeFormat: dateTimeFormat,
 		}