From 5de559fb369d665064b0374012ebaf4458b66c0c Mon Sep 17 00:00:00 2001
From: Vacha Shah <vachshah@amazon.com>
Date: Thu, 18 Aug 2022 06:59:50 +0000
Subject: [PATCH] Ignore some tests for search aggregation for security

Signed-off-by: Vacha Shah <vachshah@amazon.com>
---
 .github/workflows/test-integrations.yml | 17 ++++----
 yaml_test_runner/skip_with_security.yml | 55 ++++++++++++++++++++-----
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml
index a0dafb7b..f954afa2 100644
--- a/.github/workflows/test-integrations.yml
+++ b/.github/workflows/test-integrations.yml
@@ -13,14 +13,11 @@ jobs:
       fail-fast: false
       matrix:
         entry:
-          - { version: '1.3.4', secured: 'true' }
-          - { version: '1.3.4', secured: 'false' }
-          - { version: '1.2.4', secured: 'true' }
-          - { version: '1.2.4', secured: 'false' }
-          - { version: '1.1.0', secured: 'true' }
-          - { version: '1.1.0', secured: 'false' }
-          - { version: '2.2.0', secured: 'true' }
-          - { version: '2.2.0', secured: 'false' }
+          - { version: '1.1.0' }
+          - { version: '1.2.4' }
+          - { version: '1.3.4' }
+          - { version: '2.2.0' }
+        secured: ["true", "false"]
 
     steps:
       - name: Checkout
@@ -37,6 +34,6 @@ jobs:
             toolchain: nightly
             override: true
             components: rustfmt, clippy
-      - name: Integ OpenSearch ${{ matrix.entry.version }} secured=${{ matrix.entry.secured }}
-        run: "./.ci/run-tests opensearch ${{ matrix.entry.version }} ${{ matrix.entry.secured }}"
+      - name: Integ OpenSearch ${{ matrix.entry.version }} secured=${{ matrix.secured }}
+        run: "./.ci/run-tests opensearch ${{ matrix.entry.version }} ${{ matrix.secured }}"
         
\ No newline at end of file
diff --git a/yaml_test_runner/skip_with_security.yml b/yaml_test_runner/skip_with_security.yml
index 17b2f5bd..7323fe21 100644
--- a/yaml_test_runner/skip_with_security.yml
+++ b/yaml_test_runner/skip_with_security.yml
@@ -36,8 +36,7 @@ tests:
 
   free/indices.shard_stores/10_basic.yml:
     # uses number as a key into object. serde_json::Value expects a string key
-    - "basic index test"
-    - "multiple indices test"
+    - "*"
 
   free/indices.stats/12_level.yml:
     # uses number as a key into object. serde_json::Value expects a string key
@@ -98,6 +97,7 @@ tests:
 
   free/cat.allocation/10_basic.yml:
     - "Node ID"
+    - "Bytes"
   
   free/cat.count/10_basic.yml:
     - "Test cat count output"
@@ -118,6 +118,9 @@ tests:
   free/cluster.allocation_explain/10_basic.yml:
     - "cluster shard allocation explanation test with empty request"
   
+  free/cluster.health/20_request_timeout.yml:
+    - "cluster health request timeout waiting for active shards"
+
   free/indices.refresh/10_basic.yml:
     - "Indices refresh test _all"
     - "Indices refresh test empty array"
@@ -132,6 +135,9 @@ tests:
     - "Basic multi-search"
     - "Least impact smoke test"
   
+  free/range/10_basic.yml:
+    - "Integer range"
+  
   free/search/10_source_filtering.yml:
     - "*"
 
@@ -151,42 +157,71 @@ tests:
     - "pre_filter_shard_size with shards that have no hit"
 
   free/search.aggregation/100_avg_metric.yml:
-    - "Aggregating wrong datatype test"
+    - "*"
   
   free/search.aggregation/10_histogram.yml:
     - "Basic test"
     - "Format test"
 
   free/search.aggregation/110_max_metric.yml:
-    - "Aggregating wrong datatype test"
+    - "*"
 
   free/search.aggregation/120_min_metric.yml:
-    - "Aggregating wrong datatype test"
+    - "*"
   
   free/search.aggregation/130_sum_metric.yml:
-    - "Aggregating wrong datatype test"
+    - "*"
+  
+  free/search.aggregation/140_value_count_metric.yml:
+    - "*"
+  
+  free/search.aggregation/150_stats_metric.yml:
+    - "*"
+  
+  free/search.aggregation/160_extended_stats_metric.yml:
+    - "*"
+  
+  free/search.aggregation/170_cardinality_metric.yml:
+    - "*"
   
   free/search.aggregation/180_percentiles_tdigest_metric.yml:
-    - "Invalid params test"
+    - "*"
   
   free/search.aggregation/190_percentiles_hdr_metric.yml:
-    - "Basic test"
-    - "Invalid params test"
+    - "*"
   
   free/search.aggregation/20_terms.yml:
     - "*"
+  
+  free/search.aggregation/220_filters_bucket.yml:
+    - "*"
 
   free/search.aggregation/260_weighted_avg.yml:
     - "Basic test"
+  
+  free/search.aggregation/270_median_absolute_deviation_metric.yml:
+    - "*"
 
   free/search.aggregation/280_rare_terms.yml:
     - "*"
   
+  free/search.aggregation/280_geohash_grid.yml:
+    - "Basic test"
+    
+  free/search.aggregation/290_geotile_grid.yml:
+    - "Basic test"
+  
+  free/search.aggregation/320_missing.yml:
+    - "*"
+
+  free/search.aggregation/340_geo_distance.yml:
+    - "basic"
+  
   free/search.aggregation/40_range.yml:
     - "*"
   
   free/search.aggregation/50_filter.yml:
-    - "As a child of terms"
+    - "*"
   
   free/snapshot.create/10_basic.yml:
     - "Create a snapshot"