pulumi-alicloud 3.57.0__py3-none-any.whl → 3.57.0a1717541877__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 (55) hide show
  1. pulumi_alicloud/__init__.py +0 -72
  2. pulumi_alicloud/cen/get_transit_router_available_resources.py +11 -32
  3. pulumi_alicloud/cen/outputs.py +1 -23
  4. pulumi_alicloud/cfg/remediation.py +2 -10
  5. pulumi_alicloud/clickhouse/db_cluster.py +0 -47
  6. pulumi_alicloud/cms/__init__.py +0 -1
  7. pulumi_alicloud/cms/_inputs.py +18 -18
  8. pulumi_alicloud/cms/alarm.py +26 -38
  9. pulumi_alicloud/cms/outputs.py +18 -92
  10. pulumi_alicloud/cs/node_pool.py +7 -7
  11. pulumi_alicloud/ecs/_inputs.py +14 -10
  12. pulumi_alicloud/ecs/image_import.py +100 -162
  13. pulumi_alicloud/ecs/outputs.py +14 -10
  14. pulumi_alicloud/ecs/security_group_rule.py +2 -2
  15. pulumi_alicloud/eds/network_package.py +8 -22
  16. pulumi_alicloud/expressconnect/__init__.py +0 -8
  17. pulumi_alicloud/expressconnect/_inputs.py +0 -40
  18. pulumi_alicloud/expressconnect/outputs.py +0 -51
  19. pulumi_alicloud/gpdb/__init__.py +0 -1
  20. pulumi_alicloud/gpdb/instance.py +0 -47
  21. pulumi_alicloud/hbase/get_instance_types.py +2 -2
  22. pulumi_alicloud/mongodb/instance.py +7 -7
  23. pulumi_alicloud/oss/bucket_cors.py +4 -8
  24. pulumi_alicloud/oss/bucket_data_redundancy_transition.py +4 -12
  25. pulumi_alicloud/oss/bucket_public_access_block.py +4 -12
  26. pulumi_alicloud/ots/instance.py +7 -7
  27. pulumi_alicloud/ots/table.py +8 -149
  28. pulumi_alicloud/pulumi-plugin.json +1 -1
  29. pulumi_alicloud/sae/load_balancer_internet.py +2 -4
  30. pulumi_alicloud/sae/load_balancer_intranet.py +2 -4
  31. pulumi_alicloud/servicemesh/_inputs.py +6 -0
  32. pulumi_alicloud/servicemesh/outputs.py +6 -0
  33. pulumi_alicloud/servicemesh/service_mesh.py +2 -2
  34. pulumi_alicloud/simpleapplicationserver/snapshot.py +2 -10
  35. pulumi_alicloud/vpc/bgp_peer.py +8 -36
  36. pulumi_alicloud/vpc/network.py +4 -0
  37. pulumi_alicloud/vpn/connection.py +0 -220
  38. pulumi_alicloud/vpn/gateway_vpn_attachment.py +2 -2
  39. pulumi_alicloud/vpn/ipsec_server.py +12 -20
  40. pulumi_alicloud/vpn/pbr_route_entry.py +16 -152
  41. pulumi_alicloud/vpn/route_entry.py +44 -158
  42. {pulumi_alicloud-3.57.0.dist-info → pulumi_alicloud-3.57.0a1717541877.dist-info}/METADATA +1 -1
  43. {pulumi_alicloud-3.57.0.dist-info → pulumi_alicloud-3.57.0a1717541877.dist-info}/RECORD +45 -55
  44. pulumi_alicloud/cms/get_site_monitors.py +0 -243
  45. pulumi_alicloud/expressconnect/router_express_connect_router.py +0 -458
  46. pulumi_alicloud/expressconnect/router_tr_association.py +0 -578
  47. pulumi_alicloud/expressconnect/router_vbr_child_instance.py +0 -475
  48. pulumi_alicloud/expressconnect/router_vpc_association.py +0 -500
  49. pulumi_alicloud/expressconnect/traffic_qos.py +0 -284
  50. pulumi_alicloud/expressconnect/traffic_qos_association.py +0 -336
  51. pulumi_alicloud/expressconnect/traffic_qos_queue.py +0 -520
  52. pulumi_alicloud/expressconnect/traffic_qos_rule.py +0 -1174
  53. pulumi_alicloud/gpdb/db_resource_group.py +0 -364
  54. {pulumi_alicloud-3.57.0.dist-info → pulumi_alicloud-3.57.0a1717541877.dist-info}/WHEEL +0 -0
  55. {pulumi_alicloud-3.57.0.dist-info → pulumi_alicloud-3.57.0a1717541877.dist-info}/top_level.txt +0 -0
pulumi_alicloud/ecs/image_import.py CHANGED
@@ -18,7 +18,6 @@ class ImageImportArgs:
18
18
  def __init__(__self__, *,
19
19
  disk_device_mappings: pulumi.Input[Sequence[pulumi.Input['ImageImportDiskDeviceMappingArgs']]],
20
20
  architecture: Optional[pulumi.Input[str]] = None,
21
- boot_mode: Optional[pulumi.Input[str]] = None,
22
21
  description: Optional[pulumi.Input[str]] = None,
23
22
  image_name: Optional[pulumi.Input[str]] = None,
24
23
  license_type: Optional[pulumi.Input[str]] = None,
@@ -26,21 +25,19 @@ class ImageImportArgs:
26
25
  platform: Optional[pulumi.Input[str]] = None):
