fix ut

Signed-off-by: Hang Yan <yhang@vmware.com>
antrea-io · Nov 5, 2024 · 267b8d6 · 267b8d6
1 parent 85cd494
commit 267b8d6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/pkg/controller/supportbundlecollection/controller.go b/pkg/controller/supportbundlecollection/controller.go
@@ -391,14 +391,17 @@ func (c *Controller) createInternalSupportBundleCollection(bundle *v1alpha1.Supp
 		klog.ErrorS(err, "Failed to get authentication defined in the SupportBundleCollection CR", "name", bundle.Name, "authentication", bundle.Spec.Authentication)
 		return nil, err
 	}
-	internalBundleCollection := c.addInternalSupportBundleCollection(bundle, nodeSpan, &controlplane.BundleServerAuthConfiguration{
+	bundleAuthConfig := &controlplane.BundleServerAuthConfiguration{
 		BearerToken: authentication.BearerToken,
 		APIKey:      authentication.APIKey,
-		BasicAuthentication: &controlplane.BasicAuthentication{
+	}
+	if authentication.BasicAuthentication != nil {
+		bundleAuthConfig.BasicAuthentication = &controlplane.BasicAuthentication{
 			Username: authentication.BasicAuthentication.Username,
 			Password: authentication.BasicAuthentication.Password,
-		},
-	}, metav1.NewTime(expiredAt))
+		}
+	}
+	internalBundleCollection := c.addInternalSupportBundleCollection(bundle, nodeSpan, bundleAuthConfig, metav1.NewTime(expiredAt))
 	// Process the support bundle collection when time is up, this will create a CollectionFailure condition if the
 	// bundle collection is not completed in time because any Agent fails to upload the files and does not report
 	// the failure.

diff --git a/pkg/util/ftp/auth.go b/pkg/util/ftp/auth.go
@@ -50,7 +50,7 @@ type AuthConfiguration struct {
 	AuthType            AuthType
 	BearerToken         string
 	APIKey              string
-	BasicAuthentication BasicAuthentication
+	BasicAuthentication *BasicAuthentication
 }
 
 // GenSSHClientConfig generates ssh.ClientConfig from username and password
@@ -112,7 +112,7 @@ func GetAuthConfigurationFromSecret(ctx context.Context, authType AuthType, secr
 		}
 		return &AuthConfiguration{
 			AuthType: BasicAuthenticationType,
-			BasicAuthentication: BasicAuthentication{
+			BasicAuthentication: &BasicAuthentication{
 				Username: username,
 				Password: password,
 			},

diff --git a/pkg/util/ftp/auth_test.go b/pkg/util/ftp/auth_test.go
@@ -115,7 +115,7 @@ func TestParseFileServerAuth(t *testing.T) {
 			},
 			expectedAuth: &AuthConfiguration{
 				AuthType: BasicAuthenticationType,
-				BasicAuthentication: BasicAuthentication{
+				BasicAuthentication: &BasicAuthentication{
 					Username: usr,
 					Password: pwd,
 				},