forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix/113148-unmute
- Loading branch information
Showing
1,112 changed files
with
20,764 additions
and
6,390 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -56,7 +56,6 @@ steps: | |
| matrix: | ||
| setup: | ||
| BWC_VERSION: | ||
| - 7.17.13 | ||
| - 8.9.1 | ||
| - 8.10.0 | ||
| agents: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,7 +14,7 @@ BWC_VERSION: | |
| - "8.12.2" | ||
| - "8.13.4" | ||
| - "8.14.3" | ||
| - "8.15.3" | ||
| - "8.15.4" | ||
| - "8.16.0" | ||
| - "8.17.0" | ||
| - "9.0.0" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| BWC_VERSION: | ||
| - "8.15.3" | ||
| - "8.15.4" | ||
| - "8.16.0" | ||
| - "8.17.0" | ||
| - "9.0.0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
build-tools/src/main/java/org/elasticsearch/gradle/util/PlatformUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| package org.elasticsearch.gradle.util; | ||
|
|
||
| import java.util.stream.Collectors; | ||
|
|
||
| public class PlatformUtils { | ||
|
|
||
| public static String normalize(String input) { | ||
| return input.lines() | ||
| .map(it -> it.replace('\\', '/')) | ||
| .map(it -> it.replaceAll("\\d+\\.\\d\\ds", "0.00s")) | ||
| .map(it -> it.replace("file:/./", "file:./")) | ||
| .collect(Collectors.joining("\n")); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
...ement-runtime/src/main/java/org/elasticsearch/entitlement/runtime/policy/Entitlement.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| package org.elasticsearch.entitlement.runtime.policy; | ||
|
|
||
| /** | ||
| * Marker interface to ensure that only {@link Entitlement} are | ||
| * part of a {@link Policy}. All entitlement classes should implement | ||
| * this. | ||
| */ | ||
| public interface Entitlement { | ||
|
|
||
| } |
36 changes: 36 additions & 0 deletions
36
...ntime/src/main/java/org/elasticsearch/entitlement/runtime/policy/ExternalEntitlement.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| package org.elasticsearch.entitlement.runtime.policy; | ||
|
|
||
| import java.lang.annotation.ElementType; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| /** | ||
| * This annotation indicates an {@link Entitlement} is available | ||
| * to "external" classes such as those used in plugins. Any {@link Entitlement} | ||
| * using this annotation is considered parseable as part of a policy file | ||
| * for entitlements. | ||
| */ | ||
| @Target(ElementType.CONSTRUCTOR) | ||
| @Retention(RetentionPolicy.RUNTIME) | ||
| public @interface ExternalEntitlement { | ||
|
|
||
| /** | ||
| * This is the list of parameter names that are | ||
| * parseable in {@link PolicyParser#parseEntitlement(String, String)}. | ||
| * The number and order of parameter names much match the number and order | ||
| * of constructor parameters as this is how the parser will pass in the | ||
| * parsed values from a policy file. However, the names themselves do NOT | ||
| * have to match the parameter names of the constructor. | ||
| */ | ||
| String[] parameterNames() default {}; | ||
| } |
67 changes: 67 additions & 0 deletions
67
...t-runtime/src/main/java/org/elasticsearch/entitlement/runtime/policy/FileEntitlement.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| package org.elasticsearch.entitlement.runtime.policy; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * Describes a file entitlement with a path and actions. | ||
| */ | ||
| public class FileEntitlement implements Entitlement { | ||
|
|
||
| public static final int READ_ACTION = 0x1; | ||
| public static final int WRITE_ACTION = 0x2; | ||
|
|
||
| private final String path; | ||
| private final int actions; | ||
|
|
||
| @ExternalEntitlement(parameterNames = { "path", "actions" }) | ||
| public FileEntitlement(String path, List<String> actionsList) { | ||
| this.path = path; | ||
| int actionsInt = 0; | ||
|
|
||
| for (String actionString : actionsList) { | ||
| if ("read".equals(actionString)) { | ||
| if ((actionsInt & READ_ACTION) == READ_ACTION) { | ||
| throw new IllegalArgumentException("file action [read] specified multiple times"); | ||
| } | ||
| actionsInt |= READ_ACTION; | ||
| } else if ("write".equals(actionString)) { | ||
| if ((actionsInt & WRITE_ACTION) == WRITE_ACTION) { | ||
| throw new IllegalArgumentException("file action [write] specified multiple times"); | ||
| } | ||
| actionsInt |= WRITE_ACTION; | ||
| } else { | ||
| throw new IllegalArgumentException("unknown file action [" + actionString + "]"); | ||
| } | ||
| } | ||
|
|
||
| this.actions = actionsInt; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
| FileEntitlement that = (FileEntitlement) o; | ||
| return actions == that.actions && Objects.equals(path, that.path); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(path, actions); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "FileEntitlement{" + "path='" + path + '\'' + ", actions=" + actions + '}'; | ||
| } | ||
| } |
Oops, something went wrong.