Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ module.exports = {

'extends': 'google',
'rules': {
"linebreak-style": 0,
'require-jsdoc': [OFF, {
'require': {
'FunctionDeclaration': true,
Expand Down
2 changes: 2 additions & 0 deletions src/schemas/agent.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ const updateAgentStatus = {
'systemAvailableDisk': {'type': 'integer'},
'systemAvailableMemory': {'type': 'integer'},
'systemTotalCpu': {'type': 'number'},
'securityStatus': {'type': 'string'},
'securityViolationInfo': {'type': 'string'},
'microserviceStatus': {'type': 'string'},
'repositoryCount': {'type': 'integer', 'minimum': 0},
'repositoryStatus': {'type': 'string'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ module.exports = {
},

down: (queryInterface, Sequelize) => {
/*
Add reverting commands here.
Return a promise to correctly handle asynchronicity.

Example:
return queryInterface.dropTable('users');
*/
return queryInterface.removeColumn('Fogs', 'system-available-memory')
.then(() => {
return queryInterface.removeColumn('Fogs', 'system-available-disk')
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
'use strict'

module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.addColumn('Fogs',
'security_status', Sequelize.TEXT
).then(() => {
return queryInterface.addColumn('Fogs',
'security_violation_info', Sequelize.TEXT
)
})
},

down: (queryInterface, Sequelize) => {
return queryInterface.removeColumn('Fogs', 'security_status')
.then(() => {
return queryInterface.removeColumn('Fogs', 'security_violation_info')
})
// restore constraints. Because Sequelize has problem with Sqlite constraints
.then(() => {
return queryInterface.addConstraint('Fogs', ['user_id'], {
type: 'FOREIGN KEY',
name: 'userId',
references: {
name: 'userId',
table: 'Users',
field: 'id',
},
onDelete: 'cascade',
})
}).then(() => {
return queryInterface.addConstraint('Fogs', ['fog_type_id'], {
type: 'FOREIGN KEY',
name: 'fogTypeId',
references: {
name: 'fogTypeId',
table: 'FogTypes',
field: 'id',
},
onDelete: 'set null',
})
})
},
}
10 changes: 10 additions & 0 deletions src/sequelize/models/fog.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,16 @@ module.exports = (sequelize, DataTypes) => {
type: DataTypes.FLOAT,
field: 'system-total-cpu',
},
securityStatus: {
type: DataTypes.TEXT,
defaultValue: 'OK',
field: 'security_status',
},
securityViolationInfo: {
type: DataTypes.TEXT,
defaultValue: 'No violation',
field: 'security_violation_info',
},
catalogItemStatus: {
type: DataTypes.TEXT,
field: 'catalog_item_status',
Expand Down
2 changes: 2 additions & 0 deletions src/services/agent-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ const updateAgentStatus = async function(agentStatus, fog, transaction) {
systemAvailableDisk: agentStatus.systemAvailableDisk,
systemAvailableMemory: agentStatus.systemAvailableMemory,
systemTotalCpu: agentStatus.systemTotalCpu,
securityStatus: agentStatus.securityStatus,
securityViolationInfo: agentStatus.securityViolationInfo,
repositoryCount: agentStatus.repositoryCount,
repositoryStatus: agentStatus.repositoryStatus,
systemTime: agentStatus.systemTime,
Expand Down
4 changes: 4 additions & 0 deletions test/src/services/agent-service.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,8 @@ describe('Agent Service', () => {
systemAvailableDisk: 1,
systemAvailableMemory: 1,
systemTotalCpu: 1.1,
securityStatus: 'OK',
securityViolationInfo: '',
repositoryCount: 5,
repositoryStatus: 'testStatus',
systemTime: 15325235253,
Expand Down Expand Up @@ -549,6 +551,8 @@ describe('Agent Service', () => {
systemAvailableDisk: 1,
systemAvailableMemory: 1,
systemTotalCpu: 1.1,
securityStatus: 'OK',
securityViolationInfo: '',
repositoryCount: 5,
repositoryStatus: 'testStatus',
systemTime: 15325235253,
Expand Down