mirror of
https://github.com/optim-enterprises-bv/vault.git
synced 2025-10-29 09:42:25 +00:00
* Client Count Routing Updates (#24733) * updates client count routing for sync and future additions * adds copyright header to clients sync template * adds missing copyright headers * UI: Adds secret_syncs to mirage /activity endpoint (#24846) * add secret_syncs to mirage endpoint * import clients handler * UI: Set up client charts for incoming sync data (#24852) * sum stacked bar values for tooltip total * make tooltip dynamic based on chartLegend * remove redundant helper * add secret_syncs to client count utils * move sum function to helper * update horizontal bar chart to include sync_clients * calculate sum of bars in tooltip * rename color palette const, define chart legends in each parent component instead of token.js * update tooltips * update mirage handler to add sys/ namespace * update mirage handler to add sys/ namespace * use pushObject * update test * UI: Secret sync bar chart (#24926) * install lineal * add ember-style-modifier dep * Add client count types for serialized data * Add sync bar chart component with tests * Chart is responsive * address comments * Clients Counts Parent Route (#24899) * adds interfaces for clients models * moves date formatting logic from clients activity adapter to utils file * adds clients counts route * updates links to clients route to point to top level and updates redirect to counts overview route * removes clients base route and moves overview and sync routes under counts * adds clients counts page component * converts clients route to ts * adds billing start timestamp to clients config mirage response and updates counts route to always attempt to fetch activity * fixes issue with updating namespace and auth mount query params always triggering client counts route model hook * adds tests for clients counts page component * adds missing copyright header to client-counts type file * Update ui/app/components/clients/page/counts.hbs Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com> * fixes bad import in sync-bar-chart * updates clients counts route to bypass query if there is not start_time * pins d3-shape to 1.3.7 for now -- makes lineal play nice with old charts * fixes sync bar chart tooltip assertion --------- Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com> * UI: convert line-chart to lineal (#24961) * lineal chart alongside svg * Add version-history to sync handler for testing * line chart is TS, test updated * remove d3-shape resolution * fix clients/token-test * use chartHeight in running-total template * use M/yy key instead of timestamp, chart is responsive * Add test for swapping datasets * add more edge case tests * more test * remove untrue assertion * fix weird decimal when between 1.1k and 2k * address feedback * Update line-chart to use timestamp instead of month key * Add timestamp to all places where month is on the clients activity response * Client Counts Overview (#24969) * adds counts base component for use in client counts child routes * adds clients counts overview page component * splits out monthly new chart from clients running total component * adds missing copyright headers * moves running total related assertions from token to overview acceptance test * removes new client assertions from running-total test and adds tests for monthly-new component * updates copy in running-total component * fixes clients overview tests * fixes timestamp stub not being restored in monthly-new test * fixes mfa-login test * renames counts component to activity * removes unused selectedAuthMethod arg from running-total component * adds timestamp back to running-total component * Secrets sync UI: add sync page component (#24982) * adds counts base component for use in client counts child routes * adds clients counts overview page component * splits out monthly new chart from clients running total component * adds missing copyright headers * move sync-bar-chart to charts/ folder * update types and rename chart * rename template file * moves running total related assertions from token to overview acceptance test * removes new client assertions from running-total test and adds tests for monthly-new component * updates copy in running-total component * fixes clients overview tests * fixes timestamp stub not being restored in monthly-new test * fixes mfa-login test * fix 0 values erroring charts * separate timestamp again * address merge conflicts * finish building sync chart component WIP css * renames counts component to activity * update import * revert name to dataKey * update styling for charts without legends * use monthly stat chart component for layout * use monthly chart stats in monthly new * implement stat wrapper; * remove extra grid div * rename component * fix legend css; * update test[ * remove arbitrarily setting max * add single month view * use stat text * update line chart tests * rename line chart * update tests --------- Co-authored-by: Jordan Reimer <zofskeez@gmail.com> * update selectors * add sync page tests * Secrets Sync UI: Add secrets syncs to csv export (#25056) * update mirage and add sync clients to export csv * fix sync legend label * remove word * update copy in modal * update mirage * fix attribution tooltip text * Clients Counts Token Route (#25019) * renames token route and page component back to dashboard * adds client counts token route and page component * updates charts in token page to use ChartContainer component * adds tests for clients token page component * restore clients dashboard test * use var for chart title sync page * updates clients token page to show usage stats when querying single month * updates token page clients averages to only include entity and non-entity clients in calculation * fixes monthly total counts lower than new clients in mirage handler * fixes token test --------- Co-authored-by: clairebontempo@gmail.com <clairebontempo@gmail.com> * Clients Usage Stats/Running Total Updates (#25094) * updates clients usage counts and running totals * updates usage stats total copy * fixes client counts overview tests * Secrets sync UI: cleanup and consolidation of components (#25090) * rename authMethod to mountPath * generalize count template copy * add todo to delete monthly new component * rename to tokenTab * wrap filters in conditional checking for start timestamp * some users may not have access to /config endpoint * fix querying when user has no billing date permissions and clicks current billing period * extend activity component from counts page * Revert "extend activity component from counts page" This reverts commit 1d0e85c82faf88c4385a04b1a5841cdde7fd00e0. * rename to startTimestampISO * remove timestamp from route and just use activity model responseTimestamp * fix chart y domain max * fix typos in usage stat and running totals component * delete backing class for display only template; * updates tests * adds comment for fetching license to get start date for billing * cleans up unused client counts files (#25157) * adds changelog * fix assertion copy * adds changelog description * updates enterprise sidebar nav test --------- Co-authored-by: clairebontempo@gmail.com <clairebontempo@gmail.com> Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com> Co-authored-by: Chelsea Shaw <82459713+hashishaw@users.noreply.github.com>
498 lines
16 KiB
JavaScript
498 lines
16 KiB
JavaScript
/**
|
|
* Copyright (c) HashiCorp, Inc.
|
|
* SPDX-License-Identifier: BUSL-1.1
|
|
*/
|
|
|
|
import { Response } from 'miragejs';
|
|
import { camelize } from '@ember/string';
|
|
import { findDestination } from 'core/helpers/sync-destinations';
|
|
import clientsHandler from './clients';
|
|
|
|
export const associationsResponse = (schema, req) => {
|
|
const { type, name } = req.params;
|
|
const records = schema.db.syncAssociations.where({ type, name });
|
|
|
|
return {
|
|
data: {
|
|
associated_secrets: records.length
|
|
? records.reduce((associations, association) => {
|
|
const key = `${association.mount}/${association.secret_name}`;
|
|
delete association.type;
|
|
delete association.name;
|
|
associations[key] = association;
|
|
return associations;
|
|
}, {})
|
|
: {},
|
|
store_name: name,
|
|
store_type: type,
|
|
},
|
|
};
|
|
};
|
|
|
|
export const syncStatusResponse = (schema, req) => {
|
|
const { mount, secret_name } = req.queryParams;
|
|
const records = schema.db.syncAssociations.where({ mount, secret_name });
|
|
if (!records.length) {
|
|
return new Response(404, {}, { errors: [] });
|
|
}
|
|
const STATUSES = ['SYNCED', 'SYNCING', 'UNSYNCED', 'UNSYNCING', 'INTERNAL_VAULT_ERROR', 'UNKNOWN'];
|
|
const generatedRecords = records.reduce((records, record, index) => {
|
|
const destinationType = record.type;
|
|
const destinationName = record.name;
|
|
record.sync_status = STATUSES[index];
|
|
const key = `${destinationType}/${destinationName}`;
|
|
records[key] = record;
|
|
return records;
|
|
}, {});
|
|
if (records.length === 5) {
|
|
// create one more record with sync_status = 'UNKNOWN' to mock each status option
|
|
generatedRecords['aws-sm/my-aws-destination'] = {
|
|
...generatedRecords['aws-sm/destination-aws'],
|
|
sync_status: 'UNKNOWN',
|
|
name: 'my-aws-destination',
|
|
updated_at: new Date().toISOString(),
|
|
};
|
|
}
|
|
return {
|
|
data: {
|
|
associated_destinations: generatedRecords,
|
|
},
|
|
};
|
|
};
|
|
|
|
const createOrUpdateDestination = (schema, req) => {
|
|
const { type, name } = req.params;
|
|
const request = JSON.parse(req.requestBody);
|
|
const apiResponse = {};
|
|
for (const attr in request) {
|
|
// API returns ***** for credentials sent in a request
|
|
// and returns nothing if empty (assume using environment variables)
|
|
const { maskedParams } = findDestination(type);
|
|
if (maskedParams.includes(camelize(attr))) {
|
|
apiResponse[attr] = request[attr] === '' ? '' : '*****';
|
|
} else {
|
|
apiResponse[attr] = request[attr];
|
|
}
|
|
}
|
|
const data = { ...apiResponse, type, name };
|
|
schema.db.syncDestinations.firstOrCreate({ type, name }, data);
|
|
return schema.db.syncDestinations.update({ type, name }, data);
|
|
};
|
|
|
|
export default function (server) {
|
|
const base = '/sys/sync/destinations';
|
|
const uri = `${base}/:type/:name`;
|
|
|
|
const destinationResponse = (record) => {
|
|
delete record.id;
|
|
const { name, type, ...connection_details } = record;
|
|
return {
|
|
data: {
|
|
connection_details,
|
|
name,
|
|
type,
|
|
},
|
|
};
|
|
};
|
|
|
|
// destinations
|
|
server.get(base, (schema) => {
|
|
const records = schema.db.syncDestinations.where({});
|
|
if (!records.length) {
|
|
return new Response(404, {}, { errors: [] });
|
|
}
|
|
return {
|
|
data: {
|
|
key_info: records.reduce((keyInfo, record) => {
|
|
const key = `${record.type}/`;
|
|
if (!keyInfo[key]) {
|
|
keyInfo[key] = [record.name];
|
|
} else {
|
|
keyInfo[key].push(record.name);
|
|
}
|
|
return keyInfo;
|
|
}, {}),
|
|
keys: records.map((r) => `${r.type}/`),
|
|
},
|
|
};
|
|
});
|
|
server.get(uri, (schema, req) => {
|
|
const { type, name } = req.params;
|
|
const record = schema.db.syncDestinations.findBy({ type, name });
|
|
if (record) {
|
|
return destinationResponse(record);
|
|
}
|
|
return new Response(404, {}, { errors: [] });
|
|
});
|
|
server.post(uri, (schema, req) => {
|
|
const record = createOrUpdateDestination(schema, req);
|
|
return destinationResponse(record);
|
|
});
|
|
server.patch(uri, (schema, req) => {
|
|
const record = createOrUpdateDestination(schema, req);
|
|
return destinationResponse(record);
|
|
});
|
|
server.delete(uri, (schema, req) => {
|
|
const { type, name } = req.params;
|
|
schema.db.syncDestinations.update(
|
|
{ type, name },
|
|
// these parameters are added after a purge delete is initiated
|
|
// if only `purge_initiated_at` exists the delete progress banner renders
|
|
// if `purge_error` also has a value then delete failed banner renders
|
|
{
|
|
purge_initiated_at: '2024-01-09T16:54:28.463879-07:00',
|
|
// WIP (backend hasn't added yet) update when we have a realistic error message)
|
|
// purge_error: '1 error occurred: association could for some confusing reason not be un-synced!',
|
|
}
|
|
);
|
|
const record = schema.db.syncDestinations.findBy({ type, name });
|
|
return destinationResponse(record);
|
|
// return the following instead to test immediate deletion
|
|
// schema.db.syncDestinations.remove({ type, name });
|
|
// return new Response(204);
|
|
});
|
|
// associations
|
|
server.get('/sys/sync/associations', (schema) => {
|
|
const records = schema.db.syncAssociations.where({});
|
|
if (!records.length) {
|
|
return new Response(404, {}, { errors: [] });
|
|
}
|
|
// for now we only care about the total_associations value
|
|
return {
|
|
data: {
|
|
key_info: {},
|
|
keys: [],
|
|
total_associations: records.length,
|
|
total_secrets: records.reduce((secrets, association) => {
|
|
const secretPath = `${association.mount}/${association.secret_name}`;
|
|
if (!secrets.includes(secretPath)) {
|
|
secrets.push(secretPath);
|
|
}
|
|
return secrets;
|
|
}, []),
|
|
},
|
|
};
|
|
});
|
|
server.get(`${uri}/associations`, (schema, req) => {
|
|
return associationsResponse(schema, req);
|
|
});
|
|
server.post(`${uri}/associations/set`, (schema, req) => {
|
|
const { type, name } = req.params;
|
|
const { secret_name, mount } = JSON.parse(req.requestBody);
|
|
if (secret_name.slice(-1) === '/') {
|
|
return new Response(
|
|
400,
|
|
{},
|
|
{ errors: ['Secret not found. Please provide full path to existing secret'] }
|
|
);
|
|
}
|
|
const data = { type, name, mount, secret_name };
|
|
schema.db.syncAssociations.firstOrCreate({ type, name }, data);
|
|
schema.db.syncAssociations.update(
|
|
{ type, name },
|
|
{ ...data, sync_status: 'SYNCED', updated_at: new Date().toISOString() }
|
|
);
|
|
return associationsResponse(schema, req);
|
|
});
|
|
server.post(`${uri}/associations/remove`, (schema, req) => {
|
|
const { type, name } = req.params;
|
|
schema.db.syncAssociations.update({ type, name }, { sync_status: 'UNSYNCED' });
|
|
return associationsResponse(schema, req);
|
|
});
|
|
server.get('sys/sync/associations/:mount/*name', (schema, req) => {
|
|
return syncStatusResponse(schema, req);
|
|
});
|
|
|
|
// SYNC CLIENTS ACTIVITY RESPONSE
|
|
|
|
// DYNAMIC RESPONSE (with date querying)
|
|
clientsHandler(server); // imports all of the endpoints defined in mirage/handlers/clients file
|
|
|
|
// STATIC RESPONSE (0 entity/non-entity clients)
|
|
/*
|
|
server.get('/sys/internal/counters/activity', (schema, req) => {
|
|
let { start_time, end_time } = req.queryParams;
|
|
// backend returns a timestamp if given unix time, so first convert to timestamp string here
|
|
if (!start_time.includes('T')) start_time = fromUnixTime(start_time).toISOString();
|
|
if (!end_time.includes('T')) end_time = fromUnixTime(end_time).toISOString();
|
|
return {
|
|
request_id: 'some-activity-id',
|
|
lease_id: '',
|
|
renewable: false,
|
|
lease_duration: 0,
|
|
data: {
|
|
start_time, // set by query params
|
|
end_time, // set by query params
|
|
total: {
|
|
clients: 15,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 15,
|
|
},
|
|
by_namespace: [
|
|
{
|
|
counts: {
|
|
clients: 15,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 15,
|
|
},
|
|
mounts: [
|
|
{
|
|
counts: {
|
|
clients: 15,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 15,
|
|
},
|
|
mount_path: 'sys/',
|
|
},
|
|
],
|
|
namespace_id: 'root',
|
|
namespace_path: '',
|
|
},
|
|
],
|
|
months: [
|
|
{ counts: null, namespaces: null, new_clients: null, timestamp: '2023-09-01T00:00:00Z' },
|
|
{
|
|
counts: {
|
|
clients: 10,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 10,
|
|
},
|
|
namespaces: [
|
|
{
|
|
counts: {
|
|
clients: 10,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 10,
|
|
},
|
|
mounts: [
|
|
{
|
|
counts: {
|
|
clients: 10,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 10,
|
|
},
|
|
mount_path: 'sys/',
|
|
},
|
|
],
|
|
namespace_id: 'root',
|
|
namespace_path: '',
|
|
},
|
|
],
|
|
new_clients: {
|
|
counts: {
|
|
clients: 10,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 10,
|
|
},
|
|
namespaces: [
|
|
{
|
|
counts: {
|
|
clients: 10,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 10,
|
|
},
|
|
mounts: [
|
|
{
|
|
counts: {
|
|
clients: 10,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 10,
|
|
},
|
|
mount_path: 'sys/',
|
|
},
|
|
],
|
|
namespace_id: 'root',
|
|
namespace_path: '',
|
|
},
|
|
],
|
|
},
|
|
timestamp: '2023-10-01T00:00:00Z',
|
|
},
|
|
{
|
|
counts: {
|
|
clients: 7,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 7,
|
|
},
|
|
namespaces: [
|
|
{
|
|
counts: {
|
|
clients: 7,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 7,
|
|
},
|
|
mounts: [
|
|
{
|
|
counts: {
|
|
clients: 7,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 7,
|
|
},
|
|
mount_path: 'sys/',
|
|
},
|
|
],
|
|
namespace_id: 'root',
|
|
namespace_path: '',
|
|
},
|
|
],
|
|
new_clients: {
|
|
counts: {
|
|
clients: 3,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 3,
|
|
},
|
|
namespaces: [
|
|
{
|
|
counts: {
|
|
clients: 3,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 3,
|
|
},
|
|
mounts: [
|
|
{
|
|
counts: {
|
|
clients: 3,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 3,
|
|
},
|
|
mount_path: 'sys/',
|
|
},
|
|
],
|
|
namespace_id: 'root',
|
|
namespace_path: '',
|
|
},
|
|
],
|
|
},
|
|
timestamp: '2023-11-01T00:00:00Z',
|
|
},
|
|
{
|
|
counts: {
|
|
clients: 7,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 7,
|
|
},
|
|
namespaces: [
|
|
{
|
|
counts: {
|
|
clients: 7,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 7,
|
|
},
|
|
mounts: [
|
|
{
|
|
counts: {
|
|
clients: 7,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 7,
|
|
},
|
|
mount_path: 'sys/',
|
|
},
|
|
],
|
|
namespace_id: 'root',
|
|
namespace_path: '',
|
|
},
|
|
],
|
|
new_clients: {
|
|
counts: {
|
|
clients: 2,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 2,
|
|
},
|
|
namespaces: [
|
|
{
|
|
counts: {
|
|
clients: 2,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 2,
|
|
},
|
|
mounts: [
|
|
{
|
|
counts: {
|
|
clients: 2,
|
|
distinct_entities: 0,
|
|
entity_clients: 0,
|
|
non_entity_clients: 0,
|
|
non_entity_tokens: 0,
|
|
secret_syncs: 2,
|
|
},
|
|
mount_path: 'sys/',
|
|
},
|
|
],
|
|
namespace_id: 'root',
|
|
namespace_path: '',
|
|
},
|
|
],
|
|
},
|
|
timestamp: '2023-12-01T00:00:00Z',
|
|
},
|
|
],
|
|
},
|
|
wrap_info: null,
|
|
warnings: null,
|
|
auth: null,
|
|
};
|
|
});
|
|
|
|
*/
|
|
}
|