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

Fix aws_instance creation with subnet and launch template having VPC … #32854

Merged
merged 6 commits into from
Aug 8, 2023
Merged

Fix aws_instance creation with subnet and launch template having VPC … #32854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e717ea2
Fix aws_instance creation with subnet and launch template having VPC …
dhrkumar Aug 2, 2023
b890bd2
Add changelog
dhrkumar Aug 4, 2023
a8fc09a
Fix semgrep 'ci.caps5-in-func-name'.
ewbankkit Aug 6, 2023
613b486
Tweak CHANGELOG entry.
ewbankkit Aug 6, 2023
629f75e
Remove 'testAccCheckInstanceDestroyWithProvider' and 'testAccCheckIns…
ewbankkit Aug 6, 2023
858872e
instance: Fix to instance
YakDriver Aug 8, 2023
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
3 changes: 3 additions & 0 deletions .changelog/32854.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_instance: Fix `InvalidParameterCombination: Network interfaces and an instance-level security groups may not be specified on the same request` errors creating Instances with `subnet_id` configured and `launch_template` referencing an `aws_launch_template` with configured `vpc_security_group_ids`
```
5 changes: 4 additions & 1 deletion internal/service/ec2/ec2_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2895,10 +2895,13 @@ func buildInstanceOpts(ctx context.Context, d *schema.ResourceData, meta interfa
}
}

_, assocPubIPA := d.GetOkExists("associate_public_ip_address")
_, privIP := d.GetOk("private_ip")
_, secPrivIP := d.GetOk("secondary_private_ips")
networkInterfaces, interfacesOk := d.GetOk("network_interface")

// If setting subnet and public address, OR manual network interfaces, populate those now.
if hasSubnet || interfacesOk {
if (hasSubnet && (assocPubIPA || privIP || secPrivIP)) || interfacesOk {
// Otherwise we're attaching (a) network interface(s)
opts.NetworkInterfaces = buildNetworkInterfaceOpts(d, groups, networkInterfaces)
} else {
Expand Down
Loading
Loading