thelabdude commented on a change in pull request #309:
URL: https://github.com/apache/solr-operator/pull/309#discussion_r690688351
##########
File path: controllers/controller_utils_test.go
##########
@@ -190,14 +190,6 @@ func verifyUserSuppliedTLSConfig(t *testing.T, tls
*solr.SolrTLSOptions, expecte
assert.Equal(t, expectedKeystorePasswordSecretKey,
tls.KeyStorePasswordSecret.Key)
assert.Equal(t, expectedTlsSecretName, tls.PKCS12Secret.Name)
assert.Equal(t, "keystore.p12", tls.PKCS12Secret.Key)
-
- // is there a separate truststore?
- expectedTrustStorePath := ""
- if tls.TrustStoreSecret != nil {
- expectedTrustStorePath = util.DefaultTrustStorePath + "/" +
tls.TrustStoreSecret.Key
- }
-
- expectTLSEnvVars(t, util.TLSEnvVars(tls, needsPkcs12InitContainer),
expectedKeystorePasswordSecretName, expectedKeystorePasswordSecretKey,
needsPkcs12InitContainer, expectedTrustStorePath)
Review comment:
We don't need to call `expectTLSEnvVars` in this part of the test code
as it already gets called after reconciliation, see
`expectTLSConfigOnPodTemplate` and `expectMountedTLSDirConfigOnPodTemplate`.
Removing this code allows us to hide the `TLSEnvVars` in the util package, it
doesn't need to be exposed here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
