Merge pull request #4 from Ouest-France/ghaction

pablo-ruth · web-flow · commit 6cda83d509e3 · 2019-10-09T14:32:33.000+02:00
* Migrate from Travis to Github Actions
* Lint code to pass checks
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -0,0 +1,24 @@
+name: PR
+on: [pull_request]
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go 1.13
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.13
+        id: go
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v1
+
+      - name: Build
+        run: go build -o terraform-provider-phpipam_${GITHUB_REF}
+
+      - name: Setup Lint
+        run: curl -LO https://github.com/golangci/golangci-lint/releases/download/v1.19.1/golangci-lint-1.19.1-linux-amd64.tar.gz && tar -xf golangci-lint-1.19.1-linux-amd64.tar.gz
+
+      - name: Lint
+        run: golangci-lint-1.19.1-linux-amd64/golangci-lint run
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -0,0 +1,41 @@
+name: Tag
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go 1.13
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.13
+        id: go
+
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v1
+
+      - name: Build
+        run: go build -o terraform-provider-phpipam_${{ steps.get_version.outputs.VERSION }}
+
+      - name: Setup Lint
+        run: curl -LO https://github.com/golangci/golangci-lint/releases/download/v1.19.1/golangci-lint-1.19.1-linux-amd64.tar.gz && tar -xf golangci-lint-1.19.1-linux-amd64.tar.gz
+
+      - name: Lint
+        run: golangci-lint-1.19.1-linux-amd64/golangci-lint run
+
+      - name: Upload binaries to release
+        uses: svenstaro/upload-release-action@v1-release
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: terraform-provider-phpipam_${{ steps.get_version.outputs.VERSION }}
+          asset_name: terraform-provider-phpipam_${{ steps.get_version.outputs.VERSION }}
+          tag: ${{ github.ref }}
+          overwrite: true
diff --git a/.travis.yml b/.travis.yml
diff --git a/plugin/providers/phpipam/address_structure.go b/plugin/providers/phpipam/address_structure.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/Ouest-France/phpipam-sdk-go/controllers/addresses"
 	"github.com/Ouest-France/phpipam-sdk-go/phpipam"
+	"github.com/hashicorp/terraform/helper/schema"
 )
 
 // resourceAddressOptionalFields represents all the fields that are optional in
