From 6021adebf59a3c164eda88f92c9bcd14e8c67522 Mon Sep 17 00:00:00 2001 From: rverdile Date: Fri, 20 Oct 2023 16:16:31 -0400 Subject: [PATCH] Refs 2615: don't propagate canceled context (#434) --- pkg/dao/repository_configs.go | 2 +- pkg/dao/snapshots.go | 2 +- pkg/handler/repositories.go | 5 +++++ pkg/handler/repositories_test.go | 4 ++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkg/dao/repository_configs.go b/pkg/dao/repository_configs.go index 0a479529c..364ba9b81 100644 --- a/pkg/dao/repository_configs.go +++ b/pkg/dao/repository_configs.go @@ -82,7 +82,7 @@ func (r *repositoryConfigDaoImpl) InitializePulpClient(ctx context.Context, orgI return err } - pulpClient := pulp_client.GetPulpClientWithDomain(ctx, domainName) + pulpClient := pulp_client.GetPulpClientWithDomain(context.TODO(), domainName) r.pulpClient = pulpClient return nil } diff --git a/pkg/dao/snapshots.go b/pkg/dao/snapshots.go index 42daf504f..a0dfd463d 100644 --- a/pkg/dao/snapshots.go +++ b/pkg/dao/snapshots.go @@ -161,7 +161,7 @@ func (sDao *snapshotDaoImpl) InitializePulpClient(ctx context.Context, orgID str return err } - pulpClient := pulp_client.GetPulpClientWithDomain(ctx, domainName) + pulpClient := pulp_client.GetPulpClientWithDomain(context.TODO(), domainName) sDao.pulpClient = pulpClient return nil } diff --git a/pkg/handler/repositories.go b/pkg/handler/repositories.go index 6e1e8deb9..370abd695 100644 --- a/pkg/handler/repositories.go +++ b/pkg/handler/repositories.go @@ -310,6 +310,11 @@ func (rh *RepositoryHandler) update(c echo.Context, fillDefaults bool) error { repoParams.FillDefaults() } + err := rh.DaoRegistry.RepositoryConfig.InitializePulpClient(c.Request().Context(), orgID) + if err != nil { + return ce.NewErrorResponse(ce.HttpCodeForDaoError(err), "Error initializing pulp client", err.Error()) + } + repoConfig, err := rh.DaoRegistry.RepositoryConfig.Fetch(orgID, uuid) if err != nil { return ce.NewErrorResponse(ce.HttpCodeForDaoError(err), "Error fetching repository", err.Error()) diff --git a/pkg/handler/repositories_test.go b/pkg/handler/repositories_test.go index c932e5494..bfd53da9f 100644 --- a/pkg/handler/repositories_test.go +++ b/pkg/handler/repositories_test.go @@ -860,6 +860,8 @@ func (suite *ReposSuite) TestFullUpdate() { UUID: uuid, RepositoryUUID: repoUuid, }, nil) + suite.reg.RepositoryConfig.On("Update", test_handler.MockOrgId, uuid, expected).Return(false, nil) + suite.reg.RepositoryConfig.On("InitializePulpClient", mock.AnythingOfType("*context.valueCtx"), test_handler.MockOrgId).Return(nil).Once() mockTaskClientEnqueueIntrospect(suite.tcMock, "https://example.com", repoUuid) @@ -895,6 +897,7 @@ func (suite *ReposSuite) TestPartialUpdateUrlChange() { suite.reg.RepositoryConfig.On("Update", test_handler.MockOrgId, repoConfigUuid, expected).Return(true, nil) suite.reg.RepositoryConfig.On("Fetch", test_handler.MockOrgId, repoConfigUuid).Return(repoConfig, nil) suite.reg.TaskInfo.On("IsSnapshotInProgress", *expected.OrgID, repoUuid).Return(false, nil) + suite.reg.RepositoryConfig.On("InitializePulpClient", mock.AnythingOfType("*context.valueCtx"), test_handler.MockOrgId).Return(nil).Once() mockTaskClientEnqueueSnapshot(suite, &repoConfig) mockTaskClientEnqueueIntrospect(suite.tcMock, "https://example.com", repoUuid) @@ -929,6 +932,7 @@ func (suite *ReposSuite) TestPartialUpdate() { RepositoryUUID: repoUuid, Snapshot: false, }, nil) + suite.reg.RepositoryConfig.On("InitializePulpClient", mock.AnythingOfType("*context.valueCtx"), test_handler.MockOrgId).Return(nil).Once() mockTaskClientEnqueueIntrospect(suite.tcMock, "https://example.com", repoUuid)