pulumi-alicloud 3.56.0a1717175543__py3-none-any.whl → 3.57.0__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.
Files changed (55) hide show
  1. pulumi_alicloud/__init__.py +72 -0
  2. pulumi_alicloud/cen/get_transit_router_available_resources.py +32 -11
  3. pulumi_alicloud/cen/outputs.py +23 -1
  4. pulumi_alicloud/cfg/remediation.py +10 -2
  5. pulumi_alicloud/clickhouse/db_cluster.py +47 -0
  6. pulumi_alicloud/cms/__init__.py +1 -0
  7. pulumi_alicloud/cms/_inputs.py +18 -18
  8. pulumi_alicloud/cms/alarm.py +38 -26
  9. pulumi_alicloud/cms/get_site_monitors.py +243 -0
  10. pulumi_alicloud/cms/outputs.py +92 -18
  11. pulumi_alicloud/cs/node_pool.py +7 -7
  12. pulumi_alicloud/ecs/_inputs.py +10 -14
  13. pulumi_alicloud/ecs/image_import.py +162 -100
  14. pulumi_alicloud/ecs/outputs.py +10 -14
  15. pulumi_alicloud/ecs/security_group_rule.py +2 -2
  16. pulumi_alicloud/eds/network_package.py +22 -8
  17. pulumi_alicloud/expressconnect/__init__.py +8 -0
  18. pulumi_alicloud/expressconnect/_inputs.py +40 -0
  19. pulumi_alicloud/expressconnect/outputs.py +51 -0
  20. pulumi_alicloud/expressconnect/router_express_connect_router.py +458 -0
  21. pulumi_alicloud/expressconnect/router_tr_association.py +578 -0
  22. pulumi_alicloud/expressconnect/router_vbr_child_instance.py +475 -0
  23. pulumi_alicloud/expressconnect/router_vpc_association.py +500 -0
  24. pulumi_alicloud/expressconnect/traffic_qos.py +284 -0
  25. pulumi_alicloud/expressconnect/traffic_qos_association.py +336 -0
  26. pulumi_alicloud/expressconnect/traffic_qos_queue.py +520 -0
  27. pulumi_alicloud/expressconnect/traffic_qos_rule.py +1174 -0
  28. pulumi_alicloud/gpdb/__init__.py +1 -0
  29. pulumi_alicloud/gpdb/db_resource_group.py +364 -0
  30. pulumi_alicloud/gpdb/instance.py +47 -0
  31. pulumi_alicloud/hbase/get_instance_types.py +2 -2
  32. pulumi_alicloud/mongodb/instance.py +7 -7
  33. pulumi_alicloud/oss/bucket_cors.py +8 -4
  34. pulumi_alicloud/oss/bucket_data_redundancy_transition.py +12 -4
  35. pulumi_alicloud/oss/bucket_public_access_block.py +12 -4
  36. pulumi_alicloud/ots/instance.py +7 -7
  37. pulumi_alicloud/ots/table.py +149 -8
  38. pulumi_alicloud/pulumi-plugin.json +1 -1
  39. pulumi_alicloud/sae/load_balancer_internet.py +4 -2
  40. pulumi_alicloud/sae/load_balancer_intranet.py +4 -2
  41. pulumi_alicloud/servicemesh/_inputs.py +0 -6
  42. pulumi_alicloud/servicemesh/outputs.py +0 -6
  43. pulumi_alicloud/servicemesh/service_mesh.py +2 -2
  44. pulumi_alicloud/simpleapplicationserver/snapshot.py +10 -2
  45. pulumi_alicloud/vpc/bgp_peer.py +36 -8
  46. pulumi_alicloud/vpc/network.py +0 -4
  47. pulumi_alicloud/vpn/connection.py +220 -0
  48. pulumi_alicloud/vpn/gateway_vpn_attachment.py +2 -2
  49. pulumi_alicloud/vpn/ipsec_server.py +20 -12
  50. pulumi_alicloud/vpn/pbr_route_entry.py +152 -16
  51. pulumi_alicloud/vpn/route_entry.py +158 -44
  52. {pulumi_alicloud-3.56.0a1717175543.dist-info → pulumi_alicloud-3.57.0.dist-info}/METADATA +1 -1
  53. {pulumi_alicloud-3.56.0a1717175543.dist-info → pulumi_alicloud-3.57.0.dist-info}/RECORD +55 -45
  54. {pulumi_alicloud-3.56.0a1717175543.dist-info → pulumi_alicloud-3.57.0.dist-info}/WHEEL +0 -0
  55. {pulumi_alicloud-3.56.0a1717175543.dist-info → pulumi_alicloud-3.57.0.dist-info}/top_level.txt +0 -0
