jprdonnelly/opentf
1
0
Fork 0
mirror of https://github.com/opentffoundation/opentf.git synced 2026-05-26 13:03:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reuse structure method for network interface ips

Browse Source
This commit is contained in:
clint shryock
2015-12-16 13:56:23 -06:00
parent 03a7926198
commit d4e4fb6ea0
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/providers/aws/resource_aws_network_interface.go
View File

@@ -199,14 +199,6 @@ func resourceAwsNetworkInterfaceDetach(oa *schema.Set, meta interface{}, eniId s
return nil
}
func convertToAwsStringSlice(s []interface{}) []*string {
var b []*string
for _, i := range s {
b = append(b, aws.String(i.(string)))
}
return b
}
func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn
d.Partial(true)
@@ -254,7 +246,7 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{})
if unassignIps.Len() != 0 {
input := &ec2.UnassignPrivateIpAddressesInput{
NetworkInterfaceId: aws.String(d.Id()),
PrivateIpAddresses: convertToAwsStringSlice(unassignIps.List()),
PrivateIpAddresses: expandStringList(unassignIps.List()),
}
_, err := conn.UnassignPrivateIpAddresses(input)
if err != nil {
@@ -267,7 +259,7 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{})
if assignIps.Len() != 0 {
input := &ec2.AssignPrivateIpAddressesInput{
NetworkInterfaceId: aws.String(d.Id()),
PrivateIpAddresses: convertToAwsStringSlice(assignIps.List()),
PrivateIpAddresses: expandStringList(assignIps.List()),
}
_, err := conn.AssignPrivateIpAddresses(input)
if err != nil {