fix #2835 address comments #3171
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
johnpoth
force-pushed
the
local-dependencies-2
branch
from
6111511
to
36ec1d0
Compare
squakez
approved these changes
Apr 5, 2022
tadayosi
reviewed
Apr 6, 2022
| @@ -91,6 +94,16 @@ func generateJavaKeystore(ctx *builderContext) error { | |||
| return jvm.GenerateKeystore(ctx.C, ctx.Path, ctx.Maven.TrustStoreName, ctx.Maven.TrustStorePass, certsData) | |||
| } | |||
|
|
|||
| func mergeSecrets(secrets []corev1.SecretKeySelector, secret *corev1.SecretKeySelector) []corev1.SecretKeySelector { | |||
| if secrets == nil && secret == nil { | |||
There was a problem hiding this comment.
Is this check necessary? secrets == nil
I think it's always safe to assume a slice is not nil in Go.
There was a problem hiding this comment.
Hi @tadayosi ! Thanks for reviewing!
I didn't know a slice cannot be nil in Go ?
I just wrote it to be bullet proof but I am happy to remove it if you think it's unnecessary ?
Thanks !
There was a problem hiding this comment.
After running it debug mode it seems that ctx.Build.Maven.CASecrets does get set to nil so the check is necessary ? Thanks!
There was a problem hiding this comment.
Let me merge this for now and we can reiterate later
tadayosi
reviewed
Apr 6, 2022
|
|
||
| if e.Platform.Status.Build.Maven.CASecret != nil { | ||
| certsData, err := kubernetes.GetSecretsRefData(e.Ctx, e.Client, e.Platform.Namespace, e.Platform.Status.Build.Maven.CASecret) | ||
| if secrets != nil { |
tadayosi
reviewed
Apr 6, 2022
| @@ -348,6 +350,16 @@ func (t *openAPITrait) createNewOpenAPIConfigMap(e *Environment, resource v1.Dat | |||
| return nil | |||
| } | |||
|
|
|||
| func mergeSecrets(secrets []corev1.SecretKeySelector, secret *corev1.SecretKeySelector) []corev1.SecretKeySelector { | |||
| if secrets == nil && secret == nil { | |||
tadayosi
reviewed
Apr 6, 2022
| caCerts, err = kubernetes.GetSecretsRefData(ctx, client, namespace, mvn.CASecret) | ||
| // nolint: staticcheck | ||
| secrets := mergeSecrets(mvn.CASecrets, mvn.CASecret) | ||
| if secrets != nil { |
| @@ -104,6 +107,16 @@ func GenerateCatalog( | |||
| return GenerateCatalogCommon(ctx, globalSettings, []byte(userSettings), caCerts, mvn, runtime, providerDependencies) | |||
| } | |||
|
|
|||
| func mergeSecrets(secrets []corev1.SecretKeySelector, secret *corev1.SecretKeySelector) []corev1.SecretKeySelector { | |||
| if secrets == nil && secret == nil { | |||
johnpoth
force-pushed
the
local-dependencies-2
branch
from
36ec1d0
to
08ed9ed
Compare
johnpoth
force-pushed
the
local-dependencies-2
branch
from
08ed9ed
to
eed9837
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses comments by @astefanutti in #2835
Thanks !
Release Note