Fixes #45

terraform-providers · Aug 15, 2018 · cc6bfa5 · cc6bfa5
1 parent 5979bcd
commit cc6bfa5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/oraclepaas/resource_database_service_instance.go b/oraclepaas/resource_database_service_instance.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"strconv"
+	"strings"
 	"time"
 
 	opcClient "github.com/hashicorp/go-oracle-terraform/client"
@@ -522,7 +523,6 @@ func resourceOPAASDatabaseServiceInstanceCreate(d *schema.ResourceData, meta int
 	input := database.CreateServiceInstanceInput{
 		Name:                      d.Get("name").(string),
 		Edition:                   database.ServiceInstanceEdition(d.Get("edition").(string)),
-		IPReservations:            getStringList(d, "ip_reservations"),
 		IsBYOL:                    d.Get("bring_your_own_license").(bool),
 		Level:                     database.ServiceInstanceLevel(d.Get("level").(string)),
 		Shape:                     database.ServiceInstanceShape(d.Get("shape").(string)),
@@ -545,7 +545,7 @@ func resourceOPAASDatabaseServiceInstanceCreate(d *schema.ResourceData, meta int
 	}
 
 	if _, ok := d.GetOk("ip_reservations"); ok {
-		input.IPReservations = getStringList(d, "ip_reservations")
+		input.IPReservations = strings.Join(getStringList(d, "ip_reservations"), ",")
 	}
 
 	if v, ok := d.GetOk("region"); ok {

diff --git a/oraclepaas/resource_java_service_instance.go b/oraclepaas/resource_java_service_instance.go
@@ -903,7 +903,7 @@ func expandWebLogicConfig(d *schema.ResourceData, input *java.CreateServiceInsta
 		webLogicServer.ClusterName = v.(string)
 	}
 	if v := attrs["ip_reservations"]; v != nil {
-		webLogicServer.IPReservations = getStringList(d, "weblogic_server.0.ip_reservations")
+		webLogicServer.IPReservations = strings.Join(getStringList(d, "weblogic_server.0.ip_reservations"), ",")
 	}
 	if v := attrs["middleware_volume_size"]; v != nil {
 		webLogicServer.MWVolumeSize = v.(string)
@@ -932,7 +932,7 @@ func expandOTDConfig(d *schema.ResourceData, input *java.CreateServiceInstanceIn
 		otdInfo.HAEnabled = v.(bool)
 	}
 	if v := attrs["ip_reservations"]; v != nil {
-		otdInfo.IPReservations = getStringList(d, "oracle_traffic_director.0.ip_reservations")
+		otdInfo.IPReservations = strings.Join(getStringList(d, "oracle_traffic_director.0.ip_reservations"), ",")
 	}
 	if v := attrs["load_balancing_policy"]; v != nil {
 		otdInfo.LoadBalancingPolicy = java.ServiceInstanceLoadBalancingPolicy(v.(string))

diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/database/service_instance.go b/vendor/github.com/hashicorp/go-oracle-terraform/database/service_instance.go
diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/java/service_instance.go b/vendor/github.com/hashicorp/go-oracle-terraform/java/service_instance.go