Merge pull request #347 from mkarebski/master

#328 Fix 65535 string length issue
This commit is contained in:
Tomasz Sęk 2020-04-24 15:03:44 +02:00 committed by GitHub
commit 4ffc58ecca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 66 additions and 5 deletions

View File

@ -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
@ -35,16 +37,47 @@ func (c *ConfigurationAsCode) Ensure(jenkins *v1alpha2.Jenkins) (requeue bool, e
return c.groovyClient.Ensure(func(name string) bool {
return strings.HasSuffix(name, ".yaml") || strings.HasSuffix(name, ".yml")
}, func(groovyScript string) string {
return fmt.Sprintf(applyConfigurationAsCodeGroovyScriptFmt, groovyScript)
return fmt.Sprintf(applyConfigurationAsCodeGroovyScriptFmt, prepareScript(groovyScript))
})
}
const applyConfigurationAsCodeGroovyScriptFmt = `
def config = '''
%s
'''
def stream = new ByteArrayInputStream(config.getBytes('UTF-8'))
String[] configContent = ['''%s''']
def configSb = new StringBuffer()
for (int i=0; i<configContent.size(); i++) {
configSb << configContent[i]
}
def stream = new ByteArrayInputStream(configSb.toString().getBytes('UTF-8'))
def source = new io.jenkins.plugins.casc.yaml.YamlSource(stream, io.jenkins.plugins.casc.yaml.YamlSource.READ_FROM_INPUTSTREAM)
io.jenkins.plugins.casc.ConfigurationAsCode.get().configureWith(source)
`
func prepareScript(script string) string {
var slicedScript []string
if len(script) > groovyUtf8MaxStringLength {
slicedScript = splitTooLongScript(script)
} else {
slicedScript = append(slicedScript, script)
}
return strings.Join(slicedScript, "''','''")
}
func splitTooLongScript(groovyScript string) []string {
var slicedGroovyScript []string
lastSubstrIndex := len(groovyScript) % groovyUtf8MaxStringLength
lastSubstr := groovyScript[len(groovyScript)-lastSubstrIndex:]
substrNumber := len(groovyScript) / groovyUtf8MaxStringLength
for i := 0; i < substrNumber; i++ {
scriptSubstr := groovyScript[i*groovyUtf8MaxStringLength : (i*groovyUtf8MaxStringLength)+groovyUtf8MaxStringLength]
slicedGroovyScript = append(slicedGroovyScript, scriptSubstr)
}
slicedGroovyScript = append(slicedGroovyScript, lastSubstr)
return slicedGroovyScript
}

File diff suppressed because one or more lines are too long