Skip to content

Commit 82bc6e7

Browse files
Changed log.info to tidy up using fmt.sprintf (#2246)
getIntegerEnvWithDefault func added to return value for MaxWorkers/Ansibleverbosity based on if envVar is set or a defvalue is used
1 parent ee5a9e7 commit 82bc6e7

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
### Removed
2626

2727
### Bug Fixes
28+
- Fixed log formatting issue that occurred while loading the configuration for Ansible-based operators. ([#2246](https://github.com/operator-framework/operator-sdk/pull/2246))
2829
- Fix issue faced in the Ansible based operators when `jmespath` queries are used because it was not installed. ([#2252](https://github.com/operator-framework/operator-sdk/pull/2252))
2930
- Updates `operator-sdk build` for go operators to compile the operator binary based on Go's built-in GOARCH detection. This fixes an issue that caused an `amd64` binary to be built into non-`amd64` base images when using operator-sdk on non-`amd64` architectures. ([#2268](https://github.com/operator-framework/operator-sdk/pull/2268))
3031
- Fix scorecard behavior such that a CSV file is read correctly when `olm-deployed` is set to `true`. ([#2274](https://github.com/operator-framework/operator-sdk/pull/2274))

pkg/ansible/watches/watches.go

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,7 @@ func getMaxWorkers(gvk schema.GroupVersionKind, defValue int) int {
272272
"_",
273273
-1,
274274
))
275-
maxWorkers, err := strconv.Atoi(os.Getenv(envVar))
276-
if err != nil {
277-
// we don't care why we couldn't parse it just use default
278-
log.Info("Failed to parse %v from environment. Using default %v", envVar, defValue)
279-
return defValue
280-
}
281-
275+
maxWorkers := getIntegerEnvWithDefault(envVar, defValue)
282276
if maxWorkers <= 0 {
283277
log.Info("Value %v not valid. Using default %v", maxWorkers, defValue)
284278
return defValue
@@ -295,12 +289,7 @@ func getAnsibleVerbosity(gvk schema.GroupVersionKind, defValue int) int {
295289
"_",
296290
-1,
297291
))
298-
ansibleVerbosity, err := strconv.Atoi(os.Getenv(envVar))
299-
if err != nil {
300-
log.Info("Failed to parse %v from environment. Using default %v", envVar, defValue)
301-
return defValue
302-
}
303-
292+
ansibleVerbosity := getIntegerEnvWithDefault(envVar, defValue)
304293
// Use default value when value doesn't make sense
305294
if ansibleVerbosity < 0 {
306295
log.Info("Value %v not valid. Using default %v", ansibleVerbosity, defValue)
@@ -312,3 +301,18 @@ func getAnsibleVerbosity(gvk schema.GroupVersionKind, defValue int) int {
312301
}
313302
return ansibleVerbosity
314303
}
304+
305+
// getIntegerEnvWithDefault returns value for MaxWorkers/Ansibleverbosity based on if envVar is set or a defvalue is used.
306+
func getIntegerEnvWithDefault(envVar string, defValue int) int {
307+
val := defValue
308+
if envVal, ok := os.LookupEnv(envVar); ok {
309+
if i, err := strconv.Atoi(envVal); err != nil {
310+
log.Info("Could not parse environment variable as an integer; using default value", "envVar", envVar, "default", defValue)
311+
} else {
312+
val = i
313+
}
314+
} else if !ok {
315+
log.Info("Environment variable not set; using default value", "envVar", envVar, "default", defValue)
316+
}
317+
return val
318+
}

0 commit comments

Comments
 (0)