fix default int ptr values (#58)

* fix int ptr default which should be nil not 0

* fixing default port should be 80 not 0

* fixing default port on service

- should be port 80 not 0
- int ptr was being returned as 0 not nil from resource

Author: kevholditch

kong/resource_kong_service.go

@@ -37,6 +37,7 @@ func resourceKongService() *schema.Resource {
 				Type:     schema.TypeInt,
 				Optional: true,
 				ForceNew: false,
+				Default:  80,
 			},
 			"path": &schema.Schema{
 				Type:     schema.TypeString,

kong/resource_kong_service_test.go

@@ -21,7 +21,7 @@ func TestAccKongService(t *testing.T) {
 					resource.TestCheckResourceAttr("kong_service.service", "name", "test"),
 					resource.TestCheckResourceAttr("kong_service.service", "protocol", "http"),
 					resource.TestCheckResourceAttr("kong_service.service", "host", "test.org"),
-					resource.TestCheckResourceAttr("kong_service.service", "port", "8080"),
+					resource.TestCheckResourceAttr("kong_service.service", "port", "80"),
 					resource.TestCheckResourceAttr("kong_service.service", "path", "/mypath"),
 					resource.TestCheckResourceAttr("kong_service.service", "retries", "5"),
 					resource.TestCheckResourceAttr("kong_service.service", "connect_timeout", "1000"),
@@ -121,7 +121,6 @@ resource "kong_service" "service" {
 	name     		= "test"
 	protocol 		= "http"
 	host     		= "test.org"
-	port     		= 8080
 	path     		= "/mypath"
 	retries  		= 5
 	connect_timeout = 1000

kong/resource_reader.go

@@ -5,22 +5,6 @@ import (
 	"github.com/kevholditch/gokong"
 )
 
-func readStringArrayFromResource(d *schema.ResourceData, key string) []string {
-
-	if attr, ok := d.GetOk(key); ok {
-		var array []string
-		items := attr.([]interface{})
-		for _, x := range items {
-			item := x.(string)
-			array = append(array, item)
-		}
-
-		return array
-	}
-
-	return nil
-}
-
 func readStringArrayPtrFromResource(d *schema.ResourceData, key string) []*string {
 
 	if attr, ok := d.GetOk(key); ok {
@@ -37,40 +21,24 @@ func readStringArrayPtrFromResource(d *schema.ResourceData, key string) []*strin
 	return nil
 }
 
-func readIntArrayFromResource(d *schema.ResourceData, key string) []int {
-
-	if attr, ok := d.GetOk(key); ok {
-		var array []int
-		items := attr.([]interface{})
-		for _, x := range items {
-			item := x.(int)
-			array = append(array, item)
-		}
-
-		return array
-	}
-
-	return nil
-}
-
 func readStringFromResource(d *schema.ResourceData, key string) string {
-	if attr, ok := d.GetOk(key); ok {
-		return attr.(string)
+	if value, ok := d.GetOk(key); ok {
+		return value.(string)
 	}
 	return ""
 }
 
 func readIdPtrFromResource(d *schema.ResourceData, key string) *gokong.Id {
-	if attr, ok := d.GetOk(key); ok {
-		id := gokong.Id(attr.(string))
+	if value, ok := d.GetOk(key); ok {
+		id := gokong.Id(value.(string))
 		return &id
 	}
 	return nil
 }
 
 func readStringPtrFromResource(d *schema.ResourceData, key string) *string {
-	if attr, ok := d.GetOk(key); ok {
-		return gokong.String(attr.(string))
+	if value, ok := d.GetOk(key); ok {
+		return gokong.String(value.(string))
 	}
 	return nil
 }
@@ -80,22 +48,16 @@ func readBoolPtrFromResource(d *schema.ResourceData, key string) *bool {
 }
 
 func readIntFromResource(d *schema.ResourceData, key string) int {
-	if attr, ok := d.GetOk(key); ok {
-		return attr.(int)
+	if value, ok := d.GetOk(key); ok {
+		return value.(int)
 	}
 	return 0
 }
 
 func readIntPtrFromResource(d *schema.ResourceData, key string) *int {
-	return gokong.Int(d.Get(key).(int))
-}
-
-func readMapFromResource(d *schema.ResourceData, key string) map[string]interface{} {
-
-	if attr, ok := d.GetOk(key); ok {
-		result := attr.(map[string]interface{})
-		return result
+	value, ok := d.GetOk(key)
+	if ok {
+		return gokong.Int(value.(int))
 	}
-
 	return nil
 }