Skip to content

Add UNAUTHORIZED status to dq #15138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 1, 2025
Merged

Add UNAUTHORIZED status to dq #15138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
139df13
Add UNAUTHORIZED to dq
kunga Feb 27, 2025
faddba9
done fixme
kunga Feb 28, 2025
8a8b77d
cr: compatibility level
kunga Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ void TKqpComputeActor::HandleExecute(TEvKqpCompute::TEvScanError::TPtr& ev) {
IssuesFromMessage(ev->Get()->Record.GetIssues(), issues);

State = NDqProto::COMPUTE_STATE_FAILURE;
ReportStateAndMaybeDie(YdbStatusToDqStatus(status), issues);
ReportStateAndMaybeDie(YdbStatusToDqStatus(status, EStatusCompatibilityLevel::WithUnauthorized), issues);
}

IActor* CreateKqpComputeActor(const TActorId& executerId, ui64 txId, NDqProto::TDqTask* task,
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/sys_view/ut_kqp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ void SetupAuthAccessEnvironment(TTestEnv& env) {
}

void CheckAuthAdministratorAccessIsRequired(TScanQueryPartIterator& it) {
NKqp::StreamResultToYson(it, false, EStatus::INTERNAL_ERROR,
NKqp::StreamResultToYson(it, false, EStatus::UNAUTHORIZED,
"Administrator access is required");
}

Expand Down
7 changes: 6 additions & 1 deletion ydb/library/yql/dq/actors/dq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@ Ydb::StatusIds::StatusCode DqStatusToYdbStatus(NYql::NDqProto::StatusIds::Status
return Ydb::StatusIds::SCHEME_ERROR;
case NYql::NDqProto::StatusIds::UNSUPPORTED:
return Ydb::StatusIds::UNSUPPORTED;
case NYql::NDqProto::StatusIds::UNAUTHORIZED:
return Ydb::StatusIds::UNAUTHORIZED;
case NYql::NDqProto::StatusIds::GENERIC_ERROR:
default:
return Ydb::StatusIds::GENERIC_ERROR;
}
}

NYql::NDqProto::StatusIds::StatusCode YdbStatusToDqStatus(Ydb::StatusIds::StatusCode statusCode) {
NYql::NDqProto::StatusIds::StatusCode YdbStatusToDqStatus(Ydb::StatusIds::StatusCode statusCode, EStatusCompatibilityLevel compatibility) {
switch(statusCode) {
case Ydb::StatusIds::STATUS_CODE_UNSPECIFIED:
return NYql::NDqProto::StatusIds::UNSPECIFIED;
Expand All @@ -47,6 +49,9 @@ NYql::NDqProto::StatusIds::StatusCode YdbStatusToDqStatus(Ydb::StatusIds::Status
case Ydb::StatusIds::BAD_REQUEST:
return NYql::NDqProto::StatusIds::BAD_REQUEST;
case Ydb::StatusIds::UNAUTHORIZED:
return compatibility >= EStatusCompatibilityLevel::WithUnauthorized
? NYql::NDqProto::StatusIds::UNAUTHORIZED
: NYql::NDqProto::StatusIds::INTERNAL_ERROR;
case Ydb::StatusIds::INTERNAL_ERROR:
return NYql::NDqProto::StatusIds::INTERNAL_ERROR;
case Ydb::StatusIds::ABORTED:
Expand Down
7 changes: 6 additions & 1 deletion ydb/library/yql/dq/actors/dq.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@

namespace NYql::NDq {

enum class EStatusCompatibilityLevel {
Basic,
WithUnauthorized
};

Ydb::StatusIds::StatusCode DqStatusToYdbStatus(NYql::NDqProto::StatusIds::StatusCode statusCode);
NYql::NDqProto::StatusIds::StatusCode YdbStatusToDqStatus(Ydb::StatusIds::StatusCode statusCode);
NYql::NDqProto::StatusIds::StatusCode YdbStatusToDqStatus(Ydb::StatusIds::StatusCode statusCode, EStatusCompatibilityLevel compatibility = EStatusCompatibilityLevel::Basic);

struct TEvDq {

Expand Down
1 change: 1 addition & 0 deletions ydb/library/yql/dq/actors/protos/dq_status_codes.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ message StatusIds {
SCHEME_ERROR = 14;
GENERIC_ERROR = 15;
UNDETERMINED = 16;
UNAUTHORIZED = 17;
}
}
5 changes: 1 addition & 4 deletions ydb/tests/functional/tenants/test_auth_system_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,5 @@ def test_tenant_auth_groups_access(ydb_endpoint, ydb_root, prepared_test_env, yd

else:
assert error is not None, result

# FIXME: status should have been UNAUTHORIZED
# assert error.status == ydb.issues.StatusCode.UNAUTHORIZED
assert error.status == ydb.issues.StatusCode.INTERNAL_ERROR
assert error.status == ydb.issues.StatusCode.UNAUTHORIZED
assert 'Administrator access is required' in error.message
Loading