Fix secrets clearing bug in update. Changes to update count behavior for catalogs (#1691)

* Fix secret clearing bug in update.  Always return 1 catalog updated if we can find a catalog w/ a matching version.

internal/host/plugin/loopback_test.go

@@ -19,8 +19,8 @@ func TestLoopbackPlugin(t *testing.T) {
 
 	plg := NewLoopbackPlugin()
 	secretsMap := map[string]interface{}{
-		"foo": "bar",
-		"baz": true,
+		"key1": "key2",
+		"baz":  true,
 	}
 	secrets, err := structpb.NewStruct(secretsMap)
 	require.NoError(err)
@@ -38,6 +38,30 @@ func TestLoopbackPlugin(t *testing.T) {
 	require.NotNil(catResp.GetPersisted().GetSecrets())
 	assert.EqualValues(secretsMap, catResp.GetPersisted().GetSecrets().AsMap())
 
+	newSecretsMap := map[string]interface{}{
+		"key1": "key2",
+		"baz":  true,
+	}
+	newSecrets, err := structpb.NewStruct(newSecretsMap)
+	require.NoError(err)
+
+	// First, test that if we give it secrets, those secrets come back as
+	// persisted data
+	upResp, err := plg.OnUpdateCatalog(ctx, &plgpb.OnUpdateCatalogRequest{
+		CurrentCatalog: &hostcatalogs.HostCatalog{},
+		NewCatalog: &hostcatalogs.HostCatalog{
+			Secrets: newSecrets,
+		},
+		Persisted: &plgpb.HostCatalogPersisted{
+			Secrets: secrets,
+		},
+	})
+	require.NoError(err)
+	require.NotNil(upResp)
+	require.NotNil(upResp.GetPersisted())
+	require.NotNil(upResp.GetPersisted().GetSecrets())
+	assert.EqualValues(newSecretsMap, upResp.GetPersisted().GetSecrets().AsMap())
+
 	// Add data to some sets
 	hostInfo1 := map[string]interface{}{
 		loopbackPluginHostInfoAttrField: map[string]interface{}{