pulumi-alicloud 3.78.0a1747200018__py3-none-any.whl → 3.79.0a1747372618__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of pulumi-alicloud might be problematic. Click here for more details.

Files changed (146) hide show
  1. pulumi_alicloud/__init__.py +32 -0
  2. pulumi_alicloud/adb/cluster.py +12 -12
  3. pulumi_alicloud/alb/health_check_template.py +233 -93
  4. pulumi_alicloud/alb/load_balancer.py +110 -0
  5. pulumi_alicloud/amqp/exchange.py +250 -159
  6. pulumi_alicloud/apigateway/_inputs.py +23 -3
  7. pulumi_alicloud/apigateway/api.py +7 -7
  8. pulumi_alicloud/apigateway/backend.py +8 -8
  9. pulumi_alicloud/apigateway/outputs.py +16 -2
  10. pulumi_alicloud/arms/remote_write.py +2 -2
  11. pulumi_alicloud/bp/studio_application.py +2 -2
  12. pulumi_alicloud/cassandra/cluster.py +2 -2
  13. pulumi_alicloud/cassandra/data_center.py +2 -2
  14. pulumi_alicloud/cdn/fc_trigger.py +2 -2
  15. pulumi_alicloud/cen/_inputs.py +78 -27
  16. pulumi_alicloud/cen/bandwidth_limit.py +7 -7
  17. pulumi_alicloud/cen/inter_region_traffic_qos_policy.py +6 -6
  18. pulumi_alicloud/cen/outputs.py +52 -18
  19. pulumi_alicloud/cen/traffic_marking_policy.py +49 -9
  20. pulumi_alicloud/chatbot/publish_task.py +2 -2
  21. pulumi_alicloud/cloudfirewall/__init__.py +1 -0
  22. pulumi_alicloud/cloudfirewall/ips_config.py +523 -0
  23. pulumi_alicloud/cr/registry_enterprise_instance.py +4 -4
  24. pulumi_alicloud/das/switch_das_pro.py +6 -2
  25. pulumi_alicloud/dataworks/di_alarm_rule.py +6 -4
  26. pulumi_alicloud/dataworks/di_job.py +8 -6
  27. pulumi_alicloud/dataworks/project_member.py +2 -2
  28. pulumi_alicloud/ddos/domain_resource.py +19 -9
  29. pulumi_alicloud/dms/enterprise_logic_database.py +2 -2
  30. pulumi_alicloud/dms/enterprise_proxy_access.py +2 -2
  31. pulumi_alicloud/drds/instance.py +12 -8
  32. pulumi_alicloud/ebs/dedicated_block_storage_cluster.py +2 -2
  33. pulumi_alicloud/ecs/activation.py +2 -2
  34. pulumi_alicloud/ecs/capacity_reservation.py +2 -2
  35. pulumi_alicloud/ecs/ecs_disk_attachment.py +2 -2
  36. pulumi_alicloud/ecs/ecs_invocation.py +12 -6
  37. pulumi_alicloud/ecs/ecs_network_interface_permission.py +2 -2
  38. pulumi_alicloud/ecs/ecs_snapshot_group.py +2 -2
  39. pulumi_alicloud/ecs/elasticity_assurance.py +2 -2
  40. pulumi_alicloud/ecs/image_copy.py +2 -2
  41. pulumi_alicloud/ecs/image_export.py +2 -2
  42. pulumi_alicloud/ecs/reserved_instance.py +2 -2
  43. pulumi_alicloud/ecs/snapshot.py +8 -4
  44. pulumi_alicloud/ecs/storage_capacity_unit.py +2 -2
  45. pulumi_alicloud/emr/cluster.py +4 -4
  46. pulumi_alicloud/esa/edge_container_app_record.py +10 -2
  47. pulumi_alicloud/esa/http_request_header_modification_rule.py +12 -4
  48. pulumi_alicloud/esa/http_response_header_modification_rule.py +12 -4
  49. pulumi_alicloud/esa/https_basic_configuration.py +12 -4
  50. pulumi_alicloud/esa/network_optimization.py +10 -2
  51. pulumi_alicloud/esa/origin_pool.py +10 -10
  52. pulumi_alicloud/esa/redirect_rule.py +12 -4
  53. pulumi_alicloud/esa/rewrite_url_rule.py +12 -4
  54. pulumi_alicloud/ess/outputs.py +107 -0
  55. pulumi_alicloud/ess/scaling_group.py +47 -0
  56. pulumi_alicloud/expressconnect/virtual_border_router.py +4 -4
  57. pulumi_alicloud/fnf/execution.py +2 -2
  58. pulumi_alicloud/fnf/flow.py +2 -2
  59. pulumi_alicloud/fnf/schedule.py +2 -2
  60. pulumi_alicloud/gpdb/elastic_instance.py +8 -8
  61. pulumi_alicloud/hbr/ecs_backup_plan.py +10 -2
  62. pulumi_alicloud/hbr/hana_backup_client.py +2 -2
  63. pulumi_alicloud/hbr/hana_backup_plan.py +2 -2
  64. pulumi_alicloud/hbr/hana_instance.py +2 -2
  65. pulumi_alicloud/hbr/nas_backup_plan.py +10 -2
  66. pulumi_alicloud/hbr/oss_backup_plan.py +10 -2
  67. pulumi_alicloud/hbr/ots_backup_plan.py +10 -2
  68. pulumi_alicloud/hbr/restore_job.py +2 -2
  69. pulumi_alicloud/hbr/server_backup_plan.py +10 -2
  70. pulumi_alicloud/kms/_inputs.py +12 -12
  71. pulumi_alicloud/kms/instance.py +80 -47
  72. pulumi_alicloud/kms/outputs.py +8 -8
  73. pulumi_alicloud/kvstore/instance.py +21 -7
  74. pulumi_alicloud/lindorm/instance.py +101 -7
  75. pulumi_alicloud/log/etl.py +2 -2
  76. pulumi_alicloud/log/ingestion.py +4 -6
  77. pulumi_alicloud/log/oss_export.py +4 -6
  78. pulumi_alicloud/log/oss_shipper.py +2 -2
  79. pulumi_alicloud/mse/gateway.py +2 -2
  80. pulumi_alicloud/mse/nacos_config.py +2 -0
  81. pulumi_alicloud/mse/znode.py +2 -2
  82. pulumi_alicloud/nas/mount_target.py +6 -6
  83. pulumi_alicloud/nas/snapshot.py +2 -2
  84. pulumi_alicloud/oos/default_patch_baseline.py +2 -2
  85. pulumi_alicloud/oos/secret_parameter.py +2 -2
  86. pulumi_alicloud/oss/bucket_replication.py +8 -8
  87. pulumi_alicloud/pai/__init__.py +3 -0
  88. pulumi_alicloud/pai/_inputs.py +108 -0
  89. pulumi_alicloud/pai/outputs.py +64 -0
  90. pulumi_alicloud/pai/workspace_member.py +393 -0
  91. pulumi_alicloud/pai/workspace_model.py +792 -0
  92. pulumi_alicloud/pai/workspace_model_version.py +1129 -0
  93. pulumi_alicloud/polardb/cluster.py +68 -7
  94. pulumi_alicloud/polardb/global_database_network.py +2 -2
  95. pulumi_alicloud/polardb/parameter_group.py +2 -2
  96. pulumi_alicloud/pulumi-plugin.json +1 -1
  97. pulumi_alicloud/ram/group_policy_attachment.py +2 -2
  98. pulumi_alicloud/ram/role.py +2 -2
  99. pulumi_alicloud/ram/role_attachment.py +6 -4
  100. pulumi_alicloud/rds/instance.py +47 -47
  101. pulumi_alicloud/rds/rds_clone_db_instance.py +30 -30
  102. pulumi_alicloud/rds/rds_upgrade_db_instance.py +2 -2
  103. pulumi_alicloud/resourcemanager/account.py +315 -116
  104. pulumi_alicloud/rocketmq/group.py +2 -2
  105. pulumi_alicloud/ros/change_set.py +2 -2
  106. pulumi_alicloud/ros/stack.py +2 -2
  107. pulumi_alicloud/ros/stack_group.py +2 -2
  108. pulumi_alicloud/ros/stack_instance.py +2 -2
  109. pulumi_alicloud/ros/template_scratch.py +2 -2
  110. pulumi_alicloud/scdn/domain.py +2 -2
  111. pulumi_alicloud/securitycenter/service_linked_role.py +2 -2
  112. pulumi_alicloud/servicecatalog/provisioned_product.py +2 -2
  113. pulumi_alicloud/slb/_inputs.py +44 -0
  114. pulumi_alicloud/slb/acl_entry_attachment.py +2 -2
  115. pulumi_alicloud/slb/ca_certificate.py +4 -0
  116. pulumi_alicloud/slb/listener.py +46 -89
  117. pulumi_alicloud/slb/master_slave_server_group.py +17 -35
  118. pulumi_alicloud/slb/outputs.py +26 -0
  119. pulumi_alicloud/sms/short_url.py +2 -2
  120. pulumi_alicloud/threatdetection/backup_policy.py +2 -2
  121. pulumi_alicloud/threatdetection/honeypot_probe.py +2 -2
  122. pulumi_alicloud/threatdetection/instance.py +28 -21
  123. pulumi_alicloud/threatdetection/outputs.py +98 -6
  124. pulumi_alicloud/threatdetection/vul_whitelist.py +2 -2
  125. pulumi_alicloud/threatdetection/web_lock_config.py +2 -2
  126. pulumi_alicloud/tsdb/instance.py +2 -2
  127. pulumi_alicloud/vpc/common_bandwith_package.py +28 -14
  128. pulumi_alicloud/vpc/forward_entry.py +4 -4
  129. pulumi_alicloud/vpc/gateway_route_table_attachment.py +2 -2
  130. pulumi_alicloud/vpc/ha_vip.py +4 -4
  131. pulumi_alicloud/vpc/ha_vipv2.py +4 -0
  132. pulumi_alicloud/vpc/ipv4_gateway.py +78 -37
  133. pulumi_alicloud/vpc/ipv6_gateway.py +2 -2
  134. pulumi_alicloud/vpc/nat_ip.py +2 -2
  135. pulumi_alicloud/vpc/prefix_list.py +2 -2
  136. pulumi_alicloud/vpc/route_entry.py +6 -2
  137. pulumi_alicloud/vpn/gateway_vco_route.py +2 -2
  138. pulumi_alicloud/vpn/ipsec_server.py +2 -2
  139. pulumi_alicloud/vpn/pbr_route_entry.py +2 -2
  140. pulumi_alicloud/vpn/route_entry.py +8 -8
  141. pulumi_alicloud/wafv3/instance.py +2 -2
  142. pulumi_alicloud/wafv3/outputs.py +11 -0
  143. {pulumi_alicloud-3.78.0a1747200018.dist-info → pulumi_alicloud-3.79.0a1747372618.dist-info}/METADATA +1 -1
  144. {pulumi_alicloud-3.78.0a1747200018.dist-info → pulumi_alicloud-3.79.0a1747372618.dist-info}/RECORD +146 -142
  145. {pulumi_alicloud-3.78.0a1747200018.dist-info → pulumi_alicloud-3.79.0a1747372618.dist-info}/WHEEL +1 -1
  146. {pulumi_alicloud-3.78.0a1747200018.dist-info → pulumi_alicloud-3.79.0a1747372618.dist-info}/top_level.txt +0 -0
