From 19f45b4afed4cd8392c2c75f561c3f1f8830da63 Mon Sep 17 00:00:00 2001
From: Rui Fu <freelz@gmail.com>
Date: Mon, 16 Aug 2021 20:23:18 +0800
Subject: [PATCH 1/2] fix pulsar-admin not have auth parameters

---
 controllers/spec/common.go | 47 ++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/controllers/spec/common.go b/controllers/spec/common.go
index cf209c303..ebde55757 100644
--- a/controllers/spec/common.go
+++ b/controllers/spec/common.go
@@ -177,7 +177,7 @@ func MakeJavaFunctionCommand(downloadPath, packageFile, name, clusterName, detai
 			memory, extraDependenciesDir, authProvided, tlsProvided), " ")
 	if downloadPath != "" {
 		// prepend download command if the downPath is provided
-		downloadCommand := strings.Join(getDownloadCommand(downloadPath, packageFile), " ")
+		downloadCommand := strings.Join(getDownloadCommand(downloadPath, packageFile, authProvided, tlsProvided), " ")
 		processCommand = downloadCommand + " && " + processCommand
 	}
 	return []string{"sh", "-c", processCommand}
@@ -190,7 +190,7 @@ func MakePythonFunctionCommand(downloadPath, packageFile, name, clusterName, det
 			details, authProvided, tlsProvided), " ")
 	if downloadPath != "" {
 		// prepend download command if the downPath is provided
-		downloadCommand := strings.Join(getDownloadCommand(downloadPath, packageFile), " ")
+		downloadCommand := strings.Join(getDownloadCommand(downloadPath, packageFile, authProvided, tlsProvided), " ")
 		processCommand = downloadCommand + " && " + processCommand
 	}
 	return []string{"sh", "-c", processCommand}
@@ -201,39 +201,58 @@ func MakeGoFunctionCommand(downloadPath, goExecFilePath string, function *v1alph
 		strings.Join(getProcessGoRuntimeArgs(goExecFilePath, function), " ")
 	if downloadPath != "" {
 		// prepend download command if the downPath is provided
-		downloadCommand := strings.Join(getDownloadCommand(downloadPath, goExecFilePath), " ")
+		downloadCommand := strings.Join(getDownloadCommand(downloadPath, goExecFilePath, function.Spec.Pulsar.AuthSecret != "", function.Spec.Pulsar.TLSSecret != ""), " ")
 		processCommand = downloadCommand + " && ls -al && pwd &&" + processCommand
 	}
 	return []string{"sh", "-c", processCommand}
 }
 
-func getDownloadCommand(downloadPath, componentPackage string) []string {
+func getDownloadCommand(downloadPath, componentPackage string, authProvided, tlsProvided bool) []string {
 	// The download path is the path that the package saved in the pulsar.
 	// By default, it's the path that the package saved in the pulsar, we can use package name
 	// to replace it for downloading packages from packages management service.
+	args := []string{
+		PulsarAdminExecutableFile,
+		"--admin-url",
+		"$webServiceURL",
+	}
+	if authProvided {
+		args = append(args, []string{
+			"--auth-plugin",
+			"$clientAuthenticationPlugin",
+			"--auth-params",
+			"$clientAuthenticationParameters"}...)
+	}
+
+	if tlsProvided {
+		args = append(args, []string{
+			"--tls-allow-insecure",
+			"$tlsAllowInsecureConnection",
+			"--tls-enable-hostname-verification",
+			"$tlsHostnameVerificationEnable",
+			"--tls-trust-cert-path",
+			"$tlsTrustCertsFilePath",
+		}...)
+	}
 	if hasPackageNamePrefix(downloadPath) {
-		return []string{
-			PulsarAdminExecutableFile,
-			"--admin-url",
-			"$webServiceURL",
+		args = append(args, []string{
 			"packages",
 			"download",
 			downloadPath,
 			"--path",
 			componentPackage,
-		}
+		}...)
+		return args
 	}
-	return []string{
-		PulsarAdminExecutableFile, // TODO configurable pulsar ROOTDIR and adminCLI
-		"--admin-url",
-		"$webServiceURL",
+	args = append(args, []string{
 		"functions",
 		"download",
 		"--path",
 		downloadPath,
 		"--destination-file",
 		componentPackage,
-	}
+	}...)
+	return args
 }
 
 // TODO: do a more strict check for the package name https://github.com/streamnative/function-mesh/issues/49

From fd0dc927a1c7eb91fba1031298c4914e1a8410bc Mon Sep 17 00:00:00 2001
From: Rui Fu <freelz@gmail.com>
Date: Mon, 16 Aug 2021 20:38:40 +0800
Subject: [PATCH 2/2] fix test

---
 controllers/spec/common_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/spec/common_test.go b/controllers/spec/common_test.go
index d2e1b4521..08d91f66d 100644
--- a/controllers/spec/common_test.go
+++ b/controllers/spec/common_test.go
@@ -30,7 +30,7 @@ import (
 
 func TestGetDownloadCommand(t *testing.T) {
 	doTest := func(downloadPath, componentPackage string, expectedCommand []string) {
-		actualResult := getDownloadCommand(downloadPath, componentPackage)
+		actualResult := getDownloadCommand(downloadPath, componentPackage, false, false)
 		assert.Equal(t, expectedCommand, actualResult)
 	}