Revert "[Enterprise Search] Add .connector-secrets system index and…

… GET/POST requests (elastic#103683)" This reverts commit b4345d9.
navarone-feekery · Jan 25, 2024 · 0a29fba · 0a29fba
1 parent 4e91d69
commit 0a29fba
Show file tree

Hide file tree

Showing 39 changed files with 5 additions and 1,501 deletions.
diff --git a/docs/reference/rest-api/security/get-builtin-privileges.asciidoc b/docs/reference/rest-api/security/get-builtin-privileges.asciidoc
@@ -108,14 +108,12 @@ A successful call returns an object with "cluster" and "index" fields.
     "none",
     "post_behavioral_analytics_event",
     "read_ccr",
-    "read_connector_secrets",
     "read_fleet_secrets",
     "read_ilm",
     "read_pipeline",
     "read_security",
     "read_slm",
     "transport_client",
-    "write_connector_secrets",
     "write_fleet_secrets"
   ],
   "index" : [

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector_secret.get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector_secret.get.json
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector_secret.post.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector_secret.post.json
diff --git a/.../java/org/elasticsearch/xpack/core/security/authz/privilege/ClusterPrivilegeResolver.java b/.../java/org/elasticsearch/xpack/core/security/authz/privilege/ClusterPrivilegeResolver.java
@@ -326,16 +326,6 @@ public class ClusterPrivilegeResolver {
         CROSS_CLUSTER_REPLICATION_PATTERN
     );
 
-    public static final NamedClusterPrivilege READ_CONNECTOR_SECRETS = new ActionClusterPrivilege(
-        "read_connector_secrets",
-        Set.of("cluster:admin/xpack/connector/secret/get")
-    );
-
-    public static final NamedClusterPrivilege WRITE_CONNECTOR_SECRETS = new ActionClusterPrivilege(
-        "write_connector_secrets",
-        Set.of("cluster:admin/xpack/connector/secret/post")
-    );
-
     private static final Map<String, NamedClusterPrivilege> VALUES = sortByAccessLevel(
         Stream.of(
             NONE,
@@ -390,9 +380,7 @@ public class ClusterPrivilegeResolver {
             POST_BEHAVIORAL_ANALYTICS_EVENT,
             MANAGE_SEARCH_QUERY_RULES,
             CROSS_CLUSTER_SEARCH,
-            CROSS_CLUSTER_REPLICATION,
-            READ_CONNECTOR_SECRETS,
-            WRITE_CONNECTOR_SECRETS
+            CROSS_CLUSTER_REPLICATION
         ).filter(Objects::nonNull).toList()
     );
 

diff --git a/x-pack/plugin/core/template-resources/src/main/resources/connector-secrets.json b/x-pack/plugin/core/template-resources/src/main/resources/connector-secrets.json
diff --git a/x-pack/plugin/ent-search/build.gradle b/x-pack/plugin/ent-search/build.gradle
@@ -38,13 +38,6 @@ dependencies {
   module ':modules:search-business-rules'
 }
 
-testClusters.configureEach {
-  testDistribution = 'DEFAULT'
-  setting 'xpack.security.enabled', 'true'
-  setting 'xpack.security.autoconfiguration.enabled', 'false'
-  user username: 'x_pack_rest_user', password: 'x-pack-test-password'
-}
-
 tasks.named("dependencyLicenses").configure {
   mapping from: /jackson.*/, to: 'jackson'
 }

diff --git a/x-pack/plugin/ent-search/qa/rest/roles.yml b/x-pack/plugin/ent-search/qa/rest/roles.yml
@@ -16,8 +16,6 @@ user:
   cluster:
     - post_behavioral_analytics_event
     - manage_api_key
-    - read_connector_secrets
-    - write_connector_secrets
   indices:
     - names: [
       "test-index1",

diff --git a/...est/src/yamlRestTest/resources/rest-api-spec/test/entsearch/500_connector_secret_post.yml b/...est/src/yamlRestTest/resources/rest-api-spec/test/entsearch/500_connector_secret_post.yml
diff --git a/...rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/510_connector_secret_get.yml b/...rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/510_connector_secret_get.yml
diff --git a/...rc/javaRestTest/java/org/elasticsearch/xpack/entsearch/ConnectorSecretsSystemIndexIT.java b/...rc/javaRestTest/java/org/elasticsearch/xpack/entsearch/ConnectorSecretsSystemIndexIT.java
diff --git a/x-pack/plugin/ent-search/src/main/java/module-info.java b/x-pack/plugin/ent-search/src/main/java/module-info.java
@@ -39,6 +39,4 @@
     exports org.elasticsearch.xpack.application.connector.syncjob.action;
 
     provides org.elasticsearch.features.FeatureSpecification with org.elasticsearch.xpack.application.EnterpriseSearchFeatures;
-
-    exports org.elasticsearch.xpack.application.connector.secrets.action to org.elasticsearch.server;
 }