pulumi_alicloud/resourcemanager/account.py CHANGED
@@ -22,40 +22,65 @@ class AccountArgs:
22
22
  def __init__(__self__, *,
23
23
  display_name: pulumi.Input[builtins.str],
24
24
  abandon_able_check_ids: Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]] = None,
25
+ abandonable_check_ids: Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]] = None,
25
26
  account_name_prefix: Optional[pulumi.Input[builtins.str]] = None,
26
27
  folder_id: Optional[pulumi.Input[builtins.str]] = None,
28
+ force_delete: Optional[pulumi.Input[builtins.bool]] = None,
27
29
  payer_account_id: Optional[pulumi.Input[builtins.str]] = None,
28
- tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]]] = None):
30
+ resell_account_type: Optional[pulumi.Input[builtins.str]] = None,
31
+ tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]]] = None,
32
+ type: Optional[pulumi.Input[builtins.str]] = None):
29
33
  """
30
34
  The set of arguments for constructing a Account resource.
31
- :param pulumi.Input[builtins.str] display_name: Member name. The length is 2 ~ 50 characters or Chinese characters, which can include Chinese characters, English letters, numbers, underscores (_), dots (.) And dashes (-).
32
- :param pulumi.Input[Sequence[pulumi.Input[builtins.str]]] abandon_able_check_ids: The IDs of the check items that you can choose to ignore for the member deletion.
33
- If you want to delete the account, please use datasource `resourcemanager_get_account_deletion_check_task`
34
- to get check ids and set them.
35
- :param pulumi.Input[builtins.str] account_name_prefix: The name prefix of account.
36
- :param pulumi.Input[builtins.str] folder_id: The ID of the parent folder.
37
- :param pulumi.Input[builtins.str] payer_account_id: The ID of the billing account. If you leave this parameter empty, the current account is used as the billing account.
38
- :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] tags: A mapping of tags to assign to the resource.
35
+ :param pulumi.Input[builtins.str] display_name: Member name
36
+ :param pulumi.Input[Sequence[pulumi.Input[builtins.str]]] abandon_able_check_ids: . Field 'abandon_able_check_id' has been deprecated from provider version 1.249.0. New field 'abandonable_check_id' instead.
37
+ :param pulumi.Input[Sequence[pulumi.Input[builtins.str]]] abandonable_check_ids: The ID of the check item that can choose to abandon and continue to perform member deletion.
38
+ The ID is obtained from the return parameter AbandonableChecks of GetAccountDeletionCheckResult.
39
+ :param pulumi.Input[builtins.str] account_name_prefix: Account name prefix. Empty the system randomly generated.
40
+ Format: English letters, numbers, and special characters_.-can be entered. It must start and end with an English letter or number, and continuous special characters_.-cannot be entered '_.-'.
41
+ The format of the full account name is @< ResourceDirectoryId>.aliyunid.com, for example: 'alice @ rd-3G ****.aliyunid.com'
42
+ The account name must be unique in the resource directory.
43
+ :param pulumi.Input[builtins.str] folder_id: The ID of the parent folder
44
+ :param pulumi.Input[builtins.bool] force_delete: Whether to force delete the account.
45
+ :param pulumi.Input[builtins.str] payer_account_id: The settlement account ID. If it is left blank, the newly created member will be used for self-settlement.
46
+ :param pulumi.Input[builtins.str] resell_account_type: The identity type of the member. Valid values:
47
+ - resell: The member is an account for a reseller. This is the default value. A relationship is automatically established between the member and the reseller. The management account of the resource directory must be used as the billing account of the member.
48
+ - non_resell: The member is not an account for a reseller. The member is an account that is not associated with a reseller. You can directly use the account to purchase Alibaba Cloud resources. The member is used as its own billing account.
49
+
50
+ > **NOTE:** This parameter is available only for resellers at the international site (alibabacloud.com).
51
+ :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] tags: The tag of the resource
52
+ :param pulumi.Input[builtins.str] type: Member type. The value of ResourceAccount indicates the resource account
39
53
 
40
- > **NOTE:** The member name must be unique within the resource directory.
54
+ The following arguments will be discarded. Please use new fields as soon as possible:
41
55
  """
42
56
  pulumi.set(__self__, "display_name", display_name)
57
+ if abandon_able_check_ids is not None:
58
+ warnings.warn("""Field 'abandon_able_check_id' has been deprecated since provider version 1.248.0. New field 'abandonable_check_id' instead.""", DeprecationWarning)
59
+ pulumi.log.warn("""abandon_able_check_ids is deprecated: Field 'abandon_able_check_id' has been deprecated since provider version 1.248.0. New field 'abandonable_check_id' instead.""")
43
60
  if abandon_able_check_ids is not None:
44
61
  pulumi.set(__self__, "abandon_able_check_ids", abandon_able_check_ids)
62
+ if abandonable_check_ids is not None:
63
+ pulumi.set(__self__, "abandonable_check_ids", abandonable_check_ids)
45
64
  if account_name_prefix is not None:
46
65
  pulumi.set(__self__, "account_name_prefix", account_name_prefix)
47
66
  if folder_id is not None:
48
67
  pulumi.set(__self__, "folder_id", folder_id)
68
+ if force_delete is not None:
69
+ pulumi.set(__self__, "force_delete", force_delete)
49
70
  if payer_account_id is not None:
50
71
  pulumi.set(__self__, "payer_account_id", payer_account_id)
72
+ if resell_account_type is not None:
73
+ pulumi.set(__self__, "resell_account_type", resell_account_type)
51
74
  if tags is not None:
52
75
  pulumi.set(__self__, "tags", tags)
76
+ if type is not None:
77
+ pulumi.set(__self__, "type", type)
53
78
 
54
79
  @property
55
80
  @pulumi.getter(name="displayName")
56
81
  def display_name(self) -> pulumi.Input[builtins.str]:
57
82
  """
58
- Member name. The length is 2 ~ 50 characters or Chinese characters, which can include Chinese characters, English letters, numbers, underscores (_), dots (.) And dashes (-).
83
+ Member name
59
84
  """
60
85
  return pulumi.get(self, "display_name")
61
86
 
@@ -65,11 +90,10 @@ class AccountArgs:
65
90
 
66
91
  @property
67
92
  @pulumi.getter(name="abandonAbleCheckIds")
93
+ @_utilities.deprecated("""Field 'abandon_able_check_id' has been deprecated since provider version 1.248.0. New field 'abandonable_check_id' instead.""")
68
94
  def abandon_able_check_ids(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]]:
69
95
  """
70
- The IDs of the check items that you can choose to ignore for the member deletion.
71
- If you want to delete the account, please use datasource `resourcemanager_get_account_deletion_check_task`
72
- to get check ids and set them.
96
+ . Field 'abandon_able_check_id' has been deprecated from provider version 1.249.0. New field 'abandonable_check_id' instead.
73
97
  """
74
98
  return pulumi.get(self, "abandon_able_check_ids")
75
99
 
@@ -77,11 +101,27 @@ class AccountArgs:
77
101
  def abandon_able_check_ids(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]]):
78
102
  pulumi.set(self, "abandon_able_check_ids", value)
79
103
 
104
+ @property
105
+ @pulumi.getter(name="abandonableCheckIds")
106
+ def abandonable_check_ids(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]]:
107
+ """
108
+ The ID of the check item that can choose to abandon and continue to perform member deletion.
109
+ The ID is obtained from the return parameter AbandonableChecks of GetAccountDeletionCheckResult.
110
+ """
111
+ return pulumi.get(self, "abandonable_check_ids")
112
+
113
+ @abandonable_check_ids.setter
114
+ def abandonable_check_ids(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]]):
115
+ pulumi.set(self, "abandonable_check_ids", value)
116
+
80
117
  @property
81
118
  @pulumi.getter(name="accountNamePrefix")
82
119
  def account_name_prefix(self) -> Optional[pulumi.Input[builtins.str]]:
83
120
  """
84
- The name prefix of account.
121
+ Account name prefix. Empty the system randomly generated.
122
+ Format: English letters, numbers, and special characters_.-can be entered. It must start and end with an English letter or number, and continuous special characters_.-cannot be entered '_.-'.
123
+ The format of the full account name is @< ResourceDirectoryId>.aliyunid.com, for example: 'alice @ rd-3G ****.aliyunid.com'
124
+ The account name must be unique in the resource directory.
85
125
  """
86
126
  return pulumi.get(self, "account_name_prefix")
87
127
 
@@ -93,7 +133,7 @@ class AccountArgs:
93
133
  @pulumi.getter(name="folderId")
94
134
  def folder_id(self) -> Optional[pulumi.Input[builtins.str]]:
95
135
  """
96
- The ID of the parent folder.
136
+ The ID of the parent folder
97
137
  """
98
138
  return pulumi.get(self, "folder_id")
99
139
 
@@ -101,11 +141,23 @@ class AccountArgs:
101
141
  def folder_id(self, value: Optional[pulumi.Input[builtins.str]]):
102
142
  pulumi.set(self, "folder_id", value)
103
143
 
144
+ @property
145
+ @pulumi.getter(name="forceDelete")
146
+ def force_delete(self) -> Optional[pulumi.Input[builtins.bool]]:
147
+ """
148
+ Whether to force delete the account.
149
+ """
150
+ return pulumi.get(self, "force_delete")
151
+
152
+ @force_delete.setter
153
+ def force_delete(self, value: Optional[pulumi.Input[builtins.bool]]):
154
+ pulumi.set(self, "force_delete", value)
155
+
104
156
  @property
105
157
  @pulumi.getter(name="payerAccountId")
106
158
  def payer_account_id(self) -> Optional[pulumi.Input[builtins.str]]:
107
159
  """
108
- The ID of the billing account. If you leave this parameter empty, the current account is used as the billing account.
160
+ The settlement account ID. If it is left blank, the newly created member will be used for self-settlement.
109
161
  """
110
162
  return pulumi.get(self, "payer_account_id")
111
163
 
@@ -113,13 +165,27 @@ class AccountArgs:
113
165
  def payer_account_id(self, value: Optional[pulumi.Input[builtins.str]]):
114
166
  pulumi.set(self, "payer_account_id", value)
115
167
 
168
+ @property
169
+ @pulumi.getter(name="resellAccountType")
170
+ def resell_account_type(self) -> Optional[pulumi.Input[builtins.str]]:
171
+ """
172
+ The identity type of the member. Valid values:
173
+ - resell: The member is an account for a reseller. This is the default value. A relationship is automatically established between the member and the reseller. The management account of the resource directory must be used as the billing account of the member.
174
+ - non_resell: The member is not an account for a reseller. The member is an account that is not associated with a reseller. You can directly use the account to purchase Alibaba Cloud resources. The member is used as its own billing account.
175
+
176
+ > **NOTE:** This parameter is available only for resellers at the international site (alibabacloud.com).
177
+ """
178
+ return pulumi.get(self, "resell_account_type")
179
+
180
+ @resell_account_type.setter
181
+ def resell_account_type(self, value: Optional[pulumi.Input[builtins.str]]):
182
+ pulumi.set(self, "resell_account_type", value)
183
+
116
184
  @property
117
185
  @pulumi.getter
118
186
  def tags(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]]]:
119
187
  """
120
- A mapping of tags to assign to the resource.
121
-
122
- > **NOTE:** The member name must be unique within the resource directory.
188
+ The tag of the resource
123
189
  """
124
190
  return pulumi.get(self, "tags")
125
191
 
@@ -127,49 +193,82 @@ class AccountArgs:
127
193
  def tags(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]]]):
128
194
  pulumi.set(self, "tags", value)
129
195
 
196
+ @property
197
+ @pulumi.getter
198
+ def type(self) -> Optional[pulumi.Input[builtins.str]]:
199
+ """
200
+ Member type. The value of ResourceAccount indicates the resource account
201
+
202
+ The following arguments will be discarded. Please use new fields as soon as possible:
203
+ """
204
+ return pulumi.get(self, "type")
205
+
206
+ @type.setter
207
+ def type(self, value: Optional[pulumi.Input[builtins.str]]):
208
+ pulumi.set(self, "type", value)
209
+
130
210
 
131
211
  @pulumi.input_type
132
212
  class _AccountState:
133
213
  def __init__(__self__, *,
134
214
  abandon_able_check_ids: Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]] = None,
215
+ abandonable_check_ids: Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]] = None,
135
216
  account_name_prefix: Optional[pulumi.Input[builtins.str]] = None,
136
217
  display_name: Optional[pulumi.Input[builtins.str]] = None,
137
218
  folder_id: Optional[pulumi.Input[builtins.str]] = None,
219
+ force_delete: Optional[pulumi.Input[builtins.bool]] = None,
138
220
  join_method: Optional[pulumi.Input[builtins.str]] = None,
139
221
  join_time: Optional[pulumi.Input[builtins.str]] = None,
140
222
  modify_time: Optional[pulumi.Input[builtins.str]] = None,
141
223
  payer_account_id: Optional[pulumi.Input[builtins.str]] = None,
224
+ resell_account_type: Optional[pulumi.Input[builtins.str]] = None,
142
225
  resource_directory_id: Optional[pulumi.Input[builtins.str]] = None,
143
226
  status: Optional[pulumi.Input[builtins.str]] = None,
144
227
  tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]]] = None,
145
228
  type: Optional[pulumi.Input[builtins.str]] = None):
