Merge pull request #26 from kform-dev/inventory

changed inventory such that user can supply inventory id

cmd/kform/commands/applycmd/command.go

@@ -36,6 +36,7 @@ func NewRunner(ctx context.Context, factory util.Factory, ioStreams genericcliop
 	r.Command.Flags().BoolVar(&r.DryRun, "dry-run", false, "executes a speculative execution plan, without applying the resources")
 	r.Command.Flags().StringVarP(&r.Input, "in", "i", "", "a file or directory of KRM resource(s) that act as input rendering the package")
 	r.Command.Flags().StringVarP(&r.Output, "out", "o", "", "a file or directory where the result is stored, a filename creates a single yaml doc; a dir creates seperated yaml files")
+	r.Command.Flags().StringVar(&r.InventoryID, "inventory-id", "", "iventory-id to identify the applied resources, use valid semantics")
 
 	return r
 }
@@ -47,6 +48,7 @@ type Runner struct {
 	DryRun      bool
 	Input       string
 	Output      string
+	InventoryID string
 }
 
 func (r *Runner) runE(c *cobra.Command, args []string) error {
@@ -66,6 +68,7 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {
 		Path:        path,
 		DryRun:      r.DryRun,
 		AutoApprove: r.AutoApprove,
+		InventoryID: r.InventoryID,
 	})
 
 	return kfrunner.Run(ctx)

cmd/kform/commands/destroycmd/command.go

@@ -34,6 +34,7 @@ func NewRunner(ctx context.Context, factory util.Factory, ioStreams genericcliop
 
 	r.Command.Flags().BoolVar(&r.AutoApprove, "auto-approve", false, "skip interactive approval of plan before destroying")
 	r.Command.Flags().BoolVar(&r.DryRun, "dry-run", false, "executes a speculative execution plan, without destroying the resources")
+	r.Command.Flags().StringVar(&r.InventoryID, "inventory-id", "", "iventory-id to identify the applied resources, use valid semantics")
 
 	return r
 }
@@ -45,6 +46,7 @@ type Runner struct {
 	DryRun      bool
 	Input       string
 	Output      string
+	InventoryID string
 }
 
 func (r *Runner) runE(c *cobra.Command, args []string) error {
@@ -65,6 +67,7 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {
 		Destroy:     true,
 		AutoApprove: r.AutoApprove,
 		DryRun:      r.DryRun,
+		InventoryID: r.InventoryID,
 	})
 
 	return kfrunner.Run(ctx)

cmd/kform/commands/initcmd/command.go

@@ -28,7 +28,7 @@ func NewRunner(ctx context.Context, ioStreams genericclioptions.IOStreams) *Runn
 	}
 
 	r.Command = cmd
-	r.Command.Flags().StringVarP(&r.InvConfig.InventoryID, "inventory-id", "i", "", "iventory-id listing the applied resources, use valid semantics")
+	r.Command.Flags().StringVarP(&r.InvConfig.InventoryID, "inventory-id", "i", "", "iventory-id to identify the applied resources, use valid semantics")
 	return r
 }
 
