Fix issue #1117 and #1102

common/github.ibm.com/Bluemix/riaas-go-client/clients/compute/instance.go

@@ -103,15 +103,6 @@ func (f *InstanceClient) Create(instancedef compute.PostInstancesBody) (*models.
 	return resp.Payload, nil
 }
 
-// CreateEasy ...
-func (f *InstanceClient) CreateEasy(name string) (*models.Instance, error) {
-
-	var body = compute.PostInstancesBody{
-		Name: name,
-	}
-	return f.Create(body)
-}
-
 // Update ...
 func (f *InstanceClient) Update(id, name, profileName string) (*models.Instance, error) {
 	var body = compute.PatchInstancesIDBody{}

common/github.ibm.com/Bluemix/riaas-go-client/clients/network/publicgateways.go

@@ -60,7 +60,7 @@ func (f *PublicGatewayClient) Get(id string) (*models.PublicGateway, error) {
 }
 
 /// Create ...
-func (f *PublicGatewayClient) Create(name, zoneName, vpcID, FloatingIPID, FloatingIPaddr string) (*models.PublicGateway, error) {
+func (f *PublicGatewayClient) Create(name, zoneName, vpcID, FloatingIPID, FloatingIPaddr, resourcegroupID string) (*models.PublicGateway, error) {
 
 	var body = network.PostPublicGatewaysBody{
 		Name: name,
@@ -88,6 +88,14 @@ func (f *PublicGatewayClient) Create(name, zoneName, vpcID, FloatingIPID, Floati
 		}
 		body.FloatingIP = &floatingip
 	}
+
+	if resourcegroupID != "" {
+		var resourcegroup = network.PostPublicGatewaysParamsBodyResourceGroup{
+			ID: strfmt.UUID(resourcegroupID),
+		}
+		body.ResourceGroup = &resourcegroup
+	}
+
 	params := network.NewPostPublicGatewaysParamsWithTimeout(f.session.Timeout).WithBody(body)
 	params.Version = "2019-10-08"
 	params.Generation = f.session.Generation

common/github.ibm.com/Bluemix/riaas-go-client/clients/network/subnet.go

@@ -98,17 +98,15 @@ func (f *SubnetClient) Create(name, zoneName, vpcID, networkaclID, publicgwID,
 	}
 
 	if publicgwID != "" {
-		publicgwUUID := strfmt.UUID(publicgwID)
 		var pubgw = network.PostSubnetsParamsBodyPublicGateway{
-			ID: publicgwUUID,
+			ID: strfmt.UUID(publicgwID),
 		}
 		body.PublicGateway = &pubgw
 	}
 
 	if resourcegroupID != "" {
-		resourcegroupuuid := strfmt.UUID(resourcegroupID)
 		var resourcegroup = network.PostSubnetsParamsBodyResourceGroup{
-			ID: resourcegroupuuid,
+			ID: strfmt.UUID(resourcegroupID),
 		}
 		body.ResourceGroup = &resourcegroup
 	}

common/github.ibm.com/Bluemix/riaas-go-client/swagger/swagger.yaml

@@ -4863,7 +4863,7 @@ paths:
               title: FloatingIPTemplateBasic
               type: object
             resource_group:
-              description: The resource group for this network ACL
+              description: The resource group for this public gateway
               properties:
                 id: {description: The unique identifier for this resource group, example: 56969d60-43e9-465c-883c-b9f7363e78e8,
                   format: uuid, pattern: '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$',

examples/ibm-is-vpc/main.tf

@@ -235,3 +235,9 @@ resource "ibm_is_network_acl" "isExampleACL" {
     }
   }
 }
+
+resource "ibm_is_public_gateway" "publicgateway1" {
+  name = "gateway1"
+  vpc  = ibm_is_vpc.testacc_vpc.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

@@ -22,6 +22,8 @@ const (
 	isPublicGatewayProvisioningDone = "available"
 	isPublicGatewayDeleting         = "deleting"
 	isPublicGatewayDeleted          = "done"
+
+	isPublicGatewayResourceGroup = "resource_group"
 )
 
 func resourceIBMISPublicGateway() *schema.Resource {
@@ -71,6 +73,13 @@ func resourceIBMISPublicGateway() *schema.Resource {
 				Computed: true,
 			},
 
+			isPublicGatewayResourceGroup: {
+				Type:     schema.TypeString,
+				ForceNew: true,
+				Optional: true,
+				Computed: true,
+			},
+
 			isPublicGatewayVPC: {
 				Type:     schema.TypeString,
 				ForceNew: true,
@@ -139,8 +148,13 @@ func resourceIBMISPublicGatewayCreate(d *schema.ResourceData, meta interface{})
 		}
 	}
 
+	var rg string
+	if grp, ok := d.GetOk(isPublicGatewayResourceGroup); ok {
+		rg = grp.(string)
+	}
+
 	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 +231,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 {

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"
 
@@ -45,6 +45,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.