146
229
  """
147
230
  Input properties used for looking up and filtering Account resources.
148
- :param pulumi.Input[Sequence[pulumi.Input[builtins.str]]] abandon_able_check_ids: The IDs of the check items that you can choose to ignore for the member deletion.
149
- If you want to delete the account, please use datasource `resourcemanager_get_account_deletion_check_task`
150
- to get check ids and set them.
151
- :param pulumi.Input[builtins.str] account_name_prefix: The name prefix of account.
152
- :param pulumi.Input[builtins.str] display_name: Member name. The length is 2 ~ 50 characters or Chinese characters, which can include Chinese characters, English letters, numbers, underscores (_), dots (.) And dashes (-).
153
- :param pulumi.Input[builtins.str] folder_id: The ID of the parent folder.
154
- :param pulumi.Input[builtins.str] join_method: Ways for members to join the resource directory. Valid values: `invited`, `created`.
155
- :param pulumi.Input[builtins.str] join_time: The time when the member joined the resource directory.
156
- :param pulumi.Input[builtins.str] modify_time: The modification time of the invitation.
157
- :param pulumi.Input[builtins.str] payer_account_id: The ID of the billing account. If you leave this parameter empty, the current account is used as the billing account.
158
- :param pulumi.Input[builtins.str] resource_directory_id: Resource directory ID.
159
- :param pulumi.Input[builtins.str] status: Member joining status. Valid values: `CreateSuccess`,`CreateVerifying`,`CreateFailed`,`CreateExpired`,`CreateCancelled`,`PromoteVerifying`,`PromoteFailed`,`PromoteExpired`,`PromoteCancelled`,`PromoteSuccess`,`InviteSuccess`,`Removed`.
160
- :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] tags: A mapping of tags to assign to the resource.
231
+ :param pulumi.Input[Sequence[pulumi.Input[builtins.str]]] abandon_able_check_ids: . Field 'abandon_able_check_id' has been deprecated from provider version 1.249.0. New field 'abandonable_check_id' instead.
232
+ :param pulumi.Input[Sequence[pulumi.Input[builtins.str]]] abandonable_check_ids: The ID of the check item that can choose to abandon and continue to perform member deletion.
233
+ The ID is obtained from the return parameter AbandonableChecks of GetAccountDeletionCheckResult.
234
+ :param pulumi.Input[builtins.str] account_name_prefix: Account name prefix. Empty the system randomly generated.
235
+ Format: English letters, numbers, and special characters_.-can be entered. It must start and end with an English letter or number, and continuous special characters_.-cannot be entered '_.-'.
236
+ The format of the full account name is @< ResourceDirectoryId>.aliyunid.com, for example: 'alice @ rd-3G ****.aliyunid.com'
237
+ The account name must be unique in the resource directory.
238
+ :param pulumi.Input[builtins.str] display_name: Member name
239
+ :param pulumi.Input[builtins.str] folder_id: The ID of the parent folder
240
+ :param pulumi.Input[builtins.bool] force_delete: Whether to force delete the account.
241
+ :param pulumi.Input[builtins.str] join_method: Ways for members to join the resource directory. invited, created
242
+ :param pulumi.Input[builtins.str] join_time: The time when the member joined the resource directory
243
+ :param pulumi.Input[builtins.str] modify_time: The modification time of the invitation
244
+ :param pulumi.Input[builtins.str] payer_account_id: The settlement account ID. If it is left blank, the newly created member will be used for self-settlement.
245
+ :param pulumi.Input[builtins.str] resell_account_type: The identity type of the member. Valid values:
246
+ - resell: The member is an account for a reseller. This is the default value. A relationship is automatically established between the member and the reseller. The management account of the resource directory must be used as the billing account of the member.
247
+ - non_resell: The member is not an account for a reseller. The member is an account that is not associated with a reseller. You can directly use the account to purchase Alibaba Cloud resources. The member is used as its own billing account.
248
+
249
+ > **NOTE:** This parameter is available only for resellers at the international site (alibabacloud.com).
250
+ :param pulumi.Input[builtins.str] resource_directory_id: Resource directory ID
251
+ :param pulumi.Input[builtins.str] status: Member joining status. CreateSuccess,CreateVerifying,CreateFailed,CreateExpired,CreateCancelled,PromoteVerifying,PromoteFailed,PromoteExpired,PromoteCancelled,PromoteSuccess,InviteSuccess,Removed
252
+ :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] tags: The tag of the resource
253
+ :param pulumi.Input[builtins.str] type: Member type. The value of ResourceAccount indicates the resource account
161
254
 
162
- > **NOTE:** The member name must be unique within the resource directory.
163
- :param pulumi.Input[builtins.str] type: Member type. The value of `ResourceAccount` indicates the resource account.
255
+ The following arguments will be discarded. Please use new fields as soon as possible:
164
256
  """
257
+ if abandon_able_check_ids is not None:
258
+ warnings.warn("""Field 'abandon_able_check_id' has been deprecated since provider version 1.248.0. New field 'abandonable_check_id' instead.""", DeprecationWarning)
259
+ pulumi.log.warn("""abandon_able_check_ids is deprecated: Field 'abandon_able_check_id' has been deprecated since provider version 1.248.0. New field 'abandonable_check_id' instead.""")
165
260
  if abandon_able_check_ids is not None:
166
261
  pulumi.set(__self__, "abandon_able_check_ids", abandon_able_check_ids)
262
+ if abandonable_check_ids is not None:
263
+ pulumi.set(__self__, "abandonable_check_ids", abandonable_check_ids)
167
264
  if account_name_prefix is not None:
168
265
  pulumi.set(__self__, "account_name_prefix", account_name_prefix)
169
266
  if display_name is not None:
170
267
  pulumi.set(__self__, "display_name", display_name)
171
268
  if folder_id is not None:
172
269
  pulumi.set(__self__, "folder_id", folder_id)
270
+ if force_delete is not None:
271
+ pulumi.set(__self__, "force_delete", force_delete)
173
272
  if join_method is not None:
174
273
  pulumi.set(__self__, "join_method", join_method)
175
274
  if join_time is not None:
@@ -178,6 +277,8 @@ class _AccountState:
178
277
  pulumi.set(__self__, "modify_time", modify_time)
179
278
  if payer_account_id is not None:
180
279
  pulumi.set(__self__, "payer_account_id", payer_account_id)
280
+ if resell_account_type is not None:
281
+ pulumi.set(__self__, "resell_account_type", resell_account_type)
181
282
  if resource_directory_id is not None:
182
283
  pulumi.set(__self__, "resource_directory_id", resource_directory_id)
183
284
  if status is not None:
@@ -189,11 +290,10 @@ class _AccountState:
189
290
 
190
291
  @property
191
292
  @pulumi.getter(name="abandonAbleCheckIds")
293
+ @_utilities.deprecated("""Field 'abandon_able_check_id' has been deprecated since provider version 1.248.0. New field 'abandonable_check_id' instead.""")
192
294
  def abandon_able_check_ids(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]]:
193
295
  """
194
- The IDs of the check items that you can choose to ignore for the member deletion.
195
- If you want to delete the account, please use datasource `resourcemanager_get_account_deletion_check_task`
196
- to get check ids and set them.
296
+ . Field 'abandon_able_check_id' has been deprecated from provider version 1.249.0. New field 'abandonable_check_id' instead.
197
297
  """
198
298
  return pulumi.get(self, "abandon_able_check_ids")
199
299
 
@@ -201,11 +301,27 @@ class _AccountState:
201
301
  def abandon_able_check_ids(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]]):
202
302
  pulumi.set(self, "abandon_able_check_ids", value)
203
303
 
304
+ @property
305
+ @pulumi.getter(name="abandonableCheckIds")
306
+ def abandonable_check_ids(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]]:
307
+ """
308
+ The ID of the check item that can choose to abandon and continue to perform member deletion.
309
+ The ID is obtained from the return parameter AbandonableChecks of GetAccountDeletionCheckResult.
310
+ """
311
+ return pulumi.get(self, "abandonable_check_ids")
312
+
313
+ @abandonable_check_ids.setter
314
+ def abandonable_check_ids(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]]):
315
+ pulumi.set(self, "abandonable_check_ids", value)
316
+
204
317
  @property
205
318
  @pulumi.getter(name="accountNamePrefix")
206
319
  def account_name_prefix(self) -> Optional[pulumi.Input[builtins.str]]:
