cleanup

beshu-tech · Oct 5, 2024 · e78fd88 · e78fd88
1 parent 0b47186
commit e78fd88
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 183 deletions.
diff --git a/e2e-tests/cypress/e2e/Impersonate.cy.ts b/e2e-tests/cypress/e2e/Impersonate.cy.ts
@@ -6,7 +6,6 @@ import { rorApiClient } from '../support/helpers/RorApiClient';
 
 describe('impersonate', () => {
   beforeEach(() => {
-    // rorApiClient.configureRorIndexMainSettings("defaultSettings.yaml")
     Login.initialization();
   });
 

diff --git a/e2e-tests/cypress/fixtures/defaultSettings.json b/e2e-tests/cypress/fixtures/defaultSettings.json
diff --git a/e2e-tests/cypress/fixtures/defaultSettings.yaml b/e2e-tests/cypress/fixtures/defaultSettings.yaml
@@ -24,24 +24,11 @@ readonlyrest:
         index_template: "'readonlyrest_audit_'yyyy-MM-dd"
 
   access_control_rules:
-    - name: "Kibana service account - token"
-      verbosity: error
-      token_authentication:
-        token: "Bearer ${KIBANA_SERVICE_ACCOUNT_TOKEN}" 
-        username: service_account
 
     - name: "Kibana service account - user/pass"
       verbosity: error
       auth_key: kibana:kibana
 
-    - name: "PROBE"
-      verbosity: error
-      auth_key: "elastic-internal-probe:${INTERNAL_PROBE_PASS}"
-
-    - name: "ELASTIC-INTERNAL"
-      verbosity: error
-      auth_key: "elastic-internal:${INTERNAL_USR_PASS}"
-
     - name: PERSONAL_GRP
       groups: [Personal]
       <<: *common-rules

diff --git a/e2e-tests/cypress/fixtures/reportingSettings.json b/e2e-tests/cypress/fixtures/reportingSettings.json
diff --git a/e2e-tests/cypress/fixtures/reportingSettings.yaml b/e2e-tests/cypress/fixtures/reportingSettings.yaml
@@ -24,24 +24,10 @@ readonlyrest:
 
   access_control_rules:
 
-    - name: "Kibana service account - token"
-      verbosity: error
-      token_authentication:
-        token: "Bearer ${KIBANA_SERVICE_ACCOUNT_TOKEN}" 
-        username: service_account
-
     - name: "Kibana service account - user/pass"
       verbosity: error
       auth_key: kibana:kibana
 
-    - name: "PROBE"
-      verbosity: error
-      auth_key: "elastic-internal-probe:${INTERNAL_PROBE_PASS}"
-
-    - name: "ELASTIC-INTERNAL"
-      verbosity: error
-      auth_key: "elastic-internal:${INTERNAL_USR_PASS}"
-
     - name: PERSONAL_GRP
       groups: [personal_group]
       <<: *common-rules

diff --git a/e2e-tests/cypress/fixtures/roSettings.json b/e2e-tests/cypress/fixtures/roSettings.json
diff --git a/e2e-tests/cypress/fixtures/roSettings.yaml b/e2e-tests/cypress/fixtures/roSettings.yaml
@@ -25,24 +25,10 @@ readonlyrest:
 
   access_control_rules:
 
-    - name: "Kibana service account - token"
-      verbosity: error
-      token_authentication:
-        token: "Bearer ${KIBANA_SERVICE_ACCOUNT_TOKEN}" 
-        username: service_account
-
     - name: "Kibana service account - user/pass"
       verbosity: error
       auth_key: kibana:kibana
 
-    - name: "PROBE"
-      verbosity: error
-      auth_key: "elastic-internal-probe:${INTERNAL_PROBE_PASS}"
-
-    - name: "ELASTIC-INTERNAL"
-      verbosity: error
-      auth_key: "elastic-internal:${INTERNAL_USR_PASS}"
-
     - name: PERSONAL_GRP
       groups: [personal_group]
       <<: *common-rules

diff --git a/e2e-tests/cypress/fixtures/roStrictSettings.json b/e2e-tests/cypress/fixtures/roStrictSettings.json
diff --git a/e2e-tests/cypress/fixtures/roStrictSettings.yaml b/e2e-tests/cypress/fixtures/roStrictSettings.yaml
@@ -23,24 +23,10 @@ readonlyrest:
         index_template: "'readonlyrest_audit_'yyyy-MM-dd"
 
   access_control_rules:
-
-    - name: "Kibana service account - token"
-      verbosity: error
-      token_authentication:
-        token: "Bearer ${KIBANA_SERVICE_ACCOUNT_TOKEN}" 
-        username: service_account
 
     - name: "Kibana service account - user/pass"
       verbosity: error
       auth_key: kibana:kibana
-
-    - name: "PROBE"
-      verbosity: error
-      auth_key: "elastic-internal-probe:${INTERNAL_PROBE_PASS}"
-
-    - name: "ELASTIC-INTERNAL"
-      verbosity: error
-      auth_key: "elastic-internal:${INTERNAL_USR_PASS}"
 
     - name: PERSONAL_GRP
       groups: [personal_group]