diff --git a/spec/schemas/security._common.yaml b/spec/schemas/security._common.yaml index 36c976cb0..11a92308f 100644 --- 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 index 435a27fa1..93ab62942 100644 --- 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 index b06b77fb8..f59162b31 100644 --- 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 index 2d8b41ec1..43d476e64 100644 --- 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 index 35c9fea04..80ad12800 100644 --- 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 index 2fc10499f..2668aeddd 100644 --- 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 index 0321d9022..6b2dfff52 100644 --- 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 index 6808131d8..5c0b29a8e 100644 --- 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 index 7c004b24b..094651f53 100644 --- 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 index 97335168c..9a5ab5213 100644 --- 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 index 4da5718b2..36ea369b0 100644 --- 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 index d1f1d6d26..9535c5c8f 100644 --- 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 index 340a659d5..a1e868157 100644 --- 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 index 41b5f1453..561355e77 100644 --- 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 index 784db4fcd..9285ea3b2 100644 --- 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 index 2cfb3c6a1..08f7a40d8 100644 --- 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 index 3cf053554..98f3d13cd 100644 --- 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 index 0cfcd1b43..43b3991d4 100644 --- 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 index 59e1f9062..f4af2607e 100644 --- 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 index a79ef6312..9e21d2473 100644 --- 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 index 8fed57e18..f7d8644f1 100644 --- 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 index 28c6573bd..3c961343b 100644 --- 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 index 3f51b38c3..050fff9a9 100644 --- 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 index 168ff0964..c888789cb 100644 --- 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 index 30f1f043b..6c16242b0 100644 --- 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 index 9585b1a17..41431e00b 100644 --- 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 index 1e3d95262..51bc7864f 100644 --- 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 index 3e41617ee..4a2c2ecdd 100644 --- 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 index 60d553753..8cb9c7789 100644 --- 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 index 643f7896f..39e452f83 100644 --- 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 index 4c676f39a..bc931e023 100644 --- 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 index edf450fb6..8df0c3574 100644 --- 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} diff --git a/tests/default/security/api/validate.yaml b/tests/default/security/api/validate.yaml index 5c4cbdfc4..55987ab40 100644 --- a/tests/default/security/api/validate.yaml +++ b/tests/default/security/api/validate.yaml @@ -1,6 +1,10 @@ $schema: ../../../../json_schemas/test_story.schema.yaml description: Test validate 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/authinfo.yaml b/tests/default/security/authinfo.yaml index 1d65c31f0..5243a3f6a 100644 --- a/tests/default/security/authinfo.yaml +++ b/tests/default/security/authinfo.yaml @@ -1,7 +1,10 @@ $schema: ../../../json_schemas/test_story.schema.yaml description: Test authinfo endpoint. - +distributions: + excluded: + - amazon-managed + - amazon-serverless chapters: - synopsis: Get auth info. path: /_plugins/_security/authinfo diff --git a/tests/default/security/dashboardsinfo.yaml b/tests/default/security/dashboardsinfo.yaml index fb28a9914..6bcfd4b44 100644 --- a/tests/default/security/dashboardsinfo.yaml +++ b/tests/default/security/dashboardsinfo.yaml @@ -1,7 +1,10 @@ $schema: ../../../json_schemas/test_story.schema.yaml description: Test dashboardsinfo endpoint. - +distributions: + excluded: + - amazon-managed + - amazon-serverless chapters: - synopsis: Get dashboards info. path: /_plugins/_security/dashboardsinfo diff --git a/tests/default/security/health.yaml b/tests/default/security/health.yaml index b1c42b037..cbd8e9c5a 100644 --- a/tests/default/security/health.yaml +++ b/tests/default/security/health.yaml @@ -1,7 +1,10 @@ $schema: ../../../json_schemas/test_story.schema.yaml description: Test health endpoint. - +distributions: + excluded: + - amazon-managed + - amazon-serverless chapters: - synopsis: Get security health info. path: /_plugins/_security/health diff --git a/tests/default/security/sslinfo.yaml b/tests/default/security/sslinfo.yaml index b73d18ee4..acb164fc1 100644 --- a/tests/default/security/sslinfo.yaml +++ b/tests/default/security/sslinfo.yaml @@ -1,7 +1,6 @@ $schema: ../../../json_schemas/test_story.schema.yaml description: Test sslinfo endpoint. - chapters: - synopsis: Get ssl info. path: /_opendistro/_security/sslinfo @@ -13,13 +12,11 @@ chapters: payload: principal: null peer_certificates: '0' - ssl_protocol: TLSv1.3 ssl_openssl_available: false ssl_openssl_version: -1 ssl_openssl_version_string: null ssl_openssl_non_available_cause: 'java.lang.ClassNotFoundException: io.netty.internal.tcnative.SSLContext' ssl_openssl_supports_key_manager_factory: false ssl_openssl_supports_hostname_validation: false - ssl_provider_http: JDK ssl_provider_transport_server: JDK ssl_provider_transport_client: JDK diff --git a/tests/default/security/tenantinfo.yaml b/tests/default/security/tenantinfo.yaml index 8b0aeee54..c113a1de7 100644 --- a/tests/default/security/tenantinfo.yaml +++ b/tests/default/security/tenantinfo.yaml @@ -1,7 +1,10 @@ $schema: ../../../json_schemas/test_story.schema.yaml description: Test tenantinfo endpoint. - +distributions: + excluded: + - amazon-managed + - amazon-serverless chapters: - synopsis: Get tenant info. path: /_plugins/_security/tenantinfo diff --git a/tests/default/security/whoami.yaml b/tests/default/security/whoami.yaml index 3e2c5016b..dc6c42c37 100644 --- a/tests/default/security/whoami.yaml +++ b/tests/default/security/whoami.yaml @@ -2,7 +2,10 @@ $schema: ../../../json_schemas/test_story.schema.yaml description: Test whoami endpoints. version: '>= 2.0' - +distributions: + excluded: + - amazon-managed + - amazon-serverless chapters: - synopsis: Get current user info. path: /_plugins/_security/whoami diff --git a/tests/default/security/whoamiprotected.yaml b/tests/default/security/whoamiprotected.yaml index a3771fb7c..46409fbf1 100644 --- a/tests/default/security/whoamiprotected.yaml +++ b/tests/default/security/whoamiprotected.yaml @@ -2,7 +2,10 @@ $schema: ../../../json_schemas/test_story.schema.yaml description: Test whoamiprotected endpoint. version: '> 2.10' - +distributions: + excluded: + - amazon-managed + - amazon-serverless chapters: - synopsis: Get current user info from protected endpoint. path: /_plugins/_security/whoamiprotected