pulumi_alicloud/ecs/_inputs.py CHANGED
@@ -903,13 +903,11 @@ class ImageImportDiskDeviceMappingArgs:
903
903
  oss_bucket: Optional[pulumi.Input[str]] = None,
904
904
  oss_object: Optional[pulumi.Input[str]] = None):
905
905
  """
906
- :param pulumi.Input[str] device: The name of disk N in the custom image.
907
- :param pulumi.Input[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.
908
- :param pulumi.Input[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.
909
- :param pulumi.Input[str] oss_bucket: Save the exported OSS bucket.
910
- :param pulumi.Input[str] oss_object: The file name of your OSS Object.
911
-
912
- > **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.
906
+ :param pulumi.Input[str] device: The device name of the disk.
907
+ :param pulumi.Input[int] disk_image_size: The size of the disk. Default value: `5`.
908
+ :param pulumi.Input[str] format: The format of the image. Valid values: `RAW`, `VHD`, `qcow2`.
909
+ :param pulumi.Input[str] oss_bucket: The OSS bucket where the image file is stored.
910
+ :param pulumi.Input[str] oss_object: The name (key) of the object that the uploaded image is stored as in the OSS bucket.
913
911
  """
914
912
  if device is not None:
915
913
  pulumi.set(__self__, "device", device)
@@ -926,7 +924,7 @@ class ImageImportDiskDeviceMappingArgs:
926
924
  @pulumi.getter
927
925
  def device(self) -> Optional[pulumi.Input[str]]:
928
926
  """
929
- The name of disk N in the custom image.
927
+ The device name of the disk.
930
928
  """
931
929
  return pulumi.get(self, "device")
932
930
 
@@ -938,7 +936,7 @@ class ImageImportDiskDeviceMappingArgs:
938
936
  @pulumi.getter(name="diskImageSize")
939
937
  def disk_image_size(self) -> Optional[pulumi.Input[int]]:
940
938
  """
941
- 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.
939
+ The size of the disk. Default value: `5`.
942
940
  """
943
941
  return pulumi.get(self, "disk_image_size")
944
942
 
@@ -950,7 +948,7 @@ class ImageImportDiskDeviceMappingArgs:
950
948
  @pulumi.getter
951
949
  def format(self) -> Optional[pulumi.Input[str]]:
952
950
  """
953
- Image format. Value range: When the `RAW`, `VHD`, `qcow2` is imported into the image, the system automatically detects the image format, whichever comes first.
951
+ The format of the image. Valid values: `RAW`, `VHD`, `qcow2`.
954
952
  """
955
953
  return pulumi.get(self, "format")
956
954
 
@@ -962,7 +960,7 @@ class ImageImportDiskDeviceMappingArgs:
962
960
  @pulumi.getter(name="ossBucket")
963
961
  def oss_bucket(self) -> Optional[pulumi.Input[str]]:
964
962
  """
965
- Save the exported OSS bucket.
963
+ The OSS bucket where the image file is stored.
966
964
  """
967
965
  return pulumi.get(self, "oss_bucket")
968
966
 
@@ -974,9 +972,7 @@ class ImageImportDiskDeviceMappingArgs:
974
972
  @pulumi.getter(name="ossObject")
975
973
  def oss_object(self) -> Optional[pulumi.Input[str]]:
976
974
  """
977
- The file name of your OSS Object.
978
-
979
- > **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.
975
+ The name (key) of the object that the uploaded image is stored as in the OSS bucket.
980
976
  """
981
977
  return pulumi.get(self, "oss_object")
982
978
 
pulumi_alicloud/ecs/image_import.py CHANGED
@@ -18,6 +18,7 @@ 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,
21
22
  description: Optional[pulumi.Input[str]] = None,
22
23
  image_name: Optional[pulumi.Input[str]] = None,
23
24
  license_type: Optional[pulumi.Input[str]] = None,
@@ -25,19 +26,21 @@ class ImageImportArgs:
25
26
  platform: Optional[pulumi.Input[str]] = None):
26
27
  """
27
28
  The set of arguments for constructing a ImageImport resource.
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.
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`.
37
38
  """
38
39
  pulumi.set(__self__, "disk_device_mappings", disk_device_mappings)
39
40
  if architecture is not None:
40
41
  pulumi.set(__self__, "architecture", architecture)
42
+ if boot_mode is not None:
43
+ pulumi.set(__self__, "boot_mode", boot_mode)
41
44
  if description is not None:
42
45
  pulumi.set(__self__, "description", description)
43
46
  if image_name is not None:
@@ -53,7 +56,7 @@ class ImageImportArgs:
53
56
  @pulumi.getter(name="diskDeviceMappings")
54
57
  def disk_device_mappings(self) -> pulumi.Input[Sequence[pulumi.Input['ImageImportDiskDeviceMappingArgs']]]:
55
58
  """
56
- Description of the system with disks and snapshots under the image.
59
+ The information about the custom image. See `disk_device_mapping` below.
57
60
  """
58
61
  return pulumi.get(self, "disk_device_mappings")
59
62
 
@@ -65,7 +68,7 @@ class ImageImportArgs:
65
68
  @pulumi.getter
66
69
  def architecture(self) -> Optional[pulumi.Input[str]]:
67
70
  """
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`.
71
+ The architecture of the image. Default value: `x86_64`. Valid values: `x86_64`, `i386`.
69
72
  """
70
73
  return pulumi.get(self, "architecture")
71
74
 
@@ -73,11 +76,23 @@ class ImageImportArgs:
73
76
  def architecture(self, value: Optional[pulumi.Input[str]]):
74
77
  pulumi.set(self, "architecture", value)
75
78
 
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
+
76
91
  @property
77
92
  @pulumi.getter
78
93
  def description(self) -> Optional[pulumi.Input[str]]:
79
94
  """
80
- Description of the image. The length is 2 to 256 English or Chinese characters, and cannot begin with http: // and https: //.
95
+ The description of the image. The `description` must be 2 to 256 characters in length and cannot start with http:// or https://.
81
96
  """
82
97
  return pulumi.get(self, "description")
83
98
 
@@ -89,7 +104,7 @@ class ImageImportArgs:
89
104
  @pulumi.getter(name="imageName")
90
105
  def image_name(self) -> Optional[pulumi.Input[str]]:
91
106
  """
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 (-).
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 (-).
93
108
  """
94
109
  return pulumi.get(self, "image_name")
95
110
 
@@ -101,7 +116,7 @@ class ImageImportArgs:
101
116
  @pulumi.getter(name="licenseType")
102
117
  def license_type(self) -> Optional[pulumi.Input[str]]:
103
118
  """
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`.
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`.
105
120
  """
106
121
  return pulumi.get(self, "license_type")
107
122
 
@@ -113,7 +128,7 @@ class ImageImportArgs:
113
128
  @pulumi.getter(name="osType")
114
129
  def os_type(self) -> Optional[pulumi.Input[str]]:
115
130
  """
116
- Operating system platform type. Valid values: `windows`, Default is `linux`.
131
+ The type of the operating system. Default value: `linux`. Valid values: `windows`, `linux`.
117
132
  """
118
133
  return pulumi.get(self, "os_type")
119
134
 
@@ -125,9 +140,8 @@ class ImageImportArgs:
125
140
  @pulumi.getter
126
141
  def platform(self) -> Optional[pulumi.Input[str]]:
127
142
  """
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.
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`.
131
145
  """
132
146
  return pulumi.get(self, "platform")
133
147
 
@@ -140,6 +154,7 @@ class ImageImportArgs:
140
154
  class _ImageImportState:
141
155
  def __init__(__self__, *,
142
156
  architecture: Optional[pulumi.Input[str]] = None,
157
+ boot_mode: Optional[pulumi.Input[str]] = None,
143
158
  description: Optional[pulumi.Input[str]] = None,
144
159
  disk_device_mappings: Optional[pulumi.Input[Sequence[pulumi.Input['ImageImportDiskDeviceMappingArgs']]]] = None,
145
160
  image_name: Optional[pulumi.Input[str]] = None,
@@ -148,18 +163,20 @@ class _ImageImportState:
148
163
  platform: Optional[pulumi.Input[str]] = None):
149
164
  """
150
165
  Input properties used for looking up and filtering ImageImport resources.
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.
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`.
160
175
  """
161
176
  if architecture is not None:
162
177
  pulumi.set(__self__, "architecture", architecture)
178
+ if boot_mode is not None:
179
+ pulumi.set(__self__, "boot_mode", boot_mode)
163
180
  if description is not None:
164
181
  pulumi.set(__self__, "description", description)