@@ -39,9 +39,14 @@ type Runner struct {
 
 func (r *Runner) runE(c *cobra.Command, args []string) error {
 	ctx := c.Context()
-	err := r.InvConfig.Complete(ctx, args[0])
-	if err != nil {
-		return err
+
+	if r.InvConfig.InventoryID == "" {
+		err := r.InvConfig.Complete(ctx, args[0])
+		if err != nil {
+			return err
+		}
+		return r.InvConfig.Run(ctx)
 	}
-	return r.InvConfig.Run(ctx)
+	return nil
+
 }

cmd/kform/commands/plancmd/command.go

@@ -35,6 +35,7 @@ func NewRunner(ctx context.Context, factory util.Factory, ioStreams genericcliop
 	r.Command.Flags().BoolVar(&r.Destroy, "destroy", false, "destroys resources managed by this plan")
 	r.Command.Flags().StringVarP(&r.Input, "in", "i", "", "a file or directory of KRM resource(s) that act as input rendering the package")
 	r.Command.Flags().StringVarP(&r.Output, "out", "o", "", "a file or directory where the result is stored, a filename creates a single yaml doc; a dir creates seperated yaml files")
+	r.Command.Flags().StringVar(&r.InventoryID, "inventory-id", "", "iventory-id to identify the applied resources, use valid semantics")
 
 	return r
 }
@@ -46,6 +47,7 @@ type Runner struct {
 	Destroy     bool
 	Input       string
 	Output      string
+	InventoryID string
 }
 
 func (r *Runner) runE(c *cobra.Command, args []string) error {
@@ -65,6 +67,7 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {
 		Path:        path,
 		DryRun:      true,
 		Destroy:     r.Destroy,
+		InventoryID: r.InventoryID,
 	})
 
 	return kfrunner.Run(ctx)

pkg/exec/kform/runner/runner.go

@@ -27,18 +27,18 @@ type Runner interface {
 }
 
 type Config struct {
-	Factory        util.Factory
-	PackageName    string
-	LocalInventory *unstructured.Unstructured
-	Input          string // used for none, file or dir
-	InputData      store.Storer[[]byte]
-	Output         string
-	OutputData     store.Storer[[]byte]
-	Path           string               // path of the kform files
-	ResourceData   store.Storer[[]byte] // this providers resource externally w/o having to parse from a filepath
-	DryRun         bool
-	Destroy        bool
-	AutoApprove    bool
+	Factory      util.Factory
+	PackageName  string
+	Input        string // used for none, file or dir
+	InputData    store.Storer[[]byte]
+	Output       string
+	OutputData   store.Storer[[]byte]
+	Path         string               // path of the kform files
+	ResourceData store.Storer[[]byte] // this providers resource externally w/o having to parse from a filepath
+	DryRun       bool
+	Destroy      bool
+	AutoApprove  bool
+	InventoryID  string
 }
 
 func NewKformRunner(cfg *Config) Runner {
@@ -60,14 +60,17 @@ func (r *runner) Run(ctx context.Context) error {
 	var err error
 	// get the local inventory file, which serves as a reference to lookup
 	// the inventory in the cluster backend when it was not supplied
-	if r.cfg.LocalInventory == nil {
-		r.cfg.LocalInventory, err = config.GetInventoryInfo(r.cfg.Path)
+	var localInventory *unstructured.Unstructured
+	if r.cfg.InventoryID != "" {
+		localInventory = config.GetFakeInventoryInfo(r.cfg.InventoryID)
+	} else {
+		localInventory, err = config.GetInventoryInfo(r.cfg.Path)
 		if err != nil {
 			return err
 		}
 	}
 
-	r.invManager, err = manager.New(ctx, r.cfg.LocalInventory, r.cfg.Factory, invv1alpha1.ActuationStrategyApply)
+	r.invManager, err = manager.New(ctx, localInventory, r.cfg.Factory, invv1alpha1.ActuationStrategyApply)
 	if err != nil {
 		return err
 	}

pkg/inventory/client/client.go

@@ -25,7 +25,7 @@ type Client interface {
 	// GetClusterInventory returns the inventory, which consists of the providers with their
 	// resp. configs and the packages with their respective objRefs;
 	// or an error if one occurred.
-	GetClusterInventory(ctx context.Context, inv Info) (*invv1alpha1.Inventory, error)
+	GetClusterInventory(ctx context.Context, invName Info) (*invv1alpha1.Inventory, error)
 	// GetClusterInventoryInfo returns the cluster inventory object.
 	GetClusterInventoryInfo(ctx context.Context, inv Info) (*unstructured.Unstructured, error)
 

pkg/inventory/config/config.go

@@ -16,8 +16,8 @@ import (
 	"github.com/kform-dev/kform/pkg/inventory/config/configmap"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
-	"sigs.k8s.io/cli-utils/pkg/common"
 	"sigs.k8s.io/yaml"
+	//"sigs.k8s.io/cli-utils/pkg/common"
 )
 
 const (
@@ -139,11 +139,11 @@ func (r *Config) GetInventoryFileString() string {
 func (r *Config) fillInValues() string {
 	now := time.Now()
 	nowStr := now.Format("2006-01-02 15:04:05 MST")
-	randomSuffix := common.RandomStr()
+	//randomSuffix := common.RandomStr()
 	manifestStr := r.Template
 	manifestStr = strings.ReplaceAll(manifestStr, "<DATETIME>", nowStr)
 	manifestStr = strings.ReplaceAll(manifestStr, "<NAMESPACE>", r.Namespace)
-	manifestStr = strings.ReplaceAll(manifestStr, "<RANDOMSUFFIX>", randomSuffix)
+	//manifestStr = strings.ReplaceAll(manifestStr, "<RANDOMSUFFIX>", randomSuffix)
 	manifestStr = strings.ReplaceAll(manifestStr, "<INVENTORYID>", r.InventoryID)
 	manifestStr = strings.ReplaceAll(manifestStr, "<INVENTORYKEY>", invv1alpha1.InventoryLabelKey)
 	return manifestStr
@@ -172,3 +172,12 @@ func ParseInventoryFile(b []byte) (*unstructured.Unstructured, error) {
 	}
 	return u, nil
 }
+
+func GetFakeInventoryInfo(inventoryID string) *unstructured.Unstructured {
+	u := &unstructured.Unstructured{}
+	u.SetAPIVersion("v1")
+	u.SetKind("ConfigMap")
+	u.SetName(inventoryID)
+	u.SetNamespace(kformInventoryNamespace)
+	return u
+}

pkg/inventory/config/configmap/cm_template.go

@@ -33,11 +33,5 @@ metadata:
   # NOTE: The name of the inventory object does NOT have
   # any impact on group-related functionality such as
   # deletion or pruning.
-  name: inventory-<RANDOMSUFFIX>
-  labels:
-    # DANGER: Do not change the value of this label.
-    # Changing this value will cause a loss of continuity
-    # with previously applied grouped objects. Set deletion
-    # and pruning functionality will be impaired.
-    <INVENTORYKEY>: <INVENTORYID>
+  name: inventory-<INVENTORYID>
 `

pkg/render2/celrenderer/cel.go

@@ -88,7 +88,6 @@ func getCelEnv(vars map[string]any) (*cel.Env, error) {
 }
 
 func concat(strs traits.Lister, separator string) (string, error) {
-	fmt.Println("wimconcat")
 	sz := strs.Size().(types.Int)
 	var sb strings.Builder
 	for i := types.Int(0); i < sz; i++ {

pkg/render2/celrenderer/renderer.go

@@ -18,7 +18,6 @@ package celrenderer
 
 import (
 	"context"
-	"fmt"
 	"regexp"
 	"strings"
 
@@ -127,8 +126,6 @@ func (r *renderer) RenderString(ctx context.Context, expr string) (any, error) {
 		}
 		log.Debug("expression", "expr", expr)
 		log.Debug("expression", "vars", newVars)
-		fmt.Println("expression expr", expr)
-		fmt.Println("expression vars", newVars)
 		env, err := getCelEnv(newVars)
 		if err != nil {
 			log.Error("cel environment failed", "error", err)