Merge branch 'main' into Krishnan-Priyanshu-patch-1

go.mod

@@ -5,7 +5,7 @@ go 1.23
 toolchain go1.23.2
 
 require (
-	github.com/dell/gopowerstore v1.16.1-0.20250103044727-b55f5083bb46
+	github.com/dell/gopowerstore v1.16.1-0.20250107063650-9ec041ed54dc
 	github.com/hashicorp/terraform-plugin-docs v0.20.1
 	github.com/hashicorp/terraform-plugin-framework v1.13.0
 	github.com/hashicorp/terraform-plugin-framework-validators v0.15.0

go.sum

@@ -37,10 +37,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dell/gopowerstore v1.16.1-0.20241227083619-36c4ea66275f h1:wr07YuRpeBb5sEgBahBGPWMZKomPC2TfbpBjMWMqwVE=
-github.com/dell/gopowerstore v1.16.1-0.20241227083619-36c4ea66275f/go.mod h1:RYodZ8GgJG5p85AviydL43Mt8ldcTqr5a+Cv+vqWacE=
-github.com/dell/gopowerstore v1.16.1-0.20250103044727-b55f5083bb46 h1:EdQbU3wBHUE1Jh/ucKbVkldi+l//jBg9qB0razB0G1A=
-github.com/dell/gopowerstore v1.16.1-0.20250103044727-b55f5083bb46/go.mod h1:S3Gxw34FJbKNorL/OPe/DF+0pUSkBm6E6b4ka7m6cuo=
+github.com/dell/gopowerstore v1.16.1-0.20250107063650-9ec041ed54dc h1:GXIc1HXPbOWt7I7SfiRyzWcXeTChcvhAi5F/DXCsZeA=
+github.com/dell/gopowerstore v1.16.1-0.20250107063650-9ec041ed54dc/go.mod h1:S3Gxw34FJbKNorL/OPe/DF+0pUSkBm6E6b4ka7m6cuo=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=

powerstore/datasource_host_group_test.go

@@ -64,14 +64,19 @@ func TestAccHostGroupDs_FetchHostGroup(t *testing.T) {
 				Config:      ProviderConfigForTesting + HostGroupDataSourceparamsIDNegative,
 				ExpectError: regexp.MustCompile("Unable to Read PowerStore Host Group"),
 			},
+			{
+				Config: ProviderConfigForTesting + HostGroupParamsUpdateRemoveHost,
+			},
 		},
 	})
 }
 
-var HostGroupDataSourceparamsName = `
+var HostGroupDataSourceparamsName = HostGroupParamsCreate + `
 data "powerstore_hostgroup" "test1" {
-	name = "` + hostGroupName + `"
+	depends_on = [powerstore_hostgroup.test]
+	name = powerstore_hostgroup.test.name
 }
+
 `
 
 var HostGroupDataSourceparamsNameNegative = `
@@ -80,14 +85,15 @@ data "powerstore_hostgroup" "test1" {
 }
 `
 
-var HostGroupDataSourceparamsID = `
+var HostGroupDataSourceparamsID = HostGroupParamsCreate + `
 data "powerstore_hostgroup" "test1" {
-	id = "` + hostGroupID + `"
+	id = powerstore_hostgroup.test.id
 }
 `
 
-var HostGroupDataSourceparamsAll = `
+var HostGroupDataSourceparamsAll = HostGroupParamsCreate + `
 data "powerstore_hostgroup" "test1" {
+	depends_on = [powerstore_hostgroup.test]
 }
 `
 
@@ -97,10 +103,10 @@ data "powerstore_hostgroup" "test1" {
 }
 `
 
-var HostGroupDataSourceparamsIDAndNameNegative = `
+var HostGroupDataSourceparamsIDAndNameNegative = HostGroupParamsCreate + `
 data "powerstore_hostgroup" "test1" {
-	id = "` + hostGroupID + `"
-	name = "` + hostGroupName + `"
+	id = powerstore_hostgroup.test.id
+	name = powerstore_hostgroup.test.name
 }
 `
 

powerstore/datasource_host_test.go

@@ -78,9 +78,10 @@ func TestAccHostDs_FetchHostNegative(t *testing.T) {
 	})
 }
 
-var HostDataSourceParamsName = `
+var HostDataSourceParamsName = HostParamsCreate + `
 data "powerstore_host" "test1" {
-	name = "` + hostNameRead + `"
+	depends_on = [powerstore_host.test]
+	name = powerstore_host.test.name
 }
 `
 var HostDataSourceParamsNameNegative = `
@@ -95,9 +96,9 @@ data "powerstore_host" "test1" {
 }
 `
 
