From 5ccb0fa9889796cccb2fc1649d508883b443dcad Mon Sep 17 00:00:00 2001 From: Anuj Bansal Date: Tue, 23 Feb 2021 03:47:14 -0800 Subject: [PATCH 01/15] Added multiple region support for quota --- .../src/api-controllers/middleware/index.js | 1 + .../api-controllers/routes/broker/index.js | 1 + .../osb-broker/test/broker.middleware.spec.js | 18 ++++++++++++ .../quota-app/src/QuotaApiController.js | 5 ++-- .../controllers.QuotaApiController.spec.js | 29 ++++++++++++++++++- broker/config/settings.yml | 11 +++++++ .../quota/src/QuotaAPIAuthClient.js | 6 ++-- .../quota/src/QuotaAPIClient.js | 4 +-- .../src/cf-platform-quota-manager/index.js | 7 +++++ broker/data-access-layer/quota/src/index.js | 29 ++++++++++++++++--- .../src/k8s-platform-quota-manager/index.js | 7 +++++ 11 files changed, 106 insertions(+), 12 deletions(-) diff --git a/broker/applications/osb-broker/src/api-controllers/middleware/index.js b/broker/applications/osb-broker/src/api-controllers/middleware/index.js index a14f3561e..8ac28c841 100644 --- a/broker/applications/osb-broker/src/api-controllers/middleware/index.js +++ b/broker/applications/osb-broker/src/api-controllers/middleware/index.js @@ -74,6 +74,7 @@ exports.checkQuota = function () { previousPlanId: _.get(req, 'body.previous_values.plan_id'), useAPIServerForConsumedQuotaCheck: useAPIServerForConsumedQuotaCheck, orgId: orgId, + region: req.params.region, reqMethod: req.method } }; diff --git a/broker/applications/osb-broker/src/api-controllers/routes/broker/index.js b/broker/applications/osb-broker/src/api-controllers/routes/broker/index.js index a269ab60d..1f2f1d582 100644 --- a/broker/applications/osb-broker/src/api-controllers/routes/broker/index.js +++ b/broker/applications/osb-broker/src/api-controllers/routes/broker/index.js @@ -6,3 +6,4 @@ const router = module.exports = express.Router({ mergeParams: true }); router.use('/v2', require('./v2')); +router.use('/region/:region/v2',require('./v2')); diff --git a/broker/applications/osb-broker/test/broker.middleware.spec.js b/broker/applications/osb-broker/test/broker.middleware.spec.js index 4ba1b62f5..35d157d27 100644 --- a/broker/applications/osb-broker/test/broker.middleware.spec.js +++ b/broker/applications/osb-broker/test/broker.middleware.spec.js @@ -241,6 +241,7 @@ describe('#checkQuota', () => { }); it('K8S platform, should call next', () => { req.body = k8sContextBody; + req.region= undefined; process.env.POD_NAMESPACE = 'default'; checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA }); checkQuota(req, res, next); @@ -253,6 +254,7 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: true, reqMethod: 'PATCH', + region: undefined, orgId: organization_guid } }, true); @@ -264,6 +266,7 @@ describe('#checkQuota', () => { }); it('Quota not entitled, should call next with Forbidden', () => { req.body = notEntitledBody; + req.region= undefined; checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.NOT_ENTITLED }); checkQuota(req, res, next); expect(isServiceFabrikOperationStub).to.have.been.calledOnce; @@ -275,6 +278,7 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: false, reqMethod: 'PATCH', + region: undefined, orgId: organization_guid } }, true); @@ -286,6 +290,7 @@ describe('#checkQuota', () => { }); it('Quota invalid, should call next with Forbidden', () => { req.body = invalidQuotaBody; + req.region= undefined; checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.INVALID_QUOTA }); checkQuota(req, res, next); expect(isServiceFabrikOperationStub).to.have.been.calledOnce; @@ -297,6 +302,7 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: false, reqMethod: 'PATCH', + region: undefined, orgId: organization_guid } }, true); @@ -308,6 +314,7 @@ describe('#checkQuota', () => { }); it('Quota invalid, should call next with Forbidden and keep message', () => { req.body = invalidQuotaBody; + req.region= undefined; checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.INVALID_QUOTA, message: 'Custom error message', @@ -322,6 +329,7 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: false, reqMethod: 'PATCH', + region: undefined, orgId: organization_guid } }, true); @@ -334,6 +342,7 @@ describe('#checkQuota', () => { }); it('Quota valid, should call next', () => { req.body = validQuotaBody; + req.region= undefined; checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA }); checkQuota(req, res, next); expect(isServiceFabrikOperationStub).to.have.been.calledOnce; @@ -345,6 +354,7 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: false, reqMethod: 'PATCH', + region: undefined, orgId: organization_guid } }, true); @@ -353,6 +363,7 @@ describe('#checkQuota', () => { }); it('Non instance based quota, Quota valid, should call next', () => { req.body = validQuotaBody; + req.region= undefined; let getServiceStub = sinon.stub(catalog, 'getService'); getServiceStub.returns({quota_check_type: 'composite'}); checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA }); @@ -366,6 +377,7 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: false, reqMethod: 'PATCH', + region: undefined, orgId: organization_guid }, data: req.body @@ -378,6 +390,7 @@ describe('#checkQuota', () => { }); it('SMCF platform, Quota valid, should call next', () => { req.body = SMCFContextBody; + req.region= undefined; checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA }); checkQuota(req, res, next); expect(isServiceFabrikOperationStub).to.have.been.calledOnce; @@ -389,6 +402,7 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: false, reqMethod: 'PATCH', + region: undefined, orgId: organization_guid } }, true); @@ -398,6 +412,7 @@ describe('#checkQuota', () => { it('SMK8S platform, Quota valid, should call next', () => { req.body = SMK8SContextBody; + req.region= undefined; process.env.POD_NAMESPACE = 'default'; checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA }); checkQuota(req, res, next); @@ -410,6 +425,7 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: true, reqMethod: 'PATCH', + region: undefined, orgId: organization_guid } }, true); @@ -423,6 +439,7 @@ describe('#checkQuota', () => { it('Quota funtion throws error, should call next with error', () => { checkQuotaValidityStub.returns(Promise.reject(err)); req.body = errQuotaBody; + req.region= undefined; checkQuota(req, res, next); expect(isServiceFabrikOperationStub).to.have.been.calledOnce; expect(checkQuotaValidityStub).to.have.been.calledWithExactly({ @@ -432,6 +449,7 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: false, reqMethod: 'PATCH', + region: undefined, orgId: organization_guid } }, true); diff --git a/broker/applications/quota-app/src/QuotaApiController.js b/broker/applications/quota-app/src/QuotaApiController.js index df27c66ed..d0d0d5855 100644 --- a/broker/applications/quota-app/src/QuotaApiController.js +++ b/broker/applications/quota-app/src/QuotaApiController.js @@ -24,9 +24,10 @@ class QuotaApiController extends FabrikBaseController { case 4 : K8S + SM (CF + K8S) => subaccount based API and apiserver */ try { + const region = _.get(req, 'query.region'); const quotaManager = commonFunctions.isBrokerBoshDeployment() ? - quota.getQuotaManagerInstance(CONST.PLATFORM.CF) : - quota.getQuotaManagerInstance(CONST.PLATFORM.K8S); + quota.getQuotaManagerInstance(CONST.PLATFORM.CF, region) : + quota.getQuotaManagerInstance(CONST.PLATFORM.K8S, region); const subaccountId = req.params.accountId; const planId = _.get(req, 'query.planId'); const previousPlanId = _.get(req, 'query.previousPlanId'); diff --git a/broker/applications/quota-app/test/controllers.QuotaApiController.spec.js b/broker/applications/quota-app/test/controllers.QuotaApiController.spec.js index 3305f26d7..c80958c96 100644 --- a/broker/applications/quota-app/test/controllers.QuotaApiController.spec.js +++ b/broker/applications/quota-app/test/controllers.QuotaApiController.spec.js @@ -35,22 +35,27 @@ describe('#getQuotaValidStatus', () => { const invalidQuotaPlanId = 'd616b00a-5949-4b1c-bc73-0d3c59f3954a'; const cfQuotaManager = getQuotaManagerInstance(CONST.PLATFORM.CF); const k8squotaManager = getQuotaManagerInstance(CONST.PLATFORM.K8S); - let checkCFQuotaStub, checkK8SQuotaStub; + const k8squotaManagerEU10 = getQuotaManagerInstance(CONST.PLATFORM.K8S,'eu10'); + let checkCFQuotaStub, checkK8SQuotaStub, checkK8SQuotaStubEU10; const quotaApiController = new QuotaApiController(); const res = new Response(); beforeEach(function () { checkCFQuotaStub = sinon.stub(cfQuotaManager, 'checkQuota'); checkK8SQuotaStub = sinon.stub(k8squotaManager, 'checkQuota'); + checkK8SQuotaStubEU10 = sinon.stub(k8squotaManagerEU10, 'checkQuota'); checkCFQuotaStub.withArgs(subaccount_id, organization_guid, notEntitledPlanId, previous_plan_id, 'PATCH').returns(Promise.resolve(CONST.QUOTA_API_RESPONSE_CODES.NOT_ENTITLED)); checkCFQuotaStub.withArgs(subaccount_id, organization_guid, invalidQuotaPlanId, previous_plan_id, 'PATCH').returns(Promise.resolve(CONST.QUOTA_API_RESPONSE_CODES.INVALID_QUOTA)); checkCFQuotaStub.withArgs(subaccount_id, organization_guid, validQuotaPlanId, previous_plan_id, 'PATCH').returns(Promise.resolve(CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA)); checkK8SQuotaStub.withArgs(subaccount_id, organization_guid, validQuotaPlanId, previous_plan_id, 'PATCH').returns(Promise.resolve(CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA)); checkK8SQuotaStub.withArgs(subaccount_id, organization_guid, validQuotaPlanId, previous_plan_id, 'PATCH', true).returns(Promise.resolve(CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA)); + checkK8SQuotaStubEU10.withArgs(subaccount_id, organization_guid, validQuotaPlanId, previous_plan_id, 'PATCH').returns(Promise.resolve(CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA)); + checkK8SQuotaStubEU10.withArgs(subaccount_id, organization_guid, validQuotaPlanId, previous_plan_id, 'PATCH', true).returns(Promise.resolve(CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA)); }); afterEach(function () { res.reset(); checkCFQuotaStub.restore(); checkK8SQuotaStub.restore(); + checkK8SQuotaStubEU10.restore(); }); it('K8S deployment, subaccount based check, should return valid', async () => { const req = { @@ -73,6 +78,28 @@ describe('#getQuotaValidStatus', () => { expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.OK); expect(res.send).to.have.been.calledWith({quotaValidStatus: 0}); }); + it('K8S deployment, subaccount based check, should return valid (EU10 region based)', async () => { + const req = { + params: { + accountId: subaccount_id + }, + query: { + planId: validQuotaPlanId, + previousPlanId: previous_plan_id, + reqMethod: 'PATCH', + useAPIServerForConsumedQuotaCheck: 'true', + region: 'eu10', + orgId: organization_guid + } + }; + process.env.POD_NAMESPACE = 'default'; + await quotaApiController.getQuotaValidStatus(req, res); + delete process.env.POD_NAMESPACE; + expect(checkK8SQuotaStubEU10).to.have.been.called; + expect(res.status).to.have.been.calledOnce; + expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.OK); + expect(res.send).to.have.been.calledWith({quotaValidStatus: 0}); + }); it('K8S deployment, org based check, should return valid', async () => { const req = { params: { diff --git a/broker/config/settings.yml b/broker/config/settings.yml index 81ba15370..ef6eb415e 100644 --- a/broker/config/settings.yml +++ b/broker/config/settings.yml @@ -394,6 +394,17 @@ defaults: &defaults serviceDomain: https://my-tenant-onboarding.com username: sb-service-client!t1 password: quota_password + regions: + eu10: + oauthDomain: https://myauth-domain.com + serviceDomain: https://my-tenant-onboarding.com + username: sb-service-client!t1 + password: quota_password + eu20: + oauthDomain: https://myauth-domain.com + serviceDomain: https://my-tenant-onboarding.com + username: sb-service-client!t1 + password: quota_password ##################### # METERING SETTINGS # ##################### diff --git a/broker/data-access-layer/quota/src/QuotaAPIAuthClient.js b/broker/data-access-layer/quota/src/QuotaAPIAuthClient.js index c65f63425..595672b10 100644 --- a/broker/data-access-layer/quota/src/QuotaAPIAuthClient.js +++ b/broker/data-access-layer/quota/src/QuotaAPIAuthClient.js @@ -13,11 +13,11 @@ class QuotaAPIAuthClient extends HttpClient { }, maxRedirects: 0, auth: { - username: config.quota.username, - password: config.quota.password + username: (options == undefined || options.region == undefined) ? config.quota.username : config.quota.regions[options.region].username, + password: (options == undefined || options.region == undefined) ? config.quota.password : config.quota.regions[options.region].password } }, options, { - baseURL: config.quota.oauthDomain, + baseURL: (options == undefined || options.region == undefined) ? config.quota.oauthDomain : config.quota.regions[options.region].oauthDomain, rejectUnauthorized: !config.skip_ssl_validation })); } diff --git a/broker/data-access-layer/quota/src/QuotaAPIClient.js b/broker/data-access-layer/quota/src/QuotaAPIClient.js index a7eb7c7fd..af42145cf 100644 --- a/broker/data-access-layer/quota/src/QuotaAPIClient.js +++ b/broker/data-access-layer/quota/src/QuotaAPIClient.js @@ -5,9 +5,9 @@ const config = require('@sf/app-config'); const { HttpClient } = require('@sf/common-utils'); class QuotaAPIClient extends HttpClient { - constructor(tokenIssuer) { + constructor(tokenIssuer, region) { super({ - baseURL: config.quota.serviceDomain, + baseURL: (region == undefined) ? config.quota.serviceDomain : config.quota.regions[region].serviceDomain, maxRedirects: 0, rejectUnauthorized: !config.skip_ssl_validation }); diff --git a/broker/data-access-layer/quota/src/cf-platform-quota-manager/index.js b/broker/data-access-layer/quota/src/cf-platform-quota-manager/index.js index c965299c2..8b6c73afa 100644 --- a/broker/data-access-layer/quota/src/cf-platform-quota-manager/index.js +++ b/broker/data-access-layer/quota/src/cf-platform-quota-manager/index.js @@ -1,4 +1,11 @@ 'use strict'; const CFPlatformQuotaManager = require('./CFPlatformQuotaManager'); + +const cfPlatformQuotaManagersRegional = {}; +for(let reg in require('..').regionalQuotaAPIClients) { + cfPlatformQuotaManagersRegional[reg] = new CFPlatformQuotaManager(require('..').regionalQuotaAPIClients[reg]); +} + exports.cfPlatformQuotaManager = new CFPlatformQuotaManager(require('..').quotaAPIClient); +exports.cfPlatformQuotaManagersRegional = cfPlatformQuotaManagersRegional; diff --git a/broker/data-access-layer/quota/src/index.js b/broker/data-access-layer/quota/src/index.js index a74a3bdb2..f41ec0362 100644 --- a/broker/data-access-layer/quota/src/index.js +++ b/broker/data-access-layer/quota/src/index.js @@ -3,20 +3,40 @@ const { CONST } = require('@sf/common-utils'); const assert = require('assert'); +const config = require('@sf/app-config'); + const QuotaAPIClient = require('./QuotaAPIClient'); const QuotaAPIAuthClient = require('./QuotaAPIAuthClient'); const TokenIssuer = require('./TokenIssuer'); const TokenInfo = require('./TokenInfo'); + const quotaAPIAuthClient = new QuotaAPIAuthClient(); const tokenIssuer = new TokenIssuer(quotaAPIAuthClient); const quotaAPIClient = new QuotaAPIClient(tokenIssuer); -const getQuotaManagerInstance = function(platform) { + +const regionalQuotaAPIClients = {}; +for (let reg in config.quota.regions) { + let quotaAPIAuthClientRegional = new QuotaAPIAuthClient({ region:reg }); + let tokenIssuerRegional = new TokenIssuer(quotaAPIAuthClientRegional); + let regionalQuotaAPIClient = new QuotaAPIClient(tokenIssuerRegional, reg); + regionalQuotaAPIClients[reg] = regionalQuotaAPIClient; +} + +const getQuotaManagerInstance = function(platform, region) { assert.ok(platform === CONST.PLATFORM.CF || platform === CONST.PLATFORM.K8S, `Platform can be only ${CONST.PLATFORM.CF} or ${CONST.PLATFORM.K8S}`); if(platform === CONST.PLATFORM.CF) { - const cfQuotaPlatformManager = require('./cf-platform-quota-manager').cfPlatformQuotaManager; + if(region == undefined || require('./cf-platform-quota-manager').cfPlatformQuotaManagersRegional[region] == undefined) { + const cfQuotaPlatformManager = require('./cf-platform-quota-manager').cfPlatformQuotaManager; + return cfQuotaPlatformManager; + } + const cfQuotaPlatformManager = require('./cf-platform-quota-manager').cfPlatformQuotaManagersRegional[region]; return cfQuotaPlatformManager; } else{ - const k8sQuotaPlatformManager = require('./k8s-platform-quota-manager').k8sPlatformQuotaManager; + if(region == undefined || require('./k8s-platform-quota-manager').k8sPlatformQuotaManagersRegional[region] == undefined) { + const k8sQuotaPlatformManager = require('./k8s-platform-quota-manager').k8sPlatformQuotaManager; + return k8sQuotaPlatformManager; + } + const k8sQuotaPlatformManager = require('./k8s-platform-quota-manager').k8sPlatformQuotaManagersRegional[region]; return k8sQuotaPlatformManager; } }; @@ -25,5 +45,6 @@ module.exports = { tokenIssuer, quotaAPIClient, TokenInfo, - getQuotaManagerInstance + getQuotaManagerInstance, + regionalQuotaAPIClients }; diff --git a/broker/data-access-layer/quota/src/k8s-platform-quota-manager/index.js b/broker/data-access-layer/quota/src/k8s-platform-quota-manager/index.js index 6ff6b734a..a279c3bac 100644 --- a/broker/data-access-layer/quota/src/k8s-platform-quota-manager/index.js +++ b/broker/data-access-layer/quota/src/k8s-platform-quota-manager/index.js @@ -1,4 +1,11 @@ 'use strict'; const K8SPlatformQuotaManager = require('./K8SPlatformQuotaManager'); + +const k8sPlatformQuotaManagersRegional = {}; +for(let reg in require('..').regionalQuotaAPIClients) { + k8sPlatformQuotaManagersRegional[reg] = new K8SPlatformQuotaManager(require('..').regionalQuotaAPIClients[reg]); +} + exports.k8sPlatformQuotaManager = new K8SPlatformQuotaManager(require('..').quotaAPIClient); +exports.k8sPlatformQuotaManagersRegional = k8sPlatformQuotaManagersRegional; From 1479b1022cac3f7cbd083391fe3a6b9bbc8d4f46 Mon Sep 17 00:00:00 2001 From: Anuj Bansal Date: Mon, 1 Mar 2021 04:50:23 -0800 Subject: [PATCH 02/15] Added unit tests --- .../controllers.QuotaApiController.spec.js | 132 +++++++++++++++++- 1 file changed, 131 insertions(+), 1 deletion(-) diff --git a/broker/applications/quota-app/test/controllers.QuotaApiController.spec.js b/broker/applications/quota-app/test/controllers.QuotaApiController.spec.js index c80958c96..1c9dd4a1f 100644 --- a/broker/applications/quota-app/test/controllers.QuotaApiController.spec.js +++ b/broker/applications/quota-app/test/controllers.QuotaApiController.spec.js @@ -34,13 +34,15 @@ describe('#getQuotaValidStatus', () => { const validQuotaPlanId = 'bc158c9a-7934-401e-94ab-057082a5073f'; const invalidQuotaPlanId = 'd616b00a-5949-4b1c-bc73-0d3c59f3954a'; const cfQuotaManager = getQuotaManagerInstance(CONST.PLATFORM.CF); + const cfQuotaManagerEU10 = getQuotaManagerInstance(CONST.PLATFORM.CF,'eu10'); const k8squotaManager = getQuotaManagerInstance(CONST.PLATFORM.K8S); const k8squotaManagerEU10 = getQuotaManagerInstance(CONST.PLATFORM.K8S,'eu10'); - let checkCFQuotaStub, checkK8SQuotaStub, checkK8SQuotaStubEU10; + let checkCFQuotaStub, checkK8SQuotaStub, checkK8SQuotaStubEU10, checkCFQuotaStubEU10; const quotaApiController = new QuotaApiController(); const res = new Response(); beforeEach(function () { checkCFQuotaStub = sinon.stub(cfQuotaManager, 'checkQuota'); + checkCFQuotaStubEU10 = sinon.stub(cfQuotaManagerEU10, 'checkQuota'); checkK8SQuotaStub = sinon.stub(k8squotaManager, 'checkQuota'); checkK8SQuotaStubEU10 = sinon.stub(k8squotaManagerEU10, 'checkQuota'); checkCFQuotaStub.withArgs(subaccount_id, organization_guid, notEntitledPlanId, previous_plan_id, 'PATCH').returns(Promise.resolve(CONST.QUOTA_API_RESPONSE_CODES.NOT_ENTITLED)); @@ -50,10 +52,14 @@ describe('#getQuotaValidStatus', () => { checkK8SQuotaStub.withArgs(subaccount_id, organization_guid, validQuotaPlanId, previous_plan_id, 'PATCH', true).returns(Promise.resolve(CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA)); checkK8SQuotaStubEU10.withArgs(subaccount_id, organization_guid, validQuotaPlanId, previous_plan_id, 'PATCH').returns(Promise.resolve(CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA)); checkK8SQuotaStubEU10.withArgs(subaccount_id, organization_guid, validQuotaPlanId, previous_plan_id, 'PATCH', true).returns(Promise.resolve(CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA)); + checkCFQuotaStubEU10.withArgs(subaccount_id, organization_guid, notEntitledPlanId, previous_plan_id, 'PATCH').returns(Promise.resolve(CONST.QUOTA_API_RESPONSE_CODES.NOT_ENTITLED)); + checkCFQuotaStubEU10.withArgs(subaccount_id, organization_guid, invalidQuotaPlanId, previous_plan_id, 'PATCH').returns(Promise.resolve(CONST.QUOTA_API_RESPONSE_CODES.INVALID_QUOTA)); + checkCFQuotaStubEU10.withArgs(subaccount_id, organization_guid, validQuotaPlanId, previous_plan_id, 'PATCH').returns(Promise.resolve(CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA)); }); afterEach(function () { res.reset(); checkCFQuotaStub.restore(); + checkCFQuotaStubEU10.restore(); checkK8SQuotaStub.restore(); checkK8SQuotaStubEU10.restore(); }); @@ -121,6 +127,28 @@ describe('#getQuotaValidStatus', () => { expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.OK); expect(res.send).to.have.been.calledWith({quotaValidStatus: 0}); }); + it('K8S deployment, org based check, should return valid (EU10)', async () => { + const req = { + params: { + accountId: subaccount_id + }, + query: { + planId: validQuotaPlanId, + previousPlanId: previous_plan_id, + reqMethod: 'PATCH', + useAPIServerForConsumedQuotaCheck: 'false', + region: 'eu10', + orgId: organization_guid + } + }; + process.env.POD_NAMESPACE = 'default'; + await quotaApiController.getQuotaValidStatus(req, res); + delete process.env.POD_NAMESPACE; + expect(checkK8SQuotaStubEU10).to.have.been.called; + expect(res.status).to.have.been.calledOnce; + expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.OK); + expect(res.send).to.have.been.calledWith({quotaValidStatus: 0}); + }); it('Quota not entitled, return not entitled status', async () => { const req = { params: { @@ -140,6 +168,26 @@ describe('#getQuotaValidStatus', () => { expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.OK); expect(res.send).to.have.been.calledWith({quotaValidStatus: 2}); }); + it('Quota not entitled, return not entitled status (Region EU10)', async () => { + const req = { + params: { + accountId: subaccount_id + }, + query: { + planId: notEntitledPlanId, + previousPlanId: previous_plan_id, + reqMethod: 'PATCH', + useAPIServerForConsumedQuotaCheck: 'false', + region: 'eu10', + orgId: organization_guid + } + }; + await quotaApiController.getQuotaValidStatus(req, res); + expect(checkCFQuotaStubEU10).to.have.been.called; + expect(res.status).to.have.been.calledOnce; + expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.OK); + expect(res.send).to.have.been.calledWith({quotaValidStatus: 2}); + }); it('Quota invalid, return invalid status', async () => { const req = { params: { @@ -159,6 +207,26 @@ describe('#getQuotaValidStatus', () => { expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.OK); expect(res.send).to.have.been.calledWith({quotaValidStatus: 1}); }); + it('Quota invalid, return invalid status (Region EU10)', async () => { + const req = { + params: { + accountId: subaccount_id + }, + query: { + planId: invalidQuotaPlanId, + previousPlanId: previous_plan_id, + reqMethod: 'PATCH', + useAPIServerForConsumedQuotaCheck: 'false', + region: 'eu10', + orgId: organization_guid + } + }; + await quotaApiController.getQuotaValidStatus(req, res); + expect(checkCFQuotaStubEU10).to.have.been.called; + expect(res.status).to.have.been.calledOnce; + expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.OK); + expect(res.send).to.have.been.calledWith({quotaValidStatus: 1}); + }); it('Quota valid, should return valid status', async () => { const req = { params: { @@ -178,6 +246,26 @@ describe('#getQuotaValidStatus', () => { expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.OK); expect(res.send).to.have.been.calledWith({quotaValidStatus: 0}); }); + it('Quota valid, should return valid status (Region EU10)', async () => { + const req = { + params: { + accountId: subaccount_id + }, + query: { + planId: validQuotaPlanId, + previousPlanId: previous_plan_id, + reqMethod: 'PATCH', + useAPIServerForConsumedQuotaCheck: 'false', + region: 'eu10', + orgId: organization_guid + } + }; + await quotaApiController.getQuotaValidStatus(req, res); + expect(checkCFQuotaStubEU10).to.have.been.called; + expect(res.status).to.have.been.calledOnce; + expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.OK); + expect(res.send).to.have.been.calledWith({quotaValidStatus: 0}); + }); it('Quota funtion throws error, should return error', async () => { const err = 'Error in calculating quota'; @@ -200,4 +288,46 @@ describe('#getQuotaValidStatus', () => { expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.INTERNAL_SERVER_ERROR); expect(res.send).to.have.been.calledWith({ error: err }); }); + it('Quota funtion throws error, should return error (Region EU10)', async () => { + const err = 'Error in calculating quota'; + const req = { + params: { + accountId: organization_guid + }, + query: { + planId: validQuotaPlanId, + previousPlanId: previous_plan_id, + reqMethod: 'PATCH', + region: 'eu10', + isSubaccountFlag: 'false' + } + }; + checkCFQuotaStubEU10.reset(); + checkCFQuotaStubEU10.returns(Promise.reject(err)); + await quotaApiController.getQuotaValidStatus(req, res); + expect(checkCFQuotaStubEU10).to.have.been.called; + expect(res.status).to.have.been.calledOnce; + expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.INTERNAL_SERVER_ERROR); + expect(res.send).to.have.been.calledWith({ error: err }); + }); + it('Quota valid, should return valid status using default quota, when region not found', async () => { + const req = { + params: { + accountId: subaccount_id + }, + query: { + planId: validQuotaPlanId, + previousPlanId: previous_plan_id, + reqMethod: 'PATCH', + useAPIServerForConsumedQuotaCheck: 'false', + region: 'test', + orgId: organization_guid + } + }; + await quotaApiController.getQuotaValidStatus(req, res); + expect(checkCFQuotaStub).to.have.been.called; + expect(res.status).to.have.been.calledOnce; + expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.OK); + expect(res.send).to.have.been.calledWith({quotaValidStatus: 0}); + }); }); \ No newline at end of file From a03518cf2300006af64e645015ccac61781ea5da Mon Sep 17 00:00:00 2001 From: Anuj Bansal Date: Tue, 2 Mar 2021 03:45:46 -0800 Subject: [PATCH 03/15] Added multiple-region details --- helm-charts/interoperator/values.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/helm-charts/interoperator/values.yaml b/helm-charts/interoperator/values.yaml index 7ee4877ec..98b119b44 100644 --- a/helm-charts/interoperator/values.yaml +++ b/helm-charts/interoperator/values.yaml @@ -28,6 +28,17 @@ broker: serviceDomain: https://my-tenant-onboarding.com username: quota_user password: quota_password + regions: + eu10: + oauthDomain: https://myauth-domain.com + serviceDomain: https://my-tenant-onboarding.com + username: quota_user + password: quota_password + eu20: + oauthDomain: https://myauth-domain.com + serviceDomain: https://my-tenant-onboarding.com + username: quota_user + password: quota_password image: repository: servicefabrikjenkins/service-fabrik-broker tag: 0.12.3 From 17e87adc17cdbee064ef883c88558162fc958936 Mon Sep 17 00:00:00 2001 From: Anuj Bansal Date: Wed, 3 Mar 2021 04:28:40 -0800 Subject: [PATCH 04/15] Added multiple-region details --- helm-charts/interoperator/conf/settings.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/helm-charts/interoperator/conf/settings.yaml b/helm-charts/interoperator/conf/settings.yaml index ffb20774f..9d6a55410 100644 --- a/helm-charts/interoperator/conf/settings.yaml +++ b/helm-charts/interoperator/conf/settings.yaml @@ -94,6 +94,17 @@ defaults: &defaults enabled: {{ .Values.broker.quota.enabled }} oauthDomain: {{ .Values.broker.quota.oauthDomain }} serviceDomain: {{ .Values.broker.quota.serviceDomain }} + regions: + eu10: + oauthDomain: {{ .Values.broker.quota.regions.eu10.oauthDomain }} + serviceDomain: {{ .Values.broker.quota.regions.eu10.serviceDomain }} + username: {{ .Values.broker.quota.regions.eu10.username }} + password: {{ .Values.broker.quota.regions.eu10.password }} + eu20: + oauthDomain: {{ .Values.broker.quota.regions.eu20.oauthDomain }} + serviceDomain: {{ .Values.broker.quota.regions.eu20.serviceDomain }} + username: {{ .Values.broker.quota.regions.eu20.username }} + password: {{ .Values.broker.quota.regions.eu20.password }} development: &development <<: *defaults From 82a7c5a6b3f88604401c87fe06d7b8039b71bf67 Mon Sep 17 00:00:00 2001 From: Anuj Bansal Date: Fri, 5 Mar 2021 02:19:18 -0800 Subject: [PATCH 05/15] Tagged sfserviceinstance with region --- .../ServiceBrokerApiController.js | 13 +++ ...-broker-api-2.0.instances.director.spec.js | 101 ++++++++++++++++++ .../quota-app/src/QuotaApiController.js | 2 +- .../eventmesh/src/ApiServerClient.js | 7 +- .../quota/src/BaseQuotaManager.js | 6 +- .../CFPlatformQuotaManager.js | 2 +- .../K8SPlatformQuotaManager.js | 4 +- 7 files changed, 127 insertions(+), 8 deletions(-) diff --git a/broker/applications/osb-broker/src/api-controllers/ServiceBrokerApiController.js b/broker/applications/osb-broker/src/api-controllers/ServiceBrokerApiController.js index 8d3a96dd0..9249550d6 100644 --- a/broker/applications/osb-broker/src/api-controllers/ServiceBrokerApiController.js +++ b/broker/applications/osb-broker/src/api-controllers/ServiceBrokerApiController.js @@ -120,6 +120,10 @@ class ServiceBrokerApiController extends FabrikBaseController { service_id: serviceId }, contextLabels, namespaceLabel), value => _.trim(value)); + + if(req.params.region) { + _.set(labels,'region', req.params.region); + } _.forIn(labels, function(value, key) { if (!isValidKubernetesLabelValue(value)) { @@ -195,6 +199,14 @@ class ServiceBrokerApiController extends FabrikBaseController { res.status(statusCode).send(body); } + const labels = req.params.region ? { 'region':req.params.region } : undefined; + + _.forIn(labels, function(value, key) { + if (!isValidKubernetesLabelValue(value)) { + throw new BadRequest(`Parameter ${key} value "${value}" must be a valid label value`); + } + }); + function isUpdatePossible(previousPlanId) { const previousPlan = _.find(plan.service.plans, ['id', previousPlanId]); return plan === previousPlan || _.includes(plan.manager.settings.update_predecessors, previousPlan.id); @@ -242,6 +254,7 @@ class ServiceBrokerApiController extends FabrikBaseController { resourceGroup: CONST.APISERVER.RESOURCE_GROUPS.INTEROPERATOR, resourceType: CONST.APISERVER.RESOURCE_TYPES.INTEROPERATOR_SERVICEINSTANCES, resourceId: getKubernetesName(req.params.instance_id), + labels: labels, spec: params, status: { state: CONST.APISERVER.RESOURCE_STATE.UPDATE, diff --git a/broker/applications/osb-broker/test/acceptance/service-broker-api-2.0.instances.director.spec.js b/broker/applications/osb-broker/test/acceptance/service-broker-api-2.0.instances.director.spec.js index 03e668682..92470915f 100644 --- a/broker/applications/osb-broker/test/acceptance/service-broker-api-2.0.instances.director.spec.js +++ b/broker/applications/osb-broker/test/acceptance/service-broker-api-2.0.instances.director.spec.js @@ -206,6 +206,59 @@ describe('service-broker-api-2.0', function () { mocks.verify(); }); }); + + it('returns 202 Accepted -- fetching correct region value in labels', function () { + const testPayload = _.cloneDeep(payload); + testPayload.spec.plan_id = plan_id_custom_dashboard; + const testContext = { + platform: 'sapcp', + organization_guid: organization_guid, + space_guid: space_guid, + organization_name: 'test', + space_name: 'service-fabrik', + instance_name: 'bp-monitor', + landscape_label: 'cf-eu10-canary', + origin: 'cloudfoundry', + zone_id: 'service-fabrik', + global_account_id: '9808a7d5-5c36-4149-b62d-1095373bdfaa', + license_type: 'LSS script', + subaccount_id: 'service-fabrik', + subdomain: 'service-fabrik' + }; + testPayload.spec.context = testContext; + testPayload.metadata.labels.region = 'eu10'; + testPayload.spec = camelcaseKeys(testPayload.spec); + mocks.apiServerEventMesh.nockCreateResource(CONST.APISERVER.RESOURCE_GROUPS.LOCK, CONST.APISERVER.RESOURCE_TYPES.DEPLOYMENT_LOCKS, instance_id, {}); + mocks.apiServerEventMesh.nockCreateResource(CONST.APISERVER.RESOURCE_GROUPS.INTEROPERATOR, CONST.APISERVER.RESOURCE_TYPES.INTEROPERATOR_SERVICEINSTANCES, {}, 1, testPayload); + mocks.apiServerEventMesh.nockGetResource(CONST.APISERVER.RESOURCE_GROUPS.INTEROPERATOR, CONST.APISERVER.RESOURCE_TYPES.INTEROPERATOR_SERVICEINSTANCES, instance_id, {}); + mocks.apiServerEventMesh.nockGetResource(CONST.APISERVER.RESOURCE_GROUPS.INTEROPERATOR, CONST.APISERVER.RESOURCE_TYPES.INTEROPERATOR_SERVICEINSTANCES, instance_id, { + metadata:{ + name: instance_id + }, + spec: { + clusterId: 1, + planId: plan_id_custom_dashboard, + serviceId: service_id, + } + }); + return chai.request(app) + .put(`/cf/region/eu10/v2/service_instances/${instance_id}?accepts_incomplete=true`) + .set('X-Broker-API-Version', api_version) + .auth(config.username, config.password) + .send({ + service_id: service_id, + plan_id: plan_id_custom_dashboard, + context: testContext, + organization_guid: organization_guid, + space_guid: space_guid, + parameters: parameters + }) + .then(res => { + expect(res).to.have.status(202); + expect(res.body.dashboard_url === dashboard_url_with_template); + mocks.verify(); + }); + }); it('returns UnprocessableEntity entity when dashboard template url does not evaluate to a valid URL', function () { const oldTemp = config.services[0].plans[4].manager.settings.dashboard_url_template; @@ -755,6 +808,54 @@ describe('service-broker-api-2.0', function () { }); }); + it('returns 202 Accepted if resource is already present- fetching correct region too', function () { + const context = { + platform: 'cloudfoundry', + organization_guid: organization_guid, + space_guid: space_guid + }; + mocks.apiServerEventMesh.nockGetResource(CONST.APISERVER.RESOURCE_GROUPS.LOCK, CONST.APISERVER.RESOURCE_TYPES.DEPLOYMENT_LOCKS, instance_id, { + spec: { + options: JSON.stringify({ + lockedResourceDetails: { + operation: 'update' + } + }) + } + }); + mocks.apiServerEventMesh.nockPatchResource(CONST.APISERVER.RESOURCE_GROUPS.LOCK, CONST.APISERVER.RESOURCE_TYPES.DEPLOYMENT_LOCKS, instance_id, { + metadata: { + resourceVersion: 10 + } + }); + const testPayload = _.cloneDeep(payload); + testPayload.spec = camelcaseKeys(payload.spec); + testPayload.metadata.labels.region = 'eu10'; + mocks.apiServerEventMesh.nockPatchResource(CONST.APISERVER.RESOURCE_GROUPS.INTEROPERATOR, CONST.APISERVER.RESOURCE_TYPES.INTEROPERATOR_SERVICEINSTANCES, instance_id, {}, 1, { spec: { parameters: null } }); + mocks.apiServerEventMesh.nockPatchResource(CONST.APISERVER.RESOURCE_GROUPS.INTEROPERATOR, CONST.APISERVER.RESOURCE_TYPES.INTEROPERATOR_SERVICEINSTANCES, instance_id, {}, 1, testPayload); + return chai.request(app) + .patch(`/cf/region/eu10/v2/service_instances/${instance_id}?accepts_incomplete=true`) + .send({ + service_id: service_id, + plan_id: plan_id_update, + parameters: parameters, + context: context, + previous_values: { + plan_id: plan_id, + service_id: service_id + } + }) + .set('X-Broker-API-Version', api_version) + .auth(config.username, config.password) + .then(res => { + mocks.verify(); + expect(res).to.have.status(202); + expect(res.body.operation).to.deep.equal(commonFunctions.encodeBase64({ + 'type': 'update' + })); + }); + }); + it('returns 202 Accepted if resource is already present and plan_id is not present in the request', function () { const context = { platform: 'cloudfoundry', diff --git a/broker/applications/quota-app/src/QuotaApiController.js b/broker/applications/quota-app/src/QuotaApiController.js index d0d0d5855..f7dfa06ba 100644 --- a/broker/applications/quota-app/src/QuotaApiController.js +++ b/broker/applications/quota-app/src/QuotaApiController.js @@ -36,7 +36,7 @@ class QuotaApiController extends FabrikBaseController { const useAPIServerForConsumedQuotaCheck = _.get(req, 'query.useAPIServerForConsumedQuotaCheck'); const useAPIServerForConsumedQuotaCheckFlag = (useAPIServerForConsumedQuotaCheck === 'true'); logger.info(`[Quota APP] subaccountId: ${subaccountId}, orgId: ${orgId}, planId: ${planId}, previousPlanId: ${previousPlanId}, reqMethod: ${reqMethod}, useAPIServerForConsumedQuotaCheckFlag: ${useAPIServerForConsumedQuotaCheckFlag}`); - const validStatus = await quotaManager.checkQuota(subaccountId, orgId, planId, previousPlanId, reqMethod, useAPIServerForConsumedQuotaCheckFlag); + const validStatus = await quotaManager.checkQuota(subaccountId, orgId, planId, previousPlanId, reqMethod, useAPIServerForConsumedQuotaCheckFlag, region); await res.status(CONST.HTTP_STATUS_CODE.OK).send({ quotaValidStatus: validStatus }); } catch (err) { logger.error(`[Quota APP] Quota check could not be completed due to following error: ${err}`); diff --git a/broker/data-access-layer/eventmesh/src/ApiServerClient.js b/broker/data-access-layer/eventmesh/src/ApiServerClient.js index 4cf8bf9a8..438cc2a4d 100644 --- a/broker/data-access-layer/eventmesh/src/ApiServerClient.js +++ b/broker/data-access-layer/eventmesh/src/ApiServerClient.js @@ -1062,6 +1062,11 @@ class ApiServerClient { }); patchBody.status = opts.status; } + if (opts.labels) { + patchBody.metadata = _.merge(patchBody.metadata, { + labels: opts.labels + }); + } logger.info(`Updating - Resource ${opts.resourceId} with body - ${JSON.stringify(patchBody)}`); const client = this._getApiClient(group, version); @@ -1100,7 +1105,7 @@ class ApiServerClient { return Promise.try(() => { if (_.get(opts, 'status.state') === CONST.APISERVER.RESOURCE_STATE.UPDATE) { // set parameters field to null - const clearParamsReqOpts = _.pick(opts, ['resourceGroup', 'resourceType', 'resourceId']); + const clearParamsReqOpts = _.pick(opts, ['resourceGroup', 'resourceType', 'resourceId', 'labels']); return this.updateOSBResource(_.extend(clearParamsReqOpts, { 'spec': { 'parameters': null diff --git a/broker/data-access-layer/quota/src/BaseQuotaManager.js b/broker/data-access-layer/quota/src/BaseQuotaManager.js index 5ebe389ac..9483e415f 100644 --- a/broker/data-access-layer/quota/src/BaseQuotaManager.js +++ b/broker/data-access-layer/quota/src/BaseQuotaManager.js @@ -14,7 +14,7 @@ class BaseQuotaManager { this.platform = platform; } - async checkQuota(subaccountId, orgId, planId, previousPlanId, reqMethod, useAPIServerForConsumedQuotaCheck) { + async checkQuota(subaccountId, orgId, planId, previousPlanId, reqMethod, useAPIServerForConsumedQuotaCheck, region) { if (CONST.HTTP_METHOD.PATCH === reqMethod && this.isSamePlanOrSkuUpdate(planId, previousPlanId)) { logger.debug('Quota check skipped as it is a normal instance update or plan update with same sku.'); return CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA; @@ -45,14 +45,14 @@ class BaseQuotaManager { return CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA; } else { const planIdsWithSameSKU = this.getAllPlanIdsWithSameSKU(planName, serviceName, catalog); - const instanceCount = await this.getInstanceCountonPlatform(useAPIServerForConsumedQuotaCheck ? subaccountId : orgId, planIdsWithSameSKU); + const instanceCount = await this.getInstanceCountonPlatform(useAPIServerForConsumedQuotaCheck ? subaccountId : orgId, planIdsWithSameSKU, region); logger.debug(`Number of instances are ${instanceCount} & Quota number for current org space and service_plan is ${quota}`); return instanceCount >= quota ? CONST.QUOTA_API_RESPONSE_CODES.INVALID_QUOTA : CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA; } } } } - async getInstanceCountonPlatform(orgOrSubaccountId, planGuids) { + async getInstanceCountonPlatform(orgOrSubaccountId, planGuids, region) { throw new NotImplementedBySubclass(`getInstanceCountonPlatform - ${orgOrSubaccountId}, ${planGuids}`); } getAllPlanIdsWithSameSKU(planName, serviceName, serviceCatalog) { diff --git a/broker/data-access-layer/quota/src/cf-platform-quota-manager/CFPlatformQuotaManager.js b/broker/data-access-layer/quota/src/cf-platform-quota-manager/CFPlatformQuotaManager.js index 282749dae..30ca16cca 100644 --- a/broker/data-access-layer/quota/src/cf-platform-quota-manager/CFPlatformQuotaManager.js +++ b/broker/data-access-layer/quota/src/cf-platform-quota-manager/CFPlatformQuotaManager.js @@ -13,7 +13,7 @@ class CFPlatformQuotaManager extends BaseQuotaManager { super(quotaAPIClient, CONST.PLATFORM.CF); } - async getInstanceCountonPlatform(orgId, planIds) { + async getInstanceCountonPlatform(orgId, planIds, region) { const planGuids = await this.getAllPlanGuidsFromPlanIDs(planIds); logger.debug('planguids are ', planGuids); const instances = await cloudController.getServiceInstancesInOrgWithPlansGuids(orgId, planGuids); diff --git a/broker/data-access-layer/quota/src/k8s-platform-quota-manager/K8SPlatformQuotaManager.js b/broker/data-access-layer/quota/src/k8s-platform-quota-manager/K8SPlatformQuotaManager.js index 4b4ff32a1..7686d2cb2 100644 --- a/broker/data-access-layer/quota/src/k8s-platform-quota-manager/K8SPlatformQuotaManager.js +++ b/broker/data-access-layer/quota/src/k8s-platform-quota-manager/K8SPlatformQuotaManager.js @@ -10,8 +10,8 @@ class K8SPlatformQuotaManager extends BaseQuotaManager { super(quotaAPIClient, CONST.PLATFORM.K8S); } - async getInstanceCountonPlatform(subaccountId, planIds) { - const labelString = `subaccount_id in (${subaccountId}),plan_id in (${planIds.toString()})`; + async getInstanceCountonPlatform(subaccountId, planIds, region) { + const labelString = (region == undefined) ? `subaccount_id in (${subaccountId}),plan_id in (${planIds.toString()})` : `subaccount_id in (${subaccountId}),plan_id in (${planIds.toString()}), region in (${region})`; const instances = await apiServerClient.getResources({ resourceGroup: CONST.APISERVER.RESOURCE_GROUPS.INTEROPERATOR, resourceType: CONST.APISERVER.RESOURCE_TYPES.INTEROPERATOR_SERVICEINSTANCES, From 09a1f83f66c967f72f7cc000dceedfba27e19793 Mon Sep 17 00:00:00 2001 From: Anuj Bansal Date: Fri, 5 Mar 2021 03:35:59 -0800 Subject: [PATCH 06/15] Added region support parameter --- .../osb-broker/src/api-controllers/middleware/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/broker/applications/osb-broker/src/api-controllers/middleware/index.js b/broker/applications/osb-broker/src/api-controllers/middleware/index.js index 8ac28c841..4c7252094 100644 --- a/broker/applications/osb-broker/src/api-controllers/middleware/index.js +++ b/broker/applications/osb-broker/src/api-controllers/middleware/index.js @@ -74,10 +74,12 @@ exports.checkQuota = function () { previousPlanId: _.get(req, 'body.previous_values.plan_id'), useAPIServerForConsumedQuotaCheck: useAPIServerForConsumedQuotaCheck, orgId: orgId, - region: req.params.region, reqMethod: req.method } }; + if(_.get(req.params, 'region') !== undefined) { + _.set(quotaClientOptions.queryParams, 'region', req.params.region); + } const instanceBasedQuota = supportsInstanceBasedQuota(req.body.service_id); if(!instanceBasedQuota) { quotaClientOptions.data = _.cloneDeep(req.body); From cc180aa9f06f3051eed2195fbc9975a251911f18 Mon Sep 17 00:00:00 2001 From: Anuj Bansal Date: Fri, 5 Mar 2021 03:44:06 -0800 Subject: [PATCH 07/15] Fixing UTs --- .../osb-broker/test/broker.middleware.spec.js | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/broker/applications/osb-broker/test/broker.middleware.spec.js b/broker/applications/osb-broker/test/broker.middleware.spec.js index 35d157d27..4ba1b62f5 100644 --- a/broker/applications/osb-broker/test/broker.middleware.spec.js +++ b/broker/applications/osb-broker/test/broker.middleware.spec.js @@ -241,7 +241,6 @@ describe('#checkQuota', () => { }); it('K8S platform, should call next', () => { req.body = k8sContextBody; - req.region= undefined; process.env.POD_NAMESPACE = 'default'; checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA }); checkQuota(req, res, next); @@ -254,7 +253,6 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: true, reqMethod: 'PATCH', - region: undefined, orgId: organization_guid } }, true); @@ -266,7 +264,6 @@ describe('#checkQuota', () => { }); it('Quota not entitled, should call next with Forbidden', () => { req.body = notEntitledBody; - req.region= undefined; checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.NOT_ENTITLED }); checkQuota(req, res, next); expect(isServiceFabrikOperationStub).to.have.been.calledOnce; @@ -278,7 +275,6 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: false, reqMethod: 'PATCH', - region: undefined, orgId: organization_guid } }, true); @@ -290,7 +286,6 @@ describe('#checkQuota', () => { }); it('Quota invalid, should call next with Forbidden', () => { req.body = invalidQuotaBody; - req.region= undefined; checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.INVALID_QUOTA }); checkQuota(req, res, next); expect(isServiceFabrikOperationStub).to.have.been.calledOnce; @@ -302,7 +297,6 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: false, reqMethod: 'PATCH', - region: undefined, orgId: organization_guid } }, true); @@ -314,7 +308,6 @@ describe('#checkQuota', () => { }); it('Quota invalid, should call next with Forbidden and keep message', () => { req.body = invalidQuotaBody; - req.region= undefined; checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.INVALID_QUOTA, message: 'Custom error message', @@ -329,7 +322,6 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: false, reqMethod: 'PATCH', - region: undefined, orgId: organization_guid } }, true); @@ -342,7 +334,6 @@ describe('#checkQuota', () => { }); it('Quota valid, should call next', () => { req.body = validQuotaBody; - req.region= undefined; checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA }); checkQuota(req, res, next); expect(isServiceFabrikOperationStub).to.have.been.calledOnce; @@ -354,7 +345,6 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: false, reqMethod: 'PATCH', - region: undefined, orgId: organization_guid } }, true); @@ -363,7 +353,6 @@ describe('#checkQuota', () => { }); it('Non instance based quota, Quota valid, should call next', () => { req.body = validQuotaBody; - req.region= undefined; let getServiceStub = sinon.stub(catalog, 'getService'); getServiceStub.returns({quota_check_type: 'composite'}); checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA }); @@ -377,7 +366,6 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: false, reqMethod: 'PATCH', - region: undefined, orgId: organization_guid }, data: req.body @@ -390,7 +378,6 @@ describe('#checkQuota', () => { }); it('SMCF platform, Quota valid, should call next', () => { req.body = SMCFContextBody; - req.region= undefined; checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA }); checkQuota(req, res, next); expect(isServiceFabrikOperationStub).to.have.been.calledOnce; @@ -402,7 +389,6 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: false, reqMethod: 'PATCH', - region: undefined, orgId: organization_guid } }, true); @@ -412,7 +398,6 @@ describe('#checkQuota', () => { it('SMK8S platform, Quota valid, should call next', () => { req.body = SMK8SContextBody; - req.region= undefined; process.env.POD_NAMESPACE = 'default'; checkQuotaValidityStub.resolves({ quotaValid: CONST.QUOTA_API_RESPONSE_CODES.VALID_QUOTA }); checkQuota(req, res, next); @@ -425,7 +410,6 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: true, reqMethod: 'PATCH', - region: undefined, orgId: organization_guid } }, true); @@ -439,7 +423,6 @@ describe('#checkQuota', () => { it('Quota funtion throws error, should call next with error', () => { checkQuotaValidityStub.returns(Promise.reject(err)); req.body = errQuotaBody; - req.region= undefined; checkQuota(req, res, next); expect(isServiceFabrikOperationStub).to.have.been.calledOnce; expect(checkQuotaValidityStub).to.have.been.calledWithExactly({ @@ -449,7 +432,6 @@ describe('#checkQuota', () => { previousPlanId: undefined, useAPIServerForConsumedQuotaCheck: false, reqMethod: 'PATCH', - region: undefined, orgId: organization_guid } }, true); From 0fecbf9ef35639e8697f6780261a4853be248226 Mon Sep 17 00:00:00 2001 From: Anuj Bansal Date: Fri, 5 Mar 2021 04:49:18 -0800 Subject: [PATCH 08/15] Used lodash functions --- broker/data-access-layer/quota/src/QuotaAPIAuthClient.js | 6 +++--- broker/data-access-layer/quota/src/QuotaAPIClient.js | 5 +++-- broker/data-access-layer/quota/src/index.js | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/broker/data-access-layer/quota/src/QuotaAPIAuthClient.js b/broker/data-access-layer/quota/src/QuotaAPIAuthClient.js index 595672b10..f1c8a17ad 100644 --- a/broker/data-access-layer/quota/src/QuotaAPIAuthClient.js +++ b/broker/data-access-layer/quota/src/QuotaAPIAuthClient.js @@ -13,11 +13,11 @@ class QuotaAPIAuthClient extends HttpClient { }, maxRedirects: 0, auth: { - username: (options == undefined || options.region == undefined) ? config.quota.username : config.quota.regions[options.region].username, - password: (options == undefined || options.region == undefined) ? config.quota.password : config.quota.regions[options.region].password + username: (_.get(options, 'region')) ? (_.get(config.quota, ['regions', options.region, 'username'])) : config.quota.username, + password: (_.get(options, 'region')) ? (_.get(config.quota, ['regions', options.region, 'password'])) : config.quota.password } }, options, { - baseURL: (options == undefined || options.region == undefined) ? config.quota.oauthDomain : config.quota.regions[options.region].oauthDomain, + baseURL: (_.get(options, 'region')) ? (_.get(config.quota, ['regions', options.region, 'oauthDomain'])) : config.quota.oauthDomain, rejectUnauthorized: !config.skip_ssl_validation })); } diff --git a/broker/data-access-layer/quota/src/QuotaAPIClient.js b/broker/data-access-layer/quota/src/QuotaAPIClient.js index af42145cf..3a8dc126f 100644 --- a/broker/data-access-layer/quota/src/QuotaAPIClient.js +++ b/broker/data-access-layer/quota/src/QuotaAPIClient.js @@ -1,13 +1,14 @@ 'use strict'; +const _ = require('lodash'); const Promise = require('bluebird'); const config = require('@sf/app-config'); const { HttpClient } = require('@sf/common-utils'); class QuotaAPIClient extends HttpClient { - constructor(tokenIssuer, region) { + constructor(tokenIssuer, options) { super({ - baseURL: (region == undefined) ? config.quota.serviceDomain : config.quota.regions[region].serviceDomain, + baseURL: (_.get(options, 'region')) ? (_.get(config.quota, ['regions', options.region, 'serviceDomain'])) : config.quota.serviceDomain, maxRedirects: 0, rejectUnauthorized: !config.skip_ssl_validation }); diff --git a/broker/data-access-layer/quota/src/index.js b/broker/data-access-layer/quota/src/index.js index f41ec0362..173be5e58 100644 --- a/broker/data-access-layer/quota/src/index.js +++ b/broker/data-access-layer/quota/src/index.js @@ -18,7 +18,7 @@ const regionalQuotaAPIClients = {}; for (let reg in config.quota.regions) { let quotaAPIAuthClientRegional = new QuotaAPIAuthClient({ region:reg }); let tokenIssuerRegional = new TokenIssuer(quotaAPIAuthClientRegional); - let regionalQuotaAPIClient = new QuotaAPIClient(tokenIssuerRegional, reg); + let regionalQuotaAPIClient = new QuotaAPIClient(tokenIssuerRegional, { region:reg }); regionalQuotaAPIClients[reg] = regionalQuotaAPIClient; } From 1f5b86335c2976c923bbd72328413a1ab97f0367 Mon Sep 17 00:00:00 2001 From: Anuj Bansal Date: Tue, 9 Mar 2021 20:11:06 -0800 Subject: [PATCH 09/15] Added assertion to check region mapping --- .../quota-app/test/controllers.QuotaApiController.spec.js | 8 +++----- broker/data-access-layer/quota/src/index.js | 6 ++++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/broker/applications/quota-app/test/controllers.QuotaApiController.spec.js b/broker/applications/quota-app/test/controllers.QuotaApiController.spec.js index 1c9dd4a1f..c021391a8 100644 --- a/broker/applications/quota-app/test/controllers.QuotaApiController.spec.js +++ b/broker/applications/quota-app/test/controllers.QuotaApiController.spec.js @@ -310,7 +310,7 @@ describe('#getQuotaValidStatus', () => { expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.INTERNAL_SERVER_ERROR); expect(res.send).to.have.been.calledWith({ error: err }); }); - it('Quota valid, should return valid status using default quota, when region not found', async () => { + it('Quota assertion error, when region mapping is not found', async () => { const req = { params: { accountId: subaccount_id @@ -325,9 +325,7 @@ describe('#getQuotaValidStatus', () => { } }; await quotaApiController.getQuotaValidStatus(req, res); - expect(checkCFQuotaStub).to.have.been.called; - expect(res.status).to.have.been.calledOnce; - expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.OK); - expect(res.send).to.have.been.calledWith({quotaValidStatus: 0}); + expect(checkCFQuotaStub).to.have.been.not.called; + expect(res.status).to.have.been.calledWith(CONST.HTTP_STATUS_CODE.INTERNAL_SERVER_ERROR); }); }); \ No newline at end of file diff --git a/broker/data-access-layer/quota/src/index.js b/broker/data-access-layer/quota/src/index.js index 173be5e58..82873070d 100644 --- a/broker/data-access-layer/quota/src/index.js +++ b/broker/data-access-layer/quota/src/index.js @@ -25,17 +25,19 @@ for (let reg in config.quota.regions) { const getQuotaManagerInstance = function(platform, region) { assert.ok(platform === CONST.PLATFORM.CF || platform === CONST.PLATFORM.K8S, `Platform can be only ${CONST.PLATFORM.CF} or ${CONST.PLATFORM.K8S}`); if(platform === CONST.PLATFORM.CF) { - if(region == undefined || require('./cf-platform-quota-manager').cfPlatformQuotaManagersRegional[region] == undefined) { + if(region == undefined) { const cfQuotaPlatformManager = require('./cf-platform-quota-manager').cfPlatformQuotaManager; return cfQuotaPlatformManager; } + assert.ok(require('./cf-platform-quota-manager').cfPlatformQuotaManagersRegional[region] !== undefined, `No LPS service credentials found for region: ${region}`); const cfQuotaPlatformManager = require('./cf-platform-quota-manager').cfPlatformQuotaManagersRegional[region]; return cfQuotaPlatformManager; } else{ - if(region == undefined || require('./k8s-platform-quota-manager').k8sPlatformQuotaManagersRegional[region] == undefined) { + if(region == undefined) { const k8sQuotaPlatformManager = require('./k8s-platform-quota-manager').k8sPlatformQuotaManager; return k8sQuotaPlatformManager; } + assert.ok(require('./k8s-platform-quota-manager').k8sPlatformQuotaManagersRegional[region] !== undefined, `No LPS service credentials found for region: ${region}`); const k8sQuotaPlatformManager = require('./k8s-platform-quota-manager').k8sPlatformQuotaManagersRegional[region]; return k8sQuotaPlatformManager; } From be90a18ecaf2e03a87d88468740461ad93de8512 Mon Sep 17 00:00:00 2001 From: Anuj Bansal Date: Wed, 10 Mar 2021 04:00:03 -0800 Subject: [PATCH 10/15] Added conditional statements --- helm-charts/interoperator/conf/settings.yaml | 13 +++---------- helm-charts/interoperator/templates/broker.yaml | 4 ++++ helm-charts/interoperator/templates/quota_app.yaml | 4 ++++ helm-charts/interoperator/templates/secret.yaml | 4 ++++ 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/helm-charts/interoperator/conf/settings.yaml b/helm-charts/interoperator/conf/settings.yaml index 9d6a55410..c34c163ff 100644 --- a/helm-charts/interoperator/conf/settings.yaml +++ b/helm-charts/interoperator/conf/settings.yaml @@ -94,17 +94,10 @@ defaults: &defaults enabled: {{ .Values.broker.quota.enabled }} oauthDomain: {{ .Values.broker.quota.oauthDomain }} serviceDomain: {{ .Values.broker.quota.serviceDomain }} + {{- with .Values.broker.quota.regions }} regions: - eu10: - oauthDomain: {{ .Values.broker.quota.regions.eu10.oauthDomain }} - serviceDomain: {{ .Values.broker.quota.regions.eu10.serviceDomain }} - username: {{ .Values.broker.quota.regions.eu10.username }} - password: {{ .Values.broker.quota.regions.eu10.password }} - eu20: - oauthDomain: {{ .Values.broker.quota.regions.eu20.oauthDomain }} - serviceDomain: {{ .Values.broker.quota.regions.eu20.serviceDomain }} - username: {{ .Values.broker.quota.regions.eu20.username }} - password: {{ .Values.broker.quota.regions.eu20.password }} + {{- toYaml . | nindent 6 }} + {{- end }} development: &development <<: *defaults diff --git a/helm-charts/interoperator/templates/broker.yaml b/helm-charts/interoperator/templates/broker.yaml index 82521330c..2c8501451 100644 --- a/helm-charts/interoperator/templates/broker.yaml +++ b/helm-charts/interoperator/templates/broker.yaml @@ -110,16 +110,20 @@ spec: secretKeyRef: name: {{ .Release.Name }}-creds key: quota_app_password + {{- if .Values.broker.quota.username }} - name: QUOTA_USERNAME valueFrom: secretKeyRef: name: {{ .Release.Name }}-creds key: quota_username + {{- end }} + {{- if .Values.broker.quota.password }} - name: QUOTA_PASSWORD valueFrom: secretKeyRef: name: {{ .Release.Name }}-creds key: quota_password + {{- end }} volumeMounts: - name: settings mountPath: /opt/sf-config diff --git a/helm-charts/interoperator/templates/quota_app.yaml b/helm-charts/interoperator/templates/quota_app.yaml index 4fc616cd6..679d51c17 100644 --- a/helm-charts/interoperator/templates/quota_app.yaml +++ b/helm-charts/interoperator/templates/quota_app.yaml @@ -71,16 +71,20 @@ spec: secretKeyRef: name: {{ .Release.Name }}-creds key: quota_app_password + {{- if .Values.broker.quota.username }} - name: QUOTA_USERNAME valueFrom: secretKeyRef: name: {{ .Release.Name }}-creds key: quota_username + {{- end }} + {{- if .Values.broker.quota.password }} - name: QUOTA_PASSWORD valueFrom: secretKeyRef: name: {{ .Release.Name }}-creds key: quota_password + {{- end }} volumeMounts: - name: settings mountPath: /opt/sf-config diff --git a/helm-charts/interoperator/templates/secret.yaml b/helm-charts/interoperator/templates/secret.yaml index a06f71f39..a9f6dfebd 100644 --- a/helm-charts/interoperator/templates/secret.yaml +++ b/helm-charts/interoperator/templates/secret.yaml @@ -9,7 +9,11 @@ data: broker_password: {{ .Values.broker.password | b64enc }} quota_app_username: {{ .Values.quota_app.username | b64enc }} quota_app_password: {{ .Values.quota_app.password | b64enc }} + {{- if .Values.broker.quota.username }} quota_username: {{ .Values.broker.quota.username | b64enc }} + {{- end }} + {{- if .Values.broker.quota.password }} quota_password: {{ .Values.broker.quota.password | b64enc }} + {{- end }} operator_apis_username: {{ .Values.operator_apis.username | b64enc }} operator_apis_password: {{ .Values.operator_apis.password | b64enc }} \ No newline at end of file From 32fd23ab6630fc6ccf40331b68675ce07f6df1d0 Mon Sep 17 00:00:00 2001 From: Anuj Bansal Date: Wed, 10 Mar 2021 05:52:45 -0800 Subject: [PATCH 11/15] Commenting region --- helm-charts/interoperator/values.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/helm-charts/interoperator/values.yaml b/helm-charts/interoperator/values.yaml index 98b119b44..127908bb6 100644 --- a/helm-charts/interoperator/values.yaml +++ b/helm-charts/interoperator/values.yaml @@ -28,17 +28,17 @@ broker: serviceDomain: https://my-tenant-onboarding.com username: quota_user password: quota_password - regions: - eu10: - oauthDomain: https://myauth-domain.com - serviceDomain: https://my-tenant-onboarding.com - username: quota_user - password: quota_password - eu20: - oauthDomain: https://myauth-domain.com - serviceDomain: https://my-tenant-onboarding.com - username: quota_user - password: quota_password + # regions: + # eu10: + # oauthDomain: https://myauth-domain.com + # serviceDomain: https://my-tenant-onboarding.com + # username: quota_user + # password: quota_password + # eu20: + # oauthDomain: https://myauth-domain.com + # serviceDomain: https://my-tenant-onboarding.com + # username: quota_user + # password: quota_password image: repository: servicefabrikjenkins/service-fabrik-broker tag: 0.12.3 From e1121aeaafc46ba0a1642244482418c16706acd5 Mon Sep 17 00:00:00 2001 From: Vivek Anand T Kallampally Date: Mon, 22 Feb 2021 12:47:02 +0530 Subject: [PATCH 12/15] Lazy Replication of SFService and SFPlan - Replicate these as part of Instance Replicator - Remove SFService Replicator Fetaure: HCPCFS-2505 --- .../setup_multiclusterdeploy.go | 9 - .../sfserviceinstancereplicator_controller.go | 117 ++++++++ ...rviceinstancereplicator_controller_test.go | 73 +++++ .../sfservices_mcd_controller.go | 271 ------------------ .../sfservices_mcd_controller_suite_test.go | 103 ------- .../sfservices_mcd_controller_test.go | 265 ----------------- 6 files changed, 190 insertions(+), 648 deletions(-) delete mode 100644 interoperator/controllers/multiclusterdeploy/sfservicesreplicator/sfservices_mcd_controller.go delete mode 100644 interoperator/controllers/multiclusterdeploy/sfservicesreplicator/sfservices_mcd_controller_suite_test.go delete mode 100644 interoperator/controllers/multiclusterdeploy/sfservicesreplicator/sfservices_mcd_controller_test.go diff --git a/interoperator/controllers/multiclusterdeploy/setup_multiclusterdeploy.go b/interoperator/controllers/multiclusterdeploy/setup_multiclusterdeploy.go index e42eedb07..e1c809486 100644 --- a/interoperator/controllers/multiclusterdeploy/setup_multiclusterdeploy.go +++ b/interoperator/controllers/multiclusterdeploy/setup_multiclusterdeploy.go @@ -23,7 +23,6 @@ import ( "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/controllers/multiclusterdeploy/sfclusterreplicator" "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/controllers/multiclusterdeploy/sfservicebindingreplicator" "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/controllers/multiclusterdeploy/sfserviceinstancereplicator" - "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/controllers/multiclusterdeploy/sfservicesreplicator" "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/controllers/multiclusterdeploy/watchmanager" ctrl "sigs.k8s.io/controller-runtime" @@ -70,14 +69,6 @@ func SetupWithManager(mgr ctrl.Manager) error { return err } - if err = (&sfservicesreplicator.ReconcileSFServices{ - Client: mgr.GetClient(), - Log: ctrl.Log.WithName("mcd").WithName("replicator").WithName("service"), - }).SetupWithManager(mgr); err != nil { - setupLog.Error(err, "unable to create service replicator", "controller", "ReconcileSFServices") - return err - } - if err = (&sfclusterreplicator.SFClusterReplicator{ Client: mgr.GetClient(), Log: ctrl.Log.WithName("mcd").WithName("replicator").WithName("cluster"), diff --git a/interoperator/controllers/multiclusterdeploy/sfserviceinstancereplicator/sfserviceinstancereplicator_controller.go b/interoperator/controllers/multiclusterdeploy/sfserviceinstancereplicator/sfserviceinstancereplicator_controller.go index 90a3853c8..d16855b00 100644 --- a/interoperator/controllers/multiclusterdeploy/sfserviceinstancereplicator/sfserviceinstancereplicator_controller.go +++ b/interoperator/controllers/multiclusterdeploy/sfserviceinstancereplicator/sfserviceinstancereplicator_controller.go @@ -24,6 +24,7 @@ import ( "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/internal/config" "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/pkg/cluster/registry" "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/pkg/constants" + "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/pkg/utils" "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/pkg/watches" "github.com/go-logr/logr" @@ -143,6 +144,8 @@ func (r *InstanceReplicator) Reconcile(req ctrl.Request) (ctrl.Result, error) { return ctrl.Result{}, err } + lastErr := r.reconcileServicePlan(targetClient, instance, clusterID) + if !instance.GetDeletionTimestamp().IsZero() && state == "delete" { replica.SetName(instance.GetName()) replica.SetNamespace(instance.GetNamespace()) @@ -251,6 +254,11 @@ func (r *InstanceReplicator) Reconcile(req ctrl.Request) (ctrl.Result, error) { "replicaState", replicaState, "replicaLastOperation", replicaLastOperation) } + if lastErr != nil { + // re que if service/plan replication failed + return ctrl.Result{}, err + } + return ctrl.Result{}, nil } @@ -322,6 +330,101 @@ func (r *InstanceReplicator) reconcileNamespace(targetClient client.Client, name return nil } +func (r *InstanceReplicator) reconcileServicePlan(targetClient client.Client, instance *osbv1alpha1.SFServiceInstance, clusterID string) error { + ctx := context.Background() + serviceID := instance.Spec.ServiceID + planID := instance.Spec.PlanID + log := r.Log.WithValues("clusterID", clusterID, "serviceID", serviceID, "planID", planID) + + var lastErr error + + service, serviceReplica := &osbv1alpha1.SFService{}, &osbv1alpha1.SFService{} + serviceKey := types.NamespacedName{ + Name: serviceID, + Namespace: constants.InteroperatorNamespace, + } + + plan, planReplica := &osbv1alpha1.SFPlan{}, &osbv1alpha1.SFPlan{} + planKey := types.NamespacedName{ + Name: planID, + Namespace: constants.InteroperatorNamespace, + } + + err := r.Get(ctx, serviceKey, service) + if err != nil { + log.Error(err, "Failed to get SFService from leader") + lastErr = err + } + + err = targetClient.Get(ctx, serviceKey, serviceReplica) + if err != nil { + if apiErrors.IsNotFound(err) { + replicateSFServiceResourceData(service, serviceReplica) + err = targetClient.Create(ctx, serviceReplica) + if err != nil { + log.Error(err, "Error occurred while replicating SFService to cluster ") + lastErr = err + } else { + log.Info("SFService not found in target cluster. created as copy from leader") + } + } else if !apiErrors.IsNotFound(err) { + log.Error(err, "Failed to fetch SFService from target cluster") + lastErr = err + } + } else { + replicateSFServiceResourceData(service, serviceReplica) + err = targetClient.Update(ctx, serviceReplica) + if err != nil { + log.Error(err, "Error occurred while replicating SFService to cluster") + lastErr = err + } else { + log.Info("updated SFService in target cluster") + } + } + + err = r.Get(ctx, planKey, plan) + if err != nil { + log.Error(err, "Failed to get SFPlan from leader") + lastErr = err + } + + err = targetClient.Get(ctx, planKey, planReplica) + if err != nil { + if apiErrors.IsNotFound(err) { + replicateSFPlanResourceData(plan, planReplica) + err = utils.SetOwnerReference(serviceReplica, planReplica, r.scheme) + if err != nil { + lastErr = err + } + err = targetClient.Create(ctx, planReplica) + if err != nil { + log.Error(err, "Error occurred while replicating SFPlan to cluster ") + lastErr = err + } else { + log.Info("SFPlan not found in target cluster. created as copy from leader") + } + } else if !apiErrors.IsNotFound(err) { + log.Error(err, "Failed to fetch SFPlan from target cluster") + lastErr = err + } + } else { + replicateSFPlanResourceData(plan, planReplica) + err = utils.SetOwnerReference(serviceReplica, planReplica, r.scheme) + if err != nil { + return err + } + err = targetClient.Update(ctx, planReplica) + if err != nil { + log.Error(err, "Error occurred while replicating SFPlan to cluster") + lastErr = err + } else { + log.Info("updated SFPlan in target cluster") + } + } + + return lastErr +} + func (r *InstanceReplicator) setInProgress(instance *osbv1alpha1.SFServiceInstance, state string) error { instanceID := instance.GetName() clusterID, _ := instance.GetClusterID() @@ -390,6 +493,20 @@ func copyObject(source, destination *osbv1alpha1.SFServiceInstance, preserveReso } } +func replicateSFServiceResourceData(source *osbv1alpha1.SFService, dest *osbv1alpha1.SFService) { + source.Spec.DeepCopyInto(&dest.Spec) + dest.SetName(source.GetName()) + dest.SetNamespace(source.GetNamespace()) + dest.SetLabels(source.GetLabels()) +} + +func replicateSFPlanResourceData(source *osbv1alpha1.SFPlan, dest *osbv1alpha1.SFPlan) { + source.Spec.DeepCopyInto(&dest.Spec) + dest.SetName(source.GetName()) + dest.SetNamespace(source.GetNamespace()) + dest.SetLabels(source.GetLabels()) +} + // SetupWithManager registers the MCD Instance replicator with manager // and setups the watches. func (r *InstanceReplicator) SetupWithManager(mgr ctrl.Manager) error { diff --git a/interoperator/controllers/multiclusterdeploy/sfserviceinstancereplicator/sfserviceinstancereplicator_controller_test.go b/interoperator/controllers/multiclusterdeploy/sfserviceinstancereplicator/sfserviceinstancereplicator_controller_test.go index 15d682bcd..66f188483 100644 --- a/interoperator/controllers/multiclusterdeploy/sfserviceinstancereplicator/sfserviceinstancereplicator_controller_test.go +++ b/interoperator/controllers/multiclusterdeploy/sfserviceinstancereplicator/sfserviceinstancereplicator_controller_test.go @@ -44,6 +44,8 @@ var c, c2 client.Client var expectedRequest = reconcile.Request{NamespacedName: types.NamespacedName{Name: "foo", Namespace: constants.InteroperatorNamespace}} var instanceKey = types.NamespacedName{Name: "instance-id", Namespace: "sf-instance-id"} +var serviceKey = types.NamespacedName{Name: "service-id", Namespace: constants.InteroperatorNamespace} +var planKey = types.NamespacedName{Name: "plan-id", Namespace: constants.InteroperatorNamespace} const timeout = time.Second * 5 @@ -70,6 +72,60 @@ var instance = &osbv1alpha1.SFServiceInstance{ }, } +var service = &osbv1alpha1.SFService{ + ObjectMeta: metav1.ObjectMeta{ + Name: "service-id", + Namespace: constants.InteroperatorNamespace, + }, + Spec: osbv1alpha1.SFServiceSpec{ + ID: "service-id", + }, +} +var templateSpec = []osbv1alpha1.TemplateSpec{ + { + Action: "provision", + Type: "gotemplate", + Content: "provisioncontent", + }, + { + Action: "bind", + Type: "gotemplate", + Content: "bindcontent", + }, + { + Action: "status", + Type: "gotemplate", + Content: "statuscontent", + }, + { + Action: "sources", + Type: "gotemplate", + Content: "sourcescontent", + }, +} +var plan = &osbv1alpha1.SFPlan{ + ObjectMeta: metav1.ObjectMeta{ + Name: "plan-id", + Namespace: constants.InteroperatorNamespace, + Labels: map[string]string{ + "serviceId": "service-id", + }, + }, + Spec: osbv1alpha1.SFPlanSpec{ + Name: "plan-name", + ID: "plan-id", + Description: "description", + Metadata: nil, + Free: false, + Bindable: true, + PlanUpdatable: true, + Schemas: nil, + Templates: templateSpec, + ServiceID: "service-id", + RawContext: nil, + Manager: nil, + }} + func TestReconcile(t *testing.T) { instance2 := &osbv1alpha1.SFServiceInstance{} watchChannel := make(chan event.GenericEvent) @@ -121,6 +177,9 @@ func TestReconcile(t *testing.T) { mgrStopped.Wait() }() + g.Expect(c.Create(context.TODO(), service)).NotTo(gomega.HaveOccurred()) + g.Expect(c.Create(context.TODO(), plan)).NotTo(gomega.HaveOccurred()) + // Create a new namespace ns := &corev1.Namespace{ ObjectMeta: metav1.ObjectMeta{ @@ -157,6 +216,20 @@ func TestReconcile(t *testing.T) { }) g.Expect(err).NotTo(gomega.HaveOccurred()) + // Plan and servive should be replicated in follower cluster + g.Eventually(func() error { + err = c2.Get(context.TODO(), serviceKey, service) + if err != nil { + return err + } + err = c2.Get(context.TODO(), planKey, plan) + if err != nil { + return err + } + + return nil + }, timeout).Should(gomega.Succeed()) + // State should be updated in master cluster g.Eventually(func() error { err := c.Get(context.TODO(), instanceKey, instance) diff --git a/interoperator/controllers/multiclusterdeploy/sfservicesreplicator/sfservices_mcd_controller.go b/interoperator/controllers/multiclusterdeploy/sfservicesreplicator/sfservices_mcd_controller.go deleted file mode 100644 index dd19a24cb..000000000 --- a/interoperator/controllers/multiclusterdeploy/sfservicesreplicator/sfservices_mcd_controller.go +++ /dev/null @@ -1,271 +0,0 @@ -/* -Copyright 2018 The Service Fabrik Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package sfservicesreplicator - -import ( - "context" - - osbv1alpha1 "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/api/osb/v1alpha1" - resourcev1alpha1 "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/api/resource/v1alpha1" - "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/internal/config" - "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/pkg/cluster/registry" - "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/pkg/utils" - "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/pkg/watches" - - "github.com/go-logr/logr" - apiErrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/types" - ctrl "sigs.k8s.io/controller-runtime" - kubernetes "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/handler" - "sigs.k8s.io/controller-runtime/pkg/source" -) - -// ReconcileSFServices reconciles SFServices state across clusters -type ReconcileSFServices struct { - kubernetes.Client - Log logr.Logger - scheme *runtime.Scheme - clusterRegistry registry.ClusterRegistry - cfgManager config.Config -} - -// Reconcile is called for a SFCluster. It replicates all SFServices and all SFPlans to -// the SFCluster -func (r *ReconcileSFServices) Reconcile(req ctrl.Request) (ctrl.Result, error) { - ctx := context.Background() - log := r.Log.WithValues("sfcluster", req.NamespacedName) - - // Fetch the SFCluster - clusterInstance := &resourcev1alpha1.SFCluster{} - err := r.Get(ctx, req.NamespacedName, clusterInstance) - if err != nil { - if apiErrors.IsNotFound(err) { - // Object not found, return. - return ctrl.Result{}, nil - } - log.Error(err, "Failed to get SFCluster") - // Error reading the object - requeue the request. - return ctrl.Result{}, err - } - - clusterID := clusterInstance.GetName() - // Fetch current primary cluster id from configmap - interoperatorCfg := r.cfgManager.GetConfig() - currPrimaryClusterID := interoperatorCfg.PrimaryClusterID - - if clusterID == currPrimaryClusterID { - // Target cluster is mastercluster itself - // Replication not needed - return ctrl.Result{}, nil - } - - log.Info("Reconcile started for cluster", "clusterID", clusterID) - targetClient, err := r.clusterRegistry.GetClient(clusterID) - if err != nil { - log.Error(err, "Following error occurred while getting client for cluster ", "clusterID", clusterID) - return ctrl.Result{}, err - } - - log.Info("Trying to list all the services", "namespace", req.NamespacedName.Namespace) - options := &kubernetes.ListOptions{ - Namespace: req.NamespacedName.Namespace, - } - services := &osbv1alpha1.SFServiceList{} - err = r.List(ctx, services, options) - if err != nil { - log.Error(err, "error while fetching services while processing cluster id ", "clusterID", clusterID) - return ctrl.Result{}, err - } - log.Info("services fetched ", "count", len(services.Items), "clusterID", clusterID) - for _, obj := range services.Items { - log.Info("Service is fetched from master cluster", "serviceID", obj.Spec.ID) - service := &osbv1alpha1.SFService{} - serviceKey := types.NamespacedName{ - Name: obj.GetName(), - Namespace: obj.GetNamespace(), - } - log.Info("Checking if service already exists on target cluster", "serviceID", obj.Spec.ID, "clusterID", clusterID) - err = targetClient.Get(ctx, serviceKey, service) - if err != nil { - if apiErrors.IsNotFound(err) { - replicateSFServiceResourceData(&obj, service) - err = targetClient.Create(ctx, service) - if err != nil { - log.Error(err, "Creating new service on sister cluster failed due to following error: ") - return ctrl.Result{}, err - } - log.Info("Created service on cluster", "serviceName", service.Spec.Name, "clusterID", clusterID) - err := r.handleServicePlans(service, clusterID, &targetClient) - if err != nil { - log.Error(err, "Error while replicating plans for service ", "serviceName", service.Spec.Name) - return ctrl.Result{}, err - } - } else { - log.Error(err, "Getting the service from sister cluster ", "clusterID", clusterID) - return ctrl.Result{}, err - } - } else { - replicateSFServiceResourceData(&obj, service) - err = targetClient.Update(ctx, service) - if err != nil { - log.Error(err, "Updating service on sister cluster failed due to following error: ") - return ctrl.Result{}, err - } - log.Info("Updated service on cluster", "serviceName", service.Spec.Name, "clusterID", clusterID) - err = r.handleServicePlans(service, clusterID, &targetClient) - if err != nil { - log.Error(err, "Error while replicating plans for service ", "serviceName", service.Spec.Name) - return ctrl.Result{}, err - } - } - } - return ctrl.Result{}, nil -} - -func (r *ReconcileSFServices) handleServicePlans(service *osbv1alpha1.SFService, clusterID string, targetClient *kubernetes.Client) error { - ctx := context.Background() - log := r.Log.WithValues("clusterID", clusterID) - - log.Info("Trying to list all the plans for service in the master cluster", "serviceName", service.Spec.Name) - plans := &osbv1alpha1.SFPlanList{} - searchLabels := make(kubernetes.MatchingLabels) - searchLabels["serviceId"] = service.Spec.ID - options := &kubernetes.ListOptions{ - Namespace: service.GetNamespace(), - } - searchLabels.ApplyToList(options) - err := r.List(ctx, plans, options) - if err != nil { - log.Error(err, "error while fetching plans while processing cluster id ", "clusterID", clusterID) - return err - } - log.Info("plans fetched for cluster", "count", len(plans.Items), "clusterID", clusterID) - for _, obj := range plans.Items { - log.Info("Plan is fetched from master cluster", "planID", obj.Spec.ID) - plan := &osbv1alpha1.SFPlan{} - planKey := types.NamespacedName{ - Name: obj.GetName(), - Namespace: obj.GetNamespace(), - } - log.Info("Checking if plan already exists on target cluster", "clusterID", clusterID, "planID", obj.Spec.ID) - err = (*targetClient).Get(ctx, planKey, plan) - if err != nil { - if apiErrors.IsNotFound(err) { - replicateSFPlanResourceData(&obj, plan) - err = utils.SetOwnerReference(service, plan, r.scheme) - if err != nil { - return err - } - err = (*targetClient).Create(ctx, plan) - if err != nil { - log.Error(err, "Creating new plan on sister cluster failed") - return err - } - log.Info("Created plan on cluster", "clusterID", clusterID, "planName", plan.Spec.Name) - } - } else { - replicateSFPlanResourceData(&obj, plan) - err = utils.SetOwnerReference(service, plan, r.scheme) - if err != nil { - return err - } - err = (*targetClient).Update(ctx, plan) - if err != nil { - log.Error(err, "Updating plan on sister cluster failed") - return err - } - log.Info("Updated plan on cluster ", "clusterID", clusterID, "planName", plan.Spec.Name) - } - } - return nil -} - -func enqueueRequestForAllClusters(clusterRegistry registry.ClusterRegistry) []ctrl.Request { - clusterList, err := clusterRegistry.ListClusters(nil) - if err != nil { - return nil - } - reconcileRequests := make([]ctrl.Request, len(clusterList.Items)) - for i, cluster := range clusterList.Items { - reconcileRequests[i] = ctrl.Request{ - NamespacedName: types.NamespacedName{ - Name: cluster.GetName(), - Namespace: cluster.GetNamespace(), - }, - } - } - return reconcileRequests -} - -func replicateSFServiceResourceData(source *osbv1alpha1.SFService, dest *osbv1alpha1.SFService) { - source.Spec.DeepCopyInto(&dest.Spec) - dest.SetName(source.GetName()) - dest.SetNamespace(source.GetNamespace()) - dest.SetLabels(source.GetLabels()) -} - -func replicateSFPlanResourceData(source *osbv1alpha1.SFPlan, dest *osbv1alpha1.SFPlan) { - source.Spec.DeepCopyInto(&dest.Spec) - dest.SetName(source.GetName()) - dest.SetNamespace(source.GetNamespace()) - dest.SetLabels(source.GetLabels()) -} - -// SetupWithManager registers the MCD Services Controller with manager -// and setups the watches. -func (r *ReconcileSFServices) SetupWithManager(mgr ctrl.Manager) error { - r.scheme = mgr.GetScheme() - - if r.Log == nil { - r.Log = ctrl.Log.WithName("mcd").WithName("replicator").WithName("service") - } - if r.clusterRegistry == nil { - clusterRegistry, err := registry.New(mgr.GetConfig(), mgr.GetScheme(), mgr.GetRESTMapper()) - if err != nil { - return err - } - r.clusterRegistry = clusterRegistry - } - - cfgManager, err := config.New(mgr.GetConfig(), mgr.GetScheme(), mgr.GetRESTMapper()) - if err != nil { - return err - } - r.cfgManager = cfgManager - - // Define a mapping from the object in the event(sfservice/sfplan) to - // list of sfclusters to reconcile - mapFn := handler.ToRequestsFunc( - func(a handler.MapObject) []ctrl.Request { - return enqueueRequestForAllClusters(r.clusterRegistry) - }) - - builder := ctrl.NewControllerManagedBy(mgr). - Named("mcd_replicator_service"). - For(&resourcev1alpha1.SFCluster{}). - Watches(&source.Kind{Type: &osbv1alpha1.SFService{}}, &handler.EnqueueRequestsFromMapFunc{ - ToRequests: mapFn, - }). - Watches(&source.Kind{Type: &osbv1alpha1.SFPlan{}}, &handler.EnqueueRequestsFromMapFunc{ - ToRequests: mapFn, - }). - WithEventFilter(watches.NamespaceFilter()) - - return builder.Complete(r) -} diff --git a/interoperator/controllers/multiclusterdeploy/sfservicesreplicator/sfservices_mcd_controller_suite_test.go b/interoperator/controllers/multiclusterdeploy/sfservicesreplicator/sfservices_mcd_controller_suite_test.go deleted file mode 100644 index e520182f5..000000000 --- a/interoperator/controllers/multiclusterdeploy/sfservicesreplicator/sfservices_mcd_controller_suite_test.go +++ /dev/null @@ -1,103 +0,0 @@ -/* -Copyright 2018 The Service Fabrik Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package sfservicesreplicator - -import ( - stdlog "log" - "os" - "path/filepath" - "sync" - "testing" - - osbv1alpha1 "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/api/osb/v1alpha1" - resourcev1alpha1 "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/api/resource/v1alpha1" - "github.com/go-logr/logr" - "github.com/onsi/ginkgo" - "github.com/onsi/gomega" - "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" - ctrl "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/log" - "sigs.k8s.io/controller-runtime/pkg/log/zap" - "sigs.k8s.io/controller-runtime/pkg/manager" -) - -var cfg, cfg2 *rest.Config -var k8sClient, k8sClient2 client.Client -var testEnv, testEnv2 *envtest.Environment -var testLog logr.Logger - -func TestMain(m *testing.M) { - var err error - logf.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(ginkgo.GinkgoWriter))) - testLog = ctrl.Log.WithName("test").WithName("mcd_services") - - testEnv = &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crd", "bases")}, - } - - testEnv2 = &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crd", "bases")}, - } - - err = osbv1alpha1.AddToScheme(scheme.Scheme) - if err != nil { - stdlog.Fatal(err) - } - - err = resourcev1alpha1.AddToScheme(scheme.Scheme) - if err != nil { - stdlog.Fatal(err) - } - - if cfg, err = testEnv.Start(); err != nil { - stdlog.Fatal(err) - } - - if cfg2, err = testEnv2.Start(); err != nil { - stdlog.Fatal(err) - } - - k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}) - if err != nil { - stdlog.Fatal(err) - } - - k8sClient2, err = client.New(cfg2, client.Options{Scheme: scheme.Scheme}) - if err != nil { - stdlog.Fatal(err) - } - - code := m.Run() - testEnv.Stop() - testEnv2.Stop() - os.Exit(code) -} - -// StartTestManager adds recFn -func StartTestManager(mgr manager.Manager, g *gomega.GomegaWithT) (chan struct{}, *sync.WaitGroup) { - stop := make(chan struct{}) - wg := &sync.WaitGroup{} - wg.Add(1) - go func() { - defer wg.Done() - g.Expect(mgr.Start(stop)).NotTo(gomega.HaveOccurred()) - }() - return stop, wg -} diff --git a/interoperator/controllers/multiclusterdeploy/sfservicesreplicator/sfservices_mcd_controller_test.go b/interoperator/controllers/multiclusterdeploy/sfservicesreplicator/sfservices_mcd_controller_test.go deleted file mode 100644 index f3cb5db7c..000000000 --- a/interoperator/controllers/multiclusterdeploy/sfservicesreplicator/sfservices_mcd_controller_test.go +++ /dev/null @@ -1,265 +0,0 @@ -/* -Copyright 2018 The Service Fabrik Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package sfservicesreplicator - -import ( - "context" - "fmt" - "testing" - "time" - - osbv1alpha1 "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/api/osb/v1alpha1" - resourcev1alpha1 "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/api/resource/v1alpha1" - mock_clusterRegistry "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/pkg/cluster/registry/mock_registry" - "github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/pkg/constants" - - "github.com/golang/mock/gomock" - "github.com/onsi/gomega" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - ctrlrun "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/reconcile" -) - -var c, c2 client.Client - -var expectedRequest = reconcile.Request{NamespacedName: types.NamespacedName{Name: "foo", Namespace: constants.InteroperatorNamespace}} - -const timeout = time.Second * 5 - -func createAndTestSFServiceAndPlans(serviceName string, planName string, service *osbv1alpha1.SFService, plan *osbv1alpha1.SFPlan, t *testing.T, g *gomega.GomegaWithT) { - err := c.Create(context.TODO(), service) - if apierrors.IsInvalid(err) { - t.Logf("failed to create object, got an invalid object error: %v", err) - return - } - g.Expect(err).NotTo(gomega.HaveOccurred()) - - err = c.Create(context.TODO(), plan) - if apierrors.IsInvalid(err) { - t.Logf("failed to create object, got an invalid object error: %v", err) - return - } - g.Expect(err).NotTo(gomega.HaveOccurred()) - - g.Eventually(func() error { - err := c2.Get(context.TODO(), types.NamespacedName{ - Name: serviceName, - Namespace: constants.InteroperatorNamespace, - }, service) - if err != nil { - return err - } - return nil - }, timeout).Should(gomega.Succeed()) - g.Expect(service.GetName()).To(gomega.Equal(serviceName)) - - err = c.Get(context.TODO(), types.NamespacedName{Name: planName, Namespace: constants.InteroperatorNamespace}, plan) - g.Expect(err).NotTo(gomega.HaveOccurred()) - - g.Eventually(func() error { - err := c2.Get(context.TODO(), types.NamespacedName{ - Name: planName, - Namespace: constants.InteroperatorNamespace, - }, plan) - if err != nil { - return err - } - return nil - }, timeout).Should(gomega.Succeed()) - g.Expect(plan.GetName()).To(gomega.Equal(planName)) - - g.Expect(c.Delete(context.TODO(), plan)).NotTo(gomega.HaveOccurred()) - g.Expect(c.Delete(context.TODO(), service)).NotTo(gomega.HaveOccurred()) - - g.Eventually(func() error { - err := c.Get(context.TODO(), types.NamespacedName{ - Name: plan.GetName(), - Namespace: plan.GetNamespace(), - }, plan) - if err != nil { - if apierrors.IsNotFound(err) { - return nil - } - return err - } - return fmt.Errorf("not deleted") - }, 2*timeout).Should(gomega.Succeed()) - g.Eventually(func() error { - err := c.Get(context.TODO(), types.NamespacedName{ - Name: service.GetName(), - Namespace: service.GetNamespace(), - }, service) - if err != nil { - if apierrors.IsNotFound(err) { - return nil - } - return err - } - return fmt.Errorf("not deleted") - }, timeout).Should(gomega.Succeed()) -} - -func TestReconcile(t *testing.T) { - g := gomega.NewGomegaWithT(t) - ctrl := gomock.NewController(t) - defer ctrl.Finish() - - service1 := &osbv1alpha1.SFService{ - ObjectMeta: metav1.ObjectMeta{ - Name: "foo", - Namespace: constants.InteroperatorNamespace, - }, - Spec: osbv1alpha1.SFServiceSpec{ - ID: "foo", - }, - } - var templateSpec = []osbv1alpha1.TemplateSpec{ - osbv1alpha1.TemplateSpec{ - Action: "provision", - Type: "gotemplate", - Content: "provisioncontent", - }, - osbv1alpha1.TemplateSpec{ - Action: "bind", - Type: "gotemplate", - Content: "bindcontent", - }, - osbv1alpha1.TemplateSpec{ - Action: "status", - Type: "gotemplate", - Content: "statuscontent", - }, - osbv1alpha1.TemplateSpec{ - Action: "sources", - Type: "gotemplate", - Content: "sourcescontent", - }, - } - plan1 := &osbv1alpha1.SFPlan{ - ObjectMeta: metav1.ObjectMeta{ - Name: "bar", - Namespace: constants.InteroperatorNamespace, - }, - Spec: osbv1alpha1.SFPlanSpec{ - Name: "plan-name", - ID: "plan-id", - Description: "description", - Metadata: nil, - Free: false, - Bindable: true, - PlanUpdatable: true, - Schemas: nil, - Templates: templateSpec, - ServiceID: "service-id", - RawContext: nil, - Manager: nil, - }} - labels := make(map[string]string) - labels["serviceId"] = "foo" - plan1.SetLabels(labels) - // Setup the Manager and Controller. Wrap the Controller Reconcile function so it writes each request to a - // channel when it is finished. - mgr, err := manager.New(cfg, manager.Options{ - MetricsBindAddress: "0", - }) - g.Expect(err).NotTo(gomega.HaveOccurred()) - - c, err = client.New(cfg, client.Options{ - Scheme: mgr.GetScheme(), - Mapper: mgr.GetRESTMapper(), - }) - g.Expect(err).NotTo(gomega.HaveOccurred()) - - c2, err = client.New(cfg2, client.Options{ - Scheme: mgr.GetScheme(), - Mapper: mgr.GetRESTMapper(), - }) - g.Expect(err).NotTo(gomega.HaveOccurred()) - - sfcluster1 := &resourcev1alpha1.SFCluster{ - ObjectMeta: metav1.ObjectMeta{ - Name: "1", - Namespace: constants.InteroperatorNamespace, - }, - } - - sfcluster2 := &resourcev1alpha1.SFCluster{ - ObjectMeta: metav1.ObjectMeta{ - Name: "2", - Namespace: constants.InteroperatorNamespace, - }, - } - - mockClusterRegistry := mock_clusterRegistry.NewMockClusterRegistry(ctrl) - mockClusterRegistry.EXPECT().GetClient("1").Return(c, nil).AnyTimes() - mockClusterRegistry.EXPECT().GetClient("2").Return(c2, nil).AnyTimes() - mockClusterRegistry.EXPECT().ListClusters(nil).Return(&resourcev1alpha1.SFClusterList{ - Items: []resourcev1alpha1.SFCluster{*sfcluster1, *sfcluster2}, - }, nil).AnyTimes() - - controller := &ReconcileSFServices{ - Client: mgr.GetClient(), - Log: ctrlrun.Log.WithName("mcd").WithName("replicator").WithName("service"), - clusterRegistry: mockClusterRegistry, - } - g.Expect(controller.SetupWithManager(mgr)).NotTo(gomega.HaveOccurred()) - stopMgr, mgrStopped := StartTestManager(mgr, g) - - defer func() { - close(stopMgr) - mgrStopped.Wait() - }() - - g.Expect(c.Create(context.TODO(), sfcluster1)).NotTo(gomega.HaveOccurred()) - <-time.After(time.Second) - g.Expect(c.Create(context.TODO(), sfcluster2)).NotTo(gomega.HaveOccurred()) - - createAndTestSFServiceAndPlans("foo", "bar", service1, plan1, t, g) - - g.Expect(c.Delete(context.TODO(), sfcluster1)).NotTo(gomega.HaveOccurred()) - g.Expect(c.Delete(context.TODO(), sfcluster2)).NotTo(gomega.HaveOccurred()) - g.Eventually(func() error { - err := c.Get(context.TODO(), types.NamespacedName{ - Name: sfcluster1.GetName(), - Namespace: sfcluster1.GetNamespace(), - }, sfcluster1) - if err != nil { - if apierrors.IsNotFound(err) { - return nil - } - return err - } - return fmt.Errorf("not deleted") - }, 2*timeout).Should(gomega.Succeed()) - g.Eventually(func() error { - err := c.Get(context.TODO(), types.NamespacedName{ - Name: sfcluster2.GetName(), - Namespace: sfcluster2.GetNamespace(), - }, sfcluster2) - if err != nil { - if apierrors.IsNotFound(err) { - return nil - } - return err - } - return fmt.Errorf("not deleted") - }, timeout).Should(gomega.Succeed()) -} From 22326f5c815be8ef2acf63b9bbbf7c073f787b0e Mon Sep 17 00:00:00 2001 From: Vivek Anand T Kallampally Date: Fri, 12 Mar 2021 14:17:40 +0530 Subject: [PATCH 13/15] Update base docker images - Use alpine-3.13 - Done to fix protecode scan issues --- broker/Dockerfile | 4 ++-- interoperator/Dockerfile | 2 +- operator-apis/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/broker/Dockerfile b/broker/Dockerfile index f9cd02c19..3f1869cae 100644 --- a/broker/Dockerfile +++ b/broker/Dockerfile @@ -1,5 +1,5 @@ -# FROM node:12.18-alpine3.12 also works here for a smaller image -FROM node:14.15-alpine3.12 +# FROM node:14.16-alpine3.13 also works here for a smaller image +FROM node:14.16-alpine3.13 # set our node environment, either development or production # defaults to production, compose overrides this to development on build and run diff --git a/interoperator/Dockerfile b/interoperator/Dockerfile index 1427eb8ec..9439af42b 100644 --- a/interoperator/Dockerfile +++ b/interoperator/Dockerfile @@ -25,7 +25,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -tags multiclu # Refer to https://github.com/GoogleContainerTools/distroless for more details # FROM gcr.io/distroless/static:nonroot # Using alphine as xmake supports alphine seamlessly -FROM alpine:3.12.0 +FROM alpine:3.13 WORKDIR / COPY --from=builder /workspace/manager . diff --git a/operator-apis/Dockerfile b/operator-apis/Dockerfile index 52a86615f..eb7ff47ae 100644 --- a/operator-apis/Dockerfile +++ b/operator-apis/Dockerfile @@ -21,7 +21,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o operator # Refer to https://github.com/GoogleContainerTools/distroless for more details # FROM gcr.io/distroless/static:nonroot # Using alphine as xmake supports alphine seamlessly -FROM alpine:3.12.0 +FROM alpine:3.13 WORKDIR / COPY --from=builder /workspace/operator-apis . From 691d0516241bfdd0807e0a79892d7f7c78c8c7b3 Mon Sep 17 00:00:00 2001 From: i068838 Date: Fri, 12 Mar 2021 09:29:27 +0000 Subject: [PATCH 14/15] Updating broker/Interoperator docker image versions:0.13.0 --- helm-charts/interoperator/Chart.yaml | 4 ++-- helm-charts/interoperator/values.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/helm-charts/interoperator/Chart.yaml b/helm-charts/interoperator/Chart.yaml index 51a0b40de..729854954 100644 --- a/helm-charts/interoperator/Chart.yaml +++ b/helm-charts/interoperator/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "0.12.3" +appVersion: "0.13.0" description: A Helm chart for Interoperator for Kubernetes name: interoperator -version: 0.12.3 +version: 0.13.0 diff --git a/helm-charts/interoperator/values.yaml b/helm-charts/interoperator/values.yaml index 127908bb6..59150823f 100644 --- a/helm-charts/interoperator/values.yaml +++ b/helm-charts/interoperator/values.yaml @@ -41,7 +41,7 @@ broker: # password: quota_password image: repository: servicefabrikjenkins/service-fabrik-broker - tag: 0.12.3 + tag: 0.13.0 pullPolicy: Always service: type: LoadBalancer @@ -63,7 +63,7 @@ quota_app: interoperator: image: repository: servicefabrikjenkins/service-fabrik-interoperator - tag: 0.12.3 + tag: 0.13.0 pullPolicy: Always resources: limits: @@ -85,7 +85,7 @@ operator_apis: #host: op.ingress.sf21-intop.interop.shoot.canary.k8s-hana.ondemand.com image: repository: servicefabrikjenkins/operatorapis - tag: 0.12.3 + tag: 0.13.0 pullPolicy: Always resources: limits: From 73d1c7fd71cd38fd928b05b747f4ad8dfe8a1694 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Mar 2021 06:12:42 +0000 Subject: [PATCH 15/15] Bump sigs.k8s.io/controller-runtime in /operator-apis Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.6.3 to 0.8.3. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Commits](https://github.com/kubernetes-sigs/controller-runtime/compare/v0.6.3...v0.8.3) Signed-off-by: dependabot[bot] --- operator-apis/go.mod | 10 +- operator-apis/go.sum | 268 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 273 insertions(+), 5 deletions(-) diff --git a/operator-apis/go.mod b/operator-apis/go.mod index 11d42ff81..0e52a5b00 100644 --- a/operator-apis/go.mod +++ b/operator-apis/go.mod @@ -4,14 +4,14 @@ go 1.15 require ( github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator v0.0.0-00010101000000-000000000000 - github.com/go-logr/logr v0.1.0 + github.com/go-logr/logr v0.3.0 github.com/gorilla/mux v1.8.0 github.com/onsi/ginkgo v1.14.2 github.com/onsi/gomega v1.10.3 - k8s.io/api v0.18.8 - k8s.io/apimachinery v0.18.8 - k8s.io/client-go v0.18.8 - sigs.k8s.io/controller-runtime v0.6.3 + k8s.io/api v0.20.2 + k8s.io/apimachinery v0.20.2 + k8s.io/client-go v0.20.2 + sigs.k8s.io/controller-runtime v0.8.3 ) replace github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator => ../interoperator diff --git a/operator-apis/go.sum b/operator-apis/go.sum index b9dfdf496..90f22ffbe 100644 --- a/operator-apis/go.sum +++ b/operator-apis/go.sum @@ -2,18 +2,49 @@ bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxo cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= +github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= @@ -64,8 +95,10 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= @@ -79,6 +112,9 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= @@ -96,6 +132,7 @@ github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDG github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -154,6 +191,7 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -164,6 +202,9 @@ github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2H github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -173,8 +214,13 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v0.3.0 h1:q4c+kbcR0d5rSurhBR8dIgieOaYpXtsdTYfx22Cu6rs= +github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/zapr v0.1.0 h1:h+WVe9j6HAA01niTJPA/kKH0i7e0rLZBCwauQFcRE54= github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= +github.com/go-logr/zapr v0.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4= +github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= @@ -242,18 +288,27 @@ github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 h1:ZgQEtGgCBiWRM39fZuwSd1LwSqqSW0hOdXCYYDX0R3I= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= @@ -270,20 +325,33 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk= github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= +github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= +github.com/googleapis/gnostic v0.5.1 h1:A8Yhf6EtqTv9RMsU6MQTyrtV1TjWlR6xU9BsZIwuTCM= +github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= @@ -295,6 +363,7 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= @@ -302,7 +371,9 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -330,10 +401,13 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc= +github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= @@ -350,6 +424,7 @@ github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= @@ -362,6 +437,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= @@ -377,6 +454,7 @@ github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0U github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -395,6 +473,8 @@ github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOq github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= @@ -408,6 +488,7 @@ github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:F github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -442,6 +523,7 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -449,6 +531,7 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= @@ -564,6 +647,7 @@ github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKv github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -573,6 +657,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= @@ -585,6 +671,7 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -602,13 +689,16 @@ github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= @@ -617,18 +707,28 @@ go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0 h1:sFPn2GLc3poCkfrpIXGhBD2X0CMIo4Q/zSULXrj/+uc= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.8.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0 h1:nR6NoDBgAf67s68NhaXbsojM+2gxp3S1hWkHDl27pVU= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM= +go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -638,6 +738,7 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -648,15 +749,41 @@ golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -673,23 +800,37 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 h1:AeiKBIuRw3UomYXSbLy0Mc2dDLfdtbT/IVn4keq83P0= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0 h1:wBouT66WTYFXdxfVdz9sVWARVd/2vfGcmI45D2gj45M= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -708,23 +849,36 @@ golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1 h1:ogLJMz+qpzav7lGMh10LMvAkM/fAoGlaiiHYiFYdm80= @@ -733,17 +887,24 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211 h1:9UQO31fZ+0aKQOFldThf7BKPMJTiBfWycGh/u3UoO88= golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY= +golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s= +golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -753,59 +914,125 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114 h1:DnSr2mCsxyCE6ZgIkmcWUQY2R5cH/6wL7eIxEmQOMSE= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200616133436-c1934b75d054 h1:HHeAlu5H9b71C+Fx0K+1dGgVFN1DM1/wz4aoGOA5qS8= +golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.0.1 h1:xyiBuvkD2g5n7cYzx6u2sxQvsAy4QJsZFCzGVdzOXZ0= gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= +gomodules.xyz/jsonpatch/v2 v2.1.0 h1:Phva6wqu+xR//Njw6iorylFFgn/z547tw5Ne3HZPQ+k= +gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -821,6 +1048,7 @@ gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKW gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= @@ -837,44 +1065,73 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= helm.sh/helm/v3 v3.3.4/go.mod h1:CyCGQa53/k1JFxXvXveGwtfJ4cuB9zkaBSGa5rnAiHU= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI= k8s.io/api v0.18.8 h1:aIKUzJPb96f3fKec2lxtY7acZC9gQNDLVhfSGpxBAC4= k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= +k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= +k8s.io/api v0.20.2 h1:y/HR22XDZY3pniu9hIFDLpUCPq2w5eQ6aV/VFQ7uJMw= +k8s.io/api v0.20.2/go.mod h1:d7n6Ehyzx+S+cE3VhTGfVNNqtGc/oL9DCdYYahlurV8= k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M= k8s.io/apiextensions-apiserver v0.18.8 h1:pkqYPKTHa0/3lYwH7201RpF9eFm0lmZDFBNzhN+k/sA= k8s.io/apiextensions-apiserver v0.18.8/go.mod h1:7f4ySEkkvifIr4+BRrRWriKKIJjPyg9mb/p63dJKnlM= +k8s.io/apiextensions-apiserver v0.20.1 h1:ZrXQeslal+6zKM/HjDXLzThlz/vPSxrfK3OqL8txgVQ= +k8s.io/apiextensions-apiserver v0.20.1/go.mod h1:ntnrZV+6a3dB504qwC5PN/Yg9PBiDNt1EVqbW2kORVk= k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= k8s.io/apimachinery v0.18.8 h1:jimPrycCqgx2QPearX3to1JePz7wSbVLq+7PdBTTwQ0= k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= +k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apimachinery v0.20.2 h1:hFx6Sbt1oG0n6DZ+g4bFt5f6BoMkOjKWsQFu077M3Vg= +k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg= k8s.io/apiserver v0.18.8/go.mod h1:12u5FuGql8Cc497ORNj79rhPdiXQC4bf53X/skR/1YM= +k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/cli-runtime v0.18.8/go.mod h1:7EzWiDbS9PFd0hamHHVoCY4GrokSTPSL32MA4rzIu0M= k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q= k8s.io/client-go v0.18.8 h1:SdbLpIxk5j5YbFr1b7fq8S7mDgDjYmUxSbszyoesoDM= k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU= +k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= +k8s.io/client-go v0.20.2 h1:uuf+iIAbfnCSw8IGAv/Rg0giM+2bOzHLOsbbrwrdhNQ= +k8s.io/client-go v0.20.2/go.mod h1:kH5brqWqp7HDxUFKoEgiI4v8G1xzbe9giaCenUWJzgE= k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= k8s.io/code-generator v0.18.8/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= +k8s.io/code-generator v0.20.1/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg= k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14= k8s.io/component-base v0.18.8/go.mod h1:00frPRDas29rx58pPCxNkhUfPbwajlyyvu8ruNgSErU= +k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= +k8s.io/component-base v0.20.2 h1:LMmu5I0pLtwjpp5009KLuMGFqSc2S2isGw8t1hpYKLE= +k8s.io/component-base v0.20.2/go.mod h1:pzFtCiwe/ASD0iV7ySMu8SYVJjCapNM9bjvk7ptpKh0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= +k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29 h1:NeQXVJ2XFSkRoPzRo8AId01ZER+j8oV4SZADT4iBOXQ= k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29/go.mod h1:F+5wygcW0wmRTnM3cOgIqGivxkwSWIWT5YdsDbeAOaU= +k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c= +k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kubectl v0.18.8/go.mod h1:PlEgIAjOMua4hDFTEkVf+W5M0asHUKfE4y7VDZkpLHM= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/metrics v0.18.8/go.mod h1:j7JzZdiyhLP2BsJm/Fzjs+j5Lb1Y7TySjhPWqBPwRXA= @@ -882,14 +1139,25 @@ k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19 h1:7Nu2dTj82c6IaWvL7hImJzcXoTPz1MsSCH7r+0m6rfo= k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 h1:0T5IaWHO3sJTEmCP6mUlBvMukxPKUQWqiI/YuiBNMiQ= +k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/controller-runtime v0.6.3 h1:SBbr+inLPEKhvlJtrvDcwIpm+uhDvp63Bl72xYJtoOE= sigs.k8s.io/controller-runtime v0.6.3/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJUzRP4N4JpdAY= +sigs.k8s.io/controller-runtime v0.8.3 h1:GMHvzjTmaWHQB8HadW+dIvBoJuLvZObYJ5YoZruPRao= +sigs.k8s.io/controller-runtime v0.8.3/go.mod h1:U/l+DUopBc1ecfRZ5aviA9JDmGFQKvLf5YkZNx2e0sU= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= sigs.k8s.io/structured-merge-diff/v2 v2.0.1/go.mod h1:Wb7vfKAodbKgf6tn1Kl0VvGj7mRH6DGaRcixXEJXTsE= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E= sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= +sigs.k8s.io/structured-merge-diff/v4 v4.0.2 h1:YHQV7Dajm86OuqnIR6zAelnDWBRjo+YhYV9PmGrh1s8= +sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=