27
26
  """
28
27
  The set of arguments for constructing a ImageImport resource.
29
- :param pulumi.Input[Sequence[pulumi.Input['ImageImportDiskDeviceMappingArgs']]] disk_device_mappings: The information about the custom image. See `disk_device_mapping` below.
30
- :param pulumi.Input[str] architecture: The architecture of the image. Default value: `x86_64`. Valid values: `x86_64`, `i386`.
31
- :param pulumi.Input[str] boot_mode: The boot mode of the image. Valid values: `BIOS`, `UEFI`.
32
- :param pulumi.Input[str] description: The description of the image. The `description` must be 2 to 256 characters in length and cannot start with http:// or https://.
33
- :param pulumi.Input[str] image_name: The name of the image. The `image_name` must be `2` to `128` characters in length. The `image_name` must start with a letter and cannot start with acs: or aliyun. The `image_name` cannot contain http:// or https://. The `image_name` can contain letters, digits, periods (.), colons (:), underscores (_), and hyphens (-).
34
- :param pulumi.Input[str] license_type: The type of the license used to activate the operating system after the image is imported. Default value: `Auto`. Valid values: `Auto`, `Aliyun`, `BYOL`.
35
- :param pulumi.Input[str] os_type: The type of the operating system. Default value: `linux`. Valid values: `windows`, `linux`.
36
- :param pulumi.Input[str] platform: The operating system platform. More valid values refer to [ImportImage OpenAPI](https://www.alibabacloud.com/help/en/elastic-compute-service/latest/importimage).
37
- > **NOTE:** Before provider version 1.197.0, the default value of `platform` is `Ubuntu`.
28
+ :param pulumi.Input[Sequence[pulumi.Input['ImageImportDiskDeviceMappingArgs']]] disk_device_mappings: Description of the system with disks and snapshots under the image.
29
+ :param pulumi.Input[str] architecture: Specifies the architecture of the system disk after you specify a data disk snapshot as the data source of the system disk for creating an image. Valid values: `i386` , Default is `x86_64`.
30
+ :param pulumi.Input[str] description: Description of the image. The length is 2 to 256 English or Chinese characters, and cannot begin with http: // and https: //.
31
+ :param pulumi.Input[str] image_name: The image name. The length is 2 ~ 128 English or Chinese characters. Must start with a english letter or Chinese, and cannot start with http: // and https: //. Can contain numbers, colons (:), underscores (_), or hyphens (-).
32
+ :param pulumi.Input[str] license_type: The type of the license used to activate the operating system after the image is imported. Default value: `Auto`. Valid values: `Auto`,`Aliyun`,`BYOL`.
33
+ :param pulumi.Input[str] os_type: Operating system platform type. Valid values: `windows`, Default is `linux`.
34
+ :param pulumi.Input[str] platform: The operating system distribution. Default value: Others Linux.
35
+ More valid values refer to [ImportImage OpenAPI](https://www.alibabacloud.com/help/en/elastic-compute-service/latest/importimage).
36
+ **NOTE**: It's default value is Ubuntu before version 1.197.0.
38
37
  """
39
38
  pulumi.set(__self__, "disk_device_mappings", disk_device_mappings)
40
39
  if architecture is not None:
41
40
  pulumi.set(__self__, "architecture", architecture)
42
- if boot_mode is not None:
43
- pulumi.set(__self__, "boot_mode", boot_mode)
44
41
  if description is not None:
45
42
  pulumi.set(__self__, "description", description)
46
43
  if image_name is not None:
@@ -56,7 +53,7 @@ class ImageImportArgs:
56
53
  @pulumi.getter(name="diskDeviceMappings")
57
54
  def disk_device_mappings(self) -> pulumi.Input[Sequence[pulumi.Input['ImageImportDiskDeviceMappingArgs']]]:
58
55
  """
59
- The information about the custom image. See `disk_device_mapping` below.
56
+ Description of the system with disks and snapshots under the image.
60
57
  """
61
58
  return pulumi.get(self, "disk_device_mappings")
62
59
 
@@ -68,7 +65,7 @@ class ImageImportArgs:
68
65
  @pulumi.getter
69
66
  def architecture(self) -> Optional[pulumi.Input[str]]:
70
67
  """
71
- The architecture of the image. Default value: `x86_64`. Valid values: `x86_64`, `i386`.
68
+ Specifies the architecture of the system disk after you specify a data disk snapshot as the data source of the system disk for creating an image. Valid values: `i386` , Default is `x86_64`.
72
69
  """
73
70
  return pulumi.get(self, "architecture")
74
71
 
@@ -76,23 +73,11 @@ class ImageImportArgs:
76
73
  def architecture(self, value: Optional[pulumi.Input[str]]):
77
74
  pulumi.set(self, "architecture", value)
78
75
 
79
- @property
80
- @pulumi.getter(name="bootMode")
81
- def boot_mode(self) -> Optional[pulumi.Input[str]]:
82
- """
83
- The boot mode of the image. Valid values: `BIOS`, `UEFI`.
84
- """
85
- return pulumi.get(self, "boot_mode")
86
-
87
- @boot_mode.setter
88
- def boot_mode(self, value: Optional[pulumi.Input[str]]):
89
- pulumi.set(self, "boot_mode", value)
90
-
91
76
  @property
92
77
  @pulumi.getter
93
78
  def description(self) -> Optional[pulumi.Input[str]]:
94
79
  """
95
- The description of the image. The `description` must be 2 to 256 characters in length and cannot start with http:// or https://.
80
+ Description of the image. The length is 2 to 256 English or Chinese characters, and cannot begin with http: // and https: //.
96
81
  """
97
82
  return pulumi.get(self, "description")
98
83
 
@@ -104,7 +89,7 @@ class ImageImportArgs:
104
89
  @pulumi.getter(name="imageName")
105
90
  def image_name(self) -> Optional[pulumi.Input[str]]:
106
91
  """
107
- The name of the image. The `image_name` must be `2` to `128` characters in length. The `image_name` must start with a letter and cannot start with acs: or aliyun. The `image_name` cannot contain http:// or https://. The `image_name` can contain letters, digits, periods (.), colons (:), underscores (_), and hyphens (-).
92
+ The image name. The length is 2 ~ 128 English or Chinese characters. Must start with a english letter or Chinese, and cannot start with http: // and https: //. Can contain numbers, colons (:), underscores (_), or hyphens (-).
108
93
  """
