Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Security] Moved reset_creds call to reset_internal_creds #176410

Merged
merged 8 commits into from
Feb 13, 2024
Merged

[Security] Moved reset_creds call to reset_internal_creds #176410

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
39a3b69
Moved reset creds call to reset_internal_creds
dkirchan Feb 7, 2024
f35fad0
Fixed error not to print headers - wrong endpoint
dkirchan Feb 7, 2024
c605b3a
fixes es_archiver issue
MadameSheema Feb 8, 2024
a499a15
Merge branch 'main' into reset-creds-update
dkirchan Feb 9, 2024
e69832d
Fixed reset_internal_credentials for ftr
dkirchan Feb 9, 2024
7a2249c
Merge branch 'reset-creds-update' of github.com:elastic/kibana into r…
dkirchan Feb 9, 2024
69a50a8
Merge branch 'main' into reset-creds-update
dkirchan Feb 13, 2024
afdd149
Added keys to groups
dkirchan Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ KB_URL=$(echo $ENVIRONMENT_DETAILS | jq -r '.endpoints.kibana')
sleep 5

# Resetting the credentials of the elastic user in the project
CREDS_BODY=$(curl -s --location --request POST "$QA_CONSOLE_URL/api/v1/serverless/projects/security/$ID/_reset-credentials" \
CREDS_BODY=$(curl -s --location --request POST "$QA_CONSOLE_URL/api/v1/serverless/projects/security/$ID/_reset-internal-credentials" \
--header "Authorization: ApiKey $QA_API_KEY" \
--header 'Content-Type: application/json' | jq '.')
USERNAME=$(echo $CREDS_BODY | jq -r '.username')
Expand Down
11 changes: 6 additions & 5 deletions x-pack/plugins/security_solution/scripts/run_cypress/parallel_serverless.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ async function resetCredentials(

const fetchResetCredentialsStatusAttempt = async (attemptNum: number) => {
const response = await axios.post(
`${BASE_ENV_URL}/api/v1/serverless/projects/security/${projectId}/_reset-credentials`,
`${BASE_ENV_URL}/api/v1/serverless/projects/security/${projectId}/_reset-internal-credentials`,
{},
{
headers: {
Expand All @@ -199,7 +199,7 @@ async function resetCredentials(
if (error instanceof AxiosError && error.code === 'ENOTFOUND') {
log.info('Project is not reachable. A retry will be triggered soon..');
} else {
log.info(error);
log.error(`${error.message}`);
}
},
retries: 100,
Expand All @@ -223,6 +223,7 @@ function waitForProjectInitialized(projectId: string, apiKey: string): Promise<v
}
);
if (response.data.phase !== 'initialized') {
log.info(response.data);
throw new Error('Project is not initialized. A retry will be triggered soon...');
} else {
log.info('Project is initialized');
Expand All @@ -233,7 +234,7 @@ function waitForProjectInitialized(projectId: string, apiKey: string): Promise<v
if (error instanceof AxiosError && error.code === 'ENOTFOUND') {
log.info('Project is not reachable. A retry will be triggered soon...');
} else {
log.info(error);
log.error(`${error.message}`);
}
},
retries: 100,
Expand Down Expand Up @@ -294,7 +295,7 @@ function waitForKibanaAvailable(kbUrl: string, auth: string, runnerId: string):
`${runnerId}: The Kibana URL is not yet reachable. A retry will be triggered soon...`
);
} else {
log.info(`${runnerId}: ${error}`);
log.info(`${runnerId}: ${error.message}`);
}
},
retries: 50,
Expand Down Expand Up @@ -350,7 +351,7 @@ function waitForKibanaLogin(kbUrl: string, credentials: Credentials): Promise<vo
if (error instanceof AxiosError && error.code === 'ENOTFOUND') {
log.info('Project is not reachable. A retry will be triggered soon...');
} else {
log.info(error);
log.error(`${error.message}`);
}
},
retries: 100,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/security_solution_cypress/cypress/support/es_archiver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const esArchiver = (
const isCloudServerless = config.env.CLOUD_SERVERLESS;

const serverlessCloudUser = {
username: 'elastic',
username: config.env.ELASTICSEARCH_USERNAME,
password: config.env.ELASTICSEARCH_PASSWORD,
};

Expand Down