Passing npm run test:spec -- --opensearch-distribution=amazon-managed…

… against Amazon OpenSearch 2.13. Signed-off-by: dblock <[email protected]>
opensearch-project · Aug 14, 2024 · f116d93 · f116d93
1 parent ba4f0a5
commit f116d93
Show file tree

Hide file tree

Showing 40 changed files with 153 additions and 24 deletions.
diff --git a/spec/schemas/security._common.yaml b/spec/schemas/security._common.yaml
@@ -622,10 +622,10 @@ components:
           items:
             type: string
         ssl_protocol:
-          type: string
+          type: ['null',string]
           description: Protocol for this ssl setup.
         ssl_cipher:
-          type: string
+          type: ['null',string]
           description: Cipher for this ssl setup.
         ssl_openssl_available:
           type: boolean
@@ -646,7 +646,7 @@ components:
           type: boolean
           description: Indicates whether hostname validation is supported.
         ssl_provider_http:
-          type: string
+          type: ['null',string]
           description: Returns http provider's name.
         ssl_provider_transport_server:
           type: string
@@ -657,15 +657,12 @@ components:
       required:
         - peer_certificates
         - principal
-        - ssl_cipher
         - ssl_openssl_available
         - ssl_openssl_non_available_cause
         - ssl_openssl_supports_hostname_validation
         - ssl_openssl_supports_key_manager_factory
         - ssl_openssl_version
         - ssl_openssl_version_string
-        - ssl_protocol
-        - ssl_provider_http
         - ssl_provider_transport_client
         - ssl_provider_transport_server
 

diff --git a/tests/default/cat/master.yaml b/tests/default/cat/master.yaml
@@ -1,9 +1,9 @@
 $schema: ../../../json_schemas/test_story.schema.yaml
 
 description: Test cat/master endpoints.
+version: < 2.0
 chapters:
   - synopsis: Cat with a json response.
-    version: < 2.0
     path: /_cat/master
     method: GET
     parameters:

diff --git a/tests/default/cat/nodeattrs.yaml b/tests/default/cat/nodeattrs.yaml
@@ -1,12 +1,12 @@
 $schema: ../../../json_schemas/test_story.schema.yaml
 
 description: Test cat/nodeattrs endpoints.
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 chapters:
   - synopsis: Cat with a json response.
-    distributions:
-      excluded:
-        - amazon-managed
-        - amazon-serverless
     path: /_cat/nodeattrs
     method: GET
     parameters:

diff --git a/tests/default/ingest/pipeline/neural_search.yaml b/tests/default/ingest/pipeline/neural_search.yaml
@@ -1,6 +1,11 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test the creation a neural search ingest pipeline.
+distributions:
+  # requires an ML node to be provisioned, disabling with only_run_on_ml_node is not possible
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 prologues:
   - path: /_cluster/settings
     method: PUT

diff --git a/tests/default/query/datasources.yaml b/tests/default/query/datasources.yaml
@@ -2,7 +2,10 @@ $schema: ../../../json_schemas/test_story.schema.yaml
 
 description: Test various operations of the OpenSearch Query Datasources API.
 version: '>=2.7'
-
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 prologues:
   - path: /_plugins/_query/_datasources/{datasource_name}
     method: DELETE

diff --git a/tests/default/security/api/account.yaml b/tests/default/security/api/account.yaml
@@ -1,6 +1,10 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test account endpoint.
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 chapters:
   - synopsis: Get account details.

diff --git a/tests/default/security/api/actiongroups.yaml b/tests/default/security/api/actiongroups.yaml
@@ -1,6 +1,10 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test actiongroups endpoints.
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 chapters:
   - synopsis: Create action group.

diff --git a/tests/default/security/api/allowlist.yaml b/tests/default/security/api/allowlist.yaml
@@ -2,6 +2,10 @@ $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test allowlist endpoints.
 version: '> 2.0'
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 # ADMIN-CERT only. These tests require explicit rest api admin privileges.
 chapters:

