Merge pull request #67 from MissionCriticalCloud/set_instance_offerin…

…g_case_insensitive

Fix instance service offering bug

CHANGELOG.md

@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Add ability to rename `cosmic_network_acl`'s `name` and `description` fields
 - Add `client_timeout` and `server_timeout` fields to `cosmic_loadbalancer_rule`
+- Fix bug where a resource's offering is saved in state as a case sensitive value
 - Fix bug where changing `cosmic_loadbalancer_rule` private or public ports did not recreate the resource
 - Fix bug where changing `cosmic_loadbalancer_rule` protocol did not recreate the resource
 

cosmic/resource_cosmic_disk.go

@@ -28,6 +28,9 @@ func resourceCosmicDisk() *schema.Resource {
 			"disk_offering": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					return strings.EqualFold(old, new)
+				},
 			},
 
 			"attach": &schema.Schema{

cosmic/resource_cosmic_disk_test.go

@@ -2,6 +2,7 @@ package cosmic
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/MissionCriticalCloud/go-cosmic/v6/cosmic"
@@ -344,7 +345,7 @@ resource "cosmic_disk" "foo" {
   disk_offering = "%s"
   zone          = "%s"
 }`,
-	COSMIC_DISK_OFFERING,
+	strings.ToLower(COSMIC_DISK_OFFERING),
 	COSMIC_ZONE,
 )
 

cosmic/resource_cosmic_instance.go

@@ -38,6 +38,9 @@ func resourceCosmicInstance() *schema.Resource {
 			"service_offering": {
 				Type:     schema.TypeString,
 				Required: true,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					return strings.EqualFold(old, new)
+				},
 			},
 
 			"network_id": {

cosmic/resource_cosmic_instance_test.go

@@ -2,6 +2,7 @@ package cosmic
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/MissionCriticalCloud/go-cosmic/v6/cosmic"
@@ -388,7 +389,7 @@ resource "cosmic_instance" "foo" {
 	COSMIC_VPC_OFFERING,
 	COSMIC_ZONE,
 	COSMIC_VPC_NETWORK_OFFERING,
-	COSMIC_SERVICE_OFFERING_1,
+	strings.ToLower(COSMIC_SERVICE_OFFERING_1),
 	COSMIC_TEMPLATE,
 )
 

cosmic/resource_cosmic_network.go

@@ -97,6 +97,9 @@ func resourceCosmicNetwork() *schema.Resource {
 			"network_offering": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					return strings.EqualFold(old, new)
+				},
 			},
 
 			"vlan": &schema.Schema{

cosmic/resource_cosmic_network_test.go

@@ -2,6 +2,7 @@ package cosmic
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/MissionCriticalCloud/go-cosmic/v6/cosmic"
@@ -263,7 +264,7 @@ resource "cosmic_network" "foo" {
     terraform-tag = "true"
   }
 }`,
-	COSMIC_VPC_OFFERING,
+	strings.ToLower(COSMIC_VPC_OFFERING),
 	COSMIC_ZONE,
 	COSMIC_VPC_NETWORK_OFFERING,
 )

cosmic/resource_cosmic_vpc.go

@@ -40,6 +40,9 @@ func resourceCosmicVPC() *schema.Resource {
 			"vpc_offering": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					return strings.EqualFold(old, new)
+				},
 			},
 
 			"network_domain": &schema.Schema{

cosmic/resource_cosmic_vpc_test.go

@@ -2,6 +2,7 @@ package cosmic
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/MissionCriticalCloud/go-cosmic/v6/cosmic"
@@ -117,6 +118,6 @@ resource "cosmic_vpc" "foo" {
   network_domain = "terraform-domain"
   zone           = "%s"
 }`,
-	COSMIC_VPC_OFFERING,
+	strings.ToLower(COSMIC_VPC_OFFERING),
 	COSMIC_ZONE,
 )