From e556149507bb8a01129412ad49680f92b325dfa2 Mon Sep 17 00:00:00 2001 From: Railag Date: Fri, 22 Feb 2019 14:14:32 +0300 Subject: [PATCH] bug(fix) fixing private registries (ENG-745) --- src/sequelize/managers/microservice-manager.js | 2 +- src/services/agent-service.js | 2 +- test/src/services/agent-service.test.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sequelize/managers/microservice-manager.js b/src/sequelize/managers/microservice-manager.js index 4a4e78b26..e1c329f2c 100644 --- a/src/sequelize/managers/microservice-manager.js +++ b/src/sequelize/managers/microservice-manager.js @@ -133,7 +133,7 @@ class MicroserviceManager extends BaseManager { model: Registry, as: 'registry', required: true, - attributes: ['url'] + attributes: ['id'] } ], attributes: ['picture', 'category'] diff --git a/src/services/agent-service.js b/src/services/agent-service.js index 801987aff..868407d82 100644 --- a/src/services/agent-service.js +++ b/src/services/agent-service.js @@ -256,7 +256,7 @@ const getAgentMicroservices = async function (fog, transaction) { rebuild: microservice.rebuild, rootHostAccess: microservice.rootHostAccess, logSize: microservice.logSize, - registryUrl: microservice.catalogItem.registry.url, + registryId: microservice.catalogItem.registry.id, portMappings: microservice.ports, volumeMappings: microservice.volumeMappings, imageSnapshot: microservice.imageSnapshot, diff --git a/test/src/services/agent-service.test.js b/test/src/services/agent-service.test.js index 0cfbf5c74..262e1c5a2 100644 --- a/test/src/services/agent-service.test.js +++ b/test/src/services/agent-service.test.js @@ -749,7 +749,7 @@ describe('Agent Service', () => { } ], registry: { - url: 'testUrl' + id: 10 } }, routes: routes @@ -769,7 +769,7 @@ describe('Agent Service', () => { delete: false, deleteWithCleanup: false, routes: routes, - registryUrl: 'testUrl' + registryId: 10 }] }; @@ -872,7 +872,7 @@ describe('Agent Service', () => { delete: false, deleteWithCleanup: false, routes: routes, - registryUrl: 'testUrl' + registryId: 10 }; const microserviceResponse = {