Skip to content

Commit 6ab4f70

Browse files
authored
IGNITE-26608 Added a unified mechanism for propagating Operation Context Attributes (#12429)
1 parent a2b257c commit 6ab4f70

File tree

40 files changed

+1547
-373
lines changed

40 files changed

+1547
-373
lines changed

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/AbstractBasicIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
import org.apache.ignite.internal.processors.query.calcite.schema.IgniteIndex;
4545
import org.apache.ignite.internal.processors.query.calcite.schema.IgniteTable;
4646
import org.apache.ignite.internal.processors.query.calcite.util.Commons;
47-
import org.apache.ignite.internal.processors.security.OperationSecurityContext;
4847
import org.apache.ignite.internal.processors.security.SecurityContext;
48+
import org.apache.ignite.internal.thread.context.Scope;
4949
import org.apache.ignite.internal.util.typedef.F;
5050
import org.apache.ignite.internal.util.typedef.G;
5151
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -236,7 +236,7 @@ protected List<List<?>> sql(String sql, Object... params) {
236236
protected List<List<?>> sqlAsRoot(IgniteEx ignite, String sql) throws Exception {
237237
SecurityContext secCtx = authenticate(grid(0), DFAULT_USER_NAME, "ignite");
238238

239-
try (OperationSecurityContext ignored = ignite.context().security().withContext(secCtx)) {
239+
try (Scope ignored = ignite.context().security().withContext(secCtx)) {
240240
return sql(ignite, sql);
241241
}
242242
}

modules/clients/src/test/java/org/apache/ignite/common/ComputeTaskPermissionsTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@
5454
import org.apache.ignite.internal.management.cache.VerifyBackupPartitionsTask;
5555
import org.apache.ignite.internal.processors.security.AbstractSecurityTest;
5656
import org.apache.ignite.internal.processors.security.AbstractTestSecurityPluginProvider;
57-
import org.apache.ignite.internal.processors.security.OperationSecurityContext;
5857
import org.apache.ignite.internal.processors.security.PublicAccessJob;
5958
import org.apache.ignite.internal.processors.security.SecurityContext;
6059
import org.apache.ignite.internal.processors.security.compute.ComputePermissionCheckTest;
6160
import org.apache.ignite.internal.processors.security.impl.TestSecurityData;
6261
import org.apache.ignite.internal.processors.security.impl.TestSecurityPluginProvider;
62+
import org.apache.ignite.internal.thread.context.Scope;
6363
import org.apache.ignite.internal.util.lang.ConsumerX;
6464
import org.apache.ignite.internal.util.lang.RunnableX;
6565
import org.apache.ignite.internal.util.lang.gridfunc.AtomicIntegerFactoryCallable;
@@ -476,7 +476,7 @@ public void testSystemTaskCancel() throws Exception {
476476
SecurityContext initiatorSecCtx = securityContext("no-permissions-login-0");
477477

478478
SupplierX<Future<?>> starter = () -> {
479-
try (OperationSecurityContext ignored1 = grid(0).context().security().withContext(initiatorSecCtx)) {
479+
try (Scope ignored1 = grid(0).context().security().withContext(initiatorSecCtx)) {
480480
return new TestFutureAdapter<>(
481481
grid(0).context().closure().runAsync(
482482
BROADCAST,
@@ -525,7 +525,7 @@ private void checkTaskCancel(
525525
assertTrue(taskStartedLatch.await(getTestTimeout(), MILLISECONDS));
526526

527527
try (
528-
OperationSecurityContext ignored = initiator == null
528+
Scope ignored = initiator == null
529529
? null
530530
: grid(0).context().security().withContext(initiator)
531531
) {

0 commit comments

Comments
 (0)