jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-09-16 09:26:22 +02:00
Code Issues Releases Activity

chore(deprecation): change format of deprecation notice from config command (#2822)

Browse Source 
* Update config.go

* Update config.go

* add library name

Co-authored-by: Oliver Nocon <33484802+OliverNocon@users.noreply.github.com>
This commit is contained in:
Christopher Fenner
2021-05-10 19:18:16 +02:00
committed by GitHub
parent 5899746767
commit 98fac0a455
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -14,6 +14,7 @@ RUN export GIT_COMMIT=$(git rev-parse HEAD) && \
-ldflags \ -ldflags \
"-X github.com/SAP/jenkins-library/cmd.GitCommit=${GIT_COMMIT} \ "-X github.com/SAP/jenkins-library/cmd.GitCommit=${GIT_COMMIT} \
-X github.com/SAP/jenkins-library/pkg/log.LibraryRepository=${GIT_REPOSITORY} \ -X github.com/SAP/jenkins-library/pkg/log.LibraryRepository=${GIT_REPOSITORY} \
-X github.com/SAP/jenkins-library/pkg/log.LibraryName=piper-lib-os \
-X github.com/SAP/jenkins-library/pkg/telemetry.LibraryRepository=${GIT_REPOSITORY}" \ -X github.com/SAP/jenkins-library/pkg/telemetry.LibraryRepository=${GIT_REPOSITORY}" \
-tags release \ -tags release \
-o piper -o piper

20
pkg/config/config.go
View File

@@ -59,33 +59,33 @@ func (c *Config) ApplyAliasConfig(parameters []StepParameters, secrets []StepSec
c.copyStepAliasConfig(stepName, stepAliases) c.copyStepAliasConfig(stepName, stepAliases)
} }
for _, p := range parameters { for _, p := range parameters {
c.General = setParamValueFromAlias(c.General, filters.General, p.Name, p.Aliases) c.General = setParamValueFromAlias(stepName, c.General, filters.General, p.Name, p.Aliases)
if c.Stages[stageName] != nil { if c.Stages[stageName] != nil {
c.Stages[stageName] = setParamValueFromAlias(c.Stages[stageName], filters.Stages, p.Name, p.Aliases) c.Stages[stageName] = setParamValueFromAlias(stepName, c.Stages[stageName], filters.Stages, p.Name, p.Aliases)
} }
if c.Steps[stepName] != nil { if c.Steps[stepName] != nil {
c.Steps[stepName] = setParamValueFromAlias(c.Steps[stepName], filters.Steps, p.Name, p.Aliases) c.Steps[stepName] = setParamValueFromAlias(stepName, c.Steps[stepName], filters.Steps, p.Name, p.Aliases)
} }
} }
for _, s := range secrets { for _, s := range secrets {
c.General = setParamValueFromAlias(c.General, filters.General, s.Name, s.Aliases) c.General = setParamValueFromAlias(stepName, c.General, filters.General, s.Name, s.Aliases)
if c.Stages[stageName] != nil { if c.Stages[stageName] != nil {
c.Stages[stageName] = setParamValueFromAlias(c.Stages[stageName], filters.Stages, s.Name, s.Aliases) c.Stages[stageName] = setParamValueFromAlias(stepName, c.Stages[stageName], filters.Stages, s.Name, s.Aliases)
} }
if c.Steps[stepName] != nil { if c.Steps[stepName] != nil {
c.Steps[stepName] = setParamValueFromAlias(c.Steps[stepName], filters.Steps, s.Name, s.Aliases) c.Steps[stepName] = setParamValueFromAlias(stepName, c.Steps[stepName], filters.Steps, s.Name, s.Aliases)
} }
} }
} }
func setParamValueFromAlias(configMap map[string]interface{}, filter []string, name string, aliases []Alias) map[string]interface{} { func setParamValueFromAlias(stepName string, configMap map[string]interface{}, filter []string, name string, aliases []Alias) map[string]interface{} {
if configMap != nil && configMap[name] == nil && sliceContains(filter, name) { if configMap != nil && configMap[name] == nil && sliceContains(filter, name) {
for _, a := range aliases { for _, a := range aliases {
aliasVal := getDeepAliasValue(configMap, a.Name) aliasVal := getDeepAliasValue(configMap, a.Name)
if aliasVal != nil { if aliasVal != nil {
configMap[name] = aliasVal configMap[name] = aliasVal
if a.Deprecated { if a.Deprecated {
log.Entry().WithField("package", "SAP/jenkins-library/pkg/config").Warningf("DEPRECATION NOTICE: old step config key '%v' used. Please switch to '%v'!", a.Name, name) log.Entry().Warningf("[WARNING] The parameter '%v' is DEPRECATED, use '%v' instead. (%v/%v)", a.Name, name, log.LibraryName, stepName)
} }
} }
if configMap[name] != nil { if configMap[name] != nil {
@@ -213,10 +213,10 @@ func (c *Config) GetStepConfig(flagValues map[string]interface{}, paramJSON stri
} else { } else {
//apply aliases //apply aliases
for _, p := range parameters { for _, p := range parameters {
params = setParamValueFromAlias(params, filters.Parameters, p.Name, p.Aliases) params = setParamValueFromAlias(stepName, params, filters.Parameters, p.Name, p.Aliases)
} }
for _, s := range secrets { for _, s := range secrets {
params = setParamValueFromAlias(params, filters.Parameters, s.Name, s.Aliases) params = setParamValueFromAlias(stepName, params, filters.Parameters, s.Name, s.Aliases)
} }
stepConfig.mixIn(params, filters.Parameters) stepConfig.mixIn(params, filters.Parameters)

1
pkg/log/log.go
View File

@@ -65,6 +65,7 @@ func (formatter *PiperLogFormatter) Format(entry *logrus.Entry) (bytes []byte, e
// LibraryRepository that is passed into with -ldflags // LibraryRepository that is passed into with -ldflags
var LibraryRepository string var LibraryRepository string
var LibraryName string
var logger *logrus.Entry var logger *logrus.Entry
var secrets []string var secrets []string