165
182
  if disk_device_mappings is not None:
@@ -177,7 +194,7 @@ class _ImageImportState:
177
194
  @pulumi.getter
178
195
  def architecture(self) -> Optional[pulumi.Input[str]]:
179
196
  """
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`.
197
+ The architecture of the image. Default value: `x86_64`. Valid values: `x86_64`, `i386`.
181
198
  """
182
199
  return pulumi.get(self, "architecture")
183
200
 
@@ -185,11 +202,23 @@ class _ImageImportState:
185
202
  def architecture(self, value: Optional[pulumi.Input[str]]):
186
203
  pulumi.set(self, "architecture", value)
187
204
 
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
+
188
217
  @property
189
218
  @pulumi.getter
190
219
  def description(self) -> Optional[pulumi.Input[str]]:
191
220
  """
192
- Description of the image. The length is 2 to 256 English or Chinese characters, and cannot begin with http: // and https: //.
221
+ The description of the image. The `description` must be 2 to 256 characters in length and cannot start with http:// or https://.
193
222
  """
194
223
  return pulumi.get(self, "description")
195
224
 
@@ -201,7 +230,7 @@ class _ImageImportState:
201
230
  @pulumi.getter(name="diskDeviceMappings")
202
231
  def disk_device_mappings(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['ImageImportDiskDeviceMappingArgs']]]]:
203
232
  """
204
- Description of the system with disks and snapshots under the image.
233
+ The information about the custom image. See `disk_device_mapping` below.
205
234
  """
206
235
  return pulumi.get(self, "disk_device_mappings")
207
236
 
@@ -213,7 +242,7 @@ class _ImageImportState:
213
242
  @pulumi.getter(name="imageName")
214
243
  def image_name(self) -> Optional[pulumi.Input[str]]:
215
244
  """
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 (-).
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 (-).
217
246
  """
218
247
  return pulumi.get(self, "image_name")
219
248
 
@@ -225,7 +254,7 @@ class _ImageImportState:
225
254
  @pulumi.getter(name="licenseType")
226
255
  def license_type(self) -> Optional[pulumi.Input[str]]:
227
256
  """
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`.
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`.
229
258
  """
230
259
  return pulumi.get(self, "license_type")
231
260
 
@@ -237,7 +266,7 @@ class _ImageImportState:
237
266
  @pulumi.getter(name="osType")
238
267
  def os_type(self) -> Optional[pulumi.Input[str]]:
239
268
  """
240
- Operating system platform type. Valid values: `windows`, Default is `linux`.
269
+ The type of the operating system. Default value: `linux`. Valid values: `windows`, `linux`.
241
270
  """
242
271
  return pulumi.get(self, "os_type")
243
272
 
@@ -249,9 +278,8 @@ class _ImageImportState:
249
278
  @pulumi.getter
250
279
  def platform(self) -> Optional[pulumi.Input[str]]:
251
280
  """
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.
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`.
255
283
  """
256
284
  return pulumi.get(self, "platform")
257
285
 
@@ -266,6 +294,7 @@ class ImageImport(pulumi.CustomResource):
266
294
  resource_name: str,
267
295
  opts: Optional[pulumi.ResourceOptions] = None,
268
296
  architecture: Optional[pulumi.Input[str]] = None,
297
+ boot_mode: Optional[pulumi.Input[str]] = None,
269
298
  description: Optional[pulumi.Input[str]] = None,
270
299
  disk_device_mappings: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ImageImportDiskDeviceMappingArgs']]]]] = None,
271
300
  image_name: Optional[pulumi.Input[str]] = None,
@@ -274,59 +303,70 @@ class ImageImport(pulumi.CustomResource):
274
303
  platform: Optional[pulumi.Input[str]] = None,
275
304
  __props__=None):
