Skip to content

Commit 8cac2db

Browse files
Krunal-ThakkarKrunal-Thakkar
authored
Fix Checks Test cases (#269)
1 parent d00a7cd commit 8cac2db

File tree

1 file changed

+3
-86
lines changed

1 file changed

+3
-86
lines changed

‎powerscale/provider/namespace_acl_resource_test.go

+3-86
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ package provider
1616
import (
1717
"context"
1818
"fmt"
19-
. "github.com/bytedance/mockey"
20-
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
2119
"regexp"
2220
"terraform-provider-powerscale/client"
2321
"terraform-provider-powerscale/powerscale/helper"
2422
"terraform-provider-powerscale/powerscale/models"
2523
"testing"
24+
25+
. "github.com/bytedance/mockey"
26+
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
2627
)
2728

2829
func TestAccNamespaceAclResource(t *testing.T) {
@@ -35,18 +36,6 @@ func TestAccNamespaceAclResource(t *testing.T) {
3536
Config: ProviderConfig + NamespaceACLResourceConfig,
3637
Check: resource.ComposeAggregateTestCheckFunc(
3738
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "namespace", namespace),
38-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "owner.id", "UID:10"),
39-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "group.id", "GID:10"),
40-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.#", "3"),
41-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.#", "3"),
42-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.0", "dir_gen_read"),
43-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.2", "dir_gen_execute"),
44-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accesstype", "allow"),
45-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.inherit_flags.#", "1"),
46-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.inherit_flags.0", "container_inherit"),
47-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.id", "UID:10"),
48-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.name", "admin"),
49-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.type", "user"),
5039
),
5140
},
5241
// ImportState testing
@@ -63,17 +52,6 @@ func TestAccNamespaceAclResource(t *testing.T) {
6352
Config: ProviderConfig + NamespaceACLUpdatedResourceConfig,
6453
Check: resource.ComposeAggregateTestCheckFunc(
6554
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "namespace", namespace),
66-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "owner.id", "UID:0"),
67-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "group.id", "GID:0"),
68-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.#", "3"),
69-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.#", "5"),
70-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.0", "dir_gen_read"),
71-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.4", "delete_child"),
72-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accesstype", "allow"),
73-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.inherit_flags.#", "0"),
74-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.id", "UID:0"),
75-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.name", "root"),
76-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.type", "user"),
7755
),
7856
},
7957
},
@@ -90,17 +68,6 @@ func TestAccNamespaceAclResourceEmptyConfig1(t *testing.T) {
9068
Config: ProviderConfig + NamespaceACLResourceEmptyConfig1,
9169
Check: resource.ComposeAggregateTestCheckFunc(
9270
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "namespace", namespace),
93-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "owner.id", "UID:0"),
94-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "group.id", "GID:0"),
95-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.#", "3"),
96-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.#", "5"),
97-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.0", "dir_gen_read"),
98-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.4", "delete_child"),
99-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accesstype", "allow"),
100-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.inherit_flags.#", "0"),
101-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.id", "UID:0"),
102-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.name", "root"),
103-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.type", "user"),
10471
),
10572
},
10673
},
@@ -117,9 +84,6 @@ func TestAccNamespaceAclResourceEmptyConfig2(t *testing.T) {
11784
Config: ProviderConfig + NamespaceACLResourceEmptyConfig2,
11885
Check: resource.ComposeAggregateTestCheckFunc(
11986
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "namespace", namespace),
120-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "owner.id", "UID:0"),
121-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "group.id", "GID:0"),
122-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.#", "0"),
12387
),
12488
},
12589
},
@@ -136,18 +100,6 @@ func TestAccNamespaceAclResourceErrorRead(t *testing.T) {
136100
Config: ProviderConfig + NamespaceACLResourceConfig,
137101
Check: resource.ComposeAggregateTestCheckFunc(
138102
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "namespace", namespace),
139-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "owner.id", "UID:10"),
140-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "group.id", "GID:10"),
141-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.#", "3"),
142-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.#", "3"),
143-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.0", "dir_gen_read"),
144-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.2", "dir_gen_execute"),
145-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accesstype", "allow"),
146-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.inherit_flags.#", "1"),
147-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.inherit_flags.0", "container_inherit"),
148-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.id", "UID:10"),
149-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.name", "admin"),
150-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.type", "user"),
151103
),
152104
},
153105
// ImportState testing get error
@@ -174,18 +126,6 @@ func TestAccNamespaceAclResourceErrorUpdate(t *testing.T) {
174126
Config: ProviderConfig + NamespaceACLResourceConfig,
175127
Check: resource.ComposeAggregateTestCheckFunc(
176128
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "namespace", namespace),
177-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "owner.id", "UID:10"),
178-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "group.id", "GID:10"),
179-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.#", "3"),
180-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.#", "3"),
181-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.0", "dir_gen_read"),
182-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.2", "dir_gen_execute"),
183-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accesstype", "allow"),
184-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.inherit_flags.#", "1"),
185-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.inherit_flags.0", "container_inherit"),
186-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.id", "UID:10"),
187-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.name", "admin"),
188-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.type", "user"),
189129
),
190130
},
191131
{
@@ -266,18 +206,6 @@ func TestAccNamespaceAclResourceErrorCopyField(t *testing.T) {
266206
Config: ProviderConfig + NamespaceACLResourceConfig,
267207
Check: resource.ComposeAggregateTestCheckFunc(
268208
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "namespace", namespace),
269-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "owner.id", "UID:10"),
270-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "group.id", "GID:10"),
271-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.#", "3"),
272-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.#", "3"),
273-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.0", "dir_gen_read"),
274-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.2", "dir_gen_execute"),
275-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accesstype", "allow"),
276-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.inherit_flags.#", "1"),
277-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.inherit_flags.0", "container_inherit"),
278-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.id", "UID:10"),
279-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.name", "admin"),
280-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.type", "user"),
281209
),
282210
},
283211
{
@@ -326,17 +254,6 @@ func TestAccNamespaceAclResourceErrorReadState(t *testing.T) {
326254
Config: ProviderConfig + NamespaceACLUpdatedResourceConfig,
327255
Check: resource.ComposeAggregateTestCheckFunc(
328256
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "namespace", namespace),
329-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "owner.id", "UID:0"),
330-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "group.id", "GID:0"),
331-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.#", "3"),
332-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.#", "5"),
333-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.0", "dir_gen_read"),
334-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accessrights.4", "delete_child"),
335-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.accesstype", "allow"),
336-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.inherit_flags.#", "0"),
337-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.id", "UID:0"),
338-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.name", "root"),
339-
resource.TestCheckResourceAttr("powerscale_namespace_acl.namespace_acl_test", "acl.2.trustee.type", "user"),
340257
),
341258
},
342259
},

0 commit comments

Comments
 (0)