207
320
  """
208
- The name prefix of account.
321
+ Account name prefix. Empty the system randomly generated.
322
+ Format: English letters, numbers, and special characters_.-can be entered. It must start and end with an English letter or number, and continuous special characters_.-cannot be entered '_.-'.
323
+ The format of the full account name is @< ResourceDirectoryId>.aliyunid.com, for example: 'alice @ rd-3G ****.aliyunid.com'
324
+ The account name must be unique in the resource directory.
209
325
  """
210
326
  return pulumi.get(self, "account_name_prefix")
211
327
 
@@ -217,7 +333,7 @@ class _AccountState:
217
333
  @pulumi.getter(name="displayName")
218
334
  def display_name(self) -> Optional[pulumi.Input[builtins.str]]:
219
335
  """
220
- Member name. The length is 2 ~ 50 characters or Chinese characters, which can include Chinese characters, English letters, numbers, underscores (_), dots (.) And dashes (-).
336
+ Member name
221
337
  """
222
338
  return pulumi.get(self, "display_name")
223
339
 
@@ -229,7 +345,7 @@ class _AccountState:
229
345
  @pulumi.getter(name="folderId")
230
346
  def folder_id(self) -> Optional[pulumi.Input[builtins.str]]:
231
347
  """
232
- The ID of the parent folder.
348
+ The ID of the parent folder
233
349
  """
234
350
  return pulumi.get(self, "folder_id")
235
351
 
@@ -237,11 +353,23 @@ class _AccountState:
237
353
  def folder_id(self, value: Optional[pulumi.Input[builtins.str]]):
238
354
  pulumi.set(self, "folder_id", value)
239
355
 
356
+ @property
357
+ @pulumi.getter(name="forceDelete")
358
+ def force_delete(self) -> Optional[pulumi.Input[builtins.bool]]:
359
+ """
360
+ Whether to force delete the account.
361
+ """
362
+ return pulumi.get(self, "force_delete")
363
+
364
+ @force_delete.setter
365
+ def force_delete(self, value: Optional[pulumi.Input[builtins.bool]]):
366
+ pulumi.set(self, "force_delete", value)
367
+
240
368
  @property
241
369
  @pulumi.getter(name="joinMethod")
242
370
  def join_method(self) -> Optional[pulumi.Input[builtins.str]]:
243
371
  """
244
- Ways for members to join the resource directory. Valid values: `invited`, `created`.
372
+ Ways for members to join the resource directory. invited, created
245
373
  """
246
374
  return pulumi.get(self, "join_method")
247
375
 
@@ -253,7 +381,7 @@ class _AccountState:
253
381
  @pulumi.getter(name="joinTime")
254
382
  def join_time(self) -> Optional[pulumi.Input[builtins.str]]:
255
383
  """
256
- The time when the member joined the resource directory.
384
+ The time when the member joined the resource directory
257
385
  """
258
386
  return pulumi.get(self, "join_time")
259
387
 
@@ -265,7 +393,7 @@ class _AccountState:
265
393
  @pulumi.getter(name="modifyTime")
266
394
  def modify_time(self) -> Optional[pulumi.Input[builtins.str]]:
267
395
  """
268
- The modification time of the invitation.
396
+ The modification time of the invitation
269
397
  """
270
398
  return pulumi.get(self, "modify_time")
271
399
 
@@ -277,7 +405,7 @@ class _AccountState:
277
405
  @pulumi.getter(name="payerAccountId")
278
406
  def payer_account_id(self) -> Optional[pulumi.Input[builtins.str]]:
279
407
  """
280
- The ID of the billing account. If you leave this parameter empty, the current account is used as the billing account.
408
+ The settlement account ID. If it is left blank, the newly created member will be used for self-settlement.
281
409
  """
282
410
  return pulumi.get(self, "payer_account_id")
283
411
 
@@ -285,11 +413,27 @@ class _AccountState:
285
413
  def payer_account_id(self, value: Optional[pulumi.Input[builtins.str]]):
286
414
  pulumi.set(self, "payer_account_id", value)
287
415
 
416
+ @property
417
+ @pulumi.getter(name="resellAccountType")
418
+ def resell_account_type(self) -> Optional[pulumi.Input[builtins.str]]:
419
+ """
420
+ The identity type of the member. Valid values:
421
+ - resell: The member is an account for a reseller. This is the default value. A relationship is automatically established between the member and the reseller. The management account of the resource directory must be used as the billing account of the member.
422
+ - non_resell: The member is not an account for a reseller. The member is an account that is not associated with a reseller. You can directly use the account to purchase Alibaba Cloud resources. The member is used as its own billing account.
423
+
424
+ > **NOTE:** This parameter is available only for resellers at the international site (alibabacloud.com).
425
+ """
426
+ return pulumi.get(self, "resell_account_type")
427
+
428
+ @resell_account_type.setter
429
+ def resell_account_type(self, value: Optional[pulumi.Input[builtins.str]]):
430
+ pulumi.set(self, "resell_account_type", value)
431
+
288
432
  @property
289
433
  @pulumi.getter(name="resourceDirectoryId")
290
434
  def resource_directory_id(self) -> Optional[pulumi.Input[builtins.str]]:
291
435
  """
292
- Resource directory ID.
436
+ Resource directory ID
293
437
  """
294
438
  return pulumi.get(self, "resource_directory_id")
295
439
 
@@ -301,7 +445,7 @@ class _AccountState:
301
445
  @pulumi.getter
302
446
  def status(self) -> Optional[pulumi.Input[builtins.str]]:
303
447
  """
304
- Member joining status. Valid values: `CreateSuccess`,`CreateVerifying`,`CreateFailed`,`CreateExpired`,`CreateCancelled`,`PromoteVerifying`,`PromoteFailed`,`PromoteExpired`,`PromoteCancelled`,`PromoteSuccess`,`InviteSuccess`,`Removed`.
448
+ Member joining status. CreateSuccess,CreateVerifying,CreateFailed,CreateExpired,CreateCancelled,PromoteVerifying,PromoteFailed,PromoteExpired,PromoteCancelled,PromoteSuccess,InviteSuccess,Removed
305
449
  """
306
450
  return pulumi.get(self, "status")
307
451
 
@@ -313,9 +457,7 @@ class _AccountState:
313
457
  @pulumi.getter
314
458
  def tags(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]]]:
315
459
  """
316
- A mapping of tags to assign to the resource.
317
-
318
- > **NOTE:** The member name must be unique within the resource directory.
460
+ The tag of the resource
319
461
  """
320
462
  return pulumi.get(self, "tags")
321
463
 
@@ -327,7 +469,9 @@ class _AccountState:
327
469
  @pulumi.getter
328
470
  def type(self) -> Optional[pulumi.Input[builtins.str]]:
329
471
  """
330
- Member type. The value of `ResourceAccount` indicates the resource account.
472
+ Member type. The value of ResourceAccount indicates the resource account
473
+
474
+ The following arguments will be discarded. Please use new fields as soon as possible:
331
475
  """
332
476
  return pulumi.get(self, "type")
333
477
 
@@ -343,22 +487,27 @@ class Account(pulumi.CustomResource):
343
487
  resource_name: str,
344
488
  opts: Optional[pulumi.ResourceOptions] = None,
345
489
  abandon_able_check_ids: Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]] = None,
490
+ abandonable_check_ids: Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]] = None,
346
491
  account_name_prefix: Optional[pulumi.Input[builtins.str]] = None,
347
492
  display_name: Optional[pulumi.Input[builtins.str]] = None,
348
493
  folder_id: Optional[pulumi.Input[builtins.str]] = None,
494
+ force_delete: Optional[pulumi.Input[builtins.bool]] = None,
349
495
  payer_account_id: Optional[pulumi.Input[builtins.str]] = None,
496
+ resell_account_type: Optional[pulumi.Input[builtins.str]] = None,
350
497
  tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]]] = None,
498
+ type: Optional[pulumi.Input[builtins.str]] = None,
351
499
  __props__=None):
