Skip to content

Commit 7233118

Browse files
sync examples from Provider v1.254.0
1 parent a51be27 commit 7233118

File tree

13 files changed

+89
-47
lines changed

13 files changed

+89
-47
lines changed

quickstarts/Cloud_Enterprise_Network(CEN)/101-cen-transit-router-docs-Example/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,7 @@ No modules.
2222

2323
## Inputs
2424

25-
No inputs.
25+
| Name | Description | Type | Default | Required |
26+
|------|-------------|------|---------|:--------:|
27+
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"terraform-example"` | no |
2628
<!-- END_TF_DOCS -->
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
variable "name" {
2+
default = "terraform-example"
3+
}
4+
15
resource "alicloud_cen_instance" "example" {
2-
cen_instance_name = "tf_example"
3-
description = "an example for cen"
6+
cen_instance_name = var.name
7+
description = var.name
48
}
59

610
resource "alicloud_cen_transit_router" "example" {
7-
transit_router_name = "tf_example"
811
cen_id = alicloud_cen_instance.example.id
12+
transit_router_name = var.name
913
}

quickstarts/Cloud_SSO/101-cloud-sso-access-assignment-docs-Example/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ No modules.
2020
|------|------|
2121
| [alicloud_cloud_sso_access_assignment.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/cloud_sso_access_assignment) | resource |
2222
| [alicloud_cloud_sso_access_configuration.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/cloud_sso_access_configuration) | resource |
23-
| [alicloud_cloud_sso_access_configuration_provisioning.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/cloud_sso_access_configuration_provisioning) | resource |
2423
| [alicloud_cloud_sso_directory.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/cloud_sso_directory) | resource |
2524
| [alicloud_cloud_sso_user.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/cloud_sso_user) | resource |
2625
| [random_integer.default](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/integer) | resource |
@@ -31,5 +30,5 @@ No modules.
3130

3231
| Name | Description | Type | Default | Required |
3332
|------|-------------|------|---------|:--------:|
34-
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"tf-example"` | no |
33+
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"terraform-example"` | no |
3534
<!-- END_TF_DOCS -->
Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,47 @@
11
variable "name" {
2-
default = "tf-example"
2+
default = "terraform-example"
33
}
4+
45
provider "alicloud" {
56
region = "cn-shanghai"
67
}
7-
data "alicloud_cloud_sso_directories" "default" {}
8-
data "alicloud_resource_manager_resource_directories" "default" {}
98

10-
resource "alicloud_cloud_sso_directory" "default" {
11-
count = length(data.alicloud_cloud_sso_directories.default.ids) > 0 ? 0 : 1
12-
directory_name = var.name
9+
data "alicloud_cloud_sso_directories" "default" {
1310
}
1411

15-
locals {
16-
directory_id = length(data.alicloud_cloud_sso_directories.default.ids) > 0 ? data.alicloud_cloud_sso_directories.default.ids[0] : concat(alicloud_cloud_sso_directory.default.*.id, [""])[0]
12+
data "alicloud_resource_manager_resource_directories" "default" {
1713
}
1814

1915
resource "random_integer" "default" {
2016
min = 10000
2117
max = 99999
2218
}
2319

20+
resource "alicloud_cloud_sso_directory" "default" {
21+
count = length(data.alicloud_cloud_sso_directories.default.ids) > 0 ? 0 : 1
22+
directory_name = var.name
23+
}
24+
2425
resource "alicloud_cloud_sso_user" "default" {
2526
directory_id = local.directory_id
2627
user_name = "${var.name}-${random_integer.default.result}"
2728
}
2829

2930
resource "alicloud_cloud_sso_access_configuration" "default" {
30-
access_configuration_name = "${var.name}-${random_integer.default.result}"
3131
directory_id = local.directory_id
32-
}
33-
34-
resource "alicloud_cloud_sso_access_configuration_provisioning" "default" {
35-
directory_id = local.directory_id
36-
access_configuration_id = alicloud_cloud_sso_access_configuration.default.access_configuration_id
37-
target_type = "RD-Account"
38-
target_id = data.alicloud_resource_manager_resource_directories.default.directories.0.master_account_id
32+
access_configuration_name = "${var.name}-${random_integer.default.result}"
3933
}
4034

4135
resource "alicloud_cloud_sso_access_assignment" "default" {
42-
directory_id = alicloud_cloud_sso_access_configuration_provisioning.default.directory_id
36+
directory_id = local.directory_id
4337
access_configuration_id = alicloud_cloud_sso_access_configuration.default.access_configuration_id
4438
target_type = "RD-Account"
4539
target_id = data.alicloud_resource_manager_resource_directories.default.directories.0.master_account_id
4640
principal_type = "User"
4741
principal_id = alicloud_cloud_sso_user.default.user_id
4842
deprovision_strategy = "DeprovisionForLastAccessAssignmentOnAccount"
43+
}
44+
45+
locals {
46+
directory_id = length(data.alicloud_cloud_sso_directories.default.ids) > 0 ? data.alicloud_cloud_sso_directories.default.ids[0] : concat(alicloud_cloud_sso_directory.default.*.id, [""])[0]
4947
}

quickstarts/Cloud_SSO/101-cloud-sso-user-attachment-docs-Example/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ No modules.
2929

3030
| Name | Description | Type | Default | Required |
3131
|------|-------------|------|---------|:--------:|
32-
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"tf-example"` | no |
32+
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"terraform-example"` | no |
3333
<!-- END_TF_DOCS -->
Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
variable "name" {
2-
default = "tf-example"
2+
default = "terraform-example"
33
}
4+
45
provider "alicloud" {
56
region = "cn-shanghai"
67
}
7-
data "alicloud_cloud_sso_directories" "default" {}
88

9-
resource "alicloud_cloud_sso_directory" "default" {
10-
count = length(data.alicloud_cloud_sso_directories.default.ids) > 0 ? 0 : 1
11-
directory_name = var.name
12-
}
13-
14-
locals {
15-
directory_id = length(data.alicloud_cloud_sso_directories.default.ids) > 0 ? data.alicloud_cloud_sso_directories.default.ids[0] : concat(alicloud_cloud_sso_directory.default.*.id, [""])[0]
9+
data "alicloud_cloud_sso_directories" "default" {
1610
}
1711

1812
resource "random_integer" "default" {
1913
min = 10000
2014
max = 99999
2115
}
2216

17+
resource "alicloud_cloud_sso_directory" "default" {
18+
count = length(data.alicloud_cloud_sso_directories.default.ids) > 0 ? 0 : 1
19+
directory_name = var.name
20+
}
21+
2322
resource "alicloud_cloud_sso_user" "default" {
2423
directory_id = local.directory_id
2524
user_name = "${var.name}-${random_integer.default.result}"
@@ -35,4 +34,8 @@ resource "alicloud_cloud_sso_user_attachment" "default" {
3534
directory_id = local.directory_id
3635
user_id = alicloud_cloud_sso_user.default.user_id
3736
group_id = alicloud_cloud_sso_group.default.group_id
37+
}
38+
39+
locals {
40+
directory_id = length(data.alicloud_cloud_sso_directories.default.ids) > 0 ? data.alicloud_cloud_sso_directories.default.ids[0] : concat(alicloud_cloud_sso_directory.default.*.id, [""])[0]
3841
}

quickstarts/File_Storage(NAS)/101-nas-access-point-docs-Example/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@ No modules.
3232
|------|-------------|------|---------|:--------:|
3333
| <a name="input_azone"></a> [azone](#input\_azone) | n/a | `string` | `"cn-hangzhou-g"` | no |
3434
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"terraform-example"` | no |
35-
| <a name="input_region_id"></a> [region\_id](#input\_region\_id) | n/a | `string` | `"cn-hangzhou"` | no |
3635
<!-- END_TF_DOCS -->

quickstarts/File_Storage(NAS)/101-nas-access-point-docs-Example/main.tf

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ provider "alicloud" {
66
region = "cn-hangzhou"
77
}
88

9-
variable "region_id" {
10-
default = "cn-hangzhou"
11-
}
12-
139
variable "azone" {
1410
default = "cn-hangzhou-g"
1511
}
@@ -18,6 +14,11 @@ data "alicloud_zones" "default" {
1814
available_resource_creation = "VSwitch"
1915
}
2016

17+
resource "random_integer" "default" {
18+
min = 10000
19+
max = 99999
20+
}
21+
2122
resource "alicloud_vpc" "defaultkyVC70" {
2223
cidr_block = "172.16.0.0/12"
2324
description = "接入点测试noRootDirectory"
@@ -29,11 +30,6 @@ resource "alicloud_vswitch" "defaultoZAPmO" {
2930
cidr_block = "172.16.0.0/24"
3031
}
3132

32-
resource "random_integer" "default" {
33-
min = 10000
34-
max = 99999
35-
}
36-
3733
resource "alicloud_nas_access_group" "defaultBbc7ev" {
3834
access_group_type = "Vpc"
3935
access_group_name = "${var.name}-${random_integer.default.result}"
@@ -49,7 +45,6 @@ resource "alicloud_nas_file_system" "defaultVtUpDh" {
4945
description = "AccessPointnoRootDirectory"
5046
}
5147

52-
5348
resource "alicloud_nas_access_point" "default" {
5449
vpc_id = alicloud_vpc.defaultkyVC70.id
5550
access_group = alicloud_nas_access_group.defaultBbc7ev.access_group_name

quickstarts/Global_Accelerator(GA)/101-ga-acl-entry-attachment-docs-Example/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,7 @@ No modules.
2222

2323
## Inputs
2424

25-
No inputs.
25+
| Name | Description | Type | Default | Required |
26+
|------|-------------|------|---------|:--------:|
27+
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"terraform-example"` | no |
2628
<!-- END_TF_DOCS -->
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
variable "name" {
2+
default = "terraform-example"
3+
}
4+
15
resource "alicloud_ga_acl" "default" {
2-
acl_name = "tf-example-value"
36
address_ip_version = "IPv4"
7+
acl_name = var.name
48
}
59

610
resource "alicloud_ga_acl_entry_attachment" "default" {
711
acl_id = alicloud_ga_acl.default.id
812
entry = "192.168.1.1/32"
9-
entry_description = "tf-example-value"
13+
entry_description = var.name
1014
}

0 commit comments

Comments
 (0)