Add artifacts source for application version creation

apptrust/commands/flags.go

@@ -49,6 +49,8 @@ const (
 	SourceTypeBuildsFlag              = "source-type-builds"
 	SourceTypeReleaseBundlesFlag      = "source-type-release-bundles"
 	SourceTypeApplicationVersionsFlag = "source-type-application-versions"
+	SourceTypePackagesFlag            = "source-type-packages"
+	SourceTypeArtifactsFlag           = "source-type-artifacts"
 	PropertiesFlag                    = "properties"
 	DeletePropertiesFlag              = "delete-properties"
 )
@@ -82,6 +84,8 @@ var flagsMap = map[string]components.Flag{
 	SourceTypeBuildsFlag:              components.NewStringFlag(SourceTypeBuildsFlag, "List of semicolon-separated (;) builds in the form of 'name=buildName1, id=runID1[, include-deps=true]; name=buildName2, id=runID2[, include-deps=true]' to be included in the new version.", func(f *components.StringFlag) { f.Mandatory = false }),
 	SourceTypeReleaseBundlesFlag:      components.NewStringFlag(SourceTypeReleaseBundlesFlag, "List of semicolon-separated (;) release bundles in the form of 'name=releaseBundleName1, version=version1[, project-key=project1][, repo-key=repo1]; name=releaseBundleName2, version=version2[, project-key=project2][, repo-key=repo2]' to be included in the new version.", func(f *components.StringFlag) { f.Mandatory = false }),
 	SourceTypeApplicationVersionsFlag: components.NewStringFlag(SourceTypeApplicationVersionsFlag, "List of semicolon-separated (;) application versions in the form of 'application-key=app1, version=version1; application-key=app2, version=version2' to be included in the new version.", func(f *components.StringFlag) { f.Mandatory = false }),
+	SourceTypePackagesFlag:            components.NewStringFlag(SourceTypePackagesFlag, "List of semicolon-separated (;) packages in the form of 'type=packageType1, name=packageName1, version=version1, repo-key=repo1; type=packageType2, name=packageName2, version=version2, repo-key=repo2' to be included in the new version.", func(f *components.StringFlag) { f.Mandatory = false }),
+	SourceTypeArtifactsFlag:           components.NewStringFlag(SourceTypeArtifactsFlag, "List of semicolon-separated (;) artifacts in the form of 'path=repo/path/to/artifact1[, sha256=hash1]; path=repo/path/to/artifact2[, sha256=hash2]' to be included in the new version.", func(f *components.StringFlag) { f.Mandatory = false }),
 	PropertiesFlag:                    components.NewStringFlag(PropertiesFlag, "Sets or updates custom properties for the application version in format 'key1=value1[,value2,...];key2=value3[,value4,...]'", func(f *components.StringFlag) { f.Mandatory = false }),
 	DeletePropertiesFlag:              components.NewStringFlag(DeletePropertiesFlag, "Remove a property key and all its values", func(f *components.StringFlag) { f.Mandatory = false }),
 }
@@ -96,6 +100,8 @@ var commandFlags = map[string][]string{
 		SourceTypeBuildsFlag,
 		SourceTypeReleaseBundlesFlag,
 		SourceTypeApplicationVersionsFlag,
+		SourceTypePackagesFlag,
+		SourceTypeArtifactsFlag,
 		SpecFlag,
 		SpecVarsFlag,
 	},

apptrust/commands/version/create_app_version_cmd.go

@@ -29,6 +29,7 @@ type createAppVersionCommand struct {
 }
 
 type createVersionSpec struct {
+	Artifacts      []model.CreateVersionArtifact      `json:"artifacts,omitempty"`
 	Packages       []model.CreateVersionPackage       `json:"packages,omitempty"`
 	Builds         []model.CreateVersionBuild         `json:"builds,omitempty"`
 	ReleaseBundles []model.CreateVersionReleaseBundle `json:"release_bundles,omitempty"`
@@ -115,6 +116,20 @@ func (cv *createAppVersionCommand) buildSourcesFromFlags(ctx *components.Context
 		}
 		sources.Versions = sourceVersions
 	}
+	if packagesStr := ctx.GetStringFlagValue(commands.SourceTypePackagesFlag); packagesStr != "" {
+		packages, err := cv.parsePackages(packagesStr)
+		if err != nil {
+			return nil, err
+		}
+		sources.Packages = packages
+	}
+	if artifactsStr := ctx.GetStringFlagValue(commands.SourceTypeArtifactsFlag); artifactsStr != "" {
+		artifacts, err := cv.parseArtifacts(artifactsStr)
+		if err != nil {
+			return nil, err
+		}
+		sources.Artifacts = artifacts
+	}
 	return sources, nil
 }
 
@@ -137,11 +152,12 @@ func (cv *createAppVersionCommand) loadFromSpec(ctx *components.Context) (*model
 	}
 
 	// Validation: if all sources are empty, return error