352
500
  """
353
- Provides a Resource Manager Account resource. Member accounts are containers for resources in a resource directory. These accounts isolate resources and serve as organizational units in the resource directory. You can create member accounts in a folder and then manage them in a unified manner.
354
- For information about Resource Manager Account and how to use it, see [What is Resource Manager Account](https://www.alibabacloud.com/help/en/doc-detail/111231.htm).
501
+ Provides a Resource Manager Account resource.
355
502
 
356
- > **NOTE:** Available since v1.83.0.
503
+ For information about Resource Manager Account and how to use it, see [What is Account](https://www.alibabacloud.com/help/en/doc-detail/111231.htm).
357
504
 
358
- > **NOTE:** From version 1.188.0, the resource can be destroyed. The member deletion feature is in invitational preview. You can contact the service manager of Alibaba Cloud to apply for a trial. see [how to destroy it](https://www.alibabacloud.com/help/en/resource-management/latest/delete-account).
505
+ > **NOTE:** Available since v1.83.0.
359
506
 
360
507
  ## Example Usage
361
508
 
509
+ Basic Usage
510
+
362
511
  ```python
363
512
  import pulumi
364
513
  import pulumi_alicloud as alicloud
@@ -380,33 +529,36 @@ class Account(pulumi.CustomResource):
380
529
  folder_id=example.ids[0])
381
530
  ```
382
531
 
383
- ### Deleting `resourcemanager.Account` or removing it from your configuration
384
-
385
- Deleting the resource manager account or removing it from your configuration will remove it from your state file and management,
386
- but may not destroy the account. If there are some dependent resource in the account,
387
- the deleting account will enter a silence period of 45 days. After the silence period ends,
388
- the system automatically starts to delete the member. [See More Details](https://www.alibabacloud.com/help/en/resource-management/latest/delete-resource-account).
389
-
390
532
  ## Import
391
533
 
392
534
  Resource Manager Account can be imported using the id, e.g.
393
535
 
394
536
  ```sh
395
- $ pulumi import alicloud:resourcemanager/account:Account example 13148890145*****
537
+ $ pulumi import alicloud:resourcemanager/account:Account example <id>
396
538
  ```
397
539
 
398
540
  :param str resource_name: The name of the resource.
399
541
  :param pulumi.ResourceOptions opts: Options for the resource.
400
- :param pulumi.Input[Sequence[pulumi.Input[builtins.str]]] abandon_able_check_ids: The IDs of the check items that you can choose to ignore for the member deletion.
401
- If you want to delete the account, please use datasource `resourcemanager_get_account_deletion_check_task`
402
- to get check ids and set them.
403
- :param pulumi.Input[builtins.str] account_name_prefix: The name prefix of account.
404
- :param pulumi.Input[builtins.str] display_name: Member name. The length is 2 ~ 50 characters or Chinese characters, which can include Chinese characters, English letters, numbers, underscores (_), dots (.) And dashes (-).
405
- :param pulumi.Input[builtins.str] folder_id: The ID of the parent folder.
406
- :param pulumi.Input[builtins.str] payer_account_id: The ID of the billing account. If you leave this parameter empty, the current account is used as the billing account.
407
- :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] tags: A mapping of tags to assign to the resource.
542
+ :param pulumi.Input[Sequence[pulumi.Input[builtins.str]]] abandon_able_check_ids: . Field 'abandon_able_check_id' has been deprecated from provider version 1.249.0. New field 'abandonable_check_id' instead.
543
+ :param pulumi.Input[Sequence[pulumi.Input[builtins.str]]] abandonable_check_ids: The ID of the check item that can choose to abandon and continue to perform member deletion.
544
+ The ID is obtained from the return parameter AbandonableChecks of GetAccountDeletionCheckResult.
545
+ :param pulumi.Input[builtins.str] account_name_prefix: Account name prefix. Empty the system randomly generated.
546
+ Format: English letters, numbers, and special characters_.-can be entered. It must start and end with an English letter or number, and continuous special characters_.-cannot be entered '_.-'.
547
+ The format of the full account name is @< ResourceDirectoryId>.aliyunid.com, for example: 'alice @ rd-3G ****.aliyunid.com'
548
+ The account name must be unique in the resource directory.
549
+ :param pulumi.Input[builtins.str] display_name: Member name
550
+ :param pulumi.Input[builtins.str] folder_id: The ID of the parent folder
551
+ :param pulumi.Input[builtins.bool] force_delete: Whether to force delete the account.
552
+ :param pulumi.Input[builtins.str] payer_account_id: The settlement account ID. If it is left blank, the newly created member will be used for self-settlement.
553
+ :param pulumi.Input[builtins.str] resell_account_type: The identity type of the member. Valid values:
554
+ - resell: The member is an account for a reseller. This is the default value. A relationship is automatically established between the member and the reseller. The management account of the resource directory must be used as the billing account of the member.
555
+ - non_resell: The member is not an account for a reseller. The member is an account that is not associated with a reseller. You can directly use the account to purchase Alibaba Cloud resources. The member is used as its own billing account.
408
556
 
409
- > **NOTE:** The member name must be unique within the resource directory.
557
+ > **NOTE:** This parameter is available only for resellers at the international site (alibabacloud.com).
558
+ :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] tags: The tag of the resource
559
+ :param pulumi.Input[builtins.str] type: Member type. The value of ResourceAccount indicates the resource account
560
+
561
+ The following arguments will be discarded. Please use new fields as soon as possible:
410
562
  """
411
563
  ...
412
564
  @overload
@@ -415,15 +567,16 @@ class Account(pulumi.CustomResource):
415
567
  args: AccountArgs,
416
568
  opts: Optional[pulumi.ResourceOptions] = None):
