mirror of
https://github.com/opentofu/opentofu.git
synced 2025-02-25 18:45:20 -06:00
Merge pull request #1021 from hashicorp/b-aws-instance-source-dest-check-on-create
providers/aws: fix source_dest_check on instance creation
This commit is contained in:
commit
84b1db4505
@ -487,25 +487,18 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error {
|
||||
|
||||
func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error {
|
||||
ec2conn := meta.(*AWSClient).ec2conn
|
||||
|
||||
modify := false
|
||||
opts := new(ec2.ModifyInstance)
|
||||
|
||||
if d.HasChange("source_dest_check") {
|
||||
opts.SetSourceDestCheck = true
|
||||
opts.SourceDestCheck = d.Get("source_dest_check").(bool)
|
||||
modify = true
|
||||
opts.SetSourceDestCheck = true
|
||||
opts.SourceDestCheck = d.Get("source_dest_check").(bool)
|
||||
|
||||
log.Printf("[INFO] Modifying instance %s: %#v", d.Id(), opts)
|
||||
if _, err := ec2conn.ModifyInstance(d.Id(), opts); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if modify {
|
||||
log.Printf("[INFO] Modifying instance %s: %#v", d.Id(), opts)
|
||||
if _, err := ec2conn.ModifyInstance(d.Id(), opts); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// TODO(mitchellh): wait for the attributes we modified to
|
||||
// persist the change...
|
||||
}
|
||||
// TODO(mitchellh): wait for the attributes we modified to
|
||||
// persist the change...
|
||||
|
||||
if err := setTags(ec2conn, d); err != nil {
|
||||
return err
|
||||
|
@ -145,10 +145,17 @@ func TestAccAWSInstance_sourceDestCheck(t *testing.T) {
|
||||
CheckDestroy: testAccCheckInstanceDestroy,
|
||||
Steps: []resource.TestStep{
|
||||
resource.TestStep{
|
||||
Config: testAccInstanceConfigSourceDest,
|
||||
Config: testAccInstanceConfigSourceDestDisable,
|
||||
Check: resource.ComposeTestCheckFunc(
|
||||
testAccCheckInstanceExists(
|
||||
"aws_instance.foo", &v),
|
||||
testAccCheckInstanceExists("aws_instance.foo", &v),
|
||||
testCheck(false),
|
||||
),
|
||||
},
|
||||
|
||||
resource.TestStep{
|
||||
Config: testAccInstanceConfigSourceDestEnable,
|
||||
Check: resource.ComposeTestCheckFunc(
|
||||
testAccCheckInstanceExists("aws_instance.foo", &v),
|
||||
testCheck(true),
|
||||
),
|
||||
},
|
||||
@ -156,8 +163,7 @@ func TestAccAWSInstance_sourceDestCheck(t *testing.T) {
|
||||
resource.TestStep{
|
||||
Config: testAccInstanceConfigSourceDestDisable,
|
||||
Check: resource.ComposeTestCheckFunc(
|
||||
testAccCheckInstanceExists(
|
||||
"aws_instance.foo", &v),
|
||||
testAccCheckInstanceExists("aws_instance.foo", &v),
|
||||
testCheck(false),
|
||||
),
|
||||
},
|
||||
@ -388,7 +394,7 @@ resource "aws_instance" "foo" {
|
||||
}
|
||||
`
|
||||
|
||||
const testAccInstanceConfigSourceDest = `
|
||||
const testAccInstanceConfigSourceDestEnable = `
|
||||
resource "aws_vpc" "foo" {
|
||||
cidr_block = "10.1.0.0/16"
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user