send unsynced resources with status updates

Author: maciaszczykm

pkg/streamline/applier/applier.go

@@ -189,9 +189,60 @@ func (in *Applier) Apply(ctx context.Context,
 		componentList[idx].Children = lo.ToSlicePtr(children)
 	}
 
+	// Append unsynced resources to the component list so all of them will be visible in the UI.
+	componentList, err = in.appendUnsyncedResources(service.ID, componentList, resources)
+
 	return componentList, serviceErrorList, nil
 }
 
+func (in *Applier) appendUnsyncedResources(serviceId string, components []client.ComponentAttributes, resources []unstructured.Unstructured) ([]client.ComponentAttributes, error) {
+	result := make([]client.ComponentAttributes, 0)
+	keys := containers.NewSet[smcommon.Key]()
+
+	for _, component := range components {
+		result = append(result, component)
+		keys.Add(smcommon.NewStoreKeyFromComponentAttributes(component).Key())
+	}
+
+	hooks, err := in.store.GetHookComponents(serviceId)
+	if err != nil {
+		return nil, err
+	}
+
+	// Create a map of hooks for an easy lookup.
+	keyToHookComponent := make(map[smcommon.Key]smcommon.HookComponent)
+	for _, hook := range hooks {
+		keyToHookComponent[hook.StoreKey().Key()] = hook
+	}
+
+	for _, resource := range resources {
+		key := smcommon.NewStoreKeyFromUnstructured(resource).Key()
+
+		if !keys.Has(key) {
+			// If a resource has any delete policy, check if it was already deleted.
+			// If it was deleted, then do not include it in the result.
+			deletePolicies := smcommon.ParseHookDeletePolicy(resource)
+			hook, ok := keyToHookComponent[key]
+			if len(deletePolicies) > 0 && ok && hook.HasDesiredState(deletePolicies) {
+				continue
+			}
+
+			gvk := resource.GroupVersionKind()
+			result = append(result, client.ComponentAttributes{
+				Group:     gvk.Group,
+				Version:   gvk.Version,
+				Kind:      gvk.Kind,
+				Name:      resource.GetName(),
+				Namespace: resource.GetNamespace(),
+				Synced:    false,
+				State:     lo.ToPtr(client.ComponentStatePending),
+			})
+		}
+	}
+
+	return result, nil
+}
+
 func (in *Applier) Destroy(ctx context.Context, serviceID string) ([]client.ComponentAttributes, error) {
 	deleted := 0
 	deleteFilterFunc, err := in.getDeleteFilterFunc(serviceID)

pkg/streamline/common/key.go

@@ -3,6 +3,7 @@ package common
 import (
 	"fmt"
 
+	"github.com/pluralsh/console/go/client"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
@@ -54,3 +55,11 @@ func (in StoreKey) ReplaceGroup(group string) StoreKey {
 func NewStoreKeyFromUnstructured(u unstructured.Unstructured) StoreKey {
 	return StoreKey{GVK: u.GroupVersionKind(), Namespace: u.GetNamespace(), Name: u.GetName()}
 }
+
+func NewStoreKeyFromComponentAttributes(a client.ComponentAttributes) StoreKey {
+	return StoreKey{
+		GVK:       schema.GroupVersionKind{Group: a.Group, Version: a.Version, Kind: a.Kind},
+		Namespace: a.Namespace,
+		Name:      a.Name,
+	}
+}

pkg/streamline/status_synchronizer.go

@@ -56,6 +56,8 @@ func (in *StatusSynchronizer) UpdateServiceComponents(serviceId string, componen
 		return nil
 	}
 
+	// TODO: Sync statuses of components that were not processed yet.
+
 	if err = in.client.UpdateComponents(serviceId, "", nil, components, nil, nil); err != nil {
 		return err
 	}

pkg/streamline/store/db_queries.go

@@ -21,7 +21,7 @@ const (
 			transient_manifest_sha TEXT,
 			apply_sha TEXT,
 			server_sha TEXT,
-			manifest BOOLEAN DEFAULT 0
+			manifest BOOLEAN DEFAULT 0 -- Indicates if the component was created from an original manifest set of a service
 		);
 		CREATE UNIQUE INDEX IF NOT EXISTS idx_unique_component ON component("group", version, kind, namespace, name);
 		CREATE INDEX IF NOT EXISTS idx_parent ON component(parent_uid);