Merge branch 'main' into entitlements/test-always-allowed-actions-2

Author: ldematte

modules/repository-gcs/src/main/plugin-metadata/entitlement-policy.yaml

@@ -1,16 +1,3 @@
 ALL-UNNAMED:
   - set_https_connection_properties # required by google-http-client
   - outbound_network
-  - files:
-      - relative_path: ".config/gcloud"
-        relative_to: "home"
-        mode: "read"
-        platform: "linux"
-      - relative_path: ".config/gcloud"
-        relative_to: "home"
-        mode: "read"
-        platform: "macos"
-      - relative_path: "AppData\\Roaming\\gcloud"
-        relative_to: "home"
-        mode: "read"
-        platform: "windows"

modules/repository-s3/src/main/plugin-metadata/entitlement-policy.yaml

@@ -5,9 +5,6 @@ ALL-UNNAMED:
     - relative_path: "repository-s3/aws-web-identity-token-file"
       relative_to: "config"
       mode: "read"
-    - relative_path: ".aws/"
-      relative_to: "home"
-      mode: "read"
   # The security policy permission states this is "only for tests": org.elasticsearch.repositories.s3.S3RepositoryPlugin
   # TODO: check this is actually needed, and if we can isolate it to a test-only policy
   - write_system_properties:

muted-tests.yml

@@ -363,6 +363,12 @@ tests:
 - class: org.elasticsearch.entitlement.runtime.policy.PolicyManagerTests
   method: testFilesEntitlementsWithExclusive
   issue: https://github.com/elastic/elasticsearch/issues/124420
+- class: org.elasticsearch.entitlement.runtime.policy.FileAccessTreeTests
+  method: testDuplicateExclusivePaths
+  issue: https://github.com/elastic/elasticsearch/issues/124437
+- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
+  method: testWatcherWithApiKey {cluster=UPGRADED}
+  issue: https://github.com/elastic/elasticsearch/issues/124159
 
 # Examples:
 #

plugins/discovery-gce/src/main/plugin-metadata/entitlement-policy.yaml

@@ -1,16 +1,3 @@
 ALL-UNNAMED:
   - set_https_connection_properties # required by google-http-client
   - outbound_network
-  - files:
-      - relative_path: ".config/gcloud"
-        relative_to: "home"
-        mode: "read"
-        platform: "linux"
-      - relative_path: ".config/gcloud"
-        relative_to: "home"
-        mode: "read"
-        platform: "macos"
-      - relative_path: "AppData\\Roaming\\gcloud"
-        relative_to: "home"
-        mode: "read"
-        platform: "windows"