-var HostDataSourceParamsID = `
+var HostDataSourceParamsID = HostParamsCreate + `
 data "powerstore_host" "test1" {
-	id = "` + hostIDRead + `"
+	id = powerstore_host.test.id
 }
 `
 
@@ -113,7 +114,8 @@ data "powerstore_host" "test1" {
 }
 `
 
-var HostDataSourceParamsAll = `
+var HostDataSourceParamsAll = HostParamsCreate + `
 data "powerstore_host" "test1" {
+	depends_on = [powerstore_host.test]
 }
 `

powerstore/datasource_protection_policy_test.go

@@ -77,9 +77,10 @@ func TestAccProtectionPolicyDs_FetchPolicyNegative(t *testing.T) {
 	})
 }
 
-var ProtectionPolicyDataSourceparamsName = `
+var ProtectionPolicyDataSourceparamsName = ProtectionPolicyParamsCreate + `
 data "powerstore_protectionpolicy" "test1" {
-	name = "` + policyName + `"
+	depends_on = [powerstore_protectionpolicy.test]
+	name = powerstore_protectionpolicy.test.name
 }
 `
 var ProtectionPolicyDataSourceparamsNameNegative = `
@@ -94,9 +95,9 @@ data "powerstore_protectionpolicy" "test1" {
 }
 `
 
-var ProtectionPolicyDataSourceparamsID = `
+var ProtectionPolicyDataSourceparamsID = ProtectionPolicyParamsCreate + `
 data "powerstore_protectionpolicy" "test1" {
-	id = "` + policyID + `"
+	id = powerstore_protectionpolicy.test.id
 }
 `
 
@@ -112,7 +113,8 @@ data "powerstore_protectionpolicy" "test1" {
 }
 `
 
-var ProtectionPolicyDataSourceparamsAll = `
+var ProtectionPolicyDataSourceparamsAll = ProtectionPolicyParamsCreate + `
 data "powerstore_protectionpolicy" "test1" {
+	depends_on = [powerstore_protectionpolicy.test]
 }
 `

powerstore/datasource_snapshotrule_test.go

@@ -36,102 +36,62 @@ func TestAccSnapshotRuleDs_FetchSnapshotRule(t *testing.T) {
 		ProtoV6ProviderFactories: testProviderFactory,
 		Steps: []resource.TestStep{
 			{
-				Config: SnapshotRuleDataSourceparamsName,
+				Config: ProviderConfigForTesting + SnapshotRuleDataSourceparamsName,
 			},
 			{
-				Config:      SnapshotRuleDataSourceparamsNameEmpty,
+				Config:      ProviderConfigForTesting + SnapshotRuleDataSourceparamsNameEmpty,
 				ExpectError: regexp.MustCompile("Unable to Read PowerStore Snapshot Rules"),
 			},
 			{
-				Config: SnapshotRuleDataSourceparamsID,
+				Config: ProviderConfigForTesting + SnapshotRuleDataSourceparamsID,
 			},
 			{
-				Config:      SnapshotRuleDataSourceparamsIDEmpty,
+				Config:      ProviderConfigForTesting + SnapshotRuleDataSourceparamsIDEmpty,
 				ExpectError: regexp.MustCompile("Unable to Read PowerStore Snapshot Rules"),
 			},
 			{
-				Config: SnapshotRuleDataSourceparamsAll,
+				Config: ProviderConfigForTesting + SnapshotRuleDataSourceparamsAll,
 			},
 			{
-				Config:      SnapshotRuleDataSourceparamsNameNegative,
+				Config:      ProviderConfigForTesting + SnapshotRuleDataSourceparamsNameNegative,
 				ExpectError: regexp.MustCompile("Unable to Read PowerStore Snapshot Rules"),
 			},
 		},
 	})
 }
 
-var SnapshotRuleDataSourceparamsName = `
-provider "powerstore" {
-	username = "` + username + `"
-	password = "` + password + `"
-	endpoint = "` + endpoint + `"
-	insecure = true
-}
-
+var SnapshotRuleDataSourceparamsName = SnapshotRuleParamsWithTimeOfDay + `
 data "powerstore_snapshotrule" "test1" {
-	name = "` + snapshotRuleName + `"
+	depends_on = [powerstore_snapshotrule.test]
+	name = powerstore_snapshotrule.test.name
 }
 `
 var SnapshotRuleDataSourceparamsNameEmpty = `
-provider "powerstore" {
-	username = "` + username + `"
-	password = "` + password + `"
-	endpoint = "` + endpoint + `"
-	insecure = true
-}
-
 data "powerstore_snapshotrule" "test1" {
 	name = " "
 }
 `
 
 var SnapshotRuleDataSourceparamsIDEmpty = `
-provider "powerstore" {
-	username = "` + username + `"
-	password = "` + password + `"
-	endpoint = "` + endpoint + `"
-	insecure = true
-}
-
 data "powerstore_snapshotrule" "test1" {
 	id = " "
 }
 `
 
 var SnapshotRuleDataSourceparamsNameNegative = `
-provider "powerstore" {
-	username = "` + username + `"
-	password = "` + password + `"
-	endpoint = "` + endpoint + `"
-	insecure = true
-}
-
 data "powerstore_snapshotrule" "test1" {
 	name = "invalid-name"
 }
 `
 