diff --git a/tests/default/security/api/audit.yaml b/tests/default/security/api/audit.yaml
@@ -1,6 +1,10 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test audit endpoints.
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 chapters:
   - synopsis: Get an audit config.

diff --git a/tests/default/security/api/audit/config.yaml b/tests/default/security/api/audit/config.yaml
@@ -1,7 +1,10 @@
 $schema: ../../../../../json_schemas/test_story.schema.yaml
 
 description: Test audit/config endpoint.
-
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 chapters:
   - synopsis: Create an audit config.
     path: /_plugins/_security/api/audit/config

diff --git a/tests/default/security/api/authtoken.yaml b/tests/default/security/api/authtoken.yaml
@@ -1,6 +1,10 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test authtoken endpoint.
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 chapters:
   - synopsis: Create an auth token.

diff --git a/tests/default/security/api/cache.yaml b/tests/default/security/api/cache.yaml
@@ -1,6 +1,10 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test cache endpoint.
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 chapters:
   - synopsis: Get cache.

diff --git a/tests/default/security/api/certificates.yaml b/tests/default/security/api/certificates.yaml
@@ -2,6 +2,10 @@ $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test certificates endpoints.
 version: '> 2.14'
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 # ADMIN-CERT only. These tests require explicit rest api admin privileges.
 prologues:

diff --git a/tests/default/security/api/generateonbehalfoftoken.yaml b/tests/default/security/api/generateonbehalfoftoken.yaml
@@ -2,6 +2,10 @@ $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test generateonbehalfoftoken endpoint.
 version: '> 2.11'
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 chapters:
   - synopsis: Create an On-Behalf-Of token.

diff --git a/tests/default/security/api/internalusers.yaml b/tests/default/security/api/internalusers.yaml
@@ -1,6 +1,10 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test internalusers endpoints.
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 chapters:
   - synopsis: Get internal users bulk.

diff --git a/tests/default/security/api/internalusers/authtoken.yaml b/tests/default/security/api/internalusers/authtoken.yaml
@@ -2,6 +2,10 @@ $schema: ../../../../../json_schemas/test_story.schema.yaml
 
 description: Test internalusers/authtoken endpoint.
 version: '> 2.16' # Fixed via https://github.com/opensearch-project/security/pull/4628
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 prologues:
   - path: /_plugins/_security/api/internalusers/{username}

diff --git a/tests/default/security/api/migrate.yaml b/tests/default/security/api/migrate.yaml
@@ -1,6 +1,10 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test migrate endpoint.
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 # BAD_REQUEST. Can not migrate configuration because it was already migrated.
 chapters:

diff --git a/tests/default/security/api/nodesdn.yaml b/tests/default/security/api/nodesdn.yaml
@@ -1,6 +1,10 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test nodesdn endpoints.
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 # ADMIN-CERT only. These tests require explicit rest api admin privileges.
 # The setting `plugins. security. nodes_dn_dynamic_config_enabled` must be enabled.

diff --git a/tests/default/security/api/permissionsinfo.yaml b/tests/default/security/api/permissionsinfo.yaml
@@ -1,6 +1,10 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test permissionsinfo endpoint.
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 chapters:
   - synopsis: Get evaluated permissions for currently logged in user.

diff --git a/tests/default/security/api/roles.yaml b/tests/default/security/api/roles.yaml
@@ -1,6 +1,10 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test roles endpoints.
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 chapters:
   - synopsis: Create role.

diff --git a/tests/default/security/api/rolesmapping.yaml b/tests/default/security/api/rolesmapping.yaml
@@ -1,6 +1,10 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test rolesmapping endpoint.
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 prologues:
   - path: /_plugins/_security/api/roles/{role}

