You've already forked sap-jenkins-library
mirror of
https://github.com/SAP/jenkins-library.git
synced 2025-11-06 09:09:19 +02:00
This reverts commit b760bf48e7.
Co-authored-by: Oliver Nocon <33484802+OliverNocon@users.noreply.github.com>
This commit is contained in:
@@ -130,7 +130,6 @@ func getConfig() (config.StepConfig, error) {
|
|||||||
if GeneralConfig.MetaDataResolver == nil {
|
if GeneralConfig.MetaDataResolver == nil {
|
||||||
GeneralConfig.MetaDataResolver = GetAllStepMetadata
|
GeneralConfig.MetaDataResolver = GetAllStepMetadata
|
||||||
}
|
}
|
||||||
log.Entry().Debugf("Trying to resolve metadata for step %s out of all metadata: %v", configOptions.stepName, GeneralConfig.MetaDataResolver())
|
|
||||||
metadata, err := config.ResolveMetadata(GeneralConfig.GitHubAccessTokens, GeneralConfig.MetaDataResolver, configOptions.stepMetadata, configOptions.stepName)
|
metadata, err := config.ResolveMetadata(GeneralConfig.GitHubAccessTokens, GeneralConfig.MetaDataResolver, configOptions.stepMetadata, configOptions.stepName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return stepConfig, errors.Wrapf(err, "failed to resolve metadata")
|
return stepConfig, errors.Wrapf(err, "failed to resolve metadata")
|
||||||
|
|||||||
@@ -501,7 +501,6 @@ func ResolveMetadata(gitHubTokens map[string]string, metaDataResolver func() map
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if stepName != "" {
|
if stepName != "" {
|
||||||
log.Entry().Debugf("Resolving metadata for step: %s", stepName)
|
|
||||||
if metaDataResolver == nil {
|
if metaDataResolver == nil {
|
||||||
return metadata, errors.New("metaDataResolver is nil")
|
return metadata, errors.New("metaDataResolver is nil")
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user