109
94
  return pulumi.get(self, "image_name")
110
95
 
@@ -116,7 +101,7 @@ class ImageImportArgs:
116
101
  @pulumi.getter(name="licenseType")
117
102
  def license_type(self) -> Optional[pulumi.Input[str]]:
118
103
  """
119
- The type of the license used to activate the operating system after the image is imported. Default value: `Auto`. Valid values: `Auto`, `Aliyun`, `BYOL`.
104
+ The type of the license used to activate the operating system after the image is imported. Default value: `Auto`. Valid values: `Auto`,`Aliyun`,`BYOL`.
120
105
  """
121
106
  return pulumi.get(self, "license_type")
122
107
 
@@ -128,7 +113,7 @@ class ImageImportArgs:
128
113
  @pulumi.getter(name="osType")
129
114
  def os_type(self) -> Optional[pulumi.Input[str]]:
130
115
  """
131
- The type of the operating system. Default value: `linux`. Valid values: `windows`, `linux`.
116
+ Operating system platform type. Valid values: `windows`, Default is `linux`.
132
117
  """
133
118
  return pulumi.get(self, "os_type")
134
119
 
@@ -140,8 +125,9 @@ class ImageImportArgs:
140
125
  @pulumi.getter
141
126
  def platform(self) -> Optional[pulumi.Input[str]]:
142
127
  """
143
- The operating system platform. More valid values refer to [ImportImage OpenAPI](https://www.alibabacloud.com/help/en/elastic-compute-service/latest/importimage).
144
- > **NOTE:** Before provider version 1.197.0, the default value of `platform` is `Ubuntu`.
128
+ The operating system distribution. Default value: Others Linux.
129
+ More valid values refer to [ImportImage OpenAPI](https://www.alibabacloud.com/help/en/elastic-compute-service/latest/importimage).
130
+ **NOTE**: It's default value is Ubuntu before version 1.197.0.
145
131
  """
146
132
  return pulumi.get(self, "platform")
147
133
 
@@ -154,7 +140,6 @@ class ImageImportArgs:
154
140
  class _ImageImportState:
155
141
  def __init__(__self__, *,
156
142
  architecture: Optional[pulumi.Input[str]] = None,
157
- boot_mode: Optional[pulumi.Input[str]] = None,
158
143
  description: Optional[pulumi.Input[str]] = None,
159
144
  disk_device_mappings: Optional[pulumi.Input[Sequence[pulumi.Input['ImageImportDiskDeviceMappingArgs']]]] = None,
160
145
  image_name: Optional[pulumi.Input[str]] = None,
@@ -163,20 +148,18 @@ class _ImageImportState:
163
148
  platform: Optional[pulumi.Input[str]] = None):
164
149
  """
165
150
  Input properties used for looking up and filtering ImageImport resources.
166
- :param pulumi.Input[str] architecture: The architecture of the image. Default value: `x86_64`. Valid values: `x86_64`, `i386`.
167
- :param pulumi.Input[str] boot_mode: The boot mode of the image. Valid values: `BIOS`, `UEFI`.
168
- :param pulumi.Input[str] description: The description of the image. The `description` must be 2 to 256 characters in length and cannot start with http:// or https://.
169
- :param pulumi.Input[Sequence[pulumi.Input['ImageImportDiskDeviceMappingArgs']]] disk_device_mappings: The information about the custom image. See `disk_device_mapping` below.
170
- :param pulumi.Input[str] image_name: The name of the image. The `image_name` must be `2` to `128` characters in length. The `image_name` must start with a letter and cannot start with acs: or aliyun. The `image_name` cannot contain http:// or https://. The `image_name` can contain letters, digits, periods (.), colons (:), underscores (_), and hyphens (-).
171
- :param pulumi.Input[str] license_type: The type of the license used to activate the operating system after the image is imported. Default value: `Auto`. Valid values: `Auto`, `Aliyun`, `BYOL`.
172
- :param pulumi.Input[str] os_type: The type of the operating system. Default value: `linux`. Valid values: `windows`, `linux`.
173
- :param pulumi.Input[str] platform: The operating system platform. More valid values refer to [ImportImage OpenAPI](https://www.alibabacloud.com/help/en/elastic-compute-service/latest/importimage).
174
- > **NOTE:** Before provider version 1.197.0, the default value of `platform` is `Ubuntu`.
151
+ :param pulumi.Input[str] architecture: Specifies the architecture of the system disk after you specify a data disk snapshot as the data source of the system disk for creating an image. Valid values: `i386` , Default is `x86_64`.
152
+ :param pulumi.Input[str] description: Description of the image. The length is 2 to 256 English or Chinese characters, and cannot begin with http: // and https: //.
153
+ :param pulumi.Input[Sequence[pulumi.Input['ImageImportDiskDeviceMappingArgs']]] disk_device_mappings: Description of the system with disks and snapshots under the image.
154
+ :param pulumi.Input[str] image_name: The image name. The length is 2 ~ 128 English or Chinese characters. Must start with a english letter or Chinese, and cannot start with http: // and https: //. Can contain numbers, colons (:), underscores (_), or hyphens (-).
155
+ :param pulumi.Input[str] license_type: The type of the license used to activate the operating system after the image is imported. Default value: `Auto`. Valid values: `Auto`,`Aliyun`,`BYOL`.
156
+ :param pulumi.Input[str] os_type: Operating system platform type. Valid values: `windows`, Default is `linux`.
157
+ :param pulumi.Input[str] platform: The operating system distribution. Default value: Others Linux.
158
+ More valid values refer to [ImportImage OpenAPI](https://www.alibabacloud.com/help/en/elastic-compute-service/latest/importimage).
159
+ **NOTE**: It's default value is Ubuntu before version 1.197.0.
175
160
  """
