Derive artifact catalogs from the selected party without changing configuration
This commit is contained in:
@@ -9,7 +9,7 @@ import (
|
||||
"gitea.maximumdirect.net/eric/narratio/internal/artifactpolicy"
|
||||
)
|
||||
|
||||
func validateScriptorium(cfg *ScriptoriumConfig, notarius *NotariusConfig) error {
|
||||
func validateScriptoriumConfiguration(cfg *ScriptoriumConfig) error {
|
||||
if cfg == nil {
|
||||
return nil
|
||||
}
|
||||
@@ -22,16 +22,26 @@ func validateScriptorium(cfg *ScriptoriumConfig, notarius *NotariusConfig) error
|
||||
if err := validateDuration("pipeline.scriptorium.timeout", cfg.Timeout); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
artifactNames, configuredArtifacts, err := validateScriptoriumArtifactKeys(cfg.Artifacts)
|
||||
names, _, err := validateScriptoriumArtifactKeys(cfg.Artifacts)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := validateScriptoriumDeclarations(cfg.Artifacts, artifactNames); err != nil {
|
||||
if err := validateScriptoriumDeclarations(cfg.Artifacts, names); err != nil {
|
||||
return err
|
||||
}
|
||||
return validateScriptoriumVariables(cfg.Artifacts, names)
|
||||
}
|
||||
|
||||
func validateConcreteArtifacts(artifacts map[string]ScriptoriumArtifactConfig, notarius *NotariusConfig) error {
|
||||
artifactNames, configuredArtifacts, err := validateScriptoriumArtifactKeys(artifacts)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := validateScriptoriumDeclarations(artifacts, artifactNames); err != nil {
|
||||
return err
|
||||
}
|
||||
referencedArtifacts, err := validateScriptoriumDependenciesAndInputs(
|
||||
cfg.Artifacts,
|
||||
artifacts,
|
||||
artifactNames,
|
||||
configuredArtifacts,
|
||||
notariusOutputKeySet(notarius),
|
||||
@@ -39,13 +49,13 @@ func validateScriptorium(cfg *ScriptoriumConfig, notarius *NotariusConfig) error
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := validateScriptoriumVariables(cfg.Artifacts, artifactNames); err != nil {
|
||||
if err := validateScriptoriumVariables(artifacts, artifactNames); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := validateScriptoriumReferencedOutputs(cfg.Artifacts, referencedArtifacts); err != nil {
|
||||
if err := validateScriptoriumReferencedOutputs(artifacts, referencedArtifacts); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := ValidateScriptoriumArtifactDependencies(cfg.Artifacts); err != nil {
|
||||
if err := ValidateScriptoriumArtifactDependencies(artifacts); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user