Skip to content

Commit 4f24a5f

Browse files
authored
Cherry pick new secret fixes to stable-25-3-1 (#25631)
2 parents 1fa5a26 + 767c2bc commit 4f24a5f

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

.github/config/muted_ya.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,11 @@ ydb/core/keyvalue/ut_trace TKeyValueTracingTest.ReadHuge
3333
ydb/core/keyvalue/ut_trace TKeyValueTracingTest.ReadSmall
3434
ydb/core/keyvalue/ut_trace TKeyValueTracingTest.WriteHuge
3535
ydb/core/keyvalue/ut_trace TKeyValueTracingTest.WriteSmall
36-
ydb/core/kqp/provider/ut KikimrIcGateway.TestLoadBasicSecretValueFromExternalDataSourceMetadata+UseSchemaSecrets
37-
ydb/core/kqp/provider/ut KikimrIcGateway.TestLoadServiceAccountSecretValueFromExternalDataSourceMetadata+UseSchemaSecrets
38-
ydb/core/kqp/provider/ut KikimrIcGateway.TestLoadTokenSecretValueFromExternalDataSourceMetadata+UseSchemaSecrets
3936
ydb/core/kqp/proxy_service/ut TestScriptExecutionsUtils.TestRetryLimiter
4037
ydb/core/kqp/ut/federated_query/datastreams KqpFederatedQueryDatastreams.RestoreScriptPhysicalGraphOnRetry
4138
ydb/core/kqp/ut/federated_query/datastreams KqpStreamingQueriesDdl.CreateStreamingQueryMatchRecognize
4239
ydb/core/kqp/ut/federated_query/s3 KqpFederatedQuery.TestReadLargeParquetFile
4340
ydb/core/kqp/ut/federated_query/s3 unittest.sole chunk
44-
ydb/core/kqp/federated_query/ut_service DescribeSchemaSecretsService.GetDroppedValue
45-
ydb/core/kqp/federated_query/ut_service DescribeSchemaSecretsService.GetInParallel
46-
ydb/core/kqp/federated_query/ut_service DescribeSchemaSecretsService.GetNewValue
47-
ydb/core/kqp/federated_query/ut_service DescribeSchemaSecretsService.GetUpdatedValue
4841
ydb/core/kqp/ut/indexes KqpMultishardIndex.WriteIntoRenamingAsyncIndex
4942
ydb/core/kqp/ut/indexes KqpMultishardIndex.WriteIntoRenamingSyncIndex
5043
ydb/core/kqp/ut/olap KqpOlapJson.BrokenJsonWriting[2,false,1024,0,0,0]

ydb/core/kqp/federated_query/kqp_federated_query_actors.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ void TDescribeSchemaSecretsService::Handle(TEvTxProxySchemeCache::TEvNavigateKey
121121
return;
122122
}
123123

124-
// TODO (yurikiselev): Assert that request->ResultSet.front().SecretInfo->Description.GetValue() is empty [issue:23462]
124+
const auto& secretDescription = request->ResultSet.front().SecretInfo->Description;
125+
Y_ENSURE(!secretDescription.HasValue(), "SchemeCache must never contain secret values");
125126

126127
const auto secretIt = SecretNameToValue.find(secretName);
127128
if (secretIt != SecretNameToValue.end()) { // some secret version is in cache
@@ -137,6 +138,7 @@ void TDescribeSchemaSecretsService::Handle(TEvTxProxySchemeCache::TEvNavigateKey
137138
TAutoPtr<TEvTxUserProxy::TEvNavigate> req(new TEvTxUserProxy::TEvNavigate());
138139
NKikimrSchemeOp::TDescribePath* record = req->Record.MutableDescribePath();
139140
record->SetPath(secretName);
141+
record->MutableOptions()->SetReturnSecretValue(true);
140142
// TODO(yurikiselev): Deal with UserToken [issue:25472]
141143
Send(MakeTxProxyID(), req.Release(), 0, ev->Cookie);
142144
}

0 commit comments

Comments
 (0)