276
305
  """
277
- Import a copy of your local on-premise file to ECS, and appear as a custom replacement in the corresponding domain.
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.
278
311
 
279
312
  > **NOTE:** You must upload the image file to the object storage OSS in advance.
280
313
 
281
314
  > **NOTE:** The region where the image is imported must be the same region as the OSS bucket where the image file is uploaded.
282
315
 
283
- > **NOTE:** Available in 1.69.0+.
284
-
285
316
  ## Example Usage
286
317
 
318
+ Basic Usage
319
+
287
320
  ```python
288
321
  import pulumi
289
322
  import pulumi_alicloud as alicloud
290
323
 
291
- this = alicloud.ecs.ImageImport("this",
292
- description="test import image",
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",
293
338
  architecture="x86_64",
294
- image_name="test-import-image",
295
- license_type="Auto",
296
- platform="Ubuntu",
297
339
  os_type="linux",
340
+ platform="Ubuntu",
341
+ license_type="Auto",
342
+ image_name=name,
343
+ description=name,
298
344
  disk_device_mappings=[alicloud.ecs.ImageImportDiskDeviceMappingArgs(
345
+ oss_bucket=default.id,
346
+ oss_object=default_bucket_object.id,
299
347
  disk_image_size=5,
300
- oss_bucket="testimportimage",
301
- oss_object="root.img",
302
348
  )])
303
349
  ```
304
350
 
305
- ## Attributes Reference0
306
-
307
- The following attributes are exported:
308
-
309
- * `id` - ID of the image.
310
-
311
351
  ## Import
312
352
 
313
- image can be imported using the id, e.g.
353
+ ECS Image Import can be imported using the id, e.g.
314
354
 
315
355
  ```sh
316
- $ pulumi import alicloud:ecs/imageImport:ImageImport default m-uf66871ape***yg1q***
356
+ $ pulumi import alicloud:ecs/imageImport:ImageImport example <id>
317
357
  ```
318
358
 
319
359
  :param str resource_name: The name of the resource.
320
360
  :param pulumi.ResourceOptions opts: Options for the resource.
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.
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`.
330
370
  """
331
371
  ...
332
372
  @overload
@@ -335,46 +375,57 @@ class ImageImport(pulumi.CustomResource):
335
375
  args: ImageImportArgs,
336
376
  opts: Optional[pulumi.ResourceOptions] = None):
337
377
  """
338
- Import a copy of your local on-premise file to ECS, and appear as a custom replacement in the corresponding domain.
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.
339
383
 
340
384
  > **NOTE:** You must upload the image file to the object storage OSS in advance.
341
385
 
342
386
  > **NOTE:** The region where the image is imported must be the same region as the OSS bucket where the image file is uploaded.
343
387
 
344
- > **NOTE:** Available in 1.69.0+.
345
-
346
388
  ## Example Usage
347
389
 
390
+ Basic Usage
391
+
348
392
  ```python
349
393
  import pulumi
350
394
  import pulumi_alicloud as alicloud
351
395
 
352
- this = alicloud.ecs.ImageImport("this",
353
- description="test import image",
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",
354
410
  architecture="x86_64",
355
- image_name="test-import-image",
356
- license_type="Auto",
357
- platform="Ubuntu",
358
411
  os_type="linux",
412
+ platform="Ubuntu",
413
+ license_type="Auto",
414
+ image_name=name,
415
+ description=name,
359
416
  disk_device_mappings=[alicloud.ecs.ImageImportDiskDeviceMappingArgs(
417
+ oss_bucket=default.id,
418
+ oss_object=default_bucket_object.id,
360
419
  disk_image_size=5,
361
- oss_bucket="testimportimage",
362
- oss_object="root.img",
363
420
  )])
364
421
  ```
365
422
 
366
- ## Attributes Reference0
367
-
368
- The following attributes are exported:
369
-
370
- * `id` - ID of the image.
371
-
372
423
  ## Import
373
424
 
374
- image can be imported using the id, e.g.
425
+ ECS Image Import can be imported using the id, e.g.
375
426
 
376
427
  ```sh
377
- $ pulumi import alicloud:ecs/imageImport:ImageImport default m-uf66871ape***yg1q***
428
+ $ pulumi import alicloud:ecs/imageImport:ImageImport example <id>
378
429
  ```
379
430
 
380
431
  :param str resource_name: The name of the resource.
@@ -393,6 +444,7 @@ class ImageImport(pulumi.CustomResource):
393
444
  resource_name: str,
394
445
  opts: Optional[pulumi.ResourceOptions] = None,
395
446
  architecture: Optional[pulumi.Input[str]] = None,
447
+ boot_mode: Optional[pulumi.Input[str]] = None,
396
448
  description: Optional[pulumi.Input[str]] = None,
397
449
  disk_device_mappings: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ImageImportDiskDeviceMappingArgs']]]]] = None,
398
450
  image_name: Optional[pulumi.Input[str]] = None,
@@ -409,6 +461,7 @@ class ImageImport(pulumi.CustomResource):
409
461
  __props__ = ImageImportArgs.__new__(ImageImportArgs)
410
462
 
411
463
  __props__.__dict__["architecture"] = architecture
464
+ __props__.__dict__["boot_mode"] = boot_mode
412
465
  __props__.__dict__["description"] = description
413
466
  if disk_device_mappings is None and not opts.urn:
414
467
  raise TypeError("Missing required property 'disk_device_mappings'")
@@ -428,6 +481,7 @@ class ImageImport(pulumi.CustomResource):
428
481
  id: pulumi.Input[str],
429
482
  opts: Optional[pulumi.ResourceOptions] = None,
430
483
  architecture: Optional[pulumi.Input[str]] = None,
484
+ boot_mode: Optional[pulumi.Input[str]] = None,
431
485
  description: Optional[pulumi.Input[str]] = None,
432
486
  disk_device_mappings: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ImageImportDiskDeviceMappingArgs']]]]] = None,
433
487
  image_name: Optional[pulumi.Input[str]] = None,
@@ -441,21 +495,22 @@ class ImageImport(pulumi.CustomResource):
441
495
  :param str resource_name: The unique name of the resulting resource.
442
496
  :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
443
497
  :param pulumi.ResourceOptions opts: Options for the resource.
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.
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`.
453
507
  """
