Update Terraform to v0.12

.travis.yml

@@ -0,0 +1,16 @@
+language: go
+go:
+- '1.12'
+env:
+  - GO111MODULE=on GOPROXY=https://proxy.golang.org
+deploy:
+  provider: releases
+  api_key:
+    secure: tRoe90iEct050/XQcQ1oS1Wm5Yl2V+t8K1I1Hy66aWHoGf6NRxk9VRlKyg/Fr21pcZ4vhKwtH6dvTUhKPM8TtaUf1oC1wlwZnsq2oIEAuxRMh3bCd7Psyycmd5Oo8bF3gQ0FXmpwXSDh8D8qXjx190GyP+4lV0mSehWxOv+hM4ob7v19iUmkqL3EbJonTu+weDweuAUpZsfuODUYp12vT6uRFeN85RlJccOWvTstj1W6uiycDfjDTU3N2/PmTkohQmG8JSrDZ03+89pzkTfNUGWT/y9mNsGrMlKtTIJ+tcKEuzY+pUEIooxuB9y/np3EJyfCLE/MPrMz1kxkWfn++4wkQ/C8u7KiaPC9XDF9CfOEAa7SStlx+WsezSeqCHkPYuOEFEIdXOCrlmUWwHnOjqIlYT76fOUl2mQ1MMGc/eXYS91GBu2GinRK9XrC4O3Y2+FDFhDRBoWZAXoPgjkIocae/CI2/nnD6uQ1YhJy77tbdDzrlLykXpqSeiHuzNfVTfPE+9YJfnAPq2aUjvYCHE7sKnyAIeEQJxDGGzO7erVO6UJJYRo+B2QKbgxzFSaZup+0qFMkZrrakdIS4iFyrzi0INcIKGDNyejgXAbuoYhRxYzKu3ywsM8HG+ykK3wC6dpIarwKywJhDYPsjYSnu3n060bqzo1nd+yuJaXg6+E=
+  file_glob: true
+  file: terraform-provider-phpipam_*
+  skip_cleanup: true
+  on:
+    repo: Ouest-France/terraform-provider-phpipam
+    branch: master
+    tags: true

Makefile

@@ -1,13 +1,12 @@
+build:
+	go build -o terraform-provider-phpipam_${TRAVIS_TAG}
+
 test:
 	go test -v $(shell go list ./... | grep -v /vendor/) 
 
 testacc:
 	TF_ACC=1 go test -v ./plugin/providers/phpipam -run="TestAcc"
 
-build: deps
-	gox -osarch="linux/amd64 windows/amd64 darwin/amd64" \
-	-output="pkg/{{.OS}}_{{.Arch}}/terraform-provider-phpipam" .
-
 release: release_bump release_build
 
 release_bump:
@@ -16,8 +15,5 @@ release_bump:
 release_build:
 	scripts/release_build.sh
 
-deps:
-	go get -u github.com/mitchellh/gox
-
 clean:
 	rm -rf pkg/

README.md

@@ -16,7 +16,7 @@ Terraform, allowing for the management and lookup of sections, VLANs, subnets,
 and IP addresses, entirely within Terraform.
 
 [3]: https://phpipam.net/api/api_documentation/
-[4]: https://github.com/paybyphone/phpipam-sdk-go
+[4]: https://github.com/Ouest-France/phpipam-sdk-go
 
 ## Installing
 
@@ -25,7 +25,7 @@ into your config. Check the [releases page][6] of this repo to get releases for
 Linux, OS X, and Windows.
 
 [5]: https://www.terraform.io/docs/plugins/basics.html
-[6]: https://github.com/paybyphone/terraform-provider-phpipam/releases
+[6]: https://github.com/Ouest-France/terraform-provider-phpipam/releases
 
 ## Usage
 
@@ -707,29 +707,16 @@ data "phpipam_subnet" "subnet" {
   subnet_mask    = 24
 }
 
