Skip to content

Commit 6149e3c

Browse files
peterzhuamazonangle943
peterzhuamazon
and
angle943
authored
Backport main branch from 3.7 branch #2058 #2062 #2063 #2064 (#2065)
* Skip flaky searchOnPageLoad test in discover.spec.js (#2058) Signed-off-by: Justin Kim <jungkm@amazon.com> * Fix filter_editor combo box assertion for Cypress 13 (#2062) Signed-off-by: Justin Kim <jungkm@amazon.com> * [3.7] Update windows and linux to have different llm js startup/stop scripts (#2063) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Make sure libssl curl is used to handle pem (#2064) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> --------- Signed-off-by: Justin Kim <jungkm@amazon.com> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: Justin Kim <jungkm@amazon.com>
1 parent a77582a commit 6149e3c

7 files changed

Lines changed: 126 additions & 34 deletions

File tree

‎cypress.config.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ module.exports = defineConfig({
3939
SAVED_OBJECTS_PERMISSION_ENABLED: false,
4040
DASHBOARDS_INVESTIGATION_ENABLED: true,
4141
DISABLE_LOCAL_CLUSTER: false,
42+
SECURITY_CERT_PATH: 'cypress/resources/kirk.pem',
43+
SECURITY_KEY_PATH: 'cypress/resources/kirk-key.pem',
4244
browserPermissions: {
4345
clipboard: 'allow',
4446
},

‎cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/discover.spec.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,9 @@ describe('discover app', { scrollBehavior: false }, () => {
209209
});
210210
});
211211

212-
describe('usage of discover:searchOnPageLoad', () => {
212+
// TODO: Re-enable after the Cypress 13 searchOnPageLoad flake is fixed.
213+
// Skipping entire block: setting searchOnPageLoad to false poisons state for subsequent tests.
214+
describe.skip('usage of discover:searchOnPageLoad', () => {
213215
it('should fetch data from OpenSearch initially when discover:searchOnPageLoad is false', function () {
214216
cy.setAdvancedSetting({
215217
'discover:searchOnPageLoad': false,
@@ -279,7 +281,8 @@ describe('discover app', { scrollBehavior: false }, () => {
279281
});
280282
});
281283

282-
describe('refresh interval', function () {
284+
// TODO: Re-enable after Cypress 13 state management issues are resolved.
285+
describe.skip('refresh interval', function () {
283286
it('should refetch when autofresh is enabled', () => {
284287
cy.getElementByTestId('openInspectorButton').click();
285288
cy.getElementByTestId('inspectorPanel')

‎cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/filter_editor.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ describe('discover filter editor', () => {
5454
cy.get('[data-test-subj~="filter-key-extension.raw"]').click();
5555
cy.getElementByTestId('editFilter').click();
5656
cy.getElementByTestId('filterFieldSuggestionList').should(
57-
'have.text',
57+
'contain.text',
5858
'extension.raw'
5959
);
6060
cy.get('[data-test-subj~="filterParamsComboBox"]').should(
61-
'have.text',
61+
'contain.text',
6262
'jpg'
6363
);
6464
cy.getElementByTestId('cancelSaveFilter').click();

‎cypress/utils/plugins/dashboards-assistant/commands.js‎

Lines changed: 49 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,19 @@ Cypress.Commands.add('putAgentIdConfig', ({ type, agentName, agentId }) => {
217217
!Cypress.env('DATASOURCE_MANAGEMENT_ENABLED')
218218
) {
219219
// The .plugins-ml-config index is a system index and need to call the API by using certificate file
220-
return cy.exec(
221-
`curl -k --cert <(cat <<EOF \n${certPublicKeyContent}\nEOF\n) --key <(cat <<EOF\n${certPrivateKeyContent}\nEOF\n) -XPUT '${endpoint}' -H 'Content-Type: application/json' -d '{"type":"os_chat_root_agent","configuration":{"agent_id":"${agentId}"}}'`
222-
);
220+
if (Cypress.platform === 'win32') {
221+
return cy.exec(
222+
`curl -k --cert "${Cypress.env(
223+
'SECURITY_CERT_PATH'
224+
)}" --key "${Cypress.env(
225+
'SECURITY_KEY_PATH'
226+
)}" -XPUT "${endpoint}" -H "Content-Type: application/json" -d "{\\"type\\":\\"os_chat_root_agent\\",\\"configuration\\":{\\"agent_id\\":\\"${agentId}\\"}}"`
227+
);
228+
} else {
229+
return cy.exec(
230+
`curl -k --cert <(cat <<EOF \n${certPublicKeyContent}\nEOF\n) --key <(cat <<EOF\n${certPrivateKeyContent}\nEOF\n) -XPUT '${endpoint}' -H 'Content-Type: application/json' -d '{"type":"os_chat_root_agent","configuration":{"agent_id":"${agentId}"}}'`
231+
);
232+
}
223233
} else {
224234
return cy.request('PUT', endpoint, {
225235
type,
@@ -241,9 +251,19 @@ Cypress.Commands.add('deleteAgentConfig', ({ agentName }) => {
241251
!Cypress.env('DATASOURCE_MANAGEMENT_ENABLED')
242252
) {
243253
// The .plugins-ml-config index is a system index and need to call the API by using certificate file
244-
return cy.exec(
245-
`curl -k --cert <(cat <<EOF \n${certPublicKeyContent}\nEOF\n) --key <(cat <<EOF\n${certPrivateKeyContent}\nEOF\n) -XDELETE '${endpoint}' -H 'Content-Type: application/json'`
246-
);
254+
if (Cypress.platform === 'win32') {
255+
return cy.exec(
256+
`curl -k --cert "${Cypress.env(
257+
'SECURITY_CERT_PATH'
258+
)}" --key "${Cypress.env(
259+
'SECURITY_KEY_PATH'
260+
)}" -XDELETE "${endpoint}" -H "Content-Type: application/json"`
261+
);
262+
} else {
263+
return cy.exec(
264+
`curl -k --cert <(cat <<EOF \n${certPublicKeyContent}\nEOF\n) --key <(cat <<EOF\n${certPrivateKeyContent}\nEOF\n) -XDELETE '${endpoint}' -H 'Content-Type: application/json'`
265+
);
266+
}
247267
} else {
248268
return cy.request('DELETE', endpoint);
249269
}
@@ -274,10 +294,18 @@ Cypress.Commands.add('cleanProvisionedAgents', () => {
274294
Cypress.Commands.add('startDummyServer', () => {
275295
// Not a good practice to start a server inside Cypress https://docs.cypress.io/guides/references/best-practices#Web-Servers
276296
// But in out case, we need to reuse release e2e template and let's make it a tradeoff.
277-
cy.exec(
278-
"nohup yarn start-assistant-dummy-llm-server > /tmp/assistant-llm.log 2>&1 & sleep 1 && ps -ef | grep [a]ssistant-dummy-llm.js | head -n 1 | awk '{print $2}' > /tmp/assistant-llm.pid",
279-
{ timeout: 10000 }
280-
);
297+
const isWindows = Cypress.platform === 'win32';
298+
if (isWindows) {
299+
cy.exec(
300+
'bash -c "nohup yarn start-assistant-dummy-llm-server > /tmp/assistant-llm.log 2>&1 & echo $(cat /proc/$!/winpid) > /tmp/assistant-llm.winpid && sleep 1"',
301+
{ timeout: 10000 }
302+
);
303+
} else {
304+
cy.exec(
305+
"nohup yarn start-assistant-dummy-llm-server > /tmp/assistant-llm.log 2>&1 & sleep 1 && ps -ef | grep [a]ssistant-dummy-llm.js | head -n 1 | awk '{print $2}' > /tmp/assistant-llm.pid",
306+
{ timeout: 10000 }
307+
);
308+
}
281309
// Wait for server to start and verify it's running
282310
cy.wait(3000);
283311
cy.exec(
@@ -291,9 +319,17 @@ Cypress.Commands.add('startDummyServer', () => {
291319
});
292320

293321
Cypress.Commands.add('stopDummyServer', () => {
294-
cy.exec('kill -9 $(cat /tmp/assistant-llm.pid) || true', {
295-
failOnNonZeroExit: false,
296-
});
322+
const isWindows = Cypress.platform === 'win32';
323+
if (isWindows) {
324+
cy.exec(
325+
'bash -c "pid=$(cat /tmp/assistant-llm.winpid); while child=$(wmic process where \\"ParentProcessId=$pid\\" get ProcessId 2>/dev/null | tail -2 | head -1 | tr -d \' \\r\') && [ -n \\"$child\\" ]; do pid=$child; done; taskkill //F //PID $pid"',
326+
{ failOnNonZeroExit: false }
327+
);
328+
} else {
329+
cy.exec('kill -9 $(cat /tmp/assistant-llm.pid) || true', {
330+
failOnNonZeroExit: false,
331+
});
332+
}
297333
});
298334

299335
Cypress.Commands.add('sendAssistantMessage', (body, dataSourceId) => {

‎cypress/utils/plugins/dashboards-investigation/commands.js‎

Lines changed: 51 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,19 @@ Cypress.Commands.add(
237237
agentName
238238
)}`;
239239
if (BACKEND_BASE_PATH.startsWith('https')) {
240-
return cy.exec(
241-
`curl -k --cert <(cat <<EOF \n${certPublicKeyContent}\nEOF\n) --key <(cat <<EOF\n${certPrivateKeyContent}\nEOF\n) -XPUT '${endpoint}' -H 'Content-Type: application/json' -d '{"type":"${type}","configuration":{"agent_id":"${agentId}"}}'`
242-
);
240+
if (Cypress.platform === 'win32') {
241+
return cy.exec(
242+
`curl -k --cert "${Cypress.env(
243+
'SECURITY_CERT_PATH'
244+
)}" --key "${Cypress.env(
245+
'SECURITY_KEY_PATH'
246+
)}" -XPUT "${endpoint}" -H "Content-Type: application/json" -d "{\\"type\\":\\"${type}\\",\\"configuration\\":{\\"agent_id\\":\\"${agentId}\\"}}"`
247+
);
248+
} else {
249+
return cy.exec(
250+
`curl -k --cert <(cat <<EOF \n${certPublicKeyContent}\nEOF\n) --key <(cat <<EOF\n${certPrivateKeyContent}\nEOF\n) -XPUT '${endpoint}' -H 'Content-Type: application/json' -d '{"type":"${type}","configuration":{"agent_id":"${agentId}"}}'`
251+
);
252+
}
243253
} else {
244254
return cy.request('PUT', endpoint, {
245255
type,
@@ -255,10 +265,21 @@ Cypress.Commands.add('deleteInvestigationAgentConfig', ({ agentName }) => {
255265
agentName
256266
)}`;
257267
if (BACKEND_BASE_PATH.startsWith('https')) {
258-
return cy.exec(
259-
`curl -k --cert <(cat <<EOF \n${certPublicKeyContent}\nEOF\n) --key <(cat <<EOF\n${certPrivateKeyContent}\nEOF\n) -XDELETE '${endpoint}' -H 'Content-Type: application/json'`,
260-
{ failOnNonZeroExit: false }
261-
);
268+
if (Cypress.platform === 'win32') {
269+
return cy.exec(
270+
`curl -k --cert "${Cypress.env(
271+
'SECURITY_CERT_PATH'
272+
)}" --key "${Cypress.env(
273+
'SECURITY_KEY_PATH'
274+
)}" -XDELETE "${endpoint}" -H "Content-Type: application/json"`,
275+
{ failOnNonZeroExit: false }
276+
);
277+
} else {
278+
return cy.exec(
279+
`curl -k --cert <(cat <<EOF \n${certPublicKeyContent}\nEOF\n) --key <(cat <<EOF\n${certPrivateKeyContent}\nEOF\n) -XDELETE '${endpoint}' -H 'Content-Type: application/json'`,
280+
{ failOnNonZeroExit: false }
281+
);
282+
}
262283
} else {
263284
return cy.request({
264285
method: 'DELETE',
@@ -310,15 +331,31 @@ Cypress.Commands.add('startInvestigationDummyServer', () => {
310331
// failOnNonZeroExit: false,
311332
// });
312333
cy.wait(500);
313-
cy.exec(
314-
"nohup yarn start-investigation-dummy-llm-server > /tmp/investigation-llm.log 2>&1 & sleep 1 && ps -ef | grep [i]nvestigation-dummy-llm.js | head -n 1 | awk '{print $2}' > /tmp/investigation-llm.pid",
315-
{ timeout: 10000 }
316-
);
334+
const isWindows = Cypress.platform === 'win32';
335+
if (isWindows) {
336+
cy.exec(
337+
'bash -c "nohup yarn start-investigation-dummy-llm-server > /tmp/investigation-llm.log 2>&1 & echo $(cat /proc/$!/winpid) > /tmp/investigation-llm.winpid && sleep 1"',
338+
{ timeout: 10000 }
339+
);
340+
} else {
341+
cy.exec(
342+
"nohup yarn start-investigation-dummy-llm-server > /tmp/investigation-llm.log 2>&1 & sleep 1 && ps -ef | grep [i]nvestigation-dummy-llm.js | head -n 1 | awk '{print $2}' > /tmp/investigation-llm.pid",
343+
{ timeout: 10000 }
344+
);
345+
}
317346
cy.wait(2000);
318347
});
319348

320349
Cypress.Commands.add('stopInvestigationDummyServer', () => {
321-
cy.exec('kill -9 $(cat /tmp/investigation-llm.pid) || true', {
322-
failOnNonZeroExit: false,
323-
});
350+
const isWindows = Cypress.platform === 'win32';
351+
if (isWindows) {
352+
cy.exec(
353+
'bash -c "pid=$(cat /tmp/investigation-llm.winpid); while child=$(wmic process where \\"ParentProcessId=$pid\\" get ProcessId 2>/dev/null | tail -2 | head -1 | tr -d \' \\r\') && [ -n \\"$child\\" ]; do pid=$child; done; taskkill //F //PID $pid"',
354+
{ failOnNonZeroExit: false }
355+
);
356+
} else {
357+
cy.exec('kill -9 $(cat /tmp/investigation-llm.pid) || true', {
358+
failOnNonZeroExit: false,
359+
});
360+
}
324361
});

‎integtest.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22

33
set -e
44

5+
DIR="$(dirname "$0")"
6+
pwd && cd $DIR
7+
8+
# Handle keys properly with path set for assistantDashboards and investigationDashboards
9+
if [ "$OSTYPE" = "msys" ] || [ "$OSTYPE" = "cygwin" ] || [ "$OSTYPE" = "win32" ]; then
10+
PATH="$(cygpath -w "$HOME/scoop/shims"):$PATH"
11+
export CYPRESS_SECURITY_CERT_PATH="$(cygpath -w "$(pwd)/cypress/resources/kirk.pem")"
12+
export CYPRESS_SECURITY_KEY_PATH="$(cygpath -w "$(pwd)/cypress/resources/kirk-key.pem")"
13+
else
14+
export CYPRESS_SECURITY_CERT_PATH="$(pwd)/cypress/resources/kirk.pem"
15+
export CYPRESS_SECURITY_KEY_PATH="$(pwd)/cypress/resources/kirk-key.pem"
16+
fi
17+
518
. ./browser_downloader.sh
619

720
function usage() {

‎package-lock.json‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)