Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhancement(File-share): VPC Beta SDK upgraded #4770

Merged
merged 2 commits into from
Aug 29, 2023
Merged

enhancement(File-share): VPC Beta SDK upgraded #4770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8d6e6c
enhancement(File-share): GA Preview, beta SDK upgraded
deepaksibm Aug 28, 2023
c0c5cb0
test case updates
deepaksibm Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ require (
github.com/IBM/scc-go-sdk/v4 v4.0.2
github.com/IBM/schematics-go-sdk v0.2.1
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.0
github.com/IBM/vpc-beta-go-sdk v0.5.0
github.com/IBM/vpc-beta-go-sdk v0.6.0
github.com/IBM/vpc-go-sdk v0.40.0
github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5
github.com/Shopify/sarama v1.29.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ github.com/IBM/schematics-go-sdk v0.2.1 h1:byATysGD+Z1k/wdtNqQmKALcAPjgSLuSyzcab
github.com/IBM/schematics-go-sdk v0.2.1/go.mod h1:Tw2OSAPdpC69AxcwoyqcYYaGTTW6YpERF9uNEU+BFRQ=
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.0 h1:Lx4Bvim/MfoHEYR+n312bty5DirAJypBGGS9YZo3zCw=
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.0/go.mod h1:jagqWmjZ0zUEqh5jdGB42ApSQS40fu2LWw6pdg8JJko=
github.com/IBM/vpc-beta-go-sdk v0.5.0 h1:FfhidOZ6qlINsxvVHVZeMK2JzRld64iK3fHpUwX/vx8=
github.com/IBM/vpc-beta-go-sdk v0.5.0/go.mod h1:fzHDAQIqH/5yJmYsKodKHLcqxMDT+yfH6vZjdiw8CQA=
github.com/IBM/vpc-beta-go-sdk v0.6.0 h1:wfM3AcW3zOM3xsRtZ+EA6+sESlGUjQ6Yf4n5QQyz4uc=
github.com/IBM/vpc-beta-go-sdk v0.6.0/go.mod h1:fzHDAQIqH/5yJmYsKodKHLcqxMDT+yfH6vZjdiw8CQA=
github.com/IBM/vpc-go-sdk v0.40.0 h1:p4E1dIQc6+WmqLwRTzgWA2udqFw6nypOg+8R0WxTgX0=
github.com/IBM/vpc-go-sdk v0.40.0/go.mod h1:MgZrbITC067AlcE5oy4hwylasFvrePL4RVxeF6GTdKQ=
github.com/Jeffail/gabs v1.1.1 h1:V0uzR08Hj22EX8+8QMhyI9sX2hwRu+/RJhJUmnwda/E=
Expand Down
2 changes: 1 addition & 1 deletion ibm/flex/structures.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2629,7 +2629,7 @@ func ResourceSharesValidateHelper(diff *schema.ResourceDiff, sizeStr, profileStr
}
}

if profile != "custom-iops" {
if profile != "custom-iops" && profile != "dp2" {
if iops != 0 && diff.NewValueKnown(iopsStr) && diff.HasChange(iopsStr) {
return fmt.Errorf("The Share profile specified in the request cannot accept IOPS values")
}
Expand Down
26 changes: 20 additions & 6 deletions ibm/service/vpc/data_source_ibm_is_share_mount_targets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"time"

"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
"github.com/IBM/vpc-beta-go-sdk/vpcbetav1"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down Expand Up @@ -238,22 +239,35 @@ func dataSourceIBMIsShareTargetsRead(context context.Context, d *schema.Resource
return diag.FromErr(err)
}

start := ""
allrecs := []vpcbetav1.ShareMountTarget{}
listShareTargetsOptions := &vpcbetav1.ListShareMountTargetsOptions{}

listShareTargetsOptions.SetShareID(d.Get("share").(string))
if name, ok := d.GetOk("name"); ok {
listShareTargetsOptions.SetName(name.(string))
}
shareTargetCollection, response, err := vpcClient.ListShareMountTargetsWithContext(context, listShareTargetsOptions)
if err != nil {
log.Printf("[DEBUG] ListShareTargetsWithContext failed %s\n%s", err, response)
return diag.FromErr(err)
for {
if start != "" {
listShareTargetsOptions.Start = &start
}
shareTargetCollection, response, err := vpcClient.ListShareMountTargetsWithContext(context, listShareTargetsOptions)
if err != nil {
log.Printf("[DEBUG] ListShareTargetsWithContext failed %s\n%s", err, response)
return diag.FromErr(err)
}
start = flex.GetNext(shareTargetCollection.Next)
allrecs = append(allrecs, shareTargetCollection.MountTargets...)

if start == "" {
break
}
}

d.SetId(dataSourceIBMIsShareTargetsID(d))

if shareTargetCollection.MountTargets != nil {
err = d.Set("mount_targets", dataSourceShareMountTargetCollectionFlattenTargets(shareTargetCollection.MountTargets))
if len(allrecs) > 0 {
err = d.Set("mount_targets", dataSourceShareMountTargetCollectionFlattenTargets(allrecs))
if err != nil {
return diag.FromErr(fmt.Errorf("Error setting targets %s", err))
}
Expand Down
17 changes: 9 additions & 8 deletions ibm/service/vpc/data_source_ibm_is_share_mount_targets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ func TestAccIBMIsShareTargetsDataSource(t *testing.T) {
{
Config: testAccCheckIBMIsShareTargetsDataSourceConfigBasic(shareName, vpcName, targetName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "share_targets.#"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "share_targets.0.created_at"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "share_targets.0.href"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "share_targets.0.id"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "share_targets.0.lifecycle_state"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "share_targets.0.mount_path"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "share_targets.0.name"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "share_targets.0.resource_type"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "mount_targets.#"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "mount_targets.0.created_at"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "mount_targets.0.href"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "mount_targets.0.id"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "mount_targets.0.lifecycle_state"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "mount_targets.0.mount_path"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "mount_targets.0.name"),
resource.TestCheckResourceAttrSet("data.ibm_is_share_mount_targets.is_share_targets", "mount_targets.0.resource_type"),
),
},
},
Expand All @@ -40,6 +40,7 @@ func TestAccIBMIsShareTargetsDataSource(t *testing.T) {
func testAccCheckIBMIsShareTargetsDataSourceConfigBasic(sname, vpcName, targetName string) string {
return fmt.Sprintf(`
resource "ibm_is_share" "is_share" {
access_control_mode = "vpc"
zone = "us-south-2"
size = 200
name = "%s"
Expand Down
Loading