From aff974b466f78f9b2cb9e2d752a55143936e57d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Fri, 11 Jan 2019 11:02:54 +0100 Subject: [PATCH] Refactoring --- .../base/resources/init_configuration_configmap.go | 3 +-- .../configuration/base/resources}/render.go | 6 +++--- .../configuration/base/resources/scripts_configmap.go | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) rename pkg/controller/{render => jenkins/configuration/base/resources}/render.go (58%) diff --git a/pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go b/pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go index e44c3bec..1b04f1d3 100644 --- a/pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go @@ -6,7 +6,6 @@ import ( "text/template" virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" - "github.com/VirtusLab/jenkins-operator/pkg/controller/render" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +41,7 @@ func buildCreateJenkinsOperatorUserGroovyScript() (*string, error) { OperatorPasswordFile: OperatorCredentialsSecretPasswordKey, } - output, err := render.Render(createOperatorUserGroovyFmtTemplate, data) + output, err := render(createOperatorUserGroovyFmtTemplate, data) if err != nil { return nil, err } diff --git a/pkg/controller/render/render.go b/pkg/controller/jenkins/configuration/base/resources/render.go similarity index 58% rename from pkg/controller/render/render.go rename to pkg/controller/jenkins/configuration/base/resources/render.go index f0234aec..51da4503 100644 --- a/pkg/controller/render/render.go +++ b/pkg/controller/jenkins/configuration/base/resources/render.go @@ -1,12 +1,12 @@ -package render +package resources import ( "bytes" "text/template" ) -// Render executes a parsed template (go-template) with configuration from data -func Render(template *template.Template, data interface{}) (string, error) { +// render executes a parsed template (go-template) with configuration from data +func render(template *template.Template, data interface{}) (string, error) { var buffer bytes.Buffer if err := template.Execute(&buffer, data); err != nil { return "", err diff --git a/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go b/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go index 6f29e124..75e72899 100644 --- a/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go @@ -7,7 +7,6 @@ import ( virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1" "github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants" - "github.com/VirtusLab/jenkins-operator/pkg/controller/render" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -287,7 +286,7 @@ func buildInitBashScript(pluginsToInstall map[string][]string) (*string, error) JenkinsScriptsVolumePath: jenkinsScriptsVolumePath, } - output, err := render.Render(initBashTemplate, data) + output, err := render(initBashTemplate, data) if err != nil { return nil, err }