176
161
  if architecture is not None:
177
162
  pulumi.set(__self__, "architecture", architecture)
178
- if boot_mode is not None:
179
- pulumi.set(__self__, "boot_mode", boot_mode)
180
163
  if description is not None:
181
164
  pulumi.set(__self__, "description", description)
182
165
  if disk_device_mappings is not None:
@@ -194,7 +177,7 @@ class _ImageImportState:
194
177
  @pulumi.getter
195
178
  def architecture(self) -> Optional[pulumi.Input[str]]:
196
179
  """
197
- The architecture of the image. Default value: `x86_64`. Valid values: `x86_64`, `i386`.
180
+ Specifies the architecture of the system disk after you specify a data disk snapshot as the data source of the system disk for creating an image. Valid values: `i386` , Default is `x86_64`.
198
181
  """
199
182
  return pulumi.get(self, "architecture")
200
183
 
@@ -202,23 +185,11 @@ class _ImageImportState:
202
185
  def architecture(self, value: Optional[pulumi.Input[str]]):
203
186
  pulumi.set(self, "architecture", value)
204
187
 
205
- @property
206
- @pulumi.getter(name="bootMode")
207
- def boot_mode(self) -> Optional[pulumi.Input[str]]:
208
- """
209
- The boot mode of the image. Valid values: `BIOS`, `UEFI`.
210
- """
211
- return pulumi.get(self, "boot_mode")
212
-
213
- @boot_mode.setter
214
- def boot_mode(self, value: Optional[pulumi.Input[str]]):
215
- pulumi.set(self, "boot_mode", value)
216
-
217
188
  @property
218
189
  @pulumi.getter
219
190
  def description(self) -> Optional[pulumi.Input[str]]:
220
191
  """
221
- The description of the image. The `description` must be 2 to 256 characters in length and cannot start with http:// or https://.
192
+ Description of the image. The length is 2 to 256 English or Chinese characters, and cannot begin with http: // and https: //.
222
193
  """
223
194
  return pulumi.get(self, "description")
224
195
 
@@ -230,7 +201,7 @@ class _ImageImportState:
230
201
  @pulumi.getter(name="diskDeviceMappings")
231
202
  def disk_device_mappings(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['ImageImportDiskDeviceMappingArgs']]]]:
232
203
  """
233
- The information about the custom image. See `disk_device_mapping` below.
204
+ Description of the system with disks and snapshots under the image.
234
205
  """
235
206
  return pulumi.get(self, "disk_device_mappings")
236
207
 
@@ -242,7 +213,7 @@ class _ImageImportState:
242
213
  @pulumi.getter(name="imageName")
243
214
  def image_name(self) -> Optional[pulumi.Input[str]]:
244
215
  """
245
- The name of the image. The `image_name` must be `2` to `128` characters in length. The `image_name` must start with a letter and cannot start with acs: or aliyun. The `image_name` cannot contain http:// or https://. The `image_name` can contain letters, digits, periods (.), colons (:), underscores (_), and hyphens (-).
216
+ The image name. The length is 2 ~ 128 English or Chinese characters. Must start with a english letter or Chinese, and cannot start with http: // and https: //. Can contain numbers, colons (:), underscores (_), or hyphens (-).
246
217
  """
247
218
  return pulumi.get(self, "image_name")
248
219
 
@@ -254,7 +225,7 @@ class _ImageImportState:
254
225
  @pulumi.getter(name="licenseType")
255
226
  def license_type(self) -> Optional[pulumi.Input[str]]:
256
227
  """
257
- The type of the license used to activate the operating system after the image is imported. Default value: `Auto`. Valid values: `Auto`, `Aliyun`, `BYOL`.
228
+ The type of the license used to activate the operating system after the image is imported. Default value: `Auto`. Valid values: `Auto`,`Aliyun`,`BYOL`.
258
229
  """
259
230
  return pulumi.get(self, "license_type")
260
231
 
@@ -266,7 +237,7 @@ class _ImageImportState:
266
237
  @pulumi.getter(name="osType")
267
238
  def os_type(self) -> Optional[pulumi.Input[str]]:
268
239
  """
269
- The type of the operating system. Default value: `linux`. Valid values: `windows`, `linux`.
240
+ Operating system platform type. Valid values: `windows`, Default is `linux`.
270
241
  """
271
242
  return pulumi.get(self, "os_type")
272
243
 
@@ -278,8 +249,9 @@ class _ImageImportState:
278
249
  @pulumi.getter
279
250
  def platform(self) -> Optional[pulumi.Input[str]]:
280
251
  """
281
- The operating system platform. More valid values refer to [ImportImage OpenAPI](https://www.alibabacloud.com/help/en/elastic-compute-service/latest/importimage).
282
- > **NOTE:** Before provider version 1.197.0, the default value of `platform` is `Ubuntu`.
252
+ The operating system distribution. Default value: Others Linux.
253
+ More valid values refer to [ImportImage OpenAPI](https://www.alibabacloud.com/help/en/elastic-compute-service/latest/importimage).
254
+ **NOTE**: It's default value is Ubuntu before version 1.197.0.
283
255
  """
284
256
  return pulumi.get(self, "platform")
285
257
 
@@ -294,7 +266,6 @@ class ImageImport(pulumi.CustomResource):
294
266
  resource_name: str,
295
267
  opts: Optional[pulumi.ResourceOptions] = None,
296
268
  architecture: Optional[pulumi.Input[str]] = None,
297
- boot_mode: Optional[pulumi.Input[str]] = None,
298
269
  description: Optional[pulumi.Input[str]] = None,
299
270
  disk_device_mappings: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ImageImportDiskDeviceMappingArgs']]]]] = None,
