Merge 443a096 into 4fde7f6

Author: skywalker-jpg

ydb/core/external_sources/external_data_source.cpp

@@ -36,6 +36,14 @@ struct TExternalDataSource : public IExternalSource {
         ythrow TExternalSourceException() << "Only external table supports parameters";
     }
 
+    bool isRDBMSDataSource(const TProtoStringType& sourceType) const {
+        if (IsIn({"Greenplum", "PostgreSQL", "MySQL", "MsSQLServer", "Clickhouse"}, sourceType)) {
+            return true;
+        }
+
+        return false;
+    }
+
     virtual void ValidateExternalDataSource(const TString& externalDataSourceDescription) const override {
         NKikimrSchemeOp::TExternalDataSourceDescription proto;
         if (!proto.ParseFromString(externalDataSourceDescription)) {
@@ -49,6 +57,10 @@ struct TExternalDataSource : public IExternalSource {
             ythrow TExternalSourceException() << "Unsupported property: " << key;
         }
 
+        if (isRDBMSDataSource(proto.GetSourceType()) && !proto.GetProperties().GetProperties().contains("database_name")){
+            ythrow TExternalSourceException() << proto.GetSourceType() << " source must provide database_name";
+        }
+
         ValidateHostname(HostnamePatterns, proto.GetLocation());
     }
 

ydb/core/fq/libs/control_plane_storage/request_validators.cpp

@@ -20,10 +20,15 @@ void ValidateGenericConnectionSetting(
     }
 
     if (!connection.database_id() && !(connection.host() && connection.port())) {
-        auto msg = TStringBuilder() << "content.setting.clickhouse_cluster.{database_id or host,port} field is not specified";
+        auto msg = TStringBuilder() << "content.setting." << dataSourceKind << "_cluster.{database_id or host,port} field is not specified";
         issues.AddIssue( MakeErrorIssue(TIssuesIds::BAD_REQUEST,msg));
     }
 
+    if (!connection.database_name() || connection.database_name() == "") {
+        auto msg = TStringBuilder() << "content.setting." << dataSourceKind << "_cluster.{database_id or host,port} field is not specified";
+        issues.AddIssue( MakeErrorIssue(TIssuesIds::BAD_REQUEST,msg));
+    }    
+
     if (!connection.login()) {
         auto msg = TStringBuilder() << "content.setting." << dataSourceKind << "_cluster.login is not specified";
         issues.AddIssue(MakeErrorIssue(TIssuesIds::BAD_REQUEST, msg));
@@ -70,16 +75,17 @@ NYql::TIssues ValidateConnectionSetting(
         break;
     }
     case FederatedQuery::ConnectionSetting::kGreenplumCluster: {
-        const FederatedQuery::GreenplumCluster database = setting.greenplum_cluster(); 
-        if (!database.has_auth() || database.auth().identity_case() == FederatedQuery::IamAuth::IDENTITY_NOT_SET) {
+        const FederatedQuery::GreenplumCluster& greenplumStorage = setting.greenplum_cluster(); 
+
+        if (!greenplumStorage.has_auth() || greenplumStorage.auth().identity_case() == FederatedQuery::IamAuth::IDENTITY_NOT_SET) {
             issues.AddIssue(MakeErrorIssue(TIssuesIds::BAD_REQUEST, "content.setting.greenplum_database.auth field is not specified"));
         }
 
-        if (database.auth().identity_case() == FederatedQuery::IamAuth::kCurrentIam && disableCurrentIam) {
+        if (greenplumStorage.auth().identity_case() == FederatedQuery::IamAuth::kCurrentIam && disableCurrentIam) {
             issues.AddIssue(MakeErrorIssue(TIssuesIds::BAD_REQUEST, "current iam authorization is disabled"));
         }
 
-        if (!database.database_id() && !database.database_name()) {
+        if (!greenplumStorage.database_id() && !greenplumStorage.database_name()) {
             issues.AddIssue(MakeErrorIssue(TIssuesIds::BAD_REQUEST, "content.setting.greenplum_database.{database_id or database_name} field is not specified"));
         }
         break;