@@ -196,25 +196,37 @@ func expandAddress(d *schema.ResourceData) addresses.Address {
 
 // flattenAddress sets fields in a *schema.ResourceData with fields supplied by
 // the input addresses.Address. This is used in read operations.
-func flattenAddress(a addresses.Address, d *schema.ResourceData) {
+func flattenAddress(a addresses.Address, d *schema.ResourceData) error {
 	d.SetId(strconv.Itoa(a.ID))
-	d.Set("address_id", a.ID)
-	d.Set("subnet_id", a.SubnetID)
-	d.Set("ip_address", a.IPAddress)
-	d.Set("is_gateway", a.IsGateway)
-	d.Set("description", a.Description)
-	d.Set("hostname", a.Hostname)
-	d.Set("mac_address", a.MACAddress)
-	d.Set("owner", a.Owner)
-	d.Set("state_tag_id", a.Tag)
-	d.Set("skip_ptr_record", a.PTRIgnore)
-	d.Set("ptr_record_id", a.PTRRecordID)
-	d.Set("device_id", a.DeviceID)
-	d.Set("switch_port_label", a.Port)
-	d.Set("note", a.Note)
-	d.Set("last_seen", a.LastSeen)
-	d.Set("exclude_ping", a.ExcludePing)
-	d.Set("edit_date", a.EditDate)
+
+	fields := map[string]interface{}{
+		"address_id":        a.ID,
+		"subnet_id":         a.SubnetID,
+		"ip_address":        a.IPAddress,
+		"is_gateway":        a.IsGateway,
+		"description":       a.Description,
+		"hostname":          a.Hostname,
+		"mac_address":       a.MACAddress,
+		"owner":             a.Owner,
+		"state_tag_id":      a.Tag,
+		"skip_ptr_record":   a.PTRIgnore,
+		"ptr_record_id":     a.PTRRecordID,
+		"device_id":         a.DeviceID,
+		"switch_port_label": a.Port,
+		"note":              a.Note,
+		"last_seen":         a.LastSeen,
+		"exclude_ping":      a.ExcludePing,
+		"edit_date":         a.EditDate,
+	}
+
+	for field, value := range fields {
+		err := d.Set(field, value)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
 }
 
 // addressSearchInSubnet provides the address search functionality for both the
diff --git a/plugin/providers/phpipam/custom_field_structure.go b/plugin/providers/phpipam/custom_field_structure.go
@@ -5,10 +5,10 @@ import (
 	"reflect"
 	"regexp"
 
-	"github.com/hashicorp/terraform/helper/schema"
 	"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"
+	"github.com/hashicorp/terraform/helper/schema"
 )
 
 // customFieldFilterSchema returns a *schema.Schema for the custom_field_filter
@@ -43,7 +43,7 @@ func customFieldFilterSchema(conflicts []string) *schema.Schema {
 // this function will be updated.
 func customFieldFilter(data, search map[string]interface{}) (bool, error) {
 	// zero-length or nil map is a panic. This should never happen
-	if search == nil || len(search) == 0 {
+	if len(search) == 0 {
 		panic("Zero length or nil map passed as search terms to customFieldFilter")
 	}
 
diff --git a/plugin/providers/phpipam/data_source_phpipam_address.go b/plugin/providers/phpipam/data_source_phpipam_address.go
@@ -3,8 +3,8 @@ package phpipam
 import (
 	"errors"
 
-	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/Ouest-France/phpipam-sdk-go/controllers/addresses"
+	"github.com/hashicorp/terraform/helper/schema"
 )
 
 func dataSourcePHPIPAMAddress() *schema.Resource {
@@ -42,7 +42,10 @@ func dataSourcePHPIPAMAddressRead(d *schema.ResourceData, meta interface{}) erro
 	if len(out) != 1 {
 		return errors.New("Your search returned zero or multiple results. Please correct your search and try again")
 	}
-	flattenAddress(out[0], d)
+	err = flattenAddress(out[0], d)
+	if err != nil {
+		return err
+	}
 	fields, err := c.GetAddressCustomFields(out[0].ID)
 	if err != nil {
 		return err
diff --git a/plugin/providers/phpipam/data_source_phpipam_first_free_address.go b/plugin/providers/phpipam/data_source_phpipam_first_free_address.go
@@ -33,7 +33,7 @@ func dataSourcePHPIPAMFirstFreeAddressRead(d *schema.ResourceData, meta interfac
 	}
 
 	d.SetId(out)
-	d.Set("ip_address", out)
+	err = d.Set("ip_address", out)
 
-	return nil
+	return err
 }
diff --git a/plugin/providers/phpipam/data_source_phpipam_section.go b/plugin/providers/phpipam/data_source_phpipam_section.go
@@ -3,8 +3,8 @@ package phpipam
 import (
 	"errors"
 
-	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/Ouest-France/phpipam-sdk-go/controllers/sections"
+	"github.com/hashicorp/terraform/helper/schema"
 )
 
 func dataSourcePHPIPAMSection() *schema.Resource {
@@ -34,6 +34,7 @@ func dataSourcePHPIPAMSectionRead(d *schema.ResourceData, meta interface{}) erro
 	default:
 		return errors.New("section_id or name not defined, cannot proceed with reading data")
 	}
-	flattenSection(out, d)
-	return nil
+	err = flattenSection(out, d)
+
+	return err
 }
diff --git a/plugin/providers/phpipam/data_source_phpipam_subnet.go b/plugin/providers/phpipam/data_source_phpipam_subnet.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/Ouest-France/phpipam-sdk-go/controllers/subnets"
+	"github.com/hashicorp/terraform/helper/schema"
 )
 
 func dataSourcePHPIPAMSubnet() *schema.Resource {
@@ -43,7 +43,10 @@ func dataSourcePHPIPAMSubnetRead(d *schema.ResourceData, meta interface{}) error
 	if len(out) != 1 {
 		return errors.New("Your search returned zero or multiple results. Please correct your search and try again")
 	}
-	flattenSubnet(out[0], d)
+	err = flattenSubnet(out[0], d)
+	if err != nil {
+		return err
+	}
 	fields, err := c.GetSubnetCustomFields(out[0].ID)
 	if err != nil {
 		return err
diff --git a/plugin/providers/phpipam/data_source_phpipam_vlan.go b/plugin/providers/phpipam/data_source_phpipam_vlan.go
@@ -3,8 +3,8 @@ package phpipam
 import (
 	"errors"
 
-	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/Ouest-France/phpipam-sdk-go/controllers/vlans"
+	"github.com/hashicorp/terraform/helper/schema"
 )
 
 func dataSourcePHPIPAMVLAN() *schema.Resource {
@@ -39,6 +39,6 @@ func dataSourcePHPIPAMVLANRead(d *schema.ResourceData, meta interface{}) error {
 	default:
 		return errors.New("vlan_id or number not defined, cannot proceed with reading data")
 	}
-	flattenVLAN(out, d)
-	return nil
+	err := flattenVLAN(out, d)
+	return err
 }
diff --git a/plugin/providers/phpipam/resource_phpipam_address.go b/plugin/providers/phpipam/resource_phpipam_address.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/Ouest-France/phpipam-sdk-go/phpipam"
+	"github.com/hashicorp/terraform/helper/schema"
 )
 
 // resourcePHPIPAMAddress returns the resource structure for the phpipam_address
@@ -37,7 +37,10 @@ func resourcePHPIPAMAddressCreate(d *schema.ResourceData, meta interface{}) erro
 	}
 
 	if in.IPAddress == "" {
-		d.Set("ip_address", ip)
+		err = d.Set("ip_address", ip)
+		if err != nil {
+			return err
+		}
 	}
 
 	// If we have custom fields, set them now. We need to get the IP address's ID
diff --git a/plugin/providers/phpipam/section_structure.go b/plugin/providers/phpipam/section_structure.go
@@ -3,9 +3,9 @@ package phpipam
 import (
 	"strconv"
 
-	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/Ouest-France/phpipam-sdk-go/controllers/sections"
 	"github.com/Ouest-France/phpipam-sdk-go/phpipam"
+	"github.com/hashicorp/terraform/helper/schema"
 )
 
 // resourceSectionOptionalFields represents all the fields that are optional in
@@ -142,19 +142,31 @@ func expandSection(d *schema.ResourceData) sections.Section {
 
 // flattenSection sets fields in a *schema.ResourceData with fields supplied by
 // the input sections.Section. This is used in read operations.
-func flattenSection(s sections.Section, d *schema.ResourceData) {
+func flattenSection(s sections.Section, d *schema.ResourceData) error {
 	d.SetId(strconv.Itoa(s.ID))
-	d.Set("section_id", s.ID)
-	d.Set("name", s.Name)
-	d.Set("description", s.Description)
-	d.Set("master_section_id", s.MasterSection)
-	d.Set("permissions", s.Permissions)
-	d.Set("strict_mode", s.StrictMode)
-	d.Set("subnet_ordering", s.SubnetOrdering)
-	d.Set("display_order", s.Order)
-	d.Set("edit_date", s.EditDate)
-	d.Set("show_vlan_in_subnet_listing", s.ShowVLAN)
-	d.Set("show_vrf_in_subnet_listing", s.ShowVRF)
-	d.Set("show_supernet_only", s.ShowSupernetOnly)
-	d.Set("dns_resolver_id", s.DNS)
+
+	fields := map[string]interface{}{
+		"section_id":                  s.ID,
+		"name":                        s.Name,
+		"description":                 s.Description,
+		"master_section_id":           s.MasterSection,
+		"permissions":                 s.Permissions,
+		"strict_mode":                 s.StrictMode,
+		"subnet_ordering":             s.SubnetOrdering,
+		"display_order":               s.Order,
+		"edit_date":                   s.EditDate,
+		"show_vlan_in_subnet_listing": s.ShowVLAN,
+		"show_vrf_in_subnet_listing":  s.ShowVRF,
+		"show_supernet_only":          s.ShowSupernetOnly,
+		"dns_resolver_id":             s.DNS,
+	}
+
+	for field, value := range fields {
+		err := d.Set(field, value)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
 }
diff --git a/plugin/providers/phpipam/subnet_structure.go b/plugin/providers/phpipam/subnet_structure.go
diff --git a/plugin/providers/phpipam/vlan_structure.go b/plugin/providers/phpipam/vlan_structure.go

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func dataSourcePHPIPAMFirstFreeAddressRead(d *schema.ResourceData, meta interfac`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`d.SetId(out)`
`36`		`- d.Set("ip_address", out)`
	`36`	`+ err = d.Set("ip_address", out)`
`37`	`37`
`38`		`- return nil`
	`38`	`+ return err`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package phpipam`
`3`	`3`	`import (`
`4`	`4`	`"errors"`
`5`	`5`
`6`		`- "github.com/hashicorp/terraform/helper/schema"`
`7`	`6`	`"github.com/Ouest-France/phpipam-sdk-go/controllers/sections"`
	`7`	`+ "github.com/hashicorp/terraform/helper/schema"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func dataSourcePHPIPAMSection() *schema.Resource {`
`@@ -34,6 +34,7 @@ func dataSourcePHPIPAMSectionRead(d *schema.ResourceData, meta interface{}) erro`
`34`	`34`	`default:`
`35`	`35`	`return errors.New("section_id or name not defined, cannot proceed with reading data")`
`36`	`36`	`}`
`37`		`- flattenSection(out, d)`
`38`		`- return nil`
	`37`	`+ err = flattenSection(out, d)`
	`38`	`+`
	`39`	`+ return err`
`39`	`40`	`}`