From c162bde6cb54582c56a461a2b9cc7245d90b01d2 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Tue, 4 Jul 2023 22:47:09 +0000 Subject: [PATCH] Set pool manager status Signed-off-by: Gabriel Adrian Samfira --- runner/enterprises.go | 4 +++- runner/organizations.go | 5 +++-- runner/repositories.go | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/runner/enterprises.go b/runner/enterprises.go index b84a2e29..4f1ecb1a 100644 --- a/runner/enterprises.go +++ b/runner/enterprises.go @@ -183,11 +183,13 @@ func (r *Runner) UpdateEnterprise(ctx context.Context, enterpriseID string, para return params.Enterprise{}, errors.Wrap(err, "updating enterprise pool manager") } } else { - if _, err := r.poolManagerCtrl.CreateEnterprisePoolManager(r.ctx, enterprise, r.providers, r.store); err != nil { + poolMgr, err = r.poolManagerCtrl.CreateEnterprisePoolManager(r.ctx, enterprise, r.providers, r.store) + if err != nil { return params.Enterprise{}, errors.Wrap(err, "creating enterprise pool manager") } } + enterprise.PoolManagerStatus = poolMgr.Status() return enterprise, nil } diff --git a/runner/organizations.go b/runner/organizations.go index e4083fb2..00913be1 100644 --- a/runner/organizations.go +++ b/runner/organizations.go @@ -193,16 +193,17 @@ func (r *Runner) UpdateOrganization(ctx context.Context, orgID string, param par WebhookSecret: org.WebhookSecret, InternalConfig: &internalCfg, } - // stop the pool mgr if err := poolMgr.RefreshState(newState); err != nil { return params.Organization{}, errors.Wrap(err, "updating org pool manager") } } else { - if _, err := r.poolManagerCtrl.CreateOrgPoolManager(r.ctx, org, r.providers, r.store); err != nil { + poolMgr, err = r.poolManagerCtrl.CreateOrgPoolManager(r.ctx, org, r.providers, r.store) + if err != nil { return params.Organization{}, errors.Wrap(err, "creating org pool manager") } } + org.PoolManagerStatus = poolMgr.Status() return org, nil } diff --git a/runner/repositories.go b/runner/repositories.go index 84649032..4fd0b6d7 100644 --- a/runner/repositories.go +++ b/runner/repositories.go @@ -192,16 +192,17 @@ func (r *Runner) UpdateRepository(ctx context.Context, repoID string, param para WebhookSecret: repo.WebhookSecret, InternalConfig: &internalCfg, } - // stop the pool mgr if err := poolMgr.RefreshState(newState); err != nil { return params.Repository{}, errors.Wrap(err, "updating repo pool manager") } } else { - if _, err := r.poolManagerCtrl.CreateRepoPoolManager(r.ctx, repo, r.providers, r.store); err != nil { + poolMgr, err = r.poolManagerCtrl.CreateRepoPoolManager(r.ctx, repo, r.providers, r.store) + if err != nil { return params.Repository{}, errors.Wrap(err, "creating repo pool manager") } } + repo.PoolManagerStatus = poolMgr.Status() return repo, nil }