-	if (len(spec.Packages) == 0) && (len(spec.Builds) == 0) && (len(spec.ReleaseBundles) == 0) && (len(spec.Versions) == 0) {
-		return nil, errorutils.CheckErrorf("Spec file is empty: must provide at least one source (packages, builds, release_bundles, or versions)")
+	if (len(spec.Packages) == 0) && (len(spec.Builds) == 0) && (len(spec.ReleaseBundles) == 0) && (len(spec.Versions) == 0) && (len(spec.Artifacts) == 0) {
+		return nil, errorutils.CheckErrorf("Spec file is empty: must provide at least one source (artifacts, packages, builds, release_bundles, or versions)")
 	}
 
 	sources := &model.CreateVersionSources{
+		Artifacts:      spec.Artifacts,
 		Packages:       spec.Packages,
 		Builds:         spec.Builds,
 		ReleaseBundles: spec.ReleaseBundles,
@@ -239,6 +255,61 @@ func (cv *createAppVersionCommand) parseSourceVersions(applicationVersionsStr st
 	return refs, nil
 }
 
+func (cv *createAppVersionCommand) parsePackages(packagesStr string) ([]model.CreateVersionPackage, error) {
+	const (
+		typeField       = "type"
+		nameField       = "name"
+		versionField    = "version"
+		repositoryField = "repo-key"
+	)
+
+	var packages []model.CreateVersionPackage
+	packageEntries := utils.ParseSliceFlag(packagesStr)
+	for _, entry := range packageEntries {
+		packageEntryMap, err := utils.ParseKeyValueString(entry, ",")
+		if err != nil {
+			return nil, errorutils.CheckErrorf("invalid package format: %v", err)
+		}
+		err = validateRequiredFieldsInMap(packageEntryMap, typeField, nameField, versionField, repositoryField)
+		if err != nil {
+			return nil, errorutils.CheckErrorf("invalid package format: %v", err)
+		}
+		packages = append(packages, model.CreateVersionPackage{
+			Type:       packageEntryMap[typeField],
+			Name:       packageEntryMap[nameField],
+			Version:    packageEntryMap[versionField],
+			Repository: packageEntryMap[repositoryField],
+		})
+	}
+	return packages, nil
+}
+
+func (cv *createAppVersionCommand) parseArtifacts(artifactsStr string) ([]model.CreateVersionArtifact, error) {
+	const (
+		pathField   = "path"
+		sha256Field = "sha256"
+	)
+
+	var artifacts []model.CreateVersionArtifact
+	artifactEntries := utils.ParseSliceFlag(artifactsStr)
+	for _, entry := range artifactEntries {
+		artifactEntryMap, err := utils.ParseKeyValueString(entry, ",")
+		if err != nil {
+			return nil, errorutils.CheckErrorf("invalid artifact format: %v", err)
+		}
+		err = validateRequiredFieldsInMap(artifactEntryMap, pathField)
+		if err != nil {
+			return nil, errorutils.CheckErrorf("invalid artifact format: %v", err)
+		}
+		artifact := model.CreateVersionArtifact{
+			Path:   artifactEntryMap[pathField],
+			SHA256: artifactEntryMap[sha256Field],
+		}
+		artifacts = append(artifacts, artifact)
+	}
+	return artifacts, nil
+}
+
 func validateCreateAppVersionContext(ctx *components.Context) error {
 	if err := validateNoSpecAndFlagsTogether(ctx); err != nil {
 		return err
@@ -250,12 +321,14 @@ func validateCreateAppVersionContext(ctx *components.Context) error {
 	hasSource := ctx.IsFlagSet(commands.SpecFlag) ||
 		ctx.IsFlagSet(commands.SourceTypeBuildsFlag) ||
 		ctx.IsFlagSet(commands.SourceTypeReleaseBundlesFlag) ||
-		ctx.IsFlagSet(commands.SourceTypeApplicationVersionsFlag)
+		ctx.IsFlagSet(commands.SourceTypeApplicationVersionsFlag) ||
+		ctx.IsFlagSet(commands.SourceTypePackagesFlag) ||
+		ctx.IsFlagSet(commands.SourceTypeArtifactsFlag)
 
 	if !hasSource {
 		return errorutils.CheckErrorf(
-			"At least one source flag is required to create an application version. Please provide --%s or at least one of the following: --%s, --%s, --%s.",
-			commands.SpecFlag, commands.SourceTypeBuildsFlag, commands.SourceTypeReleaseBundlesFlag, commands.SourceTypeApplicationVersionsFlag)
+			"At least one source flag is required to create an application version. Please provide --%s or at least one of the following: --%s, --%s, --%s, --%s, --%s.",
+			commands.SpecFlag, commands.SourceTypeBuildsFlag, commands.SourceTypeReleaseBundlesFlag, commands.SourceTypeApplicationVersionsFlag, commands.SourceTypePackagesFlag, commands.SourceTypeArtifactsFlag)
 	}
 
 	return nil
@@ -292,6 +365,8 @@ func validateNoSpecAndFlagsTogether(ctx *components.Context) error {
 			commands.SourceTypeBuildsFlag,
 			commands.SourceTypeReleaseBundlesFlag,
 			commands.SourceTypeApplicationVersionsFlag,
+			commands.SourceTypePackagesFlag,
+			commands.SourceTypeArtifactsFlag,
 		}
 		for _, flag := range otherSourceFlags {
 			if ctx.IsFlagSet(flag) {