Skip to content

Commit 471c0ea

Browse files
added defaultCollections to utils
1 parent ebe4d5c commit 471c0ea

File tree

7 files changed

+20
-13
lines changed

7 files changed

+20
-13
lines changed

2021-08-17-2021-08-17-logs.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"_id":"611bb38611ad1e8e4c351797","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"Running Codefresh YAML validation\r\n","time":1629205382647},{"_id":"611bb38611ad1e8e4c351798","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"YAML validation passed successfully\r\n","time":1629205382738},{"_id":"611bb3981c7b4c0011783aa4","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"Validating connection to Docker daemon...\r\n","time":1629205400975},{"_id":"611bb3991c7b4c0011783aa5","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"Connection to Docker daemon validated\r\n","time":1629205401050},{"_id":"611bb3991c7b4c0011783aa6","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"Creating logging service...\r\n","time":1629205401091},{"_id":"611bb3991c7b4c0011783aa7","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"Logging service created\r\n","time":1629205401494},{"_id":"611bb3991c7b4c0011783aa8","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"Validating logging service\r\n","time":1629205401500},{"_id":"611bb39a1c7b4c0011783aa9","slot":"metrics.memory","payload":{"time":1629205402720,"usage":60108800},"accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791"},{"_id":"611bb39b1c7b4c0011783aaa","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"Logging service validated\r\n","time":1629205403964},{"_id":"611bb39b1c7b4c0011783aab","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"Provisioning volume: workflow_611bb38511ad1e8e4c351792\r\n","time":1629205403995},{"_id":"611bb39c1c7b4c0011783aac","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"Successfully provisioned volume: workflow_611bb38511ad1e8e4c351792\r\n","time":1629205404011},{"_id":"611bb39c1c7b4c0011783aad","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"Creating environment variable exporting file: /codefresh/volume/env_vars_to_export\r\n","time":1629205404026},{"_id":"611bb39c1c7b4c0011783aae","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"Creating export environment variable script file: /codefresh/volume/cf_export\r\n","time":1629205404539},{"_id":"611bb39c1c7b4c0011783aaf","slot":"metrics.memory","payload":{"time":1629205404728,"usage":76705792},"accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791"},{"_id":"611bb39d1c7b4c0011783ab0","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"Creating debug environment script file: /codefresh/volume/setup_debugger.sh\r\n","time":1629205405052},{"_id":"611bb39d1c7b4c0011783ab1","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"Requesting account clusters\r\n","time":1629205405624},{"_id":"611bb39d1c7b4c0011783ab2","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.Initializing Process.logs","payload":"Scheduling health checks\r\n","time":1629205405768},{"_id":"611bb39e1c7b4c0011783ab3","slot":"metrics.memory","payload":{"time":1629205406736,"usage":77905920},"accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791"},{"_id":"611bb3a01c7b4c0011783ab4","slot":"metrics.memory","payload":{"time":1629205408742,"usage":79290368},"accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791"},{"_id":"611bb3a21c7b4c0011783ab5","slot":"metrics.memory","payload":{"time":1629205410758,"usage":99737600},"accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791"},{"_id":"611bb3a285480800174e2711","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.test.logs","payload":"Pulling image library/ubuntu:latest\r\n","time":1629205410292},{"_id":"611bb3a285480800174e2712","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.test.logs","payload":"Digest: sha256:82becede498899ec668628e7cb0ad87b6e1c371cb8a1e597d83a47fac21d6af3\r\n","time":1629205410947},{"_id":"611bb3a285480800174e2713","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.test.logs","payload":"Status: Image is up to date for ubuntu:latest\r\n","time":1629205410954},{"_id":"611bb3a31c7b4c0011783ab6","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.test.logs","payload":"Successfully ran freestyle step: Running test\r\n","time":1629205411731},{"_id":"611bb3a31c7b4c0011783ab7","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.test.logs","payload":"Reading environment variable exporting file contents.\r\n","time":1629205411738},{"_id":"611bb3a31c7b4c0011783ab8","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.test.logs","payload":"Reading environment variable exporting file contents.\r\n","time":1629205411892},{"_id":"611bb3a385480800174e2714","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.test.logs","payload":"------------------------------\r\n\u001b[32mExecuting command:\u001b[39m echo hi\r\n","time":1629205411580},{"_id":"611bb3a385480800174e2715","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","slot":"steps.test.logs","payload":"hi\r\n","time":1629205411595},{"_id":"611bb3a41c7b4c0011783ab9","slot":"metrics.memory","payload":{"time":1629205412778,"usage":81248256},"accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791"}]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"_id":"611bb3855651001a26d35c0b","accountId":"6106c9362e4b3e7f21f0b113","jobId":"611bb38511ad1e8e4c351791","id":"611bb38511ad1e8e4c351791","visibility":"private","steps":{"Initializing Process":{"name":"Initializing Process","status":"success","finishTimeStamp":1629205406,"creationTimeStamp":1629205401},"test":{"name":"test","status":"success","creationTimeStamp":1629205406,"finishTimeStamp":1629205412,"metrics":{"logs":{"total":74}}}},"lastUpdate":1629205412492,"data":{"keepPVCsForPendingApproval":false,"created":1629205401,"started":1629205401,"finished":1629205413},"status":"success","metrics":{"logs":{"total":74}}}]