300
271
  image_name: Optional[pulumi.Input[str]] = None,
@@ -303,70 +274,59 @@ class ImageImport(pulumi.CustomResource):
303
274
  platform: Optional[pulumi.Input[str]] = None,
304
275
  __props__=None):
305
276
  """
306
- Provides a ECS Image Import resource.
307
-
308
- For information about ECS Image Import and how to use it, see [What is Image Import](https://www.alibabacloud.com/help/en/ecs/developer-reference/api-ecs-2014-05-26-importimage).
309
-
310
- > **NOTE:** Available since v1.69.0.
277
+ Import a copy of your local on-premise file to ECS, and appear as a custom replacement in the corresponding domain.
311
278
 
312
279
  > **NOTE:** You must upload the image file to the object storage OSS in advance.
313
280
 
314
281
  > **NOTE:** The region where the image is imported must be the same region as the OSS bucket where the image file is uploaded.
315
282
 
316
- ## Example Usage
283
+ > **NOTE:** Available in 1.69.0+.
317
284
 
318
- Basic Usage
285
+ ## Example Usage
319
286
 
320
287
  ```python
321
288
  import pulumi
322
289
  import pulumi_alicloud as alicloud
323
290
 
324
- config = pulumi.Config()
325
- name = config.get("name")
326
- if name is None:
327
- name = "terraform-image-import-example"
328
- default = alicloud.oss.Bucket("default", bucket=name)
329
- default_bucket_object = alicloud.oss.BucketObject("default",
330
- bucket=default.id,
331
- key="fc/hello.zip",
332
- content=\"\"\" # -*- coding: utf-8 -*-
333
- def handler(event, context):
334
- print "hello world"
335
- return 'hello world'
336
- \"\"\")
337
- default_image_import = alicloud.ecs.ImageImport("default",
291
+ this = alicloud.ecs.ImageImport("this",
292
+ description="test import image",
338
293
  architecture="x86_64",
339
- os_type="linux",
340
- platform="Ubuntu",
294
+ image_name="test-import-image",
341
295
  license_type="Auto",
342
- image_name=name,
343
- description=name,
296
+ platform="Ubuntu",
297
+ os_type="linux",
344
298
  disk_device_mappings=[alicloud.ecs.ImageImportDiskDeviceMappingArgs(
345
- oss_bucket=default.id,
346
- oss_object=default_bucket_object.id,
347
299
  disk_image_size=5,
300
+ oss_bucket="testimportimage",
301
+ oss_object="root.img",
348
302
  )])
349
303
  ```
350
304
 
305
+ ## Attributes Reference0
306
+
307
+ The following attributes are exported:
308
+
309
+ * `id` - ID of the image.
310
+
351
311
  ## Import
352
312
 
353
- ECS Image Import can be imported using the id, e.g.
313
+ image can be imported using the id, e.g.
354
314
 
355
315
  ```sh
356
- $ pulumi import alicloud:ecs/imageImport:ImageImport example <id>
316
+ $ pulumi import alicloud:ecs/imageImport:ImageImport default m-uf66871ape***yg1q***
357
317
  ```
358
318
 
359
319
  :param str resource_name: The name of the resource.
360
320
  :param pulumi.ResourceOptions opts: Options for the resource.
361
- :param pulumi.Input[str] architecture: The architecture of the image. Default value: `x86_64`. Valid values: `x86_64`, `i386`.
362
- :param pulumi.Input[str] boot_mode: The boot mode of the image. Valid values: `BIOS`, `UEFI`.
363
- :param pulumi.Input[str] description: The description of the image. The `description` must be 2 to 256 characters in length and cannot start with http:// or https://.
364
- :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ImageImportDiskDeviceMappingArgs']]]] disk_device_mappings: The information about the custom image. See `disk_device_mapping` below.
365
- :param pulumi.Input[str] image_name: The name of the image. The `image_name` must be `2` to `128` characters in length. The `image_name` must start with a letter and cannot start with acs: or aliyun. The `image_name` cannot contain http:// or https://. The `image_name` can contain letters, digits, periods (.), colons (:), underscores (_), and hyphens (-).
366
- :param pulumi.Input[str] license_type: The type of the license used to activate the operating system after the image is imported. Default value: `Auto`. Valid values: `Auto`, `Aliyun`, `BYOL`.
367
- :param pulumi.Input[str] os_type: The type of the operating system. Default value: `linux`. Valid values: `windows`, `linux`.
368
- :param pulumi.Input[str] platform: The operating system platform. More valid values refer to [ImportImage OpenAPI](https://www.alibabacloud.com/help/en/elastic-compute-service/latest/importimage).
369
- > **NOTE:** Before provider version 1.197.0, the default value of `platform` is `Ubuntu`.
321
+ :param pulumi.Input[str] architecture: Specifies the architecture of the system disk after you specify a data disk snapshot as the data source of the system disk for creating an image. Valid values: `i386` , Default is `x86_64`.
322
+ :param pulumi.Input[str] description: Description of the image. The length is 2 to 256 English or Chinese characters, and cannot begin with http: // and https: //.
323
+ :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ImageImportDiskDeviceMappingArgs']]]] disk_device_mappings: Description of the system with disks and snapshots under the image.
324
+ :param pulumi.Input[str] image_name: The image name. The length is 2 ~ 128 English or Chinese characters. Must start with a english letter or Chinese, and cannot start with http: // and https: //. Can contain numbers, colons (:), underscores (_), or hyphens (-).
325
+ :param pulumi.Input[str] license_type: The type of the license used to activate the operating system after the image is imported. Default value: `Auto`. Valid values: `Auto`,`Aliyun`,`BYOL`.
326
+ :param pulumi.Input[str] os_type: Operating system platform type. Valid values: `windows`, Default is `linux`.
327
+ :param pulumi.Input[str] platform: The operating system distribution. Default value: Others Linux.
328
+ More valid values refer to [ImportImage OpenAPI](https://www.alibabacloud.com/help/en/elastic-compute-service/latest/importimage).
329
+ **NOTE**: It's default value is Ubuntu before version 1.197.0.
370
330
  """