-var SnapshotRuleDataSourceparamsID = `
-provider "powerstore" {
-	username = "` + username + `"
-	password = "` + password + `"
-	endpoint = "` + endpoint + `"
-	insecure = true
-}
-
+var SnapshotRuleDataSourceparamsID = SnapshotRuleParamsWithTimeOfDay + `
 data "powerstore_snapshotrule" "test1" {
-	id = "` + snapshotRuleID + `"
+	id = powerstore_snapshotrule.test.id
 }
 `
 
-var SnapshotRuleDataSourceparamsAll = `
-provider "powerstore" {
-	username = "` + username + `"
-	password = "` + password + `"
-	endpoint = "` + endpoint + `"
-	insecure = true
-}
-
+var SnapshotRuleDataSourceparamsAll = SnapshotRuleParamsWithTimeOfDay + `
 data "powerstore_snapshotrule" "test1" {
+	depends_on = [powerstore_snapshotrule.test]
 }
 `

powerstore/datasource_volume_group_snapshot_test.go

@@ -68,9 +68,10 @@ func TestAccVolumeGroupSnapshotDs_FetchVolumeGroupSnapshot(t *testing.T) {
 	})
 }
 
-var VolumeGroupSnapshotDataSourceparamsName = `
+var VolumeGroupSnapshotDataSourceparamsName = PreReqVolumeGroupSnap + `
 data "powerstore_volumegroup_snapshot" "test1" {
-	name = "` + volumeGroupSnapshotName + `"
+	depends_on = [powerstore_volumegroup_snapshot.test]
+	name = powerstore_volumegroup_snapshot.test.name
 }
 `
 
@@ -80,14 +81,15 @@ data "powerstore_volumegroup_snapshot" "test1" {
 }
 `
 
-var VolumeGroupSnapshotDataSourceparamsID = `
+var VolumeGroupSnapshotDataSourceparamsID = PreReqVolumeGroupSnap + `
 data "powerstore_volumegroup_snapshot" "test1" {
-	id = "` + volumeGroupSnapshotID + `"
+	id = powerstore_volumegroup_snapshot.test.id
 }
 `
 
-var VolumeGroupSnapshotDataSourceparamsAll = `
+var VolumeGroupSnapshotDataSourceparamsAll = PreReqVolumeGroupSnap + `
 data "powerstore_volumegroup_snapshot" "test1" {
+	depends_on = [powerstore_volumegroup_snapshot.test]
 }
 `
 
