feat!: publish v1beta1 component configs

src/api/convert/convert_test.go

@@ -955,14 +955,14 @@ func TestV1Beta1PkgToV1Alpha1_ComponentBasics(t *testing.T) {
 				Name:        "my-component",
 				Description: "test component",
 				Optional:    true,
+				Selector: v1beta1.ComponentSelector{
+					Architecture: "amd64",
+					Flavor:       "vanilla",
+				},
 				ComponentSpec: v1beta1.ComponentSpec{
 					Target: v1beta1.ComponentTarget{
 						OS: "linux",
 					},
-					Selector: v1beta1.ComponentSelector{
-						Architecture: "amd64",
-						Flavor:       "vanilla",
-					},
 					Import: v1beta1.ComponentImport{
 						Local:  []v1beta1.ComponentImportLocal{{Path: "./path"}},
 						Remote: []v1beta1.ComponentImportRemote{{URL: "oci://example.com/pkg"}},

src/api/v1beta1/component.go

@@ -10,7 +10,9 @@ type Component struct {
 	// Message to include during package deploy describing the purpose of this component.
 	Description string `json:"description,omitempty"`
 	// Do not install this component unless explicitly requested. Defaults to false, meaning the component is required.
-	Optional      bool `json:"optional,omitempty"`
+	Optional bool `json:"optional,omitempty"`
+	// Filter when this component is included during package creation based on architecture or flavor.
+	Selector      ComponentSelector `json:"selector,omitempty"`
 	ComponentSpec `json:",inline"`
 }
 
@@ -48,9 +50,9 @@ type ComponentSelector struct {
 // ComponentImport is a reference to imported Zarf component configs.
 type ComponentImport struct {
 	// Local file path references to component config files to import.
-	Local []ComponentImportLocal `json:"local,omitempty"`
+	Local []ComponentImportLocal `json:"local,omitempty" jsonschema:"oneof_required=local"`
 	// OCI URL references to remote component config files to import; pulled at create time.
-	Remote []ComponentImportRemote `json:"remote,omitempty"`
+	Remote []ComponentImportRemote `json:"remote,omitempty" jsonschema:"oneof_required=remote"`
 }
 
 // ComponentImportLocal is a local file path reference to a component config.

src/api/v1beta1/component_config.go

@@ -11,6 +11,8 @@ type ComponentConfig struct {
 	Kind PackageKind `json:"kind" jsonschema:"enum=ZarfComponentConfig,default=ZarfComponentConfig"`
 	// Component metadata.
 	Metadata ComponentMetadata `json:"metadata"`
+	// Variant identifies the flavor and architecture represented by this component config.
+	Variant ComponentVariant `json:"variant,omitzero"`
 	// The single component this config defines.
 	Component ComponentSpec `json:"component"`
 	// Values imports Zarf values files for templating and overriding Helm values.
@@ -22,11 +24,9 @@ type ComponentConfig struct {
 // ComponentSpec is a reduced component definition used in component configs.
 type ComponentSpec struct {
 	// Import a component from another Zarf component config.
-	Import ComponentImport `json:"import,omitempty"`
+	Import ComponentImport `json:"import,omitzero"`
 	// Filter when this component is deployed based on OS.
 	Target ComponentTarget `json:"target,omitempty"`
-	// Filter when this component is included during package creation based on architecture or flavor.
-	Selector ComponentSelector `json:"selector,omitempty"`
 	// Kubernetes manifests to be included in a generated Helm chart on package deploy.
 	Manifests []Manifest `json:"manifests,omitempty"`
 	// Helm charts to install during package deploy.
@@ -60,6 +60,14 @@ type ComponentMetadata struct {
 	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
+// ComponentVariant identifies a component config variant.
+type ComponentVariant struct {
+	// Flavor identifies the component config flavor.
+	Flavor string `json:"flavor,omitempty"`
+	// Architecture identifies the architecture-specific component artifact.
+	Architecture string `json:"architecture,omitempty" jsonschema:"enum=amd64,enum=arm64"`
+}
+
 // ComponentPublishData is written during publish to track details of the component config.
 type ComponentPublishData struct {
 	// The version of Zarf used to build this component config.

src/cmd/component.go

@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2021-Present The Zarf Authors
+
+package cmd
+
+import (
+	"errors"
+	"path"
+	"strings"
+
+	"github.com/defenseunicorns/pkg/helpers/v2"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"github.com/zarf-dev/zarf/src/config/lang"
+	"github.com/zarf-dev/zarf/src/pkg/component"
+	"oras.land/oras-go/v2/registry"
+)
+
+func newComponentCommand() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "component",
+		Short: lang.CmdComponentShort,
+		// Once v1beta1 is available this should be unhidden
+		Hidden: true,
+	}
+
+	cmd.AddCommand(newComponentPublishCommand(getViper()))
+	return cmd
+}
+
+type componentPublishOptions struct {
+	ociConcurrency int
+	retries        int
+}
+
+func newComponentPublishCommand(v *viper.Viper) *cobra.Command {
+	o := &componentPublishOptions{}
+	cmd := &cobra.Command{
+		Use:     "publish COMPONENT_FILE OCI_REPOSITORY",
+		Short:   lang.CmdComponentPublishShort,
+		Example: lang.CmdComponentPublishExample,
+		Args:    cobra.ExactArgs(2),
+		RunE:    o.run,
+	}
+
+	cmd.Flags().IntVar(&o.ociConcurrency, "oci-concurrency", v.GetInt(VPkgOCIConcurrency), lang.CmdPackageFlagConcurrency)
+	cmd.Flags().IntVar(&o.retries, "retries", v.GetInt(VPkgPublishRetries), lang.CmdPackageFlagRetries)
+	return cmd
+}
+
+func (o *componentPublishOptions) run(cmd *cobra.Command, args []string) error {
+	if !helpers.IsOCIURL(args[1]) {
+		return errors.New("registry must be prefixed with 'oci://'")
+	}
+
+	parts := strings.Split(strings.TrimPrefix(args[1], helpers.OCIURLPrefix), "/")
+	destination := registry.Reference{
+		Registry:   parts[0],
+		Repository: path.Join(parts[1:]...),
+	}
+	if err := destination.ValidateRegistry(); err != nil {
+		return err
+	}
+
+	_, err := component.Publish(cmd.Context(), args[0], destination, component.PublishOptions{
+		OCIConcurrency: o.ociConcurrency,
+		Retries:        o.retries,
+		RemoteOptions:  defaultRemoteOptions(),
+	})
+	return err
+}

src/cmd/dev.go

@@ -132,31 +132,31 @@ func (o *devGenerateSchemaOptions) run(ctx context.Context, args []string) error
 		return err
 	}
 
-	loadOpts := load.DefinitionOptions{
-		Flavor:                     o.flavor,
-		SetVariables:               o.setPkgTmpl,
-		IsInteractive:              true,
-		SkipVersionCheck:           true,
+	loadOpts := load.PackageOptions{
+		DefinitionOptions: load.DefinitionOptions{
+			Flavor:           o.flavor,
+			SetVariables:     o.setPkgTmpl,
+			IsInteractive:    true,
+			SkipVersionCheck: true,
+			CachePath:        cachePath,
+			RemoteOptions:    defaultRemoteOptions(),
+		},
 		SkipValuesSchemaValidation: true,
-		CachePath:                  cachePath,
-		RemoteOptions:              defaultRemoteOptions(),
 	}
 
-	defined, err := load.PackageDefinition(ctx, basePath, loadOpts)
+	loaded, err := load.Package(ctx, basePath, loadOpts)
 	if err != nil {
 		return err
 	}
-	pkg := defined.PackageDefinition.AsV1alpha1()
+	defer func() {
+		if closeErr := loaded.Close(); closeErr != nil {
+			l.Warn("unable to close loaded package", "error", closeErr)
+		}
+	}()
+	pkg := loaded.Definition.AsV1alpha1()
 
 	// Step 1: Merge default values.files to create initial set of default Zarf values
-	valuesPaths := make([]string, len(pkg.Values.Files))
-	for i, file := range pkg.Values.Files {
-		valuesPaths[i] = filepath.Join(basePath, file)
-	}
-	zarfValues, err := value.ParseFiles(ctx, valuesPaths, value.ParseFilesOptions{})
-	if err != nil {
-		return fmt.Errorf("unable to parse package values files: %w", err)
-	}
+	zarfValues := loaded.Values.DeepCopy()
 
 	var mappedSchemas []mappedChartSchema
 
@@ -178,7 +178,7 @@ func (o *devGenerateSchemaOptions) run(ctx context.Context, args []string) error
 				ValuesDir: filepath.Join(tmpDir, "values"),
 			}
 
-			err := assemble.PackageChart(ctx, chart, basePath, chartPaths, cachePath, defaultRemoteOptions())
+			err := assemble.PackageChart(ctx, chart, loaded.Resources, chartPaths, cachePath, defaultRemoteOptions())
 			if err != nil {
 				return fmt.Errorf("unable to package chart %q for schema generation: %w", chart.Name, err)
 			}
@@ -261,10 +261,7 @@ func (o *devGenerateSchemaOptions) run(ctx context.Context, args []string) error
 	}
 
 	// Step 4: Merge and reconcile any existing schema
-	existingSchema, mergeErr := value.MergeSchemaFiles(pkg.Values.Schema, defined.ImportedSchemas, basePath)
-	if mergeErr != nil {
-		return fmt.Errorf("unable to merge imported schemas for schema generation: %w", mergeErr)
-	}
+	existingSchema := loaded.ValuesSchema
 
 	if existingSchema != nil {
 		generatedSchema = value.ReconcileJSONSchema(existingSchema, generatedSchema, o.deleteNotFound)
@@ -357,7 +354,7 @@ func (o *devInspectDefinitionOptions) run(cmd *cobra.Command, args []string) err
 	if err != nil {
 		return err
 	}
-	defined, err := load.PackageDefinition(ctx, basePath, loadOpts)
+	definition, err := load.PackageDefinition(ctx, basePath, loadOpts)
 	var lintErr *lint.LintError
 	if errors.As(err, &lintErr) {
 		PrintFindings(ctx, lintErr)
@@ -367,12 +364,12 @@ func (o *devInspectDefinitionOptions) run(cmd *cobra.Command, args []string) err
 	}
 
 	// The definition is printed in the apiVersion it was authored in.
-	if defined.PackageDefinition.OriginalAPIVersion() == v1beta1.APIVersion {
-		pkg := defined.PackageDefinition.AsV1beta1()
+	if definition.OriginalAPIVersion() == v1beta1.APIVersion {
+		pkg := definition.AsV1beta1()
 		pkg.Build = v1beta1.BuildData{}
 		return utils.ColorPrintYAML(pkg, nil, false)
 	}
-	pkg := defined.PackageDefinition.AsV1alpha1()
+	pkg := definition.AsV1alpha1()
 	pkg.Build = v1alpha1.ZarfBuildData{}
 	return utils.ColorPrintYAML(pkg, nil, false)
 }

src/cmd/root.go

@@ -205,6 +205,7 @@ func NewZarfCommand() *cobra.Command {
 	rootCmd.AddCommand(newDevCommand())
 	rootCmd.AddCommand(newInitCommand())
 	rootCmd.AddCommand(newInternalCommand(rootCmd))
+	rootCmd.AddCommand(newComponentCommand())
 	rootCmd.AddCommand(newPackageCommand())
 
 	rootCmd.AddCommand(newVersionCommand())

src/config/lang/english.go

@@ -431,6 +431,12 @@ $ zarf package publish zarf-package-my-app-amd64-1.0.0.tar.zst oci://my-registry
 	CmdPackagePublishFlagFlavor             = "The flavor of components to include in the resulting package. The flavor will be appended to the package tag"
 	CmdPackagePublishFlagTag                = "The tag to be used in the OCI reference for the package in the registry"
 
+	CmdComponentShort          = "Commands for reusable Zarf components"
+	CmdComponentPublishShort   = "Publishes a v1beta1 Zarf component to a remote registry"
+	CmdComponentPublishExample = `
+# Publish a v1beta1 component config to a remote registry
+$ zarf component publish monitoring.yaml oci://ghcr.io/my-org/components
+`
 	CmdPackageSignShort   = "Signs an existing Zarf package"
 	CmdPackageSignLong    = "Signs an existing Zarf package with a private key. The package can be a local tarball or pulled from an OCI registry. The signature is created by signing the zarf.yaml file and does not modify the package checksums."
 	CmdPackageSignExample = `

src/internal/api/v1beta1/convert.go

@@ -423,16 +423,16 @@ func componentFromGeneric(c types.Component, isInit, migrateFromV1alpha1 bool) v
 		Name:        c.Name,
 		Description: c.Description,
 		Optional:    optionalFromGeneric(c.Optional, c.Required),
+		Selector: v1beta1.ComponentSelector{
+			Architecture: c.Target.Architecture,
+			Flavor:       c.Target.Flavor,
+		},
 		ComponentSpec: v1beta1.ComponentSpec{
 			Repositories: repositoriesFromGeneric(c.Repositories),
 			StateAccess:  stateAccessFromGeneric(c.StateAccess),
 			Target: v1beta1.ComponentTarget{
 				OS: c.Target.OS,
 			},
-			Selector: v1beta1.ComponentSelector{
-				Architecture: c.Target.Architecture,
-				Flavor:       c.Target.Flavor,
-			},
 			Import:  importFromGeneric(c.Import),
 			Service: serviceFromGeneric(c, isInit),
 			Actions: actionsFromGeneric(c.Actions),

src/internal/api/v1beta1/roundtrip_test.go

@@ -60,6 +60,10 @@ func TestConvertGenericRoundTripLossless(t *testing.T) {
 				Name:        "comp",
 				Description: "comp desc",
 				Optional:    true,
+				Selector: v1beta1.ComponentSelector{
+					Architecture: "arm64",
+					Flavor:       "prod",
+				},
 				ComponentSpec: v1beta1.ComponentSpec{
 					Import: v1beta1.ComponentImport{
 						Local:  []v1beta1.ComponentImportLocal{{Path: "path"}},
@@ -68,10 +72,6 @@ func TestConvertGenericRoundTripLossless(t *testing.T) {
 					Target: v1beta1.ComponentTarget{
 						OS: "linux",
 					},
-					Selector: v1beta1.ComponentSelector{
-						Architecture: "arm64",
-						Flavor:       "prod",
-					},
 					Service:      v1beta1.ServiceRegistry,
 					Repositories: []v1beta1.Repository{{URL: "https://github.com/example/repo"}},
 					StateAccess:  []v1beta1.StateAccessKey{v1beta1.StateAccessRegistryCredentials},