371
331
  ...
372
332
  @overload
@@ -375,57 +335,46 @@ class ImageImport(pulumi.CustomResource):
375
335
  args: ImageImportArgs,
376
336
  opts: Optional[pulumi.ResourceOptions] = None):
377
337
  """
378
- Provides a ECS Image Import resource.
379
-
380
- For information about ECS Image Import and how to use it, see [What is Image Import](https://www.alibabacloud.com/help/en/ecs/developer-reference/api-ecs-2014-05-26-importimage).
381
-
382
- > **NOTE:** Available since v1.69.0.
338
+ Import a copy of your local on-premise file to ECS, and appear as a custom replacement in the corresponding domain.
383
339
 
384
340
  > **NOTE:** You must upload the image file to the object storage OSS in advance.
385
341
 
386
342
  > **NOTE:** The region where the image is imported must be the same region as the OSS bucket where the image file is uploaded.
387
343
 
388
- ## Example Usage
344
+ > **NOTE:** Available in 1.69.0+.
389
345
 
390
- Basic Usage
346
+ ## Example Usage
391
347
 
392
348
  ```python
393
349
  import pulumi
394
350
  import pulumi_alicloud as alicloud
395
351
 
396
- config = pulumi.Config()
397
- name = config.get("name")
398
- if name is None:
399
- name = "terraform-image-import-example"
400
- default = alicloud.oss.Bucket("default", bucket=name)
401
- default_bucket_object = alicloud.oss.BucketObject("default",
402
- bucket=default.id,
403
- key="fc/hello.zip",
404
- content=\"\"\" # -*- coding: utf-8 -*-
405
- def handler(event, context):
406
- print "hello world"
407
- return 'hello world'
408
- \"\"\")
409
- default_image_import = alicloud.ecs.ImageImport("default",
352
+ this = alicloud.ecs.ImageImport("this",
353
+ description="test import image",
410
354
  architecture="x86_64",
411
- os_type="linux",
412
- platform="Ubuntu",
355
+ image_name="test-import-image",
413
356
  license_type="Auto",
414
- image_name=name,
415
- description=name,
357
+ platform="Ubuntu",
358
+ os_type="linux",
416
359
  disk_device_mappings=[alicloud.ecs.ImageImportDiskDeviceMappingArgs(
417
- oss_bucket=default.id,
418
- oss_object=default_bucket_object.id,
419
360
  disk_image_size=5,
361
+ oss_bucket="testimportimage",
362
+ oss_object="root.img",
420
363
  )])
421
364
  ```
422
365
 
366
+ ## Attributes Reference0
367
+
368
+ The following attributes are exported:
369
+
370
+ * `id` - ID of the image.
371
+
423
372
  ## Import
424
373
 
425
- ECS Image Import can be imported using the id, e.g.
374
+ image can be imported using the id, e.g.
426
375
 
427
376
  ```sh
428
- $ pulumi import alicloud:ecs/imageImport:ImageImport example <id>
377
+ $ pulumi import alicloud:ecs/imageImport:ImageImport default m-uf66871ape***yg1q***
429
378
  ```
430
379
 
431
380
  :param str resource_name: The name of the resource.
@@ -444,7 +393,6 @@ class ImageImport(pulumi.CustomResource):
444
393
  resource_name: str,
445
394
  opts: Optional[pulumi.ResourceOptions] = None,
446
395
  architecture: Optional[pulumi.Input[str]] = None,
447
- boot_mode: Optional[pulumi.Input[str]] = None,
448
396
  description: Optional[pulumi.Input[str]] = None,
449
397
  disk_device_mappings: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ImageImportDiskDeviceMappingArgs']]]]] = None,
450
398
  image_name: Optional[pulumi.Input[str]] = None,
@@ -461,7 +409,6 @@ class ImageImport(pulumi.CustomResource):
461
409
  __props__ = ImageImportArgs.__new__(ImageImportArgs)
462
410
 
463
411
  __props__.__dict__["architecture"] = architecture
464
- __props__.__dict__["boot_mode"] = boot_mode
465
412
  __props__.__dict__["description"] = description
466
413
  if disk_device_mappings is None and not opts.urn:
467
414
  raise TypeError("Missing required property 'disk_device_mappings'")
@@ -481,7 +428,6 @@ class ImageImport(pulumi.CustomResource):
481
428
  id: pulumi.Input[str],
482
429
  opts: Optional[pulumi.ResourceOptions] = None,
483
430
  architecture: Optional[pulumi.Input[str]] = None,
484
- boot_mode: Optional[pulumi.Input[str]] = None,
485
431
  description: Optional[pulumi.Input[str]] = None,
486
432
  disk_device_mappings: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ImageImportDiskDeviceMappingArgs']]]]] = None,
487
433
  image_name: Optional[pulumi.Input[str]] = None,
@@ -495,22 +441,21 @@ class ImageImport(pulumi.CustomResource):
495
441
  :param str resource_name: The unique name of the resulting resource.
496
442
  :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
497
443
  :param pulumi.ResourceOptions opts: Options for the resource.
498
- :param pulumi.Input[str] architecture: The architecture of the image. Default value: `x86_64`. Valid values: `x86_64`, `i386`.
499
- :param pulumi.Input[str] boot_mode: The boot mode of the image. Valid values: `BIOS`, `UEFI`.
500
- :param pulumi.Input[str] description: The description of the image. The `description` must be 2 to 256 characters in length and cannot start with http:// or https://.
501
- :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ImageImportDiskDeviceMappingArgs']]]] disk_device_mappings: The information about the custom image. See `disk_device_mapping` below.
502
- :param pulumi.Input[str] image_name: The name of the image. The `image_name` must be `2` to `128` characters in length. The `image_name` must start with a letter and cannot start with acs: or aliyun. The `image_name` cannot contain http:// or https://. The `image_name` can contain letters, digits, periods (.), colons (:), underscores (_), and hyphens (-).
503
- :param pulumi.Input[str] license_type: The type of the license used to activate the operating system after the image is imported. Default value: `Auto`. Valid values: `Auto`, `Aliyun`, `BYOL`.
504
- :param pulumi.Input[str] os_type: The type of the operating system. Default value: `linux`. Valid values: `windows`, `linux`.
505
- :param pulumi.Input[str] platform: The operating system platform. More valid values refer to [ImportImage OpenAPI](https://www.alibabacloud.com/help/en/elastic-compute-service/latest/importimage).
506
- > **NOTE:** Before provider version 1.197.0, the default value of `platform` is `Ubuntu`.
444
+ :param pulumi.Input[str] architecture: Specifies the architecture of the system disk after you specify a data disk snapshot as the data source of the system disk for creating an image. Valid values: `i386` , Default is `x86_64`.
445
+ :param pulumi.Input[str] description: Description of the image. The length is 2 to 256 English or Chinese characters, and cannot begin with http: // and https: //.
446
+ :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ImageImportDiskDeviceMappingArgs']]]] disk_device_mappings: Description of the system with disks and snapshots under the image.
447
+ :param pulumi.Input[str] image_name: The image name. The length is 2 ~ 128 English or Chinese characters. Must start with a english letter or Chinese, and cannot start with http: // and https: //. Can contain numbers, colons (:), underscores (_), or hyphens (-).
448
+ :param pulumi.Input[str] license_type: The type of the license used to activate the operating system after the image is imported. Default value: `Auto`. Valid values: `Auto`,`Aliyun`,`BYOL`.
449
+ :param pulumi.Input[str] os_type: Operating system platform type. Valid values: `windows`, Default is `linux`.
450
+ :param pulumi.Input[str] platform: The operating system distribution. Default value: Others Linux.
451
+ More valid values refer to [ImportImage OpenAPI](https://www.alibabacloud.com/help/en/elastic-compute-service/latest/importimage).
452
+ **NOTE**: It's default value is Ubuntu before version 1.197.0.
507
453
  """