diff --git a/tests/default/security/api/securityconfig.yaml b/tests/default/security/api/securityconfig.yaml
@@ -2,6 +2,10 @@ $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test securityconfig endpoints.
 version: '> 2.9'
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 # ADMIN-CERT only (except GET). These tests require explicit rest api admin privileges.
 chapters:

diff --git a/tests/default/security/api/securityconfig/config.yaml b/tests/default/security/api/securityconfig/config.yaml
@@ -2,6 +2,10 @@ $schema: ../../../../../json_schemas/test_story.schema.yaml
 
 description: Test securityconfig/config endpoint.
 version: '> 2.9'
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 # ADMIN-CERT only (except GET). These tests require explicit rest api admin privileges.
 chapters:

diff --git a/tests/default/security/api/ssl/certs.yaml b/tests/default/security/api/ssl/certs.yaml
@@ -2,6 +2,10 @@ $schema: ../../../../../json_schemas/test_story.schema.yaml
 
 description: Test ssl/certs endpoint.
 version: '>= 2.0'
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 # ADMIN-CERT only. These tests require explicit rest api admin privileges.
 chapters:

diff --git a/tests/default/security/api/ssl/http/reloadcerts.yaml b/tests/default/security/api/ssl/http/reloadcerts.yaml
@@ -2,6 +2,10 @@ $schema: ../../../../../../json_schemas/test_story.schema.yaml
 
 description: Test ssl/http/reloadcerts endpoint.
 version: '> 2.7'
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 # ADMIN-CERT only. These tests require explicit rest api admin privileges.
 chapters:

diff --git a/tests/default/security/api/ssl/transport/reloadcerts.yaml b/tests/default/security/api/ssl/transport/reloadcerts.yaml
@@ -2,6 +2,10 @@ $schema: ../../../../../../json_schemas/test_story.schema.yaml
 
 description: Test ssl/transport/reloadcerts endpoint.
 version: '> 2.7'
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 # ADMIN-CERT only. These tests require explicit rest api admin privileges.
 chapters:

diff --git a/tests/default/security/api/tenancy/config.yaml b/tests/default/security/api/tenancy/config.yaml
@@ -2,6 +2,10 @@ $schema: ../../../../../json_schemas/test_story.schema.yaml
 
 description: Test tenancy/config endpoints.
 version: '> 2.6'
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 chapters:
   - synopsis: Get tenancy config.

diff --git a/tests/default/security/api/tenants.yaml b/tests/default/security/api/tenants.yaml
@@ -1,6 +1,10 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test tenants endpoints.
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 chapters:
   - synopsis: Create tenant.

diff --git a/tests/default/security/api/upgrade_check.yaml b/tests/default/security/api/upgrade_check.yaml
@@ -2,7 +2,10 @@ $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test _upgrade_check endpoint.
 version: '> 2.13'
-
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 chapters:
   - synopsis: Check whether an upgrade can be performed.
     path: /_plugins/_security/api/_upgrade_check

diff --git a/tests/default/security/api/upgrade_perform.yaml b/tests/default/security/api/upgrade_perform.yaml
@@ -2,7 +2,10 @@ $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test _upgrade_perform endpoint.
 version: '> 2.13'
-
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 chapters:
   - synopsis: Perform the upgrade.
     path: /_plugins/_security/api/_upgrade_perform

diff --git a/tests/default/security/api/user.yaml b/tests/default/security/api/user.yaml
@@ -1,6 +1,10 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test user endpoints.
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 chapters:
   - synopsis: Get user bulk.

diff --git a/tests/default/security/api/user/authtoken.yaml b/tests/default/security/api/user/authtoken.yaml
@@ -2,6 +2,10 @@ $schema: ../../../../../json_schemas/test_story.schema.yaml
 
 description: Test authtoken endpoints for user.
 version: '> 2.16' # Fixed via https://github.com/opensearch-project/security/pull/4628
+distributions:
+  excluded:
+    - amazon-managed
+    - amazon-serverless
 
 prologues:
   - path: /_plugins/_security/api/user/{username}