Skip to content

Commit fd777f7

Browse files
wanglamwanglam
committed
Debug failed request overwrite
Signed-off-by: Lin Wang <[email protected]>
1 parent 3650221 commit fd777f7

File tree

2 files changed

+45
-41
lines changed

2 files changed

+45
-41
lines changed

‎.github/workflows/assistant-release-e2e-workflow.yml‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -16,57 +16,57 @@ jobs:
1616
- 'cypress/**/dashboards-assistant/**'
1717
- 'cypress/support/assistant-dummy-llm.js'
1818
19-
tests-with-security:
20-
needs: changes
21-
if: ${{ needs.changes.outputs.tests == 'true' }}
22-
uses: ./.github/workflows/release-e2e-workflow-template.yml
23-
with:
24-
test-name: dashboards assistant
25-
test-command: env CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/*chatbot*.js'
26-
osd-serve-args: --assistant.chat.enabled=true
27-
artifact-name-suffix: '-with-security'
19+
# tests-with-security:
20+
# needs: changes
21+
# if: ${{ needs.changes.outputs.tests == 'true' }}
22+
# uses: ./.github/workflows/release-e2e-workflow-template.yml
23+
# with:
24+
# test-name: dashboards assistant
25+
# test-command: env CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/*chatbot*.js'
26+
# osd-serve-args: --assistant.chat.enabled=true
27+
# artifact-name-suffix: '-with-security'
2828

29-
tests-without-security:
30-
needs: changes
31-
if: ${{ needs.changes.outputs.tests == 'true' }}
32-
uses: ./.github/workflows/release-e2e-workflow-template.yml
33-
with:
34-
test-name: dashboards assistant
35-
test-command: env CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true yarn cypress:run-without-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/*chatbot*.js'
36-
osd-serve-args: --assistant.chat.enabled=true
37-
security-enabled: false
38-
artifact-name-suffix: '-without-security'
39-
multi-opensearch-enabled: false
29+
# tests-without-security:
30+
# needs: changes
31+
# if: ${{ needs.changes.outputs.tests == 'true' }}
32+
# uses: ./.github/workflows/release-e2e-workflow-template.yml
33+
# with:
34+
# test-name: dashboards assistant
35+
# test-command: env CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true yarn cypress:run-without-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/*chatbot*.js'
36+
# osd-serve-args: --assistant.chat.enabled=true
37+
# security-enabled: false
38+
# artifact-name-suffix: '-without-security'
39+
# multi-opensearch-enabled: false
4040

41-
tests-with-multiple-data-source-and-disabled-local-cluster:
42-
needs: changes
43-
if: ${{ needs.changes.outputs.tests == 'true' }}
44-
uses: ./.github/workflows/release-e2e-workflow-template.yml
45-
with:
46-
test-name: dashboards assistant
47-
test-command: env CYPRESS_DISABLE_LOCAL_CLUSTER=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/mds_chatbot*.js'
48-
osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --data_source.hideLocalCluster=true --assistant.chat.enabled=true
49-
security-enabled: true
50-
artifact-name-suffix: '-with-security-and-mds'
41+
# tests-with-multiple-data-source-and-disabled-local-cluster:
42+
# needs: changes
43+
# if: ${{ needs.changes.outputs.tests == 'true' }}
44+
# uses: ./.github/workflows/release-e2e-workflow-template.yml
45+
# with:
46+
# test-name: dashboards assistant
47+
# test-command: env CYPRESS_DISABLE_LOCAL_CLUSTER=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/mds_chatbot*.js'
48+
# osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --data_source.hideLocalCluster=true --assistant.chat.enabled=true
49+
# security-enabled: true
50+
# artifact-name-suffix: '-with-security-and-mds'
5151

52-
tests-with-query-enhancements:
53-
needs: changes
54-
if: ${{ needs.changes.outputs.tests == 'true' }}
55-
uses: ./.github/workflows/release-e2e-workflow-template.yml
56-
with:
57-
test-name: dashboards assistant
58-
test-command: env CYPRESS_DISABLE_LOCAL_CLUSTER=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true CYPRESS_WORKSPACE_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/mds_query_enhancements*.js'
59-
osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --data_source.hideLocalCluster=true --assistant.chat.enabled=true --assistant.alertInsight.enabled=true --assistant.smartAnomalyDetector.enabled=true --queryEnhancements.queryAssist.summary.enabled=true --uiSettings.overrides.home:useNewHomePage=true --uiSettings.overrides.query:enhancements:enabled=true --workspace.enabled=true --savedObjects.permission.enabled=true --assistant.text2viz.enabled=true --opensearchDashboards.dashboardAdmin.users='["admin"]' --opensearch_security.multitenancy.enabled=false
60-
security-enabled: true
61-
artifact-name-suffix: '-with-query-enhancements'
52+
# tests-with-query-enhancements:
53+
# needs: changes
54+
# if: ${{ needs.changes.outputs.tests == 'true' }}
55+
# uses: ./.github/workflows/release-e2e-workflow-template.yml
56+
# with:
57+
# test-name: dashboards assistant
58+
# test-command: env CYPRESS_DISABLE_LOCAL_CLUSTER=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true CYPRESS_WORKSPACE_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/mds_query_enhancements*.js'
59+
# osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --data_source.hideLocalCluster=true --assistant.chat.enabled=true --assistant.alertInsight.enabled=true --assistant.smartAnomalyDetector.enabled=true --queryEnhancements.queryAssist.summary.enabled=true --uiSettings.overrides.home:useNewHomePage=true --uiSettings.overrides.query:enhancements:enabled=true --workspace.enabled=true --savedObjects.permission.enabled=true --assistant.text2viz.enabled=true --opensearchDashboards.dashboardAdmin.users='["admin"]' --opensearch_security.multitenancy.enabled=false
60+
# security-enabled: true
61+
# artifact-name-suffix: '-with-query-enhancements'
6262

6363
tests-with-assistant-feature-flag:
6464
needs: changes
6565
if: ${{ needs.changes.outputs.tests == 'true' }}
6666
uses: ./.github/workflows/release-e2e-workflow-template.yml
6767
with:
6868
test-name: dashboards assistant
69-
test-command: env CYPRESS_DISABLE_LOCAL_CLUSTER=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=false CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true CYPRESS_WORKSPACE_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/mds_assistant_feature_flag_spec.js'
69+
test-command: env CYPRESS_DISABLE_LOCAL_CLUSTER=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true CYPRESS_WORKSPACE_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/mds_assistant_feature_flag_spec.js'
7070
osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --data_source.hideLocalCluster=true --assistant.chat.enabled=true --assistant.alertInsight.enabled=true --assistant.smartAnomalyDetector.enabled=true --queryEnhancements.queryAssist.summary.enabled=true --uiSettings.overrides.home:useNewHomePage=true --uiSettings.overrides.query:enhancements:enabled=true --workspace.enabled=true --savedObjects.permission.enabled=true --assistant.text2viz.enabled=true --opensearchDashboards.dashboardAdmin.users='["admin","workspace-test"]' --opensearch_security.multitenancy.enabled=false
7171
security-enabled: true
7272
artifact-name-suffix: '-with-assistant-feature-flag'

‎cypress/utils/commands.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ Cypress.Commands.overwrite('visit', (orig, url, options) => {
108108
}
109109
});
110110

111+
cy.log("Overwrite request here...")
111112
/**
112113
* Overwrite request command to support authentication similar to visit.
113114
* The request function parameters can be url, or (method, url), or (method, url, body).
@@ -129,6 +130,9 @@ Cypress.Commands.overwrite('request', (originalFn, ...args) => {
129130
[options.method, options.url, options.body] = args;
130131
}
131132

133+
cy.log('currentBackendEndpoint.get():' + currentBackendEndpoint.get());
134+
cy.log('options.url:[' + options.url+']');
135+
cy.log('BACKEND_BASE_PATH:' + BACKEND_BASE_PATH);
132136
/**
133137
*
134138
* Overwrite opensearch backend endpoint to customized endpoint if data source management enabled and

0 commit comments

Comments
 (0)