Skip to content

feature/update-log-api #43

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

Draft
devintrivir wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feature/update-log-api #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 42 additions & 7 deletions src/cli/conn/conn-save.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ export default function setup() {
` Save an existing service account to an existing connection profile (partial host URL only updates an existing profile):\n` +
` $ frodo conn save --sa-id ${s.saId} --sa-jwk-file ${s.saJwkFile} ${s.connId}\n`[
'brightCyan'
] +
` Save an existing log API key and secret to an existing connection profile (partial host URL only updates an existing profile):\n` +
` $ frodo conn save --log-api-key [key] --log-api-secret [secret] ${s.connId}\n`[
'brightCyan'
]
)
.action(
Expand Down Expand Up @@ -91,10 +95,7 @@ export default function setup() {
!state.getServiceAccountId() &&
!state.getServiceAccountJwk();
const needLogApiKey =
options.logApi &&
!state.getLogApiKey() &&
!state.getLogApiSecret() &&
needSa;
options.logApi && !state.getLogApiKey() && !state.getLogApiSecret();
const forceLoginAsUser = needSa || needLogApiKey;
if (
(options.validate && (await getTokens(forceLoginAsUser))) ||
Expand Down Expand Up @@ -126,7 +127,11 @@ export default function setup() {
}
}
// add new service account if none already exists in the profile
else if (!state.getServiceAccountId()) {
else if (
!state.getServiceAccountId() &&
!options.logApiKey &&
!options.logApiSecret
) {
try {
verboseMessage(`Creating service account...`);
const sa = await addNewServiceAccount();
Expand Down Expand Up @@ -194,8 +199,38 @@ export default function setup() {
}
}
}
// add existing log api key and secret without validation
// storing log API key and secret in the connection profile is happening default, therefore no code required here
// add existing log api key and secret to existing connection profile
if (options.logApiKey && options.logApiSecret) {
if (options.validate) {
state.setLogApiKey(options.logApiKey);
state.setLogApiSecret(options.logApiSecret);
verboseMessage(
`Added log API key ${options.logApiKey} to profile without validation.`
);
}
}
// if no existing key/secret is passed create a fresh pair and add to the profile
else if (
state.getDeploymentType() === CLOUD_DEPLOYMENT_TYPE_KEY &&
options.logApi &&
!state.getLogApiKey()
) {
try {
const creds = await provisionCreds();
state.setLogApiKey(creds.api_key_id as string);
state.setLogApiSecret(creds.api_key_secret as string);
printMessage(
`Created log API key ${creds.api_key_id} and secret.`
);
} catch (error) {
printMessage(error.response?.data, 'error');
printMessage(
`Error creating log API key and secret: ${error.response?.data?.message}`,
'error'
);
process.exitCode = 1;
}
}
try {
await saveConnectionProfile(host);
printMessage(`Saved connection profile ${state.getHost()}`);
Expand Down
Loading