lib/interface/cli/commands/offline-logs/ensure-index.cmd.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const { MongoClient } = require("mongodb");
22
const Command = require("../../Command");
33
const cmd = require("./base.cmd");
4-
const { ensureIndex } = require('./utils')
4+
const { ensureIndex, defaultCollections } = require('./utils')
55

66
const command = new Command({
77
command: "ensure-index",
@@ -18,12 +18,11 @@ const command = new Command({
1818
),
1919
handler: async (argv) => {
2020
const { uri, db } = argv;
21-
const collections = ["logs", "metadata"];
2221
const client = new MongoClient(uri);
2322
await client.connect();
2423
const database = client.db(db);
2524
const failedCollections = [];
26-
for (const collection of collections) {
25+
for (const collection of defaultCollections) {
2726
try {
2827
await ensureIndex(database, collection);
2928
} catch (error) {
Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
const readline = require('readline')
1+
const {Db, Collection} = require('mongodb');
2+
const { Collection } = require('yaml/types');
23
const { ensureIndex } = require('./utils')
34

45
describe("ensure-index", () => {
56
describe("ensureIndex", () => {
67
it("gets user input from prompt and returns true/false", () => {
7-
8-
const collection =
9-
ensureIndex(database, collection)
8+
Db.collection() = jest.fn();
9+
Collection.createIndexes() = jest.fn()
10+
11+
const database = new Db('db');
12+
const collection = 'whatever';
13+
ensureIndex(database, collection);
1014
});
1115
});
1216
});

lib/interface/cli/commands/offline-logs/offload-to-collection.cmd.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const { MongoClient, ObjectId } = require("mongodb");
22
const moment = require('moment')
33
const Command = require('../../Command');
44
const cmd = require('./base.cmd');
5-
const { objectIdFromDate } = require('./utils')
5+
const { objectIdFromDate, defaultCollections } = require('./utils')
66

77
const offloadToCollection = async function(sourceDBObj, collection, targetDB, cutoffDate) {
88
const sourceCollectionObj = sourceDBObj.collection(collection)
@@ -70,13 +70,12 @@ const command = new Command({
7070
cutoffDate,
7171
} = argv
7272

73-
const collections = ["logs", "metadata"];
7473
const client = new MongoClient(uri);
7574
try{
7675
await client.connect()
7776
const failedCollections = [];
7877
const sourceDBObj = client.db(db);
79-
const promises = collections.map( async (collection) => {
78+
const promises = defaultCollections.map( async (collection) => {
8079
try{
8180
await offloadToCollection(sourceDBObj, collection, targetDB || db, cutoffDate);
8281
} catch (error) {

lib/interface/cli/commands/offline-logs/offload-to-file.cmd.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ const { MongoClient, ObjectId } = require("mongodb");
33
const moment = require('moment')
44
const Command = require('../../Command');
55
const cmd = require('./base.cmd');
6-
const {objectIdFromDate, writeLogsToFile, checkRemnant} = require('./utils')
7-
const { boolean } = require("yargs");
6+
const {objectIdFromDate, writeLogsToFile, checkRemnant, defaultCollections} = require('./utils');
87

98
const offloadToFile = async function(database, collection, chunkDuration, cutoffDate, path) {
109
const collectionObj = database.collection(collection);
@@ -108,7 +107,7 @@ const command = new Command({
108107
.option('collections', {
109108
alias: 'c',
110109
describe: "Source collections names",
111-
default: ["logs", "metadata"],
110+
default: defaultCollections,
112111
array: true,
113112
type: "string",
114113
coerce(arg) {

lib/interface/cli/commands/offline-logs/utils.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ const moment = require("moment");
44
const { join } = require("path");
55
const fs = require("fs");
66

7+
const defaultCollections = ["logs", "metadata"];
8+
79
// converts date to objectId for filter purposes
810
const objectIdFromDate = function (date) {
911
return Math.floor(date.getTime() / 1000).toString(16) + "0000000000000000";
@@ -24,6 +26,7 @@ const writeLogsToFile = function (
2426
const absPath = join(path, fileName);
2527
const data = JSON.stringify(logsToArchive);
2628
fs.writeFileSync(absPath, data);
29+
console.info(`logs from collection '${collection}' were offloaded to '${absPath}'`)
2730
};
2831

2932
const checkRemnant = function (lowerBound, cutoffDateObj) {
@@ -103,4 +106,5 @@ module.exports = {
103106
checkRemnant,
104107
ensureIndex,
105108
getUserInput,
109+
defaultCollections,
106110
};

0 commit comments

Comments
 (0)