@@ -97,10 +99,10 @@ data "powerstore_volumegroup_snapshot" "test1" {
 }
 `
 
-var VolumeGroupSnapshotDataSourceparamsIDAndNameNegative = `
+var VolumeGroupSnapshotDataSourceparamsIDAndNameNegative = PreReqVolumeGroupSnap + `
 data "powerstore_volumegroup_snapshot" "test1" {
-	id = "` + volumeGroupSnapshotID + `"
-	name = "` + volumeGroupSnapshotName + `"
+	id = powerstore_volumegroup_snapshot.test.id
+	name = powerstore_volumegroup_snapshot.test.name
 }
 `
 

powerstore/datasource_volume_group_test.go

@@ -68,9 +68,10 @@ func TestAccVolumeGroupDs_FetchVolumeGroup(t *testing.T) {
 	})
 }
 
-var VolumeGroupDataSourceparamsName = `
+var VolumeGroupDataSourceparamsName = VolumeGroupParamsWithVolumeName + `
 data "powerstore_volumegroup" "test1" {
-	name = "` + volumeGroupName + `"
+	depends_on = [powerstore_volumegroup.test]
+	name = powerstore_volumegroup.test.name
 }
 `
 
@@ -80,14 +81,15 @@ data "powerstore_volumegroup" "test1" {
 }
 `
 
-var VolumeGroupDataSourceparamsID = `
+var VolumeGroupDataSourceparamsID = VolumeGroupParamsWithVolumeName + `
 data "powerstore_volumegroup" "test1" {
-	id = "` + volumeGroupID + `"
+	id = powerstore_volumegroup.test.id
 }
 `
 
-var VolumeGroupDataSourceparamsAll = `
+var VolumeGroupDataSourceparamsAll = VolumeGroupParamsWithVolumeName + `
 data "powerstore_volumegroup" "test1" {
+	depends_on = [powerstore_volumegroup.test]
 }
 `
 
@@ -97,10 +99,10 @@ data "powerstore_volumegroup" "test1" {
 }
 `
 
-var VolumeGroupDataSourceparamsIDAndNameNegative = `
+var VolumeGroupDataSourceparamsIDAndNameNegative = VolumeGroupParamsWithVolumeName + `
 data "powerstore_volumegroup" "test1" {
-	id = "` + volumeGroupID + `"
-	name = "` + volumeGroupName + `"
+	id = powerstore_volumegroup.test.id
+	name = powerstore_volumegroup.test.name
 }
 `
 

powerstore/datasource_volume_snapshot_test.go

@@ -68,9 +68,9 @@ func TestAccVolumeDs_FetchVolumeSnapshot(t *testing.T) {
 	})
 }
 
-var VolumeSnapshotDataSourceparamsID = `
+var VolumeSnapshotDataSourceparamsID = SnapParamsCreate + `
 data "powerstore_volume_snapshot" "test1" {
-	id = "` + volumeSnapshotID + `"
+	id = powerstore_volume_snapshot.test.id
 }
 `
 
@@ -86,9 +86,10 @@ data "powerstore_volume_snapshot" "test1" {
 }
 `
 
-var VolumeSnapshotDataSourceparamsName = `
+var VolumeSnapshotDataSourceparamsName = SnapParamsCreate + `
 data "powerstore_volume_snapshot" "test1" {
-	name = "` + volumeSnapshotName + `"
+	depends_on = [powerstore_volume_snapshot.test]
+	name = powerstore_volume_snapshot.test.name
 }
 `
 
@@ -104,14 +105,15 @@ data "powerstore_volume_snapshot" "test1" {
 }
 `
 
-var VolumeSnapshotDataSourceparamsAll = `
+var VolumeSnapshotDataSourceparamsAll = SnapParamsCreate + `
 data "powerstore_volume_snapshot" "test1" {
+	depends_on = [powerstore_volume_snapshot.test]
 }
 `
 
-var VolumeSnapshotDataSourceparamsIDAndName = `
+var VolumeSnapshotDataSourceparamsIDAndName = SnapParamsCreate + `
 data "powerstore_volume_snapshot" "test1" {
-	id = "` + volumeSnapshotID + `"
-	name = "` + volumeSnapshotName + `"
+	id = powerstore_volume_snapshot.test.id
+	name = powerstore_volume_snapshot.test.name
 }
 `