417
569
  """
418
- Provides a Resource Manager Account resource. Member accounts are containers for resources in a resource directory. These accounts isolate resources and serve as organizational units in the resource directory. You can create member accounts in a folder and then manage them in a unified manner.
419
- For information about Resource Manager Account and how to use it, see [What is Resource Manager Account](https://www.alibabacloud.com/help/en/doc-detail/111231.htm).
570
+ Provides a Resource Manager Account resource.
420
571
 
421
- > **NOTE:** Available since v1.83.0.
572
+ For information about Resource Manager Account and how to use it, see [What is Account](https://www.alibabacloud.com/help/en/doc-detail/111231.htm).
422
573
 
423
- > **NOTE:** From version 1.188.0, the resource can be destroyed. The member deletion feature is in invitational preview. You can contact the service manager of Alibaba Cloud to apply for a trial. see [how to destroy it](https://www.alibabacloud.com/help/en/resource-management/latest/delete-account).
574
+ > **NOTE:** Available since v1.83.0.
424
575
 
425
576
  ## Example Usage
426
577
 
578
+ Basic Usage
579
+
427
580
  ```python
428
581
  import pulumi
429
582
  import pulumi_alicloud as alicloud
@@ -445,19 +598,12 @@ class Account(pulumi.CustomResource):
445
598
  folder_id=example.ids[0])
446
599
  ```
447
600
 
448
- ### Deleting `resourcemanager.Account` or removing it from your configuration
449
-
450
- Deleting the resource manager account or removing it from your configuration will remove it from your state file and management,
451
- but may not destroy the account. If there are some dependent resource in the account,
452
- the deleting account will enter a silence period of 45 days. After the silence period ends,
453
- the system automatically starts to delete the member. [See More Details](https://www.alibabacloud.com/help/en/resource-management/latest/delete-resource-account).
454
-
455
601
  ## Import
456
602
 
457
603
  Resource Manager Account can be imported using the id, e.g.
458
604
 
459
605
  ```sh
460
- $ pulumi import alicloud:resourcemanager/account:Account example 13148890145*****
606
+ $ pulumi import alicloud:resourcemanager/account:Account example <id>
461
607
  ```
462
608
 
463
609
  :param str resource_name: The name of the resource.
@@ -476,11 +622,15 @@ class Account(pulumi.CustomResource):
476
622
  resource_name: str,
477
623
  opts: Optional[pulumi.ResourceOptions] = None,
478
624
  abandon_able_check_ids: Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]] = None,
625
+ abandonable_check_ids: Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]] = None,
479
626
  account_name_prefix: Optional[pulumi.Input[builtins.str]] = None,
480
627
  display_name: Optional[pulumi.Input[builtins.str]] = None,
481
628
  folder_id: Optional[pulumi.Input[builtins.str]] = None,
629
+ force_delete: Optional[pulumi.Input[builtins.bool]] = None,
482
630
  payer_account_id: Optional[pulumi.Input[builtins.str]] = None,
631
+ resell_account_type: Optional[pulumi.Input[builtins.str]] = None,
483
632
  tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]]] = None,
633
+ type: Optional[pulumi.Input[builtins.str]] = None,
484
634
  __props__=None):
485
635
  opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
486
636
  if not isinstance(opts, pulumi.ResourceOptions):
@@ -491,19 +641,22 @@ class Account(pulumi.CustomResource):
491
641
  __props__ = AccountArgs.__new__(AccountArgs)
492
642
 
493
643
  __props__.__dict__["abandon_able_check_ids"] = abandon_able_check_ids
644
+ __props__.__dict__["abandonable_check_ids"] = abandonable_check_ids
494
645
  __props__.__dict__["account_name_prefix"] = account_name_prefix
495
646
  if display_name is None and not opts.urn:
496
647
  raise TypeError("Missing required property 'display_name'")
497
648
  __props__.__dict__["display_name"] = display_name
498
649
  __props__.__dict__["folder_id"] = folder_id
650
+ __props__.__dict__["force_delete"] = force_delete
499
651
  __props__.__dict__["payer_account_id"] = payer_account_id
652
+ __props__.__dict__["resell_account_type"] = resell_account_type
500
653
  __props__.__dict__["tags"] = tags
654
+ __props__.__dict__["type"] = type
501
655
  __props__.__dict__["join_method"] = None
502
656
  __props__.__dict__["join_time"] = None
503
657
  __props__.__dict__["modify_time"] = None
504
658
  __props__.__dict__["resource_directory_id"] = None
505
659
  __props__.__dict__["status"] = None
506
- __props__.__dict__["type"] = None
507
660
  super(Account, __self__).__init__(
508
661
  'alicloud:resourcemanager/account:Account',
509
662
  resource_name,
@@ -515,13 +668,16 @@ class Account(pulumi.CustomResource):
515
668
  id: pulumi.Input[str],
516
669
  opts: Optional[pulumi.ResourceOptions] = None,
517
670
  abandon_able_check_ids: Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]] = None,
671
+ abandonable_check_ids: Optional[pulumi.Input[Sequence[pulumi.Input[builtins.str]]]] = None,
518
672
  account_name_prefix: Optional[pulumi.Input[builtins.str]] = None,
519
673
  display_name: Optional[pulumi.Input[builtins.str]] = None,
520
674
  folder_id: Optional[pulumi.Input[builtins.str]] = None,
675
+ force_delete: Optional[pulumi.Input[builtins.bool]] = None,
521
676
  join_method: Optional[pulumi.Input[builtins.str]] = None,
522
677
  join_time: Optional[pulumi.Input[builtins.str]] = None,
523
678
  modify_time: Optional[pulumi.Input[builtins.str]] = None,
524
679
  payer_account_id: Optional[pulumi.Input[builtins.str]] = None,
680
+ resell_account_type: Optional[pulumi.Input[builtins.str]] = None,
525
681
  resource_directory_id: Optional[pulumi.Input[builtins.str]] = None,
526
682
  status: Optional[pulumi.Input[builtins.str]] = None,
527
683
  tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]]] = None,
@@ -533,35 +689,47 @@ class Account(pulumi.CustomResource):
533
689
  :param str resource_name: The unique name of the resulting resource.
534
690
  :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
535
691
  :param pulumi.ResourceOptions opts: Options for the resource.
536
- :param pulumi.Input[Sequence[pulumi.Input[builtins.str]]] abandon_able_check_ids: The IDs of the check items that you can choose to ignore for the member deletion.
537
- If you want to delete the account, please use datasource `resourcemanager_get_account_deletion_check_task`
538
- to get check ids and set them.
539
- :param pulumi.Input[builtins.str] account_name_prefix: The name prefix of account.
540
- :param pulumi.Input[builtins.str] display_name: Member name. The length is 2 ~ 50 characters or Chinese characters, which can include Chinese characters, English letters, numbers, underscores (_), dots (.) And dashes (-).
541
- :param pulumi.Input[builtins.str] folder_id: The ID of the parent folder.
542
- :param pulumi.Input[builtins.str] join_method: Ways for members to join the resource directory. Valid values: `invited`, `created`.
543
- :param pulumi.Input[builtins.str] join_time: The time when the member joined the resource directory.
544
- :param pulumi.Input[builtins.str] modify_time: The modification time of the invitation.
545
- :param pulumi.Input[builtins.str] payer_account_id: The ID of the billing account. If you leave this parameter empty, the current account is used as the billing account.
546
- :param pulumi.Input[builtins.str] resource_directory_id: Resource directory ID.
547
- :param pulumi.Input[builtins.str] status: Member joining status. Valid values: `CreateSuccess`,`CreateVerifying`,`CreateFailed`,`CreateExpired`,`CreateCancelled`,`PromoteVerifying`,`PromoteFailed`,`PromoteExpired`,`PromoteCancelled`,`PromoteSuccess`,`InviteSuccess`,`Removed`.
548
- :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] tags: A mapping of tags to assign to the resource.
692
+ :param pulumi.Input[Sequence[pulumi.Input[builtins.str]]] abandon_able_check_ids: . Field 'abandon_able_check_id' has been deprecated from provider version 1.249.0. New field 'abandonable_check_id' instead.
693
+ :param pulumi.Input[Sequence[pulumi.Input[builtins.str]]] abandonable_check_ids: The ID of the check item that can choose to abandon and continue to perform member deletion.
694
+ The ID is obtained from the return parameter AbandonableChecks of GetAccountDeletionCheckResult.
695
+ :param pulumi.Input[builtins.str] account_name_prefix: Account name prefix. Empty the system randomly generated.
696
+ Format: English letters, numbers, and special characters_.-can be entered. It must start and end with an English letter or number, and continuous special characters_.-cannot be entered '_.-'.
697
+ The format of the full account name is @< ResourceDirectoryId>.aliyunid.com, for example: 'alice @ rd-3G ****.aliyunid.com'
698
+ The account name must be unique in the resource directory.
699
+ :param pulumi.Input[builtins.str] display_name: Member name
700
+ :param pulumi.Input[builtins.str] folder_id: The ID of the parent folder
701
+ :param pulumi.Input[builtins.bool] force_delete: Whether to force delete the account.
702
+ :param pulumi.Input[builtins.str] join_method: Ways for members to join the resource directory. invited, created
703
+ :param pulumi.Input[builtins.str] join_time: The time when the member joined the resource directory
704
+ :param pulumi.Input[builtins.str] modify_time: The modification time of the invitation
705
+ :param pulumi.Input[builtins.str] payer_account_id: The settlement account ID. If it is left blank, the newly created member will be used for self-settlement.
706
+ :param pulumi.Input[builtins.str] resell_account_type: The identity type of the member. Valid values:
707
+ - resell: The member is an account for a reseller. This is the default value. A relationship is automatically established between the member and the reseller. The management account of the resource directory must be used as the billing account of the member.
708
+ - non_resell: The member is not an account for a reseller. The member is an account that is not associated with a reseller. You can directly use the account to purchase Alibaba Cloud resources. The member is used as its own billing account.
709
+
710
+ > **NOTE:** This parameter is available only for resellers at the international site (alibabacloud.com).
711
+ :param pulumi.Input[builtins.str] resource_directory_id: Resource directory ID
712
+ :param pulumi.Input[builtins.str] status: Member joining status. CreateSuccess,CreateVerifying,CreateFailed,CreateExpired,CreateCancelled,PromoteVerifying,PromoteFailed,PromoteExpired,PromoteCancelled,PromoteSuccess,InviteSuccess,Removed
713
+ :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] tags: The tag of the resource
714
+ :param pulumi.Input[builtins.str] type: Member type. The value of ResourceAccount indicates the resource account
549
715
 
550
- > **NOTE:** The member name must be unique within the resource directory.
551
- :param pulumi.Input[builtins.str] type: Member type. The value of `ResourceAccount` indicates the resource account.
716
+ The following arguments will be discarded. Please use new fields as soon as possible:
552
717
  """
553
718
  opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
554
719
 
555
720
  __props__ = _AccountState.__new__(_AccountState)
556
721
 
557
722
  __props__.__dict__["abandon_able_check_ids"] = abandon_able_check_ids
723
+ __props__.__dict__["abandonable_check_ids"] = abandonable_check_ids
558
724
  __props__.__dict__["account_name_prefix"] = account_name_prefix
559
725
  __props__.__dict__["display_name"] = display_name
560
726
  __props__.__dict__["folder_id"] = folder_id
727
+ __props__.__dict__["force_delete"] = force_delete
561
728
  __props__.__dict__["join_method"] = join_method
