Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions pkg/agent/baker.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ func (t *TemplateGenerator) getLinuxNodeCustomDataJSONObject(config *datamodel.N
return fmt.Sprintf("{\"customData\": \"%s\"}", str)
}

const (
encodingGZIP = "gzip"
encodingBase64 = "base64"
)

const (
ignitionFilesTarPath = "/var/lib/ignition/ignition-files.tar"
ignitionBootcmdScriptPath = "/etc/ignition-bootcmds.sh"
Expand Down Expand Up @@ -107,13 +112,13 @@ func buildIgnitionTarEntries(customData cloudInit) ([]ignitionTarEntry, error) {
switch {
case file.Content == "" || file.Encoding == "":
contents = []byte(file.Content)
case file.Encoding == "gzip":
case file.Encoding == encodingGZIP:
decoded, err := getGzipDecodedValue([]byte(file.Content))
if err != nil {
return nil, fmt.Errorf("failed to decode gzip content for %s: %w", file.Path, err)
}
contents = decoded
case file.Encoding == "base64":
case file.Encoding == encodingBase64:
decoded, err := base64.StdEncoding.DecodeString(file.Content)
if err != nil {
return nil, fmt.Errorf("failed to decode base64 content: %w", err)
Expand Down Expand Up @@ -208,7 +213,7 @@ func cloudInitToButane(customData cloudInit) flatcar1_1.Config {
Overwrite: to.BoolPtr(true),
Contents: base0_5.Resource{
Source: to.StringPtr(dataURL),
Compression: to.StringPtr("gzip"),
Compression: to.StringPtr(encodingGZIP),
},
}
butaneconfig.Storage.Files = append(butaneconfig.Storage.Files, tarFile)
Expand Down
22 changes: 8 additions & 14 deletions pkg/agent/baker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,11 @@ type nodeBootstrappingOutput struct {
}

type decodedValue struct {
encoding cseVariableEncoding
encoding string
value string
mode int64
}

type cseVariableEncoding string

const (
cseVariableEncodingGzip cseVariableEncoding = "gzip"
)

type outputValidator func(*nodeBootstrappingOutput)

var _ = Describe("Assert generated customData and cseCmd", func() {
Expand Down Expand Up @@ -2245,7 +2239,7 @@ func ignitionDecodeFileContents(input ign3_4.Resource) ([]byte, error) {
return nil, err
}
contents := decodeddata.Data
if input.Compression != nil && *input.Compression == "gzip" {
if input.Compression != nil && *input.Compression == encodingGZIP {
contents, err = getGzipDecodedValue(contents)
if err != nil {
return nil, err
Expand Down Expand Up @@ -2298,7 +2292,7 @@ func writeInnerCustomData(outputname, customData string) error {
"overwrite": true,
"mode": entry.mode,
"contents": map[string]interface{}{
"compression": "gzip",
"compression": encodingGZIP,
"source": "data:;base64," + base64.StdEncoding.EncodeToString(gzippedContents),
},
})
Expand Down Expand Up @@ -2384,17 +2378,17 @@ func getDecodedFilesFromCustomdata(data []byte) (map[string]*decodedValue, error
var files = make(map[string]*decodedValue)

for _, val := range customData.WriteFiles {
var encoding cseVariableEncoding
var encoding string
maybeEncodedValue := val.Content

if strings.Contains(val.Encoding, "gzip") {
if strings.Contains(val.Encoding, encodingGZIP) {
if maybeEncodedValue != "" {
output, err := getGzipDecodedValue([]byte(maybeEncodedValue))
if err != nil {
return nil, fmt.Errorf("failed to decode gzip value: %q with error %w", maybeEncodedValue, err)
}
maybeEncodedValue = string(output)
encoding = cseVariableEncodingGzip
encoding = encodingGZIP
}
}

Expand Down Expand Up @@ -2936,7 +2930,7 @@ var _ = Describe("cloudInitToButane", func() {
{
Path: "/etc/test-gzip",
Permissions: "0644",
Encoding: "gzip",
Encoding: encodingGZIP,
Content: string(gzipped),
},
}}
Expand Down Expand Up @@ -3015,7 +3009,7 @@ func decodeButaneResource(resource base0_5.Resource) ([]byte, error) {
return nil, err
}
contents := decodeddata.Data
if resource.Compression != nil && *resource.Compression == "gzip" {
if resource.Compression != nil && *resource.Compression == encodingGZIP {
contents, err = getGzipDecodedValue(contents)
if err != nil {
return nil, err
Expand Down
Loading