From 117c383fac7115a0ba7e56d02b2a88df7d3c051c Mon Sep 17 00:00:00 2001 From: Ambor Date: Tue, 11 Apr 2023 11:09:42 +0800 Subject: [PATCH] style: typo for the BuilderNamespace (#2776) Signed-off-by: saltbo --- .../newdeploy/newdeploymgr_test.go | 2 +- pkg/utils/namespace.go | 18 +++++++++--------- pkg/utils/namespace_test.go | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/executor/executortype/newdeploy/newdeploymgr_test.go b/pkg/executor/executortype/newdeploy/newdeploymgr_test.go index 3d2eea05..5cc9b288 100644 --- a/pkg/executor/executortype/newdeploy/newdeploymgr_test.go +++ b/pkg/executor/executortype/newdeploy/newdeploymgr_test.go @@ -66,7 +66,7 @@ func TestRefreshFuncPods(t *testing.T) { nsResolver := utils.NamespaceResolver{ FunctionNamespace: functionNamespace, - BuiderNamespace: builderNamespace, + BuilderNamespace: builderNamespace, DefaultNamespace: defaultNamespace, } ndm.nsResolver = &nsResolver diff --git a/pkg/utils/namespace.go b/pkg/utils/namespace.go index 1e552e8d..836bdde5 100644 --- a/pkg/utils/namespace.go +++ b/pkg/utils/namespace.go @@ -20,7 +20,7 @@ const ( type ( NamespaceResolver struct { FunctionNamespace string - BuiderNamespace string + BuilderNamespace string DefaultNamespace string FissionResourceNS map[string]string Logger *zap.Logger @@ -40,14 +40,14 @@ var nsResolver *NamespaceResolver func init() { nsResolver = &NamespaceResolver{ FunctionNamespace: os.Getenv(ENV_FUNCTION_NAMESPACE), - BuiderNamespace: os.Getenv(ENV_BUILDER_NAMESPACE), + BuilderNamespace: os.Getenv(ENV_BUILDER_NAMESPACE), DefaultNamespace: os.Getenv(ENV_DEFAULT_NAMESPACE), FissionResourceNS: GetNamespaces(), Logger: loggerfactory.GetLogger(), } nsResolver.Logger.Debug("namespaces", zap.String("function_namespace", nsResolver.FunctionNamespace), - zap.String("builder_namespace", nsResolver.BuiderNamespace), + zap.String("builder_namespace", nsResolver.BuilderNamespace), zap.String("default_namespace", nsResolver.DefaultNamespace), zap.Any("fission_resource_namespace", listNamespaces(nsResolver.FissionResourceNS))) } @@ -96,8 +96,8 @@ func (nsr *NamespaceResolver) FissionNSWithOptions(option ...option) map[string] if options.functionNS && nsr.FunctionNamespace != "" { fissionResourceNS[nsr.FunctionNamespace] = nsr.FunctionNamespace } - if options.builderNS && nsr.BuiderNamespace != "" { - fissionResourceNS[nsr.BuiderNamespace] = nsr.BuiderNamespace + if options.builderNS && nsr.BuilderNamespace != "" { + fissionResourceNS[nsr.BuilderNamespace] = nsr.BuilderNamespace } if options.defaultNs && nsr.DefaultNamespace != "" { fissionResourceNS[nsr.DefaultNamespace] = nsr.DefaultNamespace @@ -118,7 +118,7 @@ func GetNamespaces() map[string]string { if len(envValue) > 0 { lstNamespaces := strings.Split(envValue, ",") for _, namespace := range lstNamespaces { - //check to handle string with additional comma at the end of string. eg- ns1,ns2, + // check to handle string with additional comma at the end of string. eg- ns1,ns2, if namespace != "" { namespaces[namespace] = namespace } @@ -132,14 +132,14 @@ func GetNamespaces() map[string]string { } func (nsr *NamespaceResolver) GetBuilderNS(namespace string) string { - if nsr.BuiderNamespace == "" { + if nsr.BuilderNamespace == "" { return namespace } if namespace != metav1.NamespaceDefault { return namespace } - return nsr.BuiderNamespace + return nsr.BuilderNamespace } func (nsr *NamespaceResolver) GetFunctionNS(namespace string) string { @@ -154,7 +154,7 @@ func (nsr *NamespaceResolver) GetFunctionNS(namespace string) string { } func (nsr *NamespaceResolver) ResolveNamespace(namespace string) string { - if nsr.FunctionNamespace == "" || nsr.BuiderNamespace == "" { + if nsr.FunctionNamespace == "" || nsr.BuilderNamespace == "" { return nsr.DefaultNamespace } return namespace diff --git a/pkg/utils/namespace_test.go b/pkg/utils/namespace_test.go index 9620f2d0..ea722f86 100644 --- a/pkg/utils/namespace_test.go +++ b/pkg/utils/namespace_test.go @@ -226,7 +226,7 @@ func TestNamespaceResolver(t *testing.T) { func getFissionNamespaces(builderNS, functionNS, defaultNS string) *NamespaceResolver { return &NamespaceResolver{ FunctionNamespace: functionNS, - BuiderNamespace: builderNS, + BuilderNamespace: builderNS, DefaultNamespace: defaultNS, } }