562
729
  __props__.__dict__["join_time"] = join_time
563
730
  __props__.__dict__["modify_time"] = modify_time
564
731
  __props__.__dict__["payer_account_id"] = payer_account_id
732
+ __props__.__dict__["resell_account_type"] = resell_account_type
565
733
  __props__.__dict__["resource_directory_id"] = resource_directory_id
566
734
  __props__.__dict__["status"] = status
567
735
  __props__.__dict__["tags"] = tags
@@ -570,19 +738,30 @@ class Account(pulumi.CustomResource):
570
738
 
571
739
  @property
572
740
  @pulumi.getter(name="abandonAbleCheckIds")
741
+ @_utilities.deprecated("""Field 'abandon_able_check_id' has been deprecated since provider version 1.248.0. New field 'abandonable_check_id' instead.""")
573
742
  def abandon_able_check_ids(self) -> pulumi.Output[Optional[Sequence[builtins.str]]]:
574
743
  """
575
- The IDs of the check items that you can choose to ignore for the member deletion.
576
- If you want to delete the account, please use datasource `resourcemanager_get_account_deletion_check_task`
577
- to get check ids and set them.
744
+ . Field 'abandon_able_check_id' has been deprecated from provider version 1.249.0. New field 'abandonable_check_id' instead.
578
745
  """
579
746
  return pulumi.get(self, "abandon_able_check_ids")
580
747
 
748
+ @property
749
+ @pulumi.getter(name="abandonableCheckIds")
750
+ def abandonable_check_ids(self) -> pulumi.Output[Optional[Sequence[builtins.str]]]:
751
+ """
752
+ The ID of the check item that can choose to abandon and continue to perform member deletion.
753
+ The ID is obtained from the return parameter AbandonableChecks of GetAccountDeletionCheckResult.
754
+ """
755
+ return pulumi.get(self, "abandonable_check_ids")
756
+
581
757
  @property
582
758
  @pulumi.getter(name="accountNamePrefix")
583
759
  def account_name_prefix(self) -> pulumi.Output[Optional[builtins.str]]:
584
760
  """
585
- The name prefix of account.
761
+ Account name prefix. Empty the system randomly generated.
762
+ Format: English letters, numbers, and special characters_.-can be entered. It must start and end with an English letter or number, and continuous special characters_.-cannot be entered '_.-'.
763
+ The format of the full account name is @< ResourceDirectoryId>.aliyunid.com, for example: 'alice @ rd-3G ****.aliyunid.com'
764
+ The account name must be unique in the resource directory.
586
765
  """
587
766
  return pulumi.get(self, "account_name_prefix")
588
767
 
@@ -590,7 +769,7 @@ class Account(pulumi.CustomResource):
590
769
  @pulumi.getter(name="displayName")
591
770
  def display_name(self) -> pulumi.Output[builtins.str]:
592
771
  """
593
- Member name. The length is 2 ~ 50 characters or Chinese characters, which can include Chinese characters, English letters, numbers, underscores (_), dots (.) And dashes (-).
772
+ Member name
594
773
  """
595
774
  return pulumi.get(self, "display_name")
596
775
 
@@ -598,15 +777,23 @@ class Account(pulumi.CustomResource):
598
777
  @pulumi.getter(name="folderId")
599
778
  def folder_id(self) -> pulumi.Output[builtins.str]:
600
779
  """
601
- The ID of the parent folder.
780
+ The ID of the parent folder
602
781
  """
603
782
  return pulumi.get(self, "folder_id")
604
783
 
784
+ @property
785
+ @pulumi.getter(name="forceDelete")
786
+ def force_delete(self) -> pulumi.Output[Optional[builtins.bool]]:
787
+ """
788
+ Whether to force delete the account.
789
+ """
790
+ return pulumi.get(self, "force_delete")
791
+
605
792
  @property
606
793
  @pulumi.getter(name="joinMethod")
607
794
  def join_method(self) -> pulumi.Output[builtins.str]:
608
795
  """
609
- Ways for members to join the resource directory. Valid values: `invited`, `created`.
796
+ Ways for members to join the resource directory. invited, created
610
797
  """
611
798
  return pulumi.get(self, "join_method")
612
799
 
@@ -614,7 +801,7 @@ class Account(pulumi.CustomResource):
614
801
  @pulumi.getter(name="joinTime")
615
802
  def join_time(self) -> pulumi.Output[builtins.str]:
616
803
  """
617
- The time when the member joined the resource directory.
804
+ The time when the member joined the resource directory
618
805
  """
619
806
  return pulumi.get(self, "join_time")
620
807
 
@@ -622,7 +809,7 @@ class Account(pulumi.CustomResource):
622
809
  @pulumi.getter(name="modifyTime")
623
810
  def modify_time(self) -> pulumi.Output[builtins.str]:
624
811
  """
625
- The modification time of the invitation.
812
+ The modification time of the invitation
626
813
  """
627
814
  return pulumi.get(self, "modify_time")
628
815
 
@@ -630,15 +817,27 @@ class Account(pulumi.CustomResource):
630
817
  @pulumi.getter(name="payerAccountId")
631
818
  def payer_account_id(self) -> pulumi.Output[Optional[builtins.str]]:
632
819
  """
633
- The ID of the billing account. If you leave this parameter empty, the current account is used as the billing account.
820
+ The settlement account ID. If it is left blank, the newly created member will be used for self-settlement.
634
821
  """
635
822
  return pulumi.get(self, "payer_account_id")
636
823
 
824
+ @property
825
+ @pulumi.getter(name="resellAccountType")
826
+ def resell_account_type(self) -> pulumi.Output[Optional[builtins.str]]:
827
+ """
828
+ The identity type of the member. Valid values:
829
+ - resell: The member is an account for a reseller. This is the default value. A relationship is automatically established between the member and the reseller. The management account of the resource directory must be used as the billing account of the member.
830
+ - non_resell: The member is not an account for a reseller. The member is an account that is not associated with a reseller. You can directly use the account to purchase Alibaba Cloud resources. The member is used as its own billing account.
831
+
832
+ > **NOTE:** This parameter is available only for resellers at the international site (alibabacloud.com).
833
+ """
834
+ return pulumi.get(self, "resell_account_type")
835
+
637
836
  @property
638
837
  @pulumi.getter(name="resourceDirectoryId")
639
838
  def resource_directory_id(self) -> pulumi.Output[builtins.str]:
640
839
  """
641
- Resource directory ID.
840
+ Resource directory ID
642
841
  """
643
842
  return pulumi.get(self, "resource_directory_id")
644
843
 
@@ -646,7 +845,7 @@ class Account(pulumi.CustomResource):
646
845
  @pulumi.getter
647
846
  def status(self) -> pulumi.Output[builtins.str]:
648
847
  """
649
- Member joining status. Valid values: `CreateSuccess`,`CreateVerifying`,`CreateFailed`,`CreateExpired`,`CreateCancelled`,`PromoteVerifying`,`PromoteFailed`,`PromoteExpired`,`PromoteCancelled`,`PromoteSuccess`,`InviteSuccess`,`Removed`.
848
+ Member joining status. CreateSuccess,CreateVerifying,CreateFailed,CreateExpired,CreateCancelled,PromoteVerifying,PromoteFailed,PromoteExpired,PromoteCancelled,PromoteSuccess,InviteSuccess,Removed
650
849
  """
651
850
  return pulumi.get(self, "status")
652
851
 
@@ -654,9 +853,7 @@ class Account(pulumi.CustomResource):
654
853
  @pulumi.getter
655
854
  def tags(self) -> pulumi.Output[Optional[Mapping[str, builtins.str]]]:
656
855
  """
657
- A mapping of tags to assign to the resource.
658
-
659
- > **NOTE:** The member name must be unique within the resource directory.
856
+ The tag of the resource
660
857
  """
661
858
  return pulumi.get(self, "tags")
662
859
 
@@ -664,7 +861,9 @@ class Account(pulumi.CustomResource):
664
861
  @pulumi.getter
665
862
  def type(self) -> pulumi.Output[builtins.str]:
666
863
  """
667
- Member type. The value of `ResourceAccount` indicates the resource account.
864
+ Member type. The value of ResourceAccount indicates the resource account
865
+
866
+ The following arguments will be discarded. Please use new fields as soon as possible:
668
867
  """
669
868
  return pulumi.get(self, "type")
670
869