ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4873 from sthulb/remove-mime-check 

Remove mime type validation
This commit is contained in:
James Nugent 2016-01-28 08:50:07 -05:00
parent 2dca1ea9a0 548136c050
commit 996da1ee60
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
builtin/providers/template/resource_cloudinit_config.go
View File

@ -32,15 +32,6 @@ func resourceCloudinitConfig() *schema.Resource {
"content_type": &schema.Schema{ "content_type": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
value := v.(string)
if _, supported := supportedContentTypes[value]; !supported {
errors = append(errors, fmt.Errorf("Part has an unsupported content type: %s", v))
}
return
},
}, },
"content": &schema.Schema{ "content": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
@ -166,7 +157,7 @@ func renderPartsToWriter(parts cloudInitParts, writer io.Writer) error {
// we need to set the boundary explictly, otherwise the boundary is random // we need to set the boundary explictly, otherwise the boundary is random
// and this causes terraform to complain about the resource being different // and this causes terraform to complain about the resource being different
if err := mimeWriter.SetBoundary("MIMEBOUNDRY"); err != nil { if err := mimeWriter.SetBoundary("MIMEBOUNDARY"); err != nil {
return err return err
} }
@ -214,15 +205,3 @@ type cloudInitPart struct {
} }
type cloudInitParts []cloudInitPart type cloudInitParts []cloudInitPart
// Support content types as specified by http://cloudinit.readthedocs.org/en/latest/topics/format.html
var supportedContentTypes = map[string]bool{
"text/x-include-once-url": true,
"text/x-include-url": true,
"text/cloud-config-archive": true,
"text/upstart-job": true,
"text/cloud-config": true,
"text/part-handler": true,
"text/x-shellscript": true,
"text/cloud-boothook": true,
}

2
builtin/providers/template/resource_cloudinit_config_test.go
View File

@ -130,4 +130,4 @@ resource "template_cloudinit_config" "config" {
} }
}` }`
var testCloudInitConfig_update_expected = `Content-Type: multipart/mixed; boundary=\"MIMEBOUNDRY\"\nMIME-Version: 1.0\r\n--MIMEBOUNDRY\r\nContent-Transfer-Encoding: 7bit\r\nContent-Type: text/x-shellscript\r\nMime-Version: 1.0\r\n\r\nbaz\r\n--MIMEBOUNDRY\r\nContent-Transfer-Encoding: 7bit\r\nContent-Type: text/x-shellscript\r\nMime-Version: 1.0\r\n\r\nffbaz\r\n--MIMEBOUNDRY--\r\n` var testCloudInitConfig_update_expected = `Content-Type: multipart/mixed; boundary=\"MIMEBOUNDARY\"\nMIME-Version: 1.0\r\n--MIMEBOUNDARY\r\nContent-Transfer-Encoding: 7bit\r\nContent-Type: text/x-shellscript\r\nMime-Version: 1.0\r\n\r\nbaz\r\n--MIMEBOUNDARY\r\nContent-Transfer-Encoding: 7bit\r\nContent-Type: text/x-shellscript\r\nMime-Version: 1.0\r\n\r\nffbaz\r\n--MIMEBOUNDARY--\r\n`