github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 01:22:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use package to suppress warning for entitlement self-test (#128223) (#128304)

Browse source 
* Use package to suppress warning for entitlement self-test

* [CI] Auto commit changes from spotless

---------

Co-authored-by: elasticsearchmachine <infra-root+elasticsearchmachine@elastic.co>
This commit is contained in:
Patrick Doyle 2025-05-22 10:16:16 -04:00 • committed by GitHub
parent 607d345366
commit 25f823c986
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libs/entitlement/src/main/java/org/elasticsearch/entitlement/bootstrap/EntitlementBootstrap.java
View file

@ -43,14 +43,14 @@ public class EntitlementBootstrap {
Function<Class<?>, PolicyManager.PolicyScope> scopeResolver,
PathLookup pathLookup,
Map<String, Path> sourcePaths,
Set<Class<?>> suppressFailureLogClasses
Set<Package> suppressFailureLogPackages
) {
public BootstrapArgs {
requireNonNull(pluginPolicies);
requireNonNull(scopeResolver);
requireNonNull(pathLookup);
requireNonNull(sourcePaths);
requireNonNull(suppressFailureLogClasses);
requireNonNull(suppressFailureLogPackages);
}
}
@ -78,7 +78,7 @@ public class EntitlementBootstrap {
* @param tempDir the temp directory for Elasticsearch
* @param logsDir the log directory for Elasticsearch
* @param pidFile path to a pid file for Elasticsearch, or {@code null} if one was not specified
* @param suppressFailureLogClasses classes for which we do not need or want to log Entitlements failures
* @param suppressFailureLogPackages packages for which we do not need or want to log Entitlements failures
*/
public static void bootstrap(
Policy serverPolicyPatch,
@ -95,7 +95,7 @@ public class EntitlementBootstrap {
Path logsDir,
Path tempDir,
Path pidFile,
Set<Class<?>> suppressFailureLogClasses
Set<Package> suppressFailureLogPackages
) {
logger.debug("Loading entitlement agent");
if (EntitlementBootstrap.bootstrapArgs != null) {
@ -119,7 +119,7 @@ public class EntitlementBootstrap {
settingResolver
),
sourcePaths,
suppressFailureLogClasses
suppressFailureLogPackages
);
exportInitializationToAgent();
loadAgent(findAgentJar());

2
libs/entitlement/src/main/java/org/elasticsearch/entitlement/initialization/EntitlementInitialization.java
View file

@ -90,7 +90,7 @@ public class EntitlementInitialization {
EntitlementBootstrap.bootstrapArgs().sourcePaths(),
ENTITLEMENTS_MODULE,
pathLookup,
bootstrapArgs.suppressFailureLogClasses()
bootstrapArgs.suppressFailureLogPackages()
);
}

10
libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java
View file

@ -256,7 +256,7 @@ public class PolicyManager {
private final Map<String, Map<String, List<Entitlement>>> pluginsEntitlements;
private final Function<Class<?>, PolicyScope> scopeResolver;
private final PathLookup pathLookup;
private final Set<Class<?>> mutedClasses;
private final Set<Package> suppressFailureLogPackages;
public static final String ALL_UNNAMED = "ALL-UNNAMED";
@ -311,7 +311,7 @@ public class PolicyManager {
Map<String, Path> sourcePaths,
Module entitlementsModule,
PathLookup pathLookup,
Set<Class<?>> suppressFailureLogClasses
Set<Package> suppressFailureLogPackages
) {
this.serverEntitlements = buildScopeEntitlementsMap(requireNonNull(serverPolicy));
this.apmAgentEntitlements = apmAgentEntitlements;
@ -322,7 +322,7 @@ public class PolicyManager {
this.sourcePaths = sourcePaths;
this.entitlementsModule = entitlementsModule;
this.pathLookup = requireNonNull(pathLookup);
this.mutedClasses = suppressFailureLogClasses;
this.suppressFailureLogPackages = suppressFailureLogPackages;
List<ExclusiveFileEntitlement> exclusiveFileEntitlements = new ArrayList<>();
for (var e : serverEntitlements.entrySet()) {
@ -688,8 +688,8 @@ public class PolicyManager {
private void notEntitled(String message, Class<?> callerClass, ModuleEntitlements entitlements) {
var exception = new NotEntitledException(message);
// Don't emit a log for muted classes, e.g. classes containing self tests
if (mutedClasses.contains(callerClass) == false) {
// Don't emit a log for suppressed packages, e.g. packages containing self tests
if (suppressFailureLogPackages.contains(callerClass.getPackage()) == false) {
entitlements.logger().warn("Not entitled: {}", message, exception);
}
throw exception;

2
server/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java
View file

@ -282,7 +282,7 @@ class Elasticsearch {
nodeEnv.logsDir(),
nodeEnv.tmpDir(),
args.pidFile(),
Set.of(EntitlementSelfTester.class)
Set.of(EntitlementSelfTester.class.getPackage())
);
EntitlementSelfTester.entitlementSelfTest();
} else {