Some OCI Optimizations

docs/2-the-zarf-cli/100-cli-commands/zarf_package.md

@@ -6,7 +6,8 @@ Zarf package commands for creating, deploying, and inspecting packages
 ## Options
 
 ```
-  -h, --help   help for package
+  -h, --help                  help for package
+      --oci-concurrency int   Number of concurrent layer operations to perform when interacting with a remote package. (default 3)
 ```
 
 ## Options inherited from parent commands

docs/2-the-zarf-cli/100-cli-commands/zarf_package_create.md

@@ -22,7 +22,7 @@ zarf package create [DIRECTORY] [flags]
   -k, --key string                         Path to private key file for signing packages
       --key-pass string                    Password to the private key file used for signing packages
   -m, --max-package-size int               Specify the maximum size of the package in megabytes, packages larger than this will be split into multiple parts. Use 0 to disable splitting.
-  -o, --output-directory string            Specify the output directory for the created Zarf package
+  -o, --output string                      Specify the output (either a directory or an oci:// URL) for the created Zarf package
       --registry-override stringToString   Specify a map of domains to override on package create when pulling images (e.g. --registry-override docker.io=dockerio-reg.enterprise.intranet) (default [])
   -s, --sbom                               View SBOM contents after creating the package
       --sbom-out string                    Specify an output directory for the SBOMs from the created Zarf package
@@ -38,6 +38,7 @@ zarf package create [DIRECTORY] [flags]
   -l, --log-level string      Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info")
       --no-log-file           Disable log file creation
       --no-progress           Disable fancy UI progress bars, spinners, logos, etc
+      --oci-concurrency int   Number of concurrent layer operations to perform when interacting with a remote package. (default 3)
       --tmpdir string         Specify the temporary directory to use for intermediate files
       --zarf-cache string     Specify the location of the Zarf cache directory (default "~/.zarf-cache")
 ```

docs/2-the-zarf-cli/100-cli-commands/zarf_package_deploy.md

@@ -19,7 +19,6 @@ zarf package deploy [PACKAGE] [flags]
       --confirm                    Confirms package deployment without prompting. ONLY use with packages you trust. Skips prompts to review SBOM, configure variables, select optional components and review potential breaking changes.
   -h, --help                       help for deploy
   -k, --key string                 Path to public key file for validating signed packages
-      --oci-concurrency int        Number of concurrent layer operations to perform when interacting with a remote package. (default 3)
       --set stringToString         Specify deployment variables to set on the command line (KEY=value) (default [])
       --sget string                Path to public sget key file for remote packages signed via cosign
       --shasum string              Shasum of the package to deploy. Required if deploying a remote package and "--insecure" is not provided
@@ -33,6 +32,7 @@ zarf package deploy [PACKAGE] [flags]
   -l, --log-level string      Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info")
       --no-log-file           Disable log file creation
       --no-progress           Disable fancy UI progress bars, spinners, logos, etc
+      --oci-concurrency int   Number of concurrent layer operations to perform when interacting with a remote package. (default 3)
       --tmpdir string         Specify the temporary directory to use for intermediate files
       --zarf-cache string     Specify the location of the Zarf cache directory (default "~/.zarf-cache")
 ```

docs/2-the-zarf-cli/100-cli-commands/zarf_package_inspect.md

@@ -29,6 +29,7 @@ zarf package inspect [PACKAGE] [flags]
   -l, --log-level string      Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info")
       --no-log-file           Disable log file creation
       --no-progress           Disable fancy UI progress bars, spinners, logos, etc
+      --oci-concurrency int   Number of concurrent layer operations to perform when interacting with a remote package. (default 3)
       --tmpdir string         Specify the temporary directory to use for intermediate files
       --zarf-cache string     Specify the location of the Zarf cache directory (default "~/.zarf-cache")
 ```

docs/2-the-zarf-cli/100-cli-commands/zarf_package_list.md

@@ -21,6 +21,7 @@ zarf package list [flags]
   -l, --log-level string      Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info")
       --no-log-file           Disable log file creation
       --no-progress           Disable fancy UI progress bars, spinners, logos, etc
+      --oci-concurrency int   Number of concurrent layer operations to perform when interacting with a remote package. (default 3)
       --tmpdir string         Specify the temporary directory to use for intermediate files
       --zarf-cache string     Specify the location of the Zarf cache directory (default "~/.zarf-cache")
 ```

docs/2-the-zarf-cli/100-cli-commands/zarf_package_publish.md

@@ -22,10 +22,9 @@ zarf package publish ./path/to/dir oci://my-registry.com/my-namespace
 ## Options
 
 ```
-  -h, --help                  help for publish
-  -k, --key string            Path to private key file for signing packages
-      --key-pass string       Password to the private key file used for publishing packages
-      --oci-concurrency int   Number of concurrent layer operations to perform when interacting with a remote package. (default 3)
+  -h, --help              help for publish
+  -k, --key string        Path to private key file for signing packages
+      --key-pass string   Password to the private key file used for publishing packages
 ```
 
 ## Options inherited from parent commands
@@ -36,6 +35,7 @@ zarf package publish ./path/to/dir oci://my-registry.com/my-namespace
   -l, --log-level string      Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info")
       --no-log-file           Disable log file creation
       --no-progress           Disable fancy UI progress bars, spinners, logos, etc
+      --oci-concurrency int   Number of concurrent layer operations to perform when interacting with a remote package. (default 3)
       --tmpdir string         Specify the temporary directory to use for intermediate files
       --zarf-cache string     Specify the location of the Zarf cache directory (default "~/.zarf-cache")
 ```

docs/2-the-zarf-cli/100-cli-commands/zarf_package_pull.md

@@ -18,8 +18,7 @@ zarf package pull [REFERENCE] [flags]
 ```
   -h, --help                      help for pull
   -k, --key string                Path to public key file for validating signed packages
-      --oci-concurrency int       Number of concurrent layer operations to perform when interacting with a remote package. (default 3)
-  -o, --output-directory string   Specify the output directory for the created Zarf package
+  -o, --output-directory string   Specify the output directory for the pulled Zarf package
 ```
 
 ## Options inherited from parent commands
@@ -30,6 +29,7 @@ zarf package pull [REFERENCE] [flags]
   -l, --log-level string      Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info")
       --no-log-file           Disable log file creation
       --no-progress           Disable fancy UI progress bars, spinners, logos, etc
+      --oci-concurrency int   Number of concurrent layer operations to perform when interacting with a remote package. (default 3)
       --tmpdir string         Specify the temporary directory to use for intermediate files
       --zarf-cache string     Specify the location of the Zarf cache directory (default "~/.zarf-cache")
 ```

docs/2-the-zarf-cli/100-cli-commands/zarf_package_remove.md

@@ -23,6 +23,7 @@ zarf package remove {PACKAGE_NAME|PACKAGE_FILE} [flags]
   -l, --log-level string      Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info")
       --no-log-file           Disable log file creation
       --no-progress           Disable fancy UI progress bars, spinners, logos, etc
+      --oci-concurrency int   Number of concurrent layer operations to perform when interacting with a remote package. (default 3)
       --tmpdir string         Specify the temporary directory to use for intermediate files
       --zarf-cache string     Specify the location of the Zarf cache directory (default "~/.zarf-cache")
 ```

src/cmd/package.go

@@ -94,8 +94,6 @@ var packageDeployCmd = &cobra.Command{
 		pkgClient := packager.NewOrDie(&pkgConfig)
 		defer pkgClient.ClearTempPaths()
 
-		pterm.Println()
-
 		// Deploy the package
 		if err := pkgClient.Deploy(); err != nil {
 			message.Fatalf(err, "Failed to deploy package: %s", err.Error())
@@ -197,7 +195,7 @@ var packageRemoveCmd = &cobra.Command{
 		defer pkgClient.ClearTempPaths()
 
 		if err := pkgClient.Remove(pkgName); err != nil {
-			message.Fatalf(err, "Unable to remove the package with an error of: %#v", err)
+			message.Fatalf(err, "Unable to remove the package with an error of: %s", err.Error())
 		}
 	},
 }
@@ -220,10 +218,16 @@ zarf package publish ./path/to/dir oci://my-registry.com/my-namespace
 			message.Fatalf(nil, "Registry must be prefixed with 'oci://'")
 		}
 		parts := strings.Split(strings.TrimPrefix(args[1], "oci://"), "/")
-		pkgConfig.PublishOpts.Reference = registry.Reference{
+		ref := registry.Reference{
 			Registry:   parts[0],
 			Repository: strings.Join(parts[1:], "/"),
 		}
+		err := ref.ValidateRegistry()
+		if err != nil {
+			message.Fatalf(nil, "%s", err.Error())
+		}
+
+		pkgConfig.PublishOpts.PackageDestination = ref.String()
 
 		// Configure the packager
 		pkgClient := packager.NewOrDie(&pkgConfig)
@@ -245,7 +249,8 @@ var packagePullCmd = &cobra.Command{
 		if !utils.IsOCIURL(args[0]) {
 			message.Fatalf(nil, "Registry must be prefixed with 'oci://'")
 		}
-		pkgConfig.DeployOpts.PackagePath = choosePackage(args)
+
+		pkgConfig.PullOpts.PackageSource = args[0]
 
 		// Configure the packager
 		pkgClient := packager.NewOrDie(&pkgConfig)
@@ -295,6 +300,7 @@ func init() {
 	packageCmd.AddCommand(packagePublishCmd)
 	packageCmd.AddCommand(packagePullCmd)
 
+	bindPackageFlags()
 	bindCreateFlags()
 	bindDeployFlags()
 	bindInspectFlags()
@@ -303,14 +309,20 @@ func init() {
 	bindPullFlags()
 }
 
+func bindPackageFlags() {
+	packageFlags := packageCmd.PersistentFlags()
+	v.SetDefault(V_PKG_OCI_CONCURRENCY, 3)
+	packageFlags.IntVar(&config.CommonOptions.OCIConcurrency, "oci-concurrency", v.GetInt(V_PKG_OCI_CONCURRENCY), lang.CmdPackageFlagConcurrency)
+}
+
 func bindCreateFlags() {
 	createFlags := packageCreateCmd.Flags()
 
 	// Always require confirm flag (no viper)
 	createFlags.BoolVar(&config.CommonOptions.Confirm, "confirm", false, lang.CmdPackageCreateFlagConfirm)
 
 	v.SetDefault(V_PKG_CREATE_SET, map[string]string{})
-	v.SetDefault(V_PKG_CREATE_OUTPUT_DIR, "")
+	v.SetDefault(V_PKG_CREATE_OUTPUT, "")
 	v.SetDefault(V_PKG_CREATE_SBOM, false)
 	v.SetDefault(V_PKG_CREATE_SBOM_OUTPUT, "")
 	v.SetDefault(V_PKG_CREATE_SKIP_SBOM, false)
@@ -319,14 +331,17 @@ func bindCreateFlags() {
 
 	createFlags.StringVar(&pkgConfig.CreateOpts.DifferentialData.DifferentialPackagePath, "differential", v.GetString(V_PKG_CREATE_DIFFERENTIAL), lang.CmdPackageCreateFlagDifferential)
 	createFlags.StringToStringVar(&pkgConfig.CreateOpts.SetVariables, "set", v.GetStringMapString(V_PKG_CREATE_SET), lang.CmdPackageCreateFlagSet)
-	createFlags.StringVarP(&pkgConfig.CreateOpts.OutputDirectory, "output-directory", "o", v.GetString(V_PKG_CREATE_OUTPUT_DIR), lang.CmdPackageCreateFlagOutputDirectory)
+	createFlags.StringVarP(&pkgConfig.CreateOpts.Output, "output", "o", v.GetString(V_PKG_CREATE_OUTPUT), lang.CmdPackageCreateFlagOutput)
+	createFlags.StringVar(&pkgConfig.CreateOpts.Output, "output-directory", v.GetString(V_PKG_CREATE_OUTPUT), lang.CmdPackageCreateFlagOutput)
 	createFlags.BoolVarP(&pkgConfig.CreateOpts.ViewSBOM, "sbom", "s", v.GetBool(V_PKG_CREATE_SBOM), lang.CmdPackageCreateFlagSbom)
 	createFlags.StringVar(&pkgConfig.CreateOpts.SBOMOutputDir, "sbom-out", v.GetString(V_PKG_CREATE_SBOM_OUTPUT), lang.CmdPackageCreateFlagSbomOut)
 	createFlags.BoolVar(&pkgConfig.CreateOpts.SkipSBOM, "skip-sbom", v.GetBool(V_PKG_CREATE_SKIP_SBOM), lang.CmdPackageCreateFlagSkipSbom)
 	createFlags.IntVarP(&pkgConfig.CreateOpts.MaxPackageSizeMB, "max-package-size", "m", v.GetInt(V_PKG_CREATE_MAX_PACKAGE_SIZE), lang.CmdPackageCreateFlagMaxPackageSize)
 	createFlags.StringVarP(&pkgConfig.CreateOpts.SigningKeyPath, "key", "k", v.GetString(V_PKG_CREATE_SIGNING_KEY), lang.CmdPackageCreateFlagSigningKey)
 	createFlags.StringVar(&pkgConfig.CreateOpts.SigningKeyPassword, "key-pass", v.GetString(V_PKG_CREATE_SIGNING_KEY_PASSWORD), lang.CmdPackageCreateFlagSigningKeyPassword)
 	createFlags.StringToStringVar(&pkgConfig.CreateOpts.RegistryOverrides, "registry-override", v.GetStringMapString(V_PKG_CREATE_REGISTRY_OVERRIDE), lang.CmdPackageCreateFlagRegistryOverride)
+
+	createFlags.MarkHidden("output-directory")
 }
 
 func bindDeployFlags() {
@@ -342,14 +357,12 @@ func bindDeployFlags() {
 	v.SetDefault(V_PKG_DEPLOY_COMPONENTS, "")
 	v.SetDefault(V_PKG_DEPLOY_SHASUM, "")
 	v.SetDefault(V_PKG_DEPLOY_SGET, "")
-	v.SetDefault(V_PKG_PUBLISH_OCI_CONCURRENCY, 3)
 	v.SetDefault(V_PKG_DEPLOY_PUBLIC_KEY, "")
 
 	deployFlags.StringToStringVar(&pkgConfig.DeployOpts.SetVariables, "set", v.GetStringMapString(V_PKG_DEPLOY_SET), lang.CmdPackageDeployFlagSet)
 	deployFlags.StringVar(&pkgConfig.DeployOpts.Components, "components", v.GetString(V_PKG_DEPLOY_COMPONENTS), lang.CmdPackageDeployFlagComponents)
 	deployFlags.StringVar(&pkgConfig.DeployOpts.Shasum, "shasum", v.GetString(V_PKG_DEPLOY_SHASUM), lang.CmdPackageDeployFlagShasum)
 	deployFlags.StringVar(&pkgConfig.DeployOpts.SGetKeyPath, "sget", v.GetString(V_PKG_DEPLOY_SGET), lang.CmdPackageDeployFlagSget)
-	deployFlags.IntVar(&pkgConfig.PublishOpts.CopyOptions.Concurrency, "oci-concurrency", v.GetInt(V_PKG_PUBLISH_OCI_CONCURRENCY), lang.CmdPackagePublishFlagConcurrency)
 	deployFlags.StringVarP(&pkgConfig.DeployOpts.PublicKeyPath, "key", "k", v.GetString(V_PKG_DEPLOY_PUBLIC_KEY), lang.CmdPackageDeployFlagPublicKey)
 }
 
@@ -369,16 +382,13 @@ func bindRemoveFlags() {
 
 func bindPublishFlags() {
 	publishFlags := packagePublishCmd.Flags()
-	publishFlags.IntVar(&pkgConfig.PublishOpts.CopyOptions.Concurrency, "oci-concurrency", v.GetInt(V_PKG_PUBLISH_OCI_CONCURRENCY), lang.CmdPackagePublishFlagConcurrency)
 	publishFlags.StringVarP(&pkgConfig.PublishOpts.SigningKeyPath, "key", "k", v.GetString(V_PKG_PUBLISH_SIGNING_KEY), lang.CmdPackagePublishFlagSigningKey)
 	publishFlags.StringVar(&pkgConfig.PublishOpts.SigningKeyPassword, "key-pass", v.GetString(V_PKG_PUBLISH_SIGNING_KEY_PASSWORD), lang.CmdPackagePublishFlagSigningKeyPassword)
 }
 
 func bindPullFlags() {
 	pullFlags := packagePullCmd.Flags()
 	v.SetDefault(V_PKG_PULL_OUTPUT_DIR, "")
-	v.SetDefault(V_PKG_PULL_OCI_CONCURRENCY, 3)
-	pullFlags.StringVarP(&pkgConfig.PullOpts.OutputDirectory, "output-directory", "o", v.GetString(V_PKG_PULL_OUTPUT_DIR), lang.CmdPackageCreateFlagOutputDirectory)
-	pullFlags.IntVar(&pkgConfig.PullOpts.CopyOptions.Concurrency, "oci-concurrency", v.GetInt(V_PKG_PULL_OCI_CONCURRENCY), lang.CmdPackagePublishFlagConcurrency)
-	pullFlags.StringVarP(&pkgConfig.PullOpts.PublicKeyPath, "key", "k", v.GetString(V_PKG_PULL_PUBLIC_KEY), lang.CmdPackagePullPublicKey)
+	pullFlags.StringVarP(&pkgConfig.PullOpts.OutputDirectory, "output-directory", "o", v.GetString(V_PKG_PULL_OUTPUT_DIR), lang.CmdPackagePullFlagOutputDirectory)
+	pullFlags.StringVarP(&pkgConfig.PullOpts.PublicKeyPath, "key", "k", v.GetString(V_PKG_PULL_PUBLIC_KEY), lang.CmdPackagePullFlagPublicKey)
 }

src/cmd/tools/archiver.go

@@ -48,7 +48,7 @@ var archiverDecompressCmd = &cobra.Command{
 		sourceArchive, destinationPath := args[0], args[1]
 		err := archiver.Unarchive(sourceArchive, destinationPath)
 		if err != nil {
-			message.Fatal(err, lang.CmdToolsArchiverDecompressErr)
+			message.Fatalf(err, lang.CmdToolsArchiverDecompressErr, err.Error())
 		}
 
 		if unarchiveAll {

src/cmd/viper.go

@@ -49,9 +49,12 @@ const (
 	V_INIT_ARTIFACT_PUSH_USER  = "init.artifact.push_username"
 	V_INIT_ARTIFACT_PUSH_TOKEN = "init.artifact.push_token"
 
+	// Package config keys
+	V_PKG_OCI_CONCURRENCY = "package.oci_concurrency"
+
 	// Package create config keys
 	V_PKG_CREATE_SET                  = "package.create.set"
-	V_PKG_CREATE_OUTPUT_DIR           = "package.create.output_directory"
+	V_PKG_CREATE_OUTPUT               = "package.create.output"
 	V_PKG_CREATE_SBOM                 = "package.create.sbom"
 	V_PKG_CREATE_SBOM_OUTPUT          = "package.create.sbom_output"
 	V_PKG_CREATE_SKIP_SBOM            = "package.create.skip_sbom"
@@ -69,14 +72,12 @@ const (
 	V_PKG_DEPLOY_PUBLIC_KEY = "package.deploy.public_key"
 
 	// Package publish config keys
-	V_PKG_PUBLISH_OCI_CONCURRENCY      = "package.publish.oci_concurrency"
 	V_PKG_PUBLISH_SIGNING_KEY          = "package.publish.signing_key"
 	V_PKG_PUBLISH_SIGNING_KEY_PASSWORD = "package.publish.signing_key_password"
 
 	// Package pull config keys
-	V_PKG_PULL_OCI_CONCURRENCY = "package.pull.oci_concurrency"
-	V_PKG_PULL_OUTPUT_DIR      = "package.pull.output_directory"
-	V_PKG_PULL_PUBLIC_KEY      = "package.pull.public_key"
+	V_PKG_PULL_OUTPUT_DIR = "package.pull.output_directory"
+	V_PKG_PULL_PUBLIC_KEY = "package.pull.public_key"
 )
 
 func initViper() {

src/config/config.go

@@ -57,6 +57,8 @@ const (
 	ZarfSBOMTar       = "sboms.tar"
 	ZarfPackagePrefix = "zarf-package-"
 
+	ZarfComponentsDir = "components"
+
 	ZarfInClusterContainerRegistryNodePort = 31999
 
 	ZarfInClusterGitServiceURL      = "http://zarf-gitea-http.zarf.svc.cluster.local:3000"
@@ -77,9 +79,6 @@ var (
 	// ZarfSeedPort is the NodePort Zarf uses for the 'seed registry'
 	ZarfSeedPort string
 
-	// Dirty Solution to getting the real time deployedComponents components.
-	deployedComponents []types.DeployedComponent
-
 	// SkipLogFile is a flag to skip logging to a file
 	SkipLogFile bool
 
@@ -155,24 +154,6 @@ func GetCraneAuthOption(username string, secret string) crane.Option {
 		}))
 }
 
-// GetDeployingComponents returns the list of deploying components.
-// TODO: (@jeff-mccoy) this should be moved out of config.
-func GetDeployingComponents() []types.DeployedComponent {
-	return deployedComponents
-}
-
-// SetDeployingComponents sets the list of deploying components.
-// TODO: (@jeff-mccoy) this should be moved out of config.
-func SetDeployingComponents(components []types.DeployedComponent) {
-	deployedComponents = components
-}
-
-// ClearDeployingComponents clears the list of deploying components.
-// TODO: (@jeff-mccoy) this should be moved out of config.
-func ClearDeployingComponents() {
-	deployedComponents = []types.DeployedComponent{}
-}
-
 // GetValidPackageExtensions returns the valid package extensions.
 func GetValidPackageExtensions() [3]string {
 	return [...]string{".tar.zst", ".tar", ".zip"}