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

Merge branch 'master' of github.com:hashicorp/terraform 

* 'master' of github.com:hashicorp/terraform:
  Update CHANGELOG.md
  provider/vsphere: read gateway and ipv6_gateway
  provider/aws: Fix cloudtrail_tags config formatting in test (#6615)
  build: "make fmt" to ignore vendor packages
This commit is contained in:
clint shryock 2016-05-11 10:39:21 -05:00
parent 8344b4fb4b 9c0a175311
commit e33847c8a8
5 changed files with 51 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -18,6 +18,7 @@ IMPROVEMENTS:
BUG FIXES:
* core: Correct the previous fix for a bug causing "attribute not found" messages during destroy, as it was insufficient [GH-6599]
* provider/vsphere: `gateway` and `ipv6_gateway` are now read from `vsphere_virtual_machine` resources [GH-6522]
## 0.6.16 (May 9, 2016)

3
Makefile
View File

@ -1,5 +1,6 @@
TEST?=$$(go list ./... | grep -v /vendor/)
VETARGS?=-all
GOFMT_FILES?=$$(find . -name '*.go' | grep -v vendor)
default: test vet
@ -80,7 +81,7 @@ generate:
@go fmt command/internal_plugin_list.go > /dev/null
fmt:
gofmt -w .
gofmt -w $(GOFMT_FILES)
fmtcheck:
@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"

24
builtin/providers/aws/resource_aws_cloudtrail_test.go
View File

@ -617,23 +617,33 @@ POLICY
`
func testAccAWSCloudTrailConfig_tags(cloudTrailRandInt int) string {
return fmt.Sprintf(testAccAWSCloudTrailConfig_tags_tpl,
`tags {
tagsString := `tags {
Foo = "moo"
Pooh = "hi"
}`, cloudTrailRandInt, cloudTrailRandInt, cloudTrailRandInt, cloudTrailRandInt)
}`
return fmt.Sprintf(testAccAWSCloudTrailConfig_tags_tpl,
cloudTrailRandInt,
tagsString,
cloudTrailRandInt,
cloudTrailRandInt,
cloudTrailRandInt)
}
func testAccAWSCloudTrailConfig_tagsModified(cloudTrailRandInt int) string {
return fmt.Sprintf(testAccAWSCloudTrailConfig_tags_tpl,
`tags {
tagsString := `tags {
Foo = "moo"
Pooh = "hi"
Moo = "boom"
}`, cloudTrailRandInt, cloudTrailRandInt, cloudTrailRandInt, cloudTrailRandInt)
}`
return fmt.Sprintf(testAccAWSCloudTrailConfig_tags_tpl,
cloudTrailRandInt,
tagsString,
cloudTrailRandInt,
cloudTrailRandInt,
cloudTrailRandInt)
}
func testAccAWSCloudTrailConfig_tagsModifiedAgain(cloudTrailRandInt int) string {
return fmt.Sprintf(testAccAWSCloudTrailConfig_tags_tpl,
"", cloudTrailRandInt, cloudTrailRandInt, cloudTrailRandInt, cloudTrailRandInt)
cloudTrailRandInt, "", cloudTrailRandInt, cloudTrailRandInt, cloudTrailRandInt)
}

25
builtin/providers/vsphere/resource_vsphere_virtual_machine.go
View File

@ -795,6 +795,31 @@ func resourceVSphereVirtualMachineRead(d *schema.ResourceData, meta interface{})
networkInterfaces = append(networkInterfaces, networkInterface)
}
}
if mvm.Guest.IpStack != nil {
for _, v := range mvm.Guest.IpStack {
if v.IpRouteConfig != nil && v.IpRouteConfig.IpRoute != nil {
for _, route := range v.IpRouteConfig.IpRoute {
if route.Gateway.Device != "" {
gatewaySetting := ""
if route.Network == "::" {
gatewaySetting = "ipv6_gateway"
} else if route.Network == "0.0.0.0" {
gatewaySetting = "ipv4_gateway"
}
if gatewaySetting != "" {
deviceID, err := strconv.Atoi(route.Gateway.Device)
if err != nil {
log.Printf("[WARN] error at processing %s of device id %#v: %#v", gatewaySetting, route.Gateway.Device, err)
} else {
log.Printf("[DEBUG] %s of device id %d: %s", gatewaySetting, deviceID, route.Gateway.IpAddress)
networkInterfaces[deviceID][gatewaySetting] = route.Gateway.IpAddress
}
}
}
}
}
}
}
log.Printf("[DEBUG] networkInterfaces: %#v", networkInterfaces)
err = d.Set("network_interface", networkInterfaces)
if err != nil {

6
builtin/providers/vsphere/resource_vsphere_virtual_machine_test.go
View File

@ -50,6 +50,7 @@ func TestAccVSphereVirtualMachine_basic(t *testing.T) {
gateway,
label,
ip_address,
gateway,
datastoreOpt,
template,
),
@ -111,6 +112,7 @@ func TestAccVSphereVirtualMachine_diskInitType(t *testing.T) {
gateway,
label,
ip_address,
gateway,
datastoreOpt,
template,
),
@ -490,6 +492,7 @@ func TestAccVSphereVirtualMachine_createWithExistingVmdk(t *testing.T) {
gateway,
label,
ip_address,
gateway,
datastoreOpt,
vmdk_path,
),
@ -935,6 +938,7 @@ resource "vsphere_virtual_machine" "foo" {
label = "%s"
ipv4_address = "%s"
ipv4_prefix_length = 24
ipv4_gateway = "%s"
}
disk {
%s
@ -958,6 +962,7 @@ resource "vsphere_virtual_machine" "thin" {
label = "%s"
ipv4_address = "%s"
ipv4_prefix_length = 24
ipv4_gateway = "%s"
}
disk {
%s
@ -1078,6 +1083,7 @@ resource "vsphere_virtual_machine" "with_existing_vmdk" {
label = "%s"
ipv4_address = "%s"
ipv4_prefix_length = 24
ipv4_gateway = "%s"
}
disk {
%s