update SA notes and diff suppress

Author: deepakibms

ibm/service/vpc/data_source_ibm_is_share_accessor_binding_test.go

@@ -26,7 +26,7 @@ func TestAccIBMIsShareAccessorBindingDataSourceBasic(t *testing.T) {
 	vpcname := fmt.Sprintf("tf-vpc-name-%d", acctest.RandIntRange(10, 100))
 	shareName := fmt.Sprintf("tf-share-%d", acctest.RandIntRange(10, 100))
 	shareName1 := fmt.Sprintf("tf-share1-%d", acctest.RandIntRange(10, 100))
-	tEMode1 := "user_managed"
+	tEMode1 := "ipsec"
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { acc.TestAccPreCheck(t) },
 		Providers: acc.TestAccProviders,

ibm/service/vpc/data_source_ibm_is_share_accessor_bindings_test.go

@@ -27,7 +27,7 @@ func TestAccIBMIsShareAccessorBindingsDataSourceBasic(t *testing.T) {
 	vpcname := fmt.Sprintf("tf-vpc-name-%d", acctest.RandIntRange(10, 100))
 	shareName := fmt.Sprintf("tf-share-%d", acctest.RandIntRange(10, 100))
 	shareName1 := fmt.Sprintf("tf-share1-%d", acctest.RandIntRange(10, 100))
-	tEMode1 := "user_managed"
+	tEMode1 := "ipsec"
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { acc.TestAccPreCheck(t) },
 		Providers: acc.TestAccProviders,

ibm/service/vpc/resource_ibm_is_share.go

@@ -31,6 +31,12 @@ const (
 	IsFileShareReplicationRoleReplica = "replica"
 )
 
+func normalizeValue(value string) string {
+	if value == "user_managed" {
+		return "ipsec"
+	}
+	return value
+}
 func ResourceIbmIsShare() *schema.Resource {
 	return &schema.Resource{
 		CreateContext: resourceIbmIsShareCreate,
@@ -54,10 +60,26 @@ func ResourceIbmIsShare() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"allowed_transit_encryption_modes": {
-				Type:        schema.TypeList,
-				Optional:    true,
-				Computed:    true,
-				Elem:        &schema.Schema{Type: schema.TypeString},
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Set: func(v interface{}) int {
+					str := v.(string)
+					normalized := normalizeValue(str)
+					return schema.HashString(normalized)
+				},
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+					DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+						if old == "user_managed" && new == "ipsec" {
+							return true
+						}
+						if old == "ipsec" && new == "user_managed" {
+							return true
+						}
+						return false
+					},
+				},
 				Description: "Allowed transit encryption modes",
 			},
 			"allowed_access_protocols": {
@@ -164,6 +186,15 @@ func ResourceIbmIsShare() *schema.Resource {
 							Optional:    true,
 							Computed:    true,
 							Description: "The transit encryption mode.",
+							DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+								if old == "user_managed" && new == "ipsec" {
+									return true
+								}
+								if old == "ipsec" && new == "user_managed" {
+									return true
+								}
+								return false
+							},
 						},
 						"name": {
 							Type:        schema.TypeString,
@@ -334,13 +365,6 @@ func ResourceIbmIsShare() *schema.Resource {
 				Description:   "Configuration for a replica file share to create and associate with this file share. Ifunspecified, a replica may be subsequently added by creating a new file share with a`source_share` referencing this file share.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
-						"allowed_transit_encryption_modes": {
-							Type:        schema.TypeList,
-							Optional:    true,
-							Computed:    true,
-							Elem:        &schema.Schema{Type: schema.TypeString},
-							Description: "Allowed transit encryption modes",
-						},
 						"crn": {
 							Type:        schema.TypeString,
 							Computed:    true,
@@ -447,6 +471,15 @@ func ResourceIbmIsShare() *schema.Resource {
 										Optional:    true,
 										Computed:    true,
 										Description: "The transit encryption mode.",
+										DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+											if old == "user_managed" && new == "ipsec" {
+												return true
+											}
+											if old == "ipsec" && new == "user_managed" {
+												return true
+											}
+											return false
+										},
 									},
 									"virtual_network_interface": {
 										Type:        schema.TypeList,
@@ -1170,19 +1203,6 @@ func resourceIbmIsShareCreate(context context.Context, d *schema.ResourceData, m
 			replicaShareMap := replicaShareIntf.([]interface{})[0].(map[string]interface{})
 			replicaShare := &vpcv1.SharePrototypeShareContext{}
 
-			if allowedTEMIntf, ok := replicaShareMap["allowed_transit_encryption_modes"]; ok {
-				allowedTransitEncryptionModes := []string{}
-				allowedTransitEncryptionModesIntf := allowedTEMIntf.([]interface{})
-				for _, allowedTransitEncryptionModesItemIntf := range allowedTransitEncryptionModesIntf {
-					allowedTransitEncryptionModesItem := allowedTransitEncryptionModesItemIntf.(string)
-					if allowedTransitEncryptionModesItem == "user_managed" {
-						allowedTransitEncryptionModesItem = "ipsec"
-					}
-					allowedTransitEncryptionModes = append(allowedTransitEncryptionModes, allowedTransitEncryptionModesItem)
-				}
-				replicaShare.AllowedTransitEncryptionModes = allowedTransitEncryptionModes
-			}
-
 			iopsIntf, ok := replicaShareMap["iops"]
 			iops := iopsIntf.(int)
 			if ok && iops != 0 {
@@ -1461,10 +1481,12 @@ func resourceIbmIsShareRead(context context.Context, d *schema.ResourceData, met
 			return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_share", "read", "set-access_control_mode").GetDiag()
 		}
 	}
+	allowedaccessprotocols := []string{}
 	if share.AllowedAccessProtocols != nil && len(share.AllowedAccessProtocols) > 0 {
-		if err = d.Set("allowed_access_protocols", *&share.AllowedAccessProtocols); err != nil {
-			return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_share", "read", "set-allowed_access_protocols").GetDiag()
-		}
+		allowedaccessprotocols = share.AllowedAccessProtocols
+	}
+	if err = d.Set("allowed_access_protocols", allowedaccessprotocols); err != nil {
+		return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_share", "read", "set-allowed_access_protocols").GetDiag()
 	}
 	if err = d.Set("bandwidth", flex.IntValue(share.Bandwidth)); err != nil {
 		return diag.FromErr(fmt.Errorf("Error setting bandwidth: %s", err))

ibm/service/vpc/resource_ibm_is_share_delete_accessor_binding_test.go

@@ -22,7 +22,7 @@ func TestAccIbmIsShareDeleteAccessorBinding(t *testing.T) {
 	shareName := fmt.Sprintf("tf-share-%d", acctest.RandIntRange(10, 100))
 	shareName1 := fmt.Sprintf("tf-share1-%d", acctest.RandIntRange(10, 100))
 	shareName2 := fmt.Sprintf("tf-share2-%d", acctest.RandIntRange(10, 100))
-	tEMode1 := "user_managed"
+	tEMode1 := "ipsec"
 	// tEMode2 := "none"
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { acc.TestAccPreCheck(t) },

website/docs/r/is_share.html.markdown

@@ -11,7 +11,7 @@ subcategory: "VPC infrastructure"
 Provides a resource for Share. This allows Share to be created, updated and deleted. For more information, about share replication, see [Share replication](https://cloud.ibm.com/docs/vpc?topic=vpc-file-storage-replication).
 
 ~> **NOTE**
-  New shares should be created with profile `dp2`. Old Tiered profiles will be deprecated soon.
+  Regional file share `rfs` profile is available for accounts that have been granted special approval to preview the feature.
 
 ## Example Usage
 
@@ -101,7 +101,7 @@ resource "ibm_is_share" "example-4" {
 ## Example share (Create accessor share for an origin share)
 ```terraform
 resource "ibm_is_share" "example-4" {
-  allowed_transit_encryption_modes = ["user_managed", "none"]
+  allowed_transit_encryption_modes = ["ipsec", "none"]
   access_control_mode = "security_group"
   name    = "my-share"
   size    = 200
@@ -121,6 +121,16 @@ resource "ibm_is_share" "example-6" {
   name                  = "my-replica1"
 }
 ```
+## Example share (Create a regional file share)
+```terraform
+resource "ibm_is_share" "example-4" {
+  allowed_transit_encryption_modes = ["stunnel", "none"]
+  access_control_mode = "security_group"
+  bandwidth = 210
+  name    = "my-share"
+  size    = 200
+  profile = "  profile = "rfs"
+}
 
 ## Argument Reference