Resolved review comments

Author: bfournie

pkg/asset/agent/manifests/common.go

@@ -30,10 +30,6 @@ func getProxy(ic *agent.OptionalInstallConfig) *aiv1beta1.Proxy {
 	}
 }
 
-func getAdditionalTrustBundle(ic *agent.OptionalInstallConfig) string {
-	return ic.Config.AdditionalTrustBundle
-}
-
 func getObjectMetaNamespace(ic *agent.OptionalInstallConfig) string {
 	if ic.Config != nil {
 		return ic.Config.Namespace

pkg/asset/agent/manifests/infraenv.go

@@ -81,8 +81,8 @@ func (i *InfraEnv) Generate(dependencies asset.Parents) error {
 		if installConfig.Config.Proxy != nil {
 			infraEnv.Spec.Proxy = getProxy(installConfig)
 		}
-		if installConfig.Config.AdditionalTrustBundle != "" {
-			infraEnv.Spec.AdditionalTrustBundle = getAdditionalTrustBundle(installConfig)
+		if atb := installConfig.Config.AdditionalTrustBundle; atb != "" {
+			infraEnv.Spec.AdditionalTrustBundle = atb
 		}
 
 		if agentConfig.Config != nil {

pkg/asset/agent/manifests/infraenv_test.go

@@ -139,7 +139,7 @@ func TestInfraEnv_Generate(t *testing.T) {
 					NMStateConfigLabelSelector: metav1.LabelSelector{
 						MatchLabels: getNMStateConfigLabels(getValidOptionalInstallConfig()),
 					},
-					AdditionalTrustBundle: getAdditionalTrustBundle(getAdditionalTrustBundleValidOptionalInstallConfig()),
+					AdditionalTrustBundle: getAdditionalTrustBundleValidOptionalInstallConfig().Config.AdditionalTrustBundle,
 				},
 			},
 		},

pkg/asset/agent/manifests/util_test.go

@@ -210,7 +210,7 @@ func getProxyValidOptionalInstallConfig() *agent.OptionalInstallConfig {
 	return validIC
 }
 
-// getAdditionalTrustBundleValidOptionalInstallConfig returns a valid optional install config with AdditonalTrustBundle
+// getAdditionalTrustBundleValidOptionalInstallConfig returns a valid optional install config with AdditonalTrustBundle.
 func getAdditionalTrustBundleValidOptionalInstallConfig() *agent.OptionalInstallConfig {
 	validIC := getValidOptionalInstallConfig()
 	validIC.Config.AdditionalTrustBundle = `-----BEGIN CERTIFICATE-----MIIDZTCCAk2gAwIBAgIURbA8lR+5xlJZUoOXK66AHFWd3uswDQYJKoZIhvcNAQELBQAwQjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDAeFw0yMjA3MDgxOTUzMTVaFw0yMjA4MDcxOTUzMTVaMEIxCzAJBgNVBAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCroH9c2PLWI0O/nBrmKtS2IuReyWaR0DOMJY7C/vc12l9zlH0DxTOUfEtdqRktjVsUn1vIIiFakxd0QLIPcMyKplmbavIBUQp+MZr0pNVX+lwcctbA7FVHEnbWYNVepoV7kZkTVvMXAqFylMXU4gDmuZzIxhVMMxjialJNED+3ngqvX4w34q4KSk1ytaHGwjREIErwPJjv5PK48KVJL2nlCuA+tbxu1r8eVkOUvZlxAuNNXk/Umf3QX5EiUlTtsmRAct6fIUT3jkrsHSS/tZ66EYJ9Q0OBoX2lL/Msmi27OQvA7uYnuqYlwJzU43tCsiip9E9z/UrLcMYyXx3oPJyPAgMBAAGjUzBRMB0GA1UdDgQWBBTIahE8DDT4T1vta6cXVVaRjnel0zAfBgNVHSMEGDAWgBTIahE8DDT4T1vta6cXVVaRjnel0zAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCQbsMtPFkqPxwOAIds3IoupuyIKmsF32ECEH/OlS+7Sj7MUJnGTQrwgjrsVS5sl8AmnGx4hPdLVX98nEcKMNkph3Hkvh4EvgjSfmYGUXuJBcYU5jqNQrlrGv37rEf5FnvdHV1F3MG8A0Mj0TLtcTdtaJFoOrnQuD/k0/1d+cMiYGTSaT5XK/unARqGEMd4BlWPh5P3SflV/Vy2hHlMpv7OcZ8yaAI3htENZLus+L5kjHWKu6dxlPHKu6ef5k64su2LTNE07Vr9S655uiFW5AX2wDVUcQEDCOiEn6SI9DTt5oQjWPMxPf+rEyfQ2f1QwVez7cyr6Qc5OIUk31HnM/Fj-----END CERTIFICATE-----`