From 85237e2da7a0d03faa8acb7601015b1affd09fc7 Mon Sep 17 00:00:00 2001 From: Mikolaj Karebski Date: Fri, 24 Apr 2020 13:33:02 +0200 Subject: [PATCH] #328 Code review fixes --- pkg/controller/jenkins/configuration/user/casc/caac.go | 4 ++-- pkg/controller/jenkins/configuration/user/casc/caas_test.go | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/controller/jenkins/configuration/user/casc/caac.go b/pkg/controller/jenkins/configuration/user/casc/caac.go index 0caf91db..51f7050d 100644 --- a/pkg/controller/jenkins/configuration/user/casc/caac.go +++ b/pkg/controller/jenkins/configuration/user/casc/caac.go @@ -13,6 +13,8 @@ import ( k8s "sigs.k8s.io/controller-runtime/pkg/client" ) +const groovyUtf8MaxStringLength = 65535 + // ConfigurationAsCode defines API which configures Jenkins with help Configuration as a code plugin type ConfigurationAsCode struct { groovyClient *groovy.Groovy @@ -53,7 +55,6 @@ io.jenkins.plugins.casc.ConfigurationAsCode.get().configureWith(source) ` func prepareScript(script string) string { - groovyUtf8MaxStringLength := 65535 var slicedScript []string if len(script) > groovyUtf8MaxStringLength { slicedScript = splitTooLongScript(script) @@ -65,7 +66,6 @@ func prepareScript(script string) string { } func splitTooLongScript(groovyScript string) []string { - groovyUtf8MaxStringLength := 65535 var slicedGroovyScript []string lastSubstrIndex := len(groovyScript) % groovyUtf8MaxStringLength diff --git a/pkg/controller/jenkins/configuration/user/casc/caas_test.go b/pkg/controller/jenkins/configuration/user/casc/caas_test.go index a9cd6f87..28cc6dbc 100644 --- a/pkg/controller/jenkins/configuration/user/casc/caas_test.go +++ b/pkg/controller/jenkins/configuration/user/casc/caas_test.go @@ -1,9 +1,10 @@ package casc import ( - "github.com/stretchr/testify/assert" "strings" "testing" + + "github.com/stretchr/testify/assert" ) func TestSplitToLongScript(t *testing.T) {