-// Get the first available address
-data "phpipam_first_free_address" "next_address" {
-  subnet_id = "${data.phpipam_subnet.subnet.subnet_id}"
-}
-
 // Reserve the address. Note that we use ignore_changes here to ensure that we
 // don't end up re-allocating this address on future Terraform runs.
 resource "phpipam_address" {
   subnet_id   = "${data.phpipam_subnet.subnet.subnet_id}"
-  ip_address  = "${data.phpipam_first_free_address.next_address.ip_address}"
   hostname    = "tf-test-host.example.internal"
   description = "Managed by Terraform"
 
   custom_fields = {
     CustomTestAddresses = "terraform-test"
   }
-
-  lifecycle {
-    ignore_changes = [
-      "subnet_id",
-      "ip_address",
-    ]
-  }
 }
 ```
 
@@ -739,7 +726,7 @@ The resource takes the following parameters:
 
  * `subnet_id` (Required) - The database ID of the subnet this IP address
    belongs to.
- * `ip_address` (Required) - The IP address to reserve.
+ * `ip_address` (Optional) - The IP address to reserve. If not defined, first free IP in subnet is used.
  * `is_gateway` (Optional) - `true` if this IP address has been designated as a
    gateway.
  * `description` (Optional) - The description provided to this IP address.

go.mod

@@ -0,0 +1,9 @@
+module github.com/Ouest-France/terraform-provider-phpipam
+
+go 1.12
+
+require (
+	github.com/Ouest-France/phpipam-sdk-go v0.0.0-20180829134422-31a77e0f2eda
+	github.com/hashicorp/terraform v0.12.0
+	github.com/imdario/mergo v0.3.7 // indirect
+)

main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/hashicorp/terraform/plugin"
-	"github.com/paybyphone/terraform-provider-phpipam/plugin/providers/phpipam"
+	"github.com/Ouest-France/terraform-provider-phpipam/plugin/providers/phpipam"
 )
 
 func main() {

plugin/providers/phpipam/address_structure.go

@@ -5,8 +5,8 @@ import (
 	"strconv"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/paybyphone/phpipam-sdk-go/controllers/addresses"
-	"github.com/paybyphone/phpipam-sdk-go/phpipam"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/addresses"
+	"github.com/Ouest-France/phpipam-sdk-go/phpipam"
 )
 
 // resourceAddressOptionalFields represents all the fields that are optional in
@@ -101,7 +101,11 @@ func resourceAddressSchema() map[string]*schema.Schema {
 	for k, v := range s {
 		switch {
 		// IP Address and Subnet ID are ForceNew
-		case k == "subnet_id" || k == "ip_address":
+		case k == "ip_address":
+			v.ForceNew = true
+			v.Optional = true
+			v.Computed = true
+		case k == "subnet_id":
 			v.Required = true
 			v.ForceNew = true
 		case k == "custom_fields":

plugin/providers/phpipam/config.go

@@ -3,12 +3,12 @@ package phpipam
 import (
 	"log"
 
-	"github.com/paybyphone/phpipam-sdk-go/controllers/addresses"
-	"github.com/paybyphone/phpipam-sdk-go/controllers/sections"
-	"github.com/paybyphone/phpipam-sdk-go/controllers/subnets"
-	"github.com/paybyphone/phpipam-sdk-go/controllers/vlans"
-	"github.com/paybyphone/phpipam-sdk-go/phpipam"
-	"github.com/paybyphone/phpipam-sdk-go/phpipam/session"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/addresses"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/sections"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/subnets"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/vlans"
+	"github.com/Ouest-France/phpipam-sdk-go/phpipam"
+	"github.com/Ouest-France/phpipam-sdk-go/phpipam/session"
 )
 
 // Config provides the configuration for the PHPIPAM provider.

plugin/providers/phpipam/custom_field_structure.go

@@ -6,9 +6,9 @@ import (
 	"regexp"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/paybyphone/phpipam-sdk-go/controllers/addresses"
-	"github.com/paybyphone/phpipam-sdk-go/controllers/subnets"
-	"github.com/paybyphone/phpipam-sdk-go/controllers/vlans"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/addresses"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/subnets"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/vlans"
 )
 
 // customFieldFilterSchema returns a *schema.Schema for the custom_field_filter

plugin/providers/phpipam/data_source_phpipam_address.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/paybyphone/phpipam-sdk-go/controllers/addresses"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/addresses"
 )
 
 func dataSourcePHPIPAMAddress() *schema.Resource {

plugin/providers/phpipam/data_source_phpipam_section.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/paybyphone/phpipam-sdk-go/controllers/sections"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/sections"
 )
 
 func dataSourcePHPIPAMSection() *schema.Resource {

plugin/providers/phpipam/data_source_phpipam_subnet.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/paybyphone/phpipam-sdk-go/controllers/subnets"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/subnets"
 )
 
 func dataSourcePHPIPAMSubnet() *schema.Resource {

plugin/providers/phpipam/data_source_phpipam_vlan.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/paybyphone/phpipam-sdk-go/controllers/vlans"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/vlans"
 )
 
 func dataSourcePHPIPAMVLAN() *schema.Resource {

plugin/providers/phpipam/resource_phpipam_address.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/paybyphone/phpipam-sdk-go/phpipam"
+	"github.com/Ouest-France/phpipam-sdk-go/phpipam"
 )
 
 // resourcePHPIPAMAddress returns the resource structure for the phpipam_address
@@ -31,10 +31,15 @@ func resourcePHPIPAMAddressCreate(d *schema.ResourceData, meta interface{}) erro
 	// Assert the ID field here is empty. If this is not empty the request will fail.
 	in.ID = 0
 
-	if _, err := c.CreateAddress(in); err != nil {
+	ip, err := c.CreateAddress(in)
+	if err != nil {
 		return err
 	}
 
+	if in.IPAddress == "" {
+		d.Set("ip_address", ip)
+	}
+
 	// If we have custom fields, set them now. We need to get the IP address's ID
 	// beforehand.
 	if customFields, ok := d.GetOk("custom_fields"); ok {

plugin/providers/phpipam/section_structure.go

@@ -4,8 +4,8 @@ import (
 	"strconv"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/paybyphone/phpipam-sdk-go/controllers/sections"
-	"github.com/paybyphone/phpipam-sdk-go/phpipam"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/sections"
+	"github.com/Ouest-France/phpipam-sdk-go/phpipam"
 )
 
 // resourceSectionOptionalFields represents all the fields that are optional in

plugin/providers/phpipam/subnet_structure.go

@@ -6,8 +6,8 @@ import (
 	"strconv"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/paybyphone/phpipam-sdk-go/controllers/subnets"
-	"github.com/paybyphone/phpipam-sdk-go/phpipam"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/subnets"
+	"github.com/Ouest-France/phpipam-sdk-go/phpipam"
 )
 
 // resourceSubnetOptionalFields represents all the fields that are optional in

plugin/providers/phpipam/vlan_structure.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/paybyphone/phpipam-sdk-go/controllers/vlans"
+	"github.com/Ouest-France/phpipam-sdk-go/controllers/vlans"
 )
 
 // resourceVLANOptionalFields represents all the fields that are optional in