V11 Fix for issue #1117, #1102

examples/ibm-is-vpc/main.tf

@@ -2,7 +2,7 @@ resource "ibm_is_vpc" "vpc1" {
   name = "vpc1"
 }
 
-resource "ibm_is_vpc_route" {
+resource "ibm_is_vpc_route" "route1" {
   name        = "route1"
   vpc         = "${ibm_is_vpc.vpc1.id}"
   zone        = "${var.zone1}"
@@ -47,7 +47,7 @@ resource "ibm_is_instance" "instance1" {
   image   = "${var.image}"
   profile = "${var.profile}"
 
-  primary_network_interface = {
+  primary_network_interface {
     port_speed = "1000"
     subnet     = "${ibm_is_subnet.subnet1.id}"
   }
@@ -151,7 +151,7 @@ resource "ibm_is_instance" "instance2" {
   image   = "${var.image}"
   profile = "${var.profile}"
 
-  primary_network_interface = {
+  primary_network_interface {
     port_speed = "1000"
     subnet     = "${ibm_is_subnet.subnet2.id}"
   }
@@ -217,33 +217,42 @@ resource "ibm_is_volume" "vol2" {
   capacity = 200
 }
 
-
 resource "ibm_is_network_acl" "isExampleACL" {
   name = "is-example-acl"
+
   rules {
     name        = "outbound"
     action      = "allow"
     source      = "0.0.0.0/0"
     destination = "0.0.0.0/0"
     direction   = "outbound"
+
     tcp {
       port_max        = 65535
       port_min        = 1
       source_port_max = 60000
       source_port_min = 22
     }
   }
+
   rules {
     name        = "inbound"
     action      = "allow"
     source      = "0.0.0.0/0"
     destination = "0.0.0.0/0"
     direction   = "inbound"
+
     tcp {
       port_max        = 65535
       port_min        = 1
       source_port_max = 60000
       source_port_min = 22
     }
   }
-}
+}
+
+resource "ibm_is_public_gateway" "publicgateway1" {
+  name = "pg1"
+  vpc  = "${ibm_is_vpc.vpc1.id}"
+  zone = "${var.zone1}"
+}

ibm/resource_ibm_is_networkacls.go

@@ -384,7 +384,7 @@ func resourceIBMISNetworkACLUpdate(d *schema.ResourceData, meta interface{}) err
 	}
 	nwaclC := network.NewNetworkAclClient(sess)
 	nwaclid := d.Id()
-	rules := d.Get(isNetworkACLRules).([]interface{})
+	rules := d.Get(isNetworkACLRules).(*schema.Set).List()
 
 	if d.HasChange(isNetworkACLName) {
 		name := d.Get(isNetworkACLName).(string)
@@ -584,13 +584,11 @@ func createInlineRules(nwaclC *network.NetworkAclClient, nwaclid string, rules [
 			}
 		}
 
-		rule, err := nwaclC.AddRule(nwaclid, name, source, destination, direction, action, protocol,
+		_, err := nwaclC.AddRule(nwaclid, name, source, destination, direction, action, protocol,
 			int64(icmptype), int64(icmpcode), int64(minport), int64(maxport), int64(sourceminport), int64(sourcemaxport), before)
 		if err != nil {
 			return err
 		}
-
-		before = rule.ID.String()
 	}
 	return nil
 }

ibm/resource_ibm_is_public_gateway.go

@@ -17,6 +17,7 @@ const (
 	isPublicGatewayVPC               = "vpc"
 	isPublicGatewayZone              = "zone"
 	isPublicGatewayFloatingIPAddress = "address"
+	isPublicGatewayResourceGroup     = "resource_group"
 
 	isPublicGatewayProvisioning     = "provisioning"
 	isPublicGatewayProvisioningDone = "available"
@@ -71,6 +72,13 @@ func resourceIBMISPublicGateway() *schema.Resource {
 				Computed: true,
 			},
 
+			isPublicGatewayResourceGroup: {
+				Type:     schema.TypeString,
+				ForceNew: true,
+				Optional: true,
+				Computed: true,
+			},
+
 			isPublicGatewayVPC: {
 				Type:     schema.TypeString,
 				ForceNew: true,
@@ -125,6 +133,10 @@ func resourceIBMISPublicGatewayCreate(d *schema.ResourceData, meta interface{})
 	name := d.Get(isPublicGatewayName).(string)
 	vpc := d.Get(isPublicGatewayVPC).(string)
 	zone := d.Get(isPublicGatewayZone).(string)
+	var rg string
+	if grp, ok := d.GetOk(isPublicGatewayResourceGroup); ok {
+		rg = grp.(string)
+	}
 	floatingipID := ""
 	floatingipadd := ""
 	if floatingipdataIntf, ok := d.GetOk(isPublicGatewayFloatingIP); ok {
@@ -140,7 +152,7 @@ func resourceIBMISPublicGatewayCreate(d *schema.ResourceData, meta interface{})
 	}
 
 	publicgwC := network.NewPublicGatewayClient(sess)
-	publicgw, err := publicgwC.Create(name, zone, vpc, floatingipID, floatingipadd)
+	publicgw, err := publicgwC.Create(name, zone, vpc, floatingipID, floatingipadd, rg)
 	if err != nil {
 		return err
 	}
@@ -217,6 +229,9 @@ func resourceIBMISPublicGatewayRead(d *schema.ResourceData, meta interface{}) er
 	d.Set(isPublicGatewayStatus, publicgw.Status)
 	d.Set(isPublicGatewayZone, publicgw.Zone.Name)
 	d.Set(isPublicGatewayVPC, publicgw.Vpc.ID.String())
+	if publicgw.ResourceGroup != nil {
+		d.Set(isPublicGatewayResourceGroup, publicgw.ResourceGroup.ID)
+	}
 
 	controller, err := getBaseController(meta)
 	if err != nil {

vendor/vendor.json

@@ -1901,10 +1901,10 @@
 			"revisionTime": "2018-05-24T00:26:36Z"
 		},
 		{
-			"checksumSHA1": "YzFuV7mxbTPAcMJ6U6nW6acaFJo=",
+			"checksumSHA1": "op5FLKoRmF0/6ORi9d3q9aoYOJQ=",
 			"path": "github.ibm.com/Bluemix/riaas-go-client",
-			"revision": "44af28b491d11609c5708520ef64c69b25cbf11a",
-			"revisionTime": "2020-02-07T09:17:59Z",
+			"revision": "e1cef421a27ee39275b81bffce4ef0f5229cfbb1",
+			"revisionTime": "2020-02-20T12:34:19Z",
 			"tree": true
 		},
 		{

website/docs/r/is_network_acl.html.markdown

@@ -123,7 +123,7 @@ The following arguments are supported:
 
 * `name` - (Required, string) The name of the network ACL.
 * `vpc` - (Optional, Forces new resource, string) The VPC Id. This is a Required field and to be set only when the generation parameter is `2`
-* `rules` - (Optional, array)   The rules for a network ACL
+* `rules` - (Optional, array)   The rules for a network ACL. The order of rules priority depends on the order of rules specified in the template.
 Nested `rules` blocks have the following structure:
 	* `name` - (Required, string) The user-defined name for this rule.
 	* `action` - (Required, string) Whether to allow or deny matching traffic.

website/docs/r/is_public_gateway.html.markdown

@@ -19,7 +19,7 @@ resource "ibm_is_vpc" "testacc_vpc" {
 }
 
 resource "ibm_is_public_gateway" "testacc_gateway" {
-	name = "test_gateway"
+	name = "test-gateway"
 	vpc = "${ibm_is_vpc.testacc_vpc.id}"
 	zone = "us-south-1"
 
@@ -44,6 +44,7 @@ The following arguments are supported:
 * `name` - (Required, string) The name of the gateway.
 * `vpc` - (Required, Forces new resource, string) The vpc id.
 * `zone` - (Required, Forces new resource, string) The gateway zone name.
+* `resource_group` - (Optional, Forces new resource, string) The resource group ID where the Public gateway is to be created.
 * `floating_ip` - (Optional, string) A nested block describing the floating IP of this gateway.
 Nested `floating_ip` blocks have the following structure:
   * `id` - (Optional, string) ID of the floating ip bound to the public gateway.