@@ -219,8 +219,8 @@ func prefixedDownloadCommandEnvNames(prefix string) downloadCommandEnvNames {
219219type DownloadServiceConfig struct {
220220 pulsar * v1alpha1.PulsarMessaging
221221 envPrefix string
222- envNames downloadCommandEnvNames
223- oauth2Mount string
222+ EnvNames downloadCommandEnvNames
223+ Oauth2Mount string
224224 tlsMount string
225225}
226226
@@ -229,15 +229,15 @@ func NewDownloadServiceConfig(packageService, messaging *v1alpha1.PulsarMessagin
229229 return DownloadServiceConfig {
230230 pulsar : packageService ,
231231 envPrefix : PackageServiceEnvPrefix ,
232- envNames : prefixedDownloadCommandEnvNames (PackageServiceEnvPrefix ),
233- oauth2Mount : PackageOAuth2MountPath ,
232+ EnvNames : prefixedDownloadCommandEnvNames (PackageServiceEnvPrefix ),
233+ Oauth2Mount : PackageOAuth2MountPath ,
234234 tlsMount : PackageTLSMountPath ,
235235 }
236236 }
237237 return DownloadServiceConfig {
238238 pulsar : messaging ,
239- envNames : defaultDownloadCommandEnvNames (),
240- oauth2Mount : "" ,
239+ EnvNames : defaultDownloadCommandEnvNames (),
240+ Oauth2Mount : "" ,
241241 tlsMount : "" ,
242242 }
243243}
@@ -392,8 +392,8 @@ func MakeStatefulSet(objectMeta *metav1.ObjectMeta, replicas *int32, downloaderI
392392 if ! hasHTTPPrefix (downloadPath ) {
393393 if authConfig := downloadConfig .AuthConfig (); authConfig != nil && authConfig .OAuth2Config != nil {
394394 oauth2MountPath := authConfig .OAuth2Config .GetMountPath ()
395- if downloadConfig .oauth2Mount != "" {
396- oauth2MountPath = downloadConfig .oauth2Mount
395+ if downloadConfig .Oauth2Mount != "" {
396+ oauth2MountPath = downloadConfig .Oauth2Mount
397397 }
398398 volumeMounts = appendVolumeMountIfNotExists (volumeMounts , generateVolumeMountFromOAuth2ConfigWithMountPath (authConfig .OAuth2Config , oauth2MountPath ))
399399 podVolumes = appendVolumeIfNotExists (podVolumes , generateVolumeFromOAuth2Config (authConfig .OAuth2Config ))
@@ -420,7 +420,7 @@ func MakeStatefulSet(objectMeta *metav1.ObjectMeta, replicas *int32, downloaderI
420420 Command : []string {"sh" , "-c" ,
421421 strings .Join (GetDownloadCommandWithEnv (downloadPath , componentPackage , true , true ,
422422 downloadConfig .AuthProvided (), downloadConfig .TLSProvided (), downloadConfig .TLSConfig (),
423- downloadConfig .AuthConfig (), downloadConfig .envNames , downloadConfig .oauth2Mount ), " " )},
423+ downloadConfig .AuthConfig (), downloadConfig .EnvNames , downloadConfig .Oauth2Mount ), " " )},
424424 VolumeMounts : volumeMounts ,
425425 ImagePullPolicy : corev1 .PullIfNotPresent ,
426426 Env : []corev1.EnvVar {{
@@ -683,7 +683,7 @@ func MakeJavaFunctionCommand(downloadPath, packageFile, name, clusterName, gener
683683 // prepend download command if the downPath is provided
684684 downloadCommand := strings .Join (GetDownloadCommandWithEnv (downloadPath , packageFile , hasPulsarctl , hasWget ,
685685 downloadConfig .AuthProvided (), downloadConfig .TLSProvided (), downloadConfig .TLSConfig (),
686- downloadConfig .AuthConfig (), downloadConfig .envNames , downloadConfig .oauth2Mount ), " " )
686+ downloadConfig .AuthConfig (), downloadConfig .EnvNames , downloadConfig .Oauth2Mount ), " " )
687687 processCommand = downloadCommand + " && " + processCommand
688688 }
689689 return []string {"bash" , "-c" , processCommand }
@@ -701,7 +701,7 @@ func MakePythonFunctionCommand(downloadPath, packageFile, name, clusterName, gen
701701 downloadCommand := strings .Join (GetDownloadCommandWithEnv (downloadPath , packageFile , hasPulsarctl , hasWget ,
702702 downloadConfig .AuthProvided (),
703703 downloadConfig .TLSProvided (), downloadConfig .TLSConfig (), downloadConfig .AuthConfig (),
704- downloadConfig .envNames , downloadConfig .oauth2Mount ), " " )
704+ downloadConfig .EnvNames , downloadConfig .Oauth2Mount ), " " )
705705 processCommand = downloadCommand + " && " + processCommand
706706 }
707707 return []string {"bash" , "-c" , processCommand }
@@ -721,7 +721,7 @@ func MakeGoFunctionCommand(downloadPath, goExecFilePath string, function *v1alph
721721 downloadCommand := strings .Join (GetDownloadCommandWithEnv (downloadPath , goExecFilePath ,
722722 hasPulsarctl , hasWget , downloadConfig .AuthProvided (),
723723 downloadConfig .TLSProvided (), downloadConfig .TLSConfig (), downloadConfig .AuthConfig (),
724- downloadConfig .envNames , downloadConfig .oauth2Mount ), " " )
724+ downloadConfig .EnvNames , downloadConfig .Oauth2Mount ), " " )
725725 processCommand = downloadCommand + " && ls -al && pwd &&" + processCommand
726726 }
727727 return []string {"bash" , "-c" , processCommand }
@@ -738,7 +738,7 @@ func MakeGenericFunctionCommand(downloadPath, functionFile, language, clusterNam
738738 downloadCommand := strings .Join (GetDownloadCommandWithEnv (downloadPath , functionFile , true , true ,
739739 downloadConfig .AuthProvided (),
740740 downloadConfig .TLSProvided (), downloadConfig .TLSConfig (), downloadConfig .AuthConfig (),
741- downloadConfig .envNames , downloadConfig .oauth2Mount ), " " )
741+ downloadConfig .EnvNames , downloadConfig .Oauth2Mount ), " " )
742742 processCommand = downloadCommand + " && " + processCommand
743743 }
744744 return []string {"sh" , "-c" , processCommand }
0 commit comments