Skip to content

Commit 44cdc35

Browse files
MonitobMonitob
authored
fix(iam): datasource iam_user and test (#1712)
1 parent fb2150e commit 44cdc35

13 files changed

+1521
-1936
lines changed

‎docs/data-sources/iam_user.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ data "scaleway_iam_user" "find_by_email" {
2828
- `email` - (Optional) The email address of the IAM user. Only one of the `email` and `user_id` should be specified.
2929
- `user_id` - (Optional) The ID of the IAM user. Only one of the `email` and `user_id` should be specified.
3030
- `organization_id` - (Optional. Defaults to [provider](../index.md#organization_d) `organization_id`) The ID of the
31-
organization the user is associated with. For now, it is necessary to
32-
explicitly provide the `organization_id` in the datasource.
31+
organization the user is associated with.
3332

3433
## Attributes Reference
3534

‎scaleway/data_source_iam_group_test.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ func TestAccScalewayDataSourceIamGroup_Basic(t *testing.T) {
2424
2525
data "scaleway_iam_group" "find_by_id_basic" {
2626
group_id = scaleway_iam_group.main_ds_basic.id
27-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
27+
organization_id = "105bdce1-64c0-48ab-899d-868455867ecf"
2828
}
2929
3030
data "scaleway_iam_group" "find_by_name_basic" {
3131
name = scaleway_iam_group.main_ds_basic.name
32-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
32+
organization_id = "105bdce1-64c0-48ab-899d-868455867ecf"
3333
}
3434
`,
3535
Check: resource.ComposeTestCheckFunc(
@@ -61,12 +61,10 @@ func TestAccScalewayDataSourceIamGroup_UsersAndApplications(t *testing.T) {
6161
}
6262
6363
data "scaleway_iam_user" "user00" {
64-
user_id = "ce18cffd-e7c8-47f8-8de8-00e97e50a0d3"
65-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
64+
user_id = "ef29ce05-3f2b-4fa0-a259-d76110850d57"
6665
}
6766
data "scaleway_iam_user" "user01" {
68-
user_id = "255b63c2-b4de-4af6-9ed4-967f69d9dd85"
69-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
67+
user_id = "d55bae64-4e2b-490f-9b2e-688715f60f6c"
7068
}
7169
7270
resource "scaleway_iam_group" "main_ds_mix" {
@@ -82,12 +80,12 @@ func TestAccScalewayDataSourceIamGroup_UsersAndApplications(t *testing.T) {
8280
8381
data "scaleway_iam_group" "find_by_id_mix" {
8482
group_id = scaleway_iam_group.main_ds_mix.id
85-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
83+
organization_id = "105bdce1-64c0-48ab-899d-868455867ecf"
8684
}
8785
8886
data "scaleway_iam_group" "find_by_name_mix" {
8987
name = scaleway_iam_group.main_ds_mix.name
90-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
88+
organization_id = "105bdce1-64c0-48ab-899d-868455867ecf"
9189
}
9290
`,
9391
Check: resource.ComposeTestCheckFunc(

‎scaleway/data_source_iam_user.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ func dataSourceScalewayIamUser() *schema.Resource {
2929
ConflictsWith: []string{"user_id"},
3030
},
3131
"organization_id": {
32-
Type: schema.TypeString,
33-
Description: "The organization_id you want to attach the resource to",
34-
Optional: true,
32+
Type: schema.TypeString,
33+
Description: "The organization_id you want to attach the resource to",
34+
Optional: true,
35+
ConflictsWith: []string{"user_id"},
3536
},
3637
},
3738
}

‎scaleway/data_source_iam_user_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@ func TestAccScalewayDataSourceIamUser_Basic(t *testing.T) {
1919
{
2020
Config: `
2121
data "scaleway_iam_user" "by_id" {
22-
user_id = "af194b1f-55a7-43f2-b61c-22a0268559e3"
23-
organization_id = "dd5b8103-52ef-40b6-b157-35a426650401"
22+
user_id = "b6360d4f-831c-45a8-889e-0b65ed079e63"
2423
}
2524
2625
data "scaleway_iam_user" "by_email" {
27-
email = "developer-tools-team@scaleway.com"
28-
organization_id = "dd5b8103-52ef-40b6-b157-35a426650401"
26+
email = "hashicorp@scaleway.com"
27+
organization_id = "105bdce1-64c0-48ab-899d-868455867ecf"
2928
}
3029
`,
3130
Check: resource.ComposeTestCheckFunc(

‎scaleway/resource_iam_api_key_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ func TestAccScalewayIamApiKey_WithUser(t *testing.T) {
108108
{
109109
Config: `
110110
data "scaleway_iam_user" "main" {
111-
email = "developer-tools-team@scaleway.com"
112-
organization_id = "dd5b8103-52ef-40b6-b157-35a426650401"
111+
email = "hashicorp@scaleway.com"
112+
organization_id = "105bdce1-64c0-48ab-899d-868455867ecf"
113113
}
114114
115115
resource "scaleway_iam_api_key" "main" {
@@ -127,8 +127,8 @@ func TestAccScalewayIamApiKey_WithUser(t *testing.T) {
127127
{
128128
Config: `
129129
data "scaleway_iam_user" "main" {
130-
email = "developer-tools-team@scaleway.com"
131-
organization_id = "dd5b8103-52ef-40b6-b157-35a426650401"
130+
email = "hashicorp@scaleway.com"
131+
organization_id = "105bdce1-64c0-48ab-899d-868455867ecf"
132132
}
133133
134134
resource "scaleway_iam_api_key" "main" {

‎scaleway/resource_iam_group_test.go‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,7 @@ func TestAccScalewayIamGroup_Users(t *testing.T) {
226226
{
227227
Config: `
228228
data "scaleway_iam_user" "user00" {
229-
user_id = "29c31dd4-8ea1-4927-82d9-a0620e04773f"
230-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
229+
user_id = "84d20ae1-9650-419a-ab74-7ab09b6262e0"
231230
}
232231
233232
resource "scaleway_iam_group" "main_user" {
@@ -247,12 +246,10 @@ func TestAccScalewayIamGroup_Users(t *testing.T) {
247246
{
248247
Config: `
249248
data "scaleway_iam_user" "user00" {
250-
user_id = "29c31dd4-8ea1-4927-82d9-a0620e04773f"
251-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
249+
user_id = "84d20ae1-9650-419a-ab74-7ab09b6262e0"
252250
}
253251
data "scaleway_iam_user" "user01" {
254-
user_id = "0afd8f94-eaf1-4949-9dcb-9ae5f4bc1017"
255-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
252+
user_id = "ef29ce05-3f2b-4fa0-a259-d76110850d57"
256253
}
257254
258255
resource "scaleway_iam_group" "main_user" {
@@ -274,8 +271,7 @@ func TestAccScalewayIamGroup_Users(t *testing.T) {
274271
{
275272
Config: `
276273
data "scaleway_iam_user" "user02" {
277-
user_id = "453c1a85-4a10-4c6f-94dc-d3193d4589a5"
278-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
274+
user_id = "dc512a33-e14c-4e72-9481-52e020ced70a"
279275
}
280276
281277
resource "scaleway_iam_group" "main_user" {
@@ -326,8 +322,7 @@ func TestAccScalewayIamGroup_UsersAndApplications(t *testing.T) {
326322
}
327323
328324
data "scaleway_iam_user" "user00" {
329-
user_id = "29c31dd4-8ea1-4927-82d9-a0620e04773f"
330-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
325+
user_id = "84d20ae1-9650-419a-ab74-7ab09b6262e0"
331326
}
332327
333328
resource "scaleway_iam_group" "main_mix" {
@@ -386,12 +381,10 @@ func TestAccScalewayIamGroup_UsersAndApplications(t *testing.T) {
386381
}
387382
388383
data "scaleway_iam_user" "user00" {
389-
user_id = "29c31dd4-8ea1-4927-82d9-a0620e04773f"
390-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
384+
user_id = "d55bae64-4e2b-490f-9b2e-688715f60f6c"
391385
}
392386
data "scaleway_iam_user" "user01" {
393-
user_id = "0afd8f94-eaf1-4949-9dcb-9ae5f4bc1017"
394-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
387+
user_id = "b6360d4f-831c-45a8-889e-0b65ed079e63"
395388
}
396389
397390
resource "scaleway_iam_group" "main_mix" {
@@ -425,16 +418,13 @@ func TestAccScalewayIamGroup_UsersAndApplications(t *testing.T) {
425418
}
426419
427420
data "scaleway_iam_user" "user01" {
428-
user_id = "0afd8f94-eaf1-4949-9dcb-9ae5f4bc1017"
429-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
421+
user_id = "d55bae64-4e2b-490f-9b2e-688715f60f6c"
430422
}
431423
data "scaleway_iam_user" "user03" {
432-
user_id = "43b0529c-0b85-45a1-bbf6-5a1336b21787"
433-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
424+
user_id = "b6360d4f-831c-45a8-889e-0b65ed079e63"
434425
}
435426
data "scaleway_iam_user" "user04" {
436-
user_id = "ce18cffd-e7c8-47f8-8de8-00e97e50a0d3"
437-
organization_id = "08555df8-bb26-43bc-b749-1b98c5d02343"
427+
user_id = "dc512a33-e14c-4e72-9481-52e020ced70a"
438428
}
439429
440430
resource "scaleway_iam_group" "main_mix" {

0 commit comments

Comments
 (0)