From e04f412905b3e20221869ea0f84964ec2f7eeea5 Mon Sep 17 00:00:00 2001 From: Chris Marchesi Date: Mon, 25 Oct 2021 15:47:32 -0700 Subject: [PATCH 1/2] Update internal/host/plugin/repository_host_catalog.go Co-authored-by: Todd --- internal/host/plugin/repository_host_catalog.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/host/plugin/repository_host_catalog.go b/internal/host/plugin/repository_host_catalog.go index 7a05a9696a..d3e69ca593 100644 --- a/internal/host/plugin/repository_host_catalog.go +++ b/internal/host/plugin/repository_host_catalog.go @@ -240,7 +240,7 @@ func (r *Repository) UpdateCatalog(ctx context.Context, c *HostCatalog, version // Patch the working set with the new attributes. c.Attributes = newCatalog.Attributes - case strings.EqualFold("secrets", f) && c.Secrets != nil: + case strings.EqualFold("secrets", f): // While in a similar format, secrets are passed along // wholesale (for the time being). Don't append this mask // field, as secrets do not have a database entry. Clear the From 237b8f9837ae1d92571a798c975edd99b61afed5 Mon Sep 17 00:00:00 2001 From: Chris Marchesi Date: Tue, 26 Oct 2021 09:38:11 -0700 Subject: [PATCH 2/2] Update internal/host/plugin/repository_host_catalog_test.go Co-authored-by: Todd --- internal/host/plugin/repository_host_catalog_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/host/plugin/repository_host_catalog_test.go b/internal/host/plugin/repository_host_catalog_test.go index 9834cb2ee6..ffab5f9a9a 100644 --- a/internal/host/plugin/repository_host_catalog_test.go +++ b/internal/host/plugin/repository_host_catalog_test.go @@ -981,7 +981,7 @@ func withNilEmbeddedCatalog() testSetCatalogOption { } } -// testSetCatalog creates a new HostCatalog with various fields set +// testSetCatalog creates a new in memory HostCatalog with various fields set // and only those fields. This is intended for use in UpdateCatalog. func testSetCatalog(c *HostCatalog, opts ...testSetCatalogOption) *HostCatalog { c = &HostCatalog{