Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

resource/launch_configuration: introduce user_data_base64 #4257

Merged
merged 3 commits into from
Apr 20, 2018
Merged

resource/launch_configuration: introduce user_data_base64 #4257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2366f60
resource/launch_configuration: add new argument user_data_base64 to s…
Apr 18, 2018
ac9d85e
resource/launch_configuration: fix tests
Apr 18, 2018
d569210
resource/launch_configuration: add acceptance test for user data
Apr 18, 2018
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
2 changes: 1 addition & 1 deletion aws/import_aws_launch_configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func TestAccAWSLaunchConfiguration_importBasic(t *testing.T) {
CheckDestroy: testAccCheckAWSLaunchConfigurationDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccAWSLaunchConfigurationNoNameConfig,
Config: testAccAWSLaunchConfigurationNoNameConfig(),
},

resource.TestStep{
Expand Down
39 changes: 30 additions & 9 deletions aws/resource_aws_launch_configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package aws

import (
"bytes"
"crypto/sha1"
"encoding/hex"
"fmt"
"log"
"time"
Expand Down Expand Up @@ -69,21 +67,37 @@ func resourceAwsLaunchConfiguration() *schema.Resource {
},

"user_data": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Type: schema.TypeString,
Optional: true,
ForceNew: true,
ConflictsWith: []string{"user_data_base64"},
StateFunc: func(v interface{}) string {
switch v.(type) {
case string:
hash := sha1.Sum([]byte(v.(string)))
return hex.EncodeToString(hash[:])
return userDataHashSum(v.(string))
default:
return ""
}
},
ValidateFunc: validation.StringLenBetween(1, 16384),
},

"user_data_base64": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
ConflictsWith: []string{"user_data"},
ValidateFunc: func(v interface{}, name string) (warns []string, errs []error) {
s := v.(string)
if !isBase64Encoded([]byte(s)) {
errs = append(errs, fmt.Errorf(
"%s: must be base64-encoded", name,
))
}
return
},
},

"security_groups": {
Type: schema.TypeSet,
Optional: true,
Expand Down Expand Up @@ -286,6 +300,8 @@ func resourceAwsLaunchConfigurationCreate(d *schema.ResourceData, meta interface
if v, ok := d.GetOk("user_data"); ok {
userData := base64Encode([]byte(v.(string)))
createLaunchConfigurationOpts.UserData = aws.String(userData)
} else if v, ok := d.GetOk("user_data_base64"); ok {
createLaunchConfigurationOpts.UserData = aws.String(v.(string))
}

createLaunchConfigurationOpts.InstanceMonitoring = &autoscaling.InstanceMonitoring{
Expand Down Expand Up @@ -523,8 +539,13 @@ func resourceAwsLaunchConfigurationRead(d *schema.ResourceData, meta interface{}
if err := d.Set("security_groups", flattenStringList(lc.SecurityGroups)); err != nil {
return fmt.Errorf("error setting security_groups: %s", err)
}
if aws.StringValue(lc.UserData) != "" {
d.Set("user_data", userDataHashSum(*lc.UserData))
if v := aws.StringValue(lc.UserData); v != "" {
_, b64 := d.GetOk("user_data_base64")
if b64 {
d.Set("user_data_base64", v)
} else {
d.Set("user_data", userDataHashSum(v))
}
}

d.Set("vpc_classic_link_id", lc.ClassicLinkVPCId)
Expand Down
Loading