454
508
  opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
455
509
 
456
510
  __props__ = _ImageImportState.__new__(_ImageImportState)
457
511
 
458
512
  __props__.__dict__["architecture"] = architecture
513
+ __props__.__dict__["boot_mode"] = boot_mode
459
514
  __props__.__dict__["description"] = description
460
515
  __props__.__dict__["disk_device_mappings"] = disk_device_mappings
461
516
  __props__.__dict__["image_name"] = image_name
@@ -468,15 +523,23 @@ class ImageImport(pulumi.CustomResource):
468
523
  @pulumi.getter
469
524
  def architecture(self) -> pulumi.Output[Optional[str]]:
470
525
  """
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`.
526
+ The architecture of the image. Default value: `x86_64`. Valid values: `x86_64`, `i386`.
472
527
  """
473
528
  return pulumi.get(self, "architecture")
474
529
 
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
+
475
538
  @property
476
539
  @pulumi.getter
477
540
  def description(self) -> pulumi.Output[Optional[str]]:
478
541
  """
479
- Description of the image. The length is 2 to 256 English or Chinese characters, and cannot begin with http: // and https: //.
542
+ The description of the image. The `description` must be 2 to 256 characters in length and cannot start with http:// or https://.
480
543
  """
481
544
  return pulumi.get(self, "description")
482
545
 
@@ -484,15 +547,15 @@ class ImageImport(pulumi.CustomResource):
484
547
  @pulumi.getter(name="diskDeviceMappings")
485
548
  def disk_device_mappings(self) -> pulumi.Output[Sequence['outputs.ImageImportDiskDeviceMapping']]:
486
549
  """
487
- Description of the system with disks and snapshots under the image.
550
+ The information about the custom image. See `disk_device_mapping` below.
488
551
  """
489
552
  return pulumi.get(self, "disk_device_mappings")
490
553
 
491
554
  @property
492
555
  @pulumi.getter(name="imageName")
493
- def image_name(self) -> pulumi.Output[Optional[str]]:
556
+ def image_name(self) -> pulumi.Output[str]:
494
557
  """
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 (-).
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 (-).
496
559
  """
497
560
  return pulumi.get(self, "image_name")
498
561
 
@@ -500,7 +563,7 @@ class ImageImport(pulumi.CustomResource):
500
563
  @pulumi.getter(name="licenseType")
501
564
  def license_type(self) -> pulumi.Output[Optional[str]]:
502
565
  """
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`.
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`.
504
567
  """
505
568
  return pulumi.get(self, "license_type")
506
569
 
@@ -508,7 +571,7 @@ class ImageImport(pulumi.CustomResource):
508
571
  @pulumi.getter(name="osType")
509
572
  def os_type(self) -> pulumi.Output[Optional[str]]:
510
573
  """
511
- Operating system platform type. Valid values: `windows`, Default is `linux`.
574
+ The type of the operating system. Default value: `linux`. Valid values: `windows`, `linux`.
512
575
  """
513
576
  return pulumi.get(self, "os_type")
514
577
 
@@ -516,9 +579,8 @@ class ImageImport(pulumi.CustomResource):
516
579
  @pulumi.getter
517
580
  def platform(self) -> pulumi.Output[str]:
518
581
  """
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.
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`.
522
584
  """
523
585
  return pulumi.get(self, "platform")
524
586