Refactor package structure

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
stefanprodan · Sep 3, 2021 · 9d50a5c · 9d50a5c
1 parent cbfd86c
commit 9d50a5c
Show file tree

Hide file tree

Showing 27 changed files with 396 additions and 358 deletions.
diff --git a/cmd/kustomizer/apply.go b/cmd/kustomizer/apply.go
@@ -22,7 +22,8 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"github.com/stefanprodan/kustomizer/pkg/resmgr"
+	"github.com/stefanprodan/kustomizer/pkg/inventory"
+	"github.com/stefanprodan/kustomizer/pkg/manager"
 )
 
 var applyCmd = &cobra.Command{
@@ -77,17 +78,27 @@ func runApplyCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	newInventory, err := inventoryMgr.Record(objects)
-	if err != nil {
+	newInventory := inventory.NewInventory(applyArgs.inventoryName, applyArgs.inventoryNamespace)
+	if err := newInventory.AddObjects(objects); err != nil {
 		return fmt.Errorf("creating inventory failed, error: %w", err)
 	}
 	logger.Println(fmt.Sprintf("applying %v manifest(s)...", len(objects)))
 
-	resMgr, err := resmgr.NewResourceManager(rootArgs.kubeconfig, rootArgs.kubecontext, PROJECT)
+	kubeClient, err := newKubeClient(rootArgs.kubeconfig, rootArgs.kubecontext)
 	if err != nil {
-		return err
+		return fmt.Errorf("client init failed: %w", err)
+	}
+
+	statusPoller, err := newKubeStatusPoller(rootArgs.kubeconfig, rootArgs.kubecontext)
+	if err != nil {
+		return fmt.Errorf("status poller init failed: %w", err)
 	}
 
+	resMgr := manager.NewResourceManager(kubeClient, statusPoller, manager.Owner{
+		Field: PROJECT,
+		Group: PROJECT + ".dev",
+	})
+
 	ctx, cancel := context.WithTimeout(context.Background(), rootArgs.timeout)
 	defer cancel()
 

diff --git a/cmd/kustomizer/build.go b/cmd/kustomizer/build.go
@@ -32,7 +32,7 @@ import (
 	kustypes "sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
 
-	"github.com/stefanprodan/kustomizer/pkg/resmgr"
+	"github.com/stefanprodan/kustomizer/pkg/objectutil"
 )
 
 var buildCmd = &cobra.Command{
@@ -72,13 +72,13 @@ func runBuildCmd(cmd *cobra.Command, args []string) error {
 
 	switch buildArgs.output {
 	case "yaml":
-		yml, err := inventoryMgr.ToYAML(objects)
+		yml, err := objectutil.ObjectsToYAML(objects)
 		if err != nil {
 			return err
 		}
 		fmt.Println(yml)
 	case "json":
-		json, err := inventoryMgr.ToJSON(objects)
+		json, err := objectutil.ObjectsToJSON(objects)
 		if err != nil {
 			return err
 		}
@@ -98,7 +98,7 @@ func buildManifests(kustomizePath string, filePaths []string) ([]*unstructured.U
 			return nil, err
 		}
 
-		objs, err := inventoryMgr.ReadAll(bytes.NewReader(data))
+		objs, err := objectutil.ReadObjects(bytes.NewReader(data))
 		if err != nil {
 			return nil, fmt.Errorf("%s: %w", kustomizePath, err)
 		}
@@ -116,7 +116,7 @@ func buildManifests(kustomizePath string, filePaths []string) ([]*unstructured.U
 				return nil, err
 			}
 
-			objs, err := inventoryMgr.ReadAll(bufio.NewReader(ms))
+			objs, err := objectutil.ReadObjects(bufio.NewReader(ms))
 			ms.Close()
 			if err != nil {
 				return nil, fmt.Errorf("%s: %w", manifest, err)
@@ -125,7 +125,7 @@ func buildManifests(kustomizePath string, filePaths []string) ([]*unstructured.U
 		}
 	}
 
-	sort.Sort(resmgr.ApplyOrder(objects))
+	sort.Sort(objectutil.ApplyOrder(objects))
 	return objects, nil
 }
 

diff --git a/pkg/resmgr/client.go → cmd/kustomizer/client.go b/pkg/resmgr/client.go → cmd/kustomizer/client.go
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package resmgr
+package main
 
 import (
 	"fmt"

diff --git a/cmd/kustomizer/delete.go b/cmd/kustomizer/delete.go
@@ -24,7 +24,9 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"github.com/stefanprodan/kustomizer/pkg/resmgr"
+
+	"github.com/stefanprodan/kustomizer/pkg/manager"
+	"github.com/stefanprodan/kustomizer/pkg/objectutil"
 )
 
 var deleteCmd = &cobra.Command{
@@ -57,28 +59,39 @@ func deleteCmdRun(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("--inventory-namespace is required")
 	}
 
-	resMgr, err := resmgr.NewResourceManager(rootArgs.kubeconfig, rootArgs.kubecontext, PROJECT)
-	if err != nil {
-		return err
-	}
-
 	ctx, cancel := context.WithTimeout(context.Background(), rootArgs.timeout)
 	defer cancel()
 
 	logger.Println("retrieving inventory...")
-	inv, err := inventoryMgr.Retrieve(ctx, resMgr.KubeClient(), deleteArgs.inventoryName, deleteArgs.inventoryNamespace)
+
+	kubeClient, err := newKubeClient(rootArgs.kubeconfig, rootArgs.kubecontext)
+	if err != nil {
+		return fmt.Errorf("client init failed: %w", err)
+	}
+
+	statusPoller, err := newKubeStatusPoller(rootArgs.kubeconfig, rootArgs.kubecontext)
+	if err != nil {
+		return fmt.Errorf("status poller init failed: %w", err)
+	}
+
+	resMgr := manager.NewResourceManager(kubeClient, statusPoller, manager.Owner{
+		Field: PROJECT,
+		Group: PROJECT + ".dev",
+	})
+
+	inv, err := inventoryMgr.Retrieve(ctx, kubeClient, deleteArgs.inventoryName, deleteArgs.inventoryNamespace)
 	if err != nil {
 		return err
 	}
 
-	objects, err := inv.List()
+	objects, err := inv.ListObjects()
 	if err != nil {
 		return err
 	}
 
 	logger.Println(fmt.Sprintf("deleting %v manifest(s)...", len(objects)))
 	hasErrors := false
-	sort.Sort(sort.Reverse(resmgr.ApplyOrder(objects)))
+	sort.Sort(sort.Reverse(objectutil.ApplyOrder(objects)))
 	for _, object := range objects {
 		change, err := resMgr.Delete(ctx, object)
 		if err != nil {

diff --git a/cmd/kustomizer/diff.go b/cmd/kustomizer/diff.go
@@ -23,7 +23,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/stefanprodan/kustomizer/pkg/resmgr"
+	"github.com/stefanprodan/kustomizer/pkg/inventory"
+	"github.com/stefanprodan/kustomizer/pkg/manager"
+	"github.com/stefanprodan/kustomizer/pkg/objectutil"
 )
 
 var diffCmd = &cobra.Command{
@@ -64,16 +66,26 @@ func runDiffCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	newInventory, err := inventoryMgr.Record(objects)
-	if err != nil {
+	newInventory := inventory.NewInventory(applyArgs.inventoryName, applyArgs.inventoryNamespace)
+	if err := newInventory.AddObjects(objects); err != nil {
 		return fmt.Errorf("creating inventory failed, error: %w", err)
 	}
 
-	resMgr, err := resmgr.NewResourceManager(rootArgs.kubeconfig, rootArgs.kubecontext, PROJECT)
+	kubeClient, err := newKubeClient(rootArgs.kubeconfig, rootArgs.kubecontext)
 	if err != nil {
-		return err
+		return fmt.Errorf("client init failed: %w", err)
+	}
+
+	statusPoller, err := newKubeStatusPoller(rootArgs.kubeconfig, rootArgs.kubecontext)
+	if err != nil {
+		return fmt.Errorf("status poller init failed: %w", err)
 	}
 
+	resMgr := manager.NewResourceManager(kubeClient, statusPoller, manager.Owner{
+		Field: PROJECT,
+		Group: PROJECT + ".dev",
+	})
+
 	ctx, cancel := context.WithTimeout(context.Background(), rootArgs.timeout)
 	defer cancel()
 
@@ -86,11 +98,11 @@ func runDiffCmd(cmd *cobra.Command, args []string) error {
 			continue
 		}
 
-		if change.Action == string(resmgr.CreatedAction) {
+		if change.Action == string(manager.CreatedAction) {
 			fmt.Println(`►`, change.Subject, "created")
 		}
 
-		if change.Action == string(resmgr.ConfiguredAction) {
+		if change.Action == string(manager.ConfiguredAction) {
 			fmt.Println(`►`, change.Subject, "drifted")
 			fmt.Println(change.Diff)
 		}
@@ -104,7 +116,7 @@ func runDiffCmd(cmd *cobra.Command, args []string) error {
 		}
 
 		for _, object := range staleObjects {
-			fmt.Println(`►`, fmt.Sprintf("%s deleted", resourceFormatter.Unstructured(object)))
+			fmt.Println(`►`, fmt.Sprintf("%s deleted", objectutil.FmtUnstructured(object)))
 		}
 	}
 

diff --git a/cmd/kustomizer/main.go b/cmd/kustomizer/main.go
@@ -17,14 +17,14 @@ limitations under the License.
 package main
 
 import (
-	"github.com/stefanprodan/kustomizer/pkg/resmgr"
 	"os"
 	"path/filepath"
 	"time"
 
 	"github.com/spf13/cobra"
-	"github.com/stefanprodan/kustomizer/pkg/inventory"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
+
+	"github.com/stefanprodan/kustomizer/pkg/inventory"
 )
 
 var VERSION = "1.0.0-dev.0"
@@ -46,10 +46,9 @@ type rootFlags struct {
 }
 
 var (
-	rootArgs          = rootFlags{}
-	logger            = stderrLogger{stderr: os.Stderr}
-	resourceFormatter = &resmgr.ResourceFormatter{}
-	inventoryMgr      *inventory.InventoryManager
+	rootArgs     = rootFlags{}
+	logger       = stderrLogger{stderr: os.Stderr}
+	inventoryMgr *inventory.InventoryManager
 )
 
 func init() {

diff --git a/pkg/inventory/doc.go b/pkg/inventory/doc.go
@@ -18,7 +18,7 @@ limitations under the License.
 // Package inventory contains utilities for keeping a record of Kubernetes objects applied on a cluster.
 //
 // The InventoryManager performs the following actions:
-// - decodes raw manifests (YAML & JSON) into Kubernetes objects
-// - records the objects metadata and stores the inventory in a Kubernetes ConfigMap
+// - records the Kubernetes objects metadata in a compacted format
+// - stores the inventory in a Kubernetes ConfigMap
 // - determines which objects are subject to garbage collection
 package inventory