508
454
  opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
509
455
 
510
456
  __props__ = _ImageImportState.__new__(_ImageImportState)
511
457
 
512
458
  __props__.__dict__["architecture"] = architecture
513
- __props__.__dict__["boot_mode"] = boot_mode
514
459
  __props__.__dict__["description"] = description
515
460
  __props__.__dict__["disk_device_mappings"] = disk_device_mappings
516
461
  __props__.__dict__["image_name"] = image_name
@@ -523,23 +468,15 @@ class ImageImport(pulumi.CustomResource):
523
468
  @pulumi.getter
524
469
  def architecture(self) -> pulumi.Output[Optional[str]]:
525
470
  """
526
- The architecture of the image. Default value: `x86_64`. Valid values: `x86_64`, `i386`.
471
+ Specifies the architecture of the system disk after you specify a data disk snapshot as the data source of the system disk for creating an image. Valid values: `i386` , Default is `x86_64`.
527
472
  """
528
473
  return pulumi.get(self, "architecture")
529
474
 
530
- @property
531
- @pulumi.getter(name="bootMode")
532
- def boot_mode(self) -> pulumi.Output[str]:
533
- """
534
- The boot mode of the image. Valid values: `BIOS`, `UEFI`.
535
- """
536
- return pulumi.get(self, "boot_mode")
537
-
538
475
  @property
539
476
  @pulumi.getter
540
477
  def description(self) -> pulumi.Output[Optional[str]]:
541
478
  """
542
- The description of the image. The `description` must be 2 to 256 characters in length and cannot start with http:// or https://.
479
+ Description of the image. The length is 2 to 256 English or Chinese characters, and cannot begin with http: // and https: //.
543
480
  """
544
481
  return pulumi.get(self, "description")
545
482
 
@@ -547,15 +484,15 @@ class ImageImport(pulumi.CustomResource):
547
484
  @pulumi.getter(name="diskDeviceMappings")
548
485
  def disk_device_mappings(self) -> pulumi.Output[Sequence['outputs.ImageImportDiskDeviceMapping']]:
549
486
  """
550
- The information about the custom image. See `disk_device_mapping` below.
487
+ Description of the system with disks and snapshots under the image.
551
488
  """
552
489
  return pulumi.get(self, "disk_device_mappings")
553
490
 
554
491
  @property
555
492
  @pulumi.getter(name="imageName")
556
- def image_name(self) -> pulumi.Output[str]:
493
+ def image_name(self) -> pulumi.Output[Optional[str]]:
557
494
  """
558
- The name of the image. The `image_name` must be `2` to `128` characters in length. The `image_name` must start with a letter and cannot start with acs: or aliyun. The `image_name` cannot contain http:// or https://. The `image_name` can contain letters, digits, periods (.), colons (:), underscores (_), and hyphens (-).
495
+ The image name. The length is 2 ~ 128 English or Chinese characters. Must start with a english letter or Chinese, and cannot start with http: // and https: //. Can contain numbers, colons (:), underscores (_), or hyphens (-).
559
496
  """
560
497
  return pulumi.get(self, "image_name")
561
498
 
@@ -563,7 +500,7 @@ class ImageImport(pulumi.CustomResource):
563
500
  @pulumi.getter(name="licenseType")
564
501
  def license_type(self) -> pulumi.Output[Optional[str]]:
565
502
  """
566
- The type of the license used to activate the operating system after the image is imported. Default value: `Auto`. Valid values: `Auto`, `Aliyun`, `BYOL`.
503
+ The type of the license used to activate the operating system after the image is imported. Default value: `Auto`. Valid values: `Auto`,`Aliyun`,`BYOL`.
567
504
  """
568
505
  return pulumi.get(self, "license_type")
569
506
 
@@ -571,7 +508,7 @@ class ImageImport(pulumi.CustomResource):
571
508
  @pulumi.getter(name="osType")
572
509
  def os_type(self) -> pulumi.Output[Optional[str]]:
573
510
  """
574
- The type of the operating system. Default value: `linux`. Valid values: `windows`, `linux`.
511
+ Operating system platform type. Valid values: `windows`, Default is `linux`.
575
512
  """
576
513
  return pulumi.get(self, "os_type")
577
514
 
@@ -579,8 +516,9 @@ class ImageImport(pulumi.CustomResource):
579
516
  @pulumi.getter
580
517
  def platform(self) -> pulumi.Output[str]:
581
518
  """
582
- The operating system platform. More valid values refer to [ImportImage OpenAPI](https://www.alibabacloud.com/help/en/elastic-compute-service/latest/importimage).
583
- > **NOTE:** Before provider version 1.197.0, the default value of `platform` is `Ubuntu`.
519
+ The operating system distribution. Default value: Others Linux.
520
+ More valid values refer to [ImportImage OpenAPI](https://www.alibabacloud.com/help/en/elastic-compute-service/latest/importimage).
521
+ **NOTE**: It's default value is Ubuntu before version 1.197.0.
584
522
  """
585
523
  return pulumi.get(self, "platform")
586
524
 
pulumi_alicloud/ecs/outputs.py CHANGED
@@ -964,11 +964,13 @@ class ImageImportDiskDeviceMapping(dict):
964
964
  oss_bucket: Optional[str] = None,
965
965
  oss_object: Optional[str] = None):
966
966
  """
967
- :param str device: The device name of the disk.
968
- :param int disk_image_size: The size of the disk. Default value: `5`.
969
- :param str format: The format of the image. Valid values: `RAW`, `VHD`, `qcow2`.
970
- :param str oss_bucket: The OSS bucket where the image file is stored.
971
- :param str oss_object: The name (key) of the object that the uploaded image is stored as in the OSS bucket.
967
+ :param str device: The name of disk N in the custom image.
968
+ :param int disk_image_size: Resolution size. You must ensure that the system disk space ≥ file system space. Ranges: When n = 1, the system disk: 5 ~ 500GiB, When n = 2 ~ 17, that is, data disk: 5 ~ 1000GiB, When temporary is introduced, the system automatically detects the size, which is subject to the detection result.
969
+ :param str format: Image format. Value range: When the `RAW`, `VHD`, `qcow2` is imported into the image, the system automatically detects the image format, whichever comes first.
970
+ :param str oss_bucket: Save the exported OSS bucket.
971
+ :param str oss_object: The file name of your OSS Object.
972
+
973
+ > **NOTE:** The disk_device_mapping is a list and it's first item will be used to system disk and other items are used to data disks.
972
974
  """
973
975
  if device is not None:
974
976
  pulumi.set(__self__, "device", device)
@@ -985,7 +987,7 @@ class ImageImportDiskDeviceMapping(dict):
985
987
  @pulumi.getter
986
988
  def device(self) -> Optional[str]:
987
989
  """
988
- The device name of the disk.
990
+ The name of disk N in the custom image.
989
991
  """
990
992
  return pulumi.get(self, "device")
991
993
 
@@ -993,7 +995,7 @@ class ImageImportDiskDeviceMapping(dict):
993
995
  @pulumi.getter(name="diskImageSize")
994
996
  def disk_image_size(self) -> Optional[int]:
995
997
  """
996
- The size of the disk. Default value: `5`.
998
+ Resolution size. You must ensure that the system disk space ≥ file system space. Ranges: When n = 1, the system disk: 5 ~ 500GiB, When n = 2 ~ 17, that is, data disk: 5 ~ 1000GiB, When temporary is introduced, the system automatically detects the size, which is subject to the detection result.
997
999
  """
998
1000
  return pulumi.get(self, "disk_image_size")
999
1001
 
@@ -1001,7 +1003,7 @@ class ImageImportDiskDeviceMapping(dict):
1001
1003
  @pulumi.getter
1002
1004
  def format(self) -> Optional[str]:
1003
1005
  """
1004
- The format of the image. Valid values: `RAW`, `VHD`, `qcow2`.
1006
+ Image format. Value range: When the `RAW`, `VHD`, `qcow2` is imported into the image, the system automatically detects the image format, whichever comes first.
1005
1007
  """
1006
1008
  return pulumi.get(self, "format")
1007
1009
 
@@ -1009,7 +1011,7 @@ class ImageImportDiskDeviceMapping(dict):
1009
1011
  @pulumi.getter(name="ossBucket")
1010
1012
  def oss_bucket(self) -> Optional[str]:
1011
1013
  """
1012
- The OSS bucket where the image file is stored.
1014
+ Save the exported OSS bucket.
1013
1015
  """
1014
1016
  return pulumi.get(self, "oss_bucket")
1015
1017
 
@@ -1017,7 +1019,9 @@ class ImageImportDiskDeviceMapping(dict):
1017
1019
  @pulumi.getter(name="ossObject")
1018
1020
  def oss_object(self) -> Optional[str]:
1019
1021
  """
1020
- The name (key) of the object that the uploaded image is stored as in the OSS bucket.
1022
+ The file name of your OSS Object.
1023
+
1024
+ > **NOTE:** The disk_device_mapping is a list and it's first item will be used to system disk and other items are used to data disks.
1021
1025
  """
1022
1026
  return pulumi.get(self, "oss_object")
1023
1027