pulumi-alicloud 3.73.0a1736850863__py3-none-any.whl → 3.73.0a1736949061__py3-none-any.whl

pulumi_alicloud/oos/secret_parameter.py

@@ -23,6 +23,7 @@ class SecretParameterArgs:
                  value: pulumi.Input[str],
                  constraints: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
+                 dkms_instance_id: Optional[pulumi.Input[str]] = None,
                  key_id: Optional[pulumi.Input[str]] = None,
                  resource_group_id: Optional[pulumi.Input[str]] = None,
                  tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None,
@@ -37,6 +38,7 @@ class SecretParameterArgs:
                * `MinLength`: The minimum length of the encryption parameter.
                * `MaxLength`: The maximum length of the encryption parameter.
         :param pulumi.Input[str] description: The description of the encryption parameter. The description must be `1` to `200` characters in length.
+        :param pulumi.Input[str] dkms_instance_id: The ID of the KMS instance.
         :param pulumi.Input[str] key_id: The Customer Master Key (CMK) of Key Management Service (KMS) that is used to encrypt the parameter.
         :param pulumi.Input[str] resource_group_id: The ID of the Resource Group.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tags: A mapping of tags to assign to the resource.
@@ -48,6 +50,8 @@ class SecretParameterArgs:
             pulumi.set(__self__, "constraints", constraints)
         if description is not None:
             pulumi.set(__self__, "description", description)
+        if dkms_instance_id is not None:
+            pulumi.set(__self__, "dkms_instance_id", dkms_instance_id)
         if key_id is not None:
             pulumi.set(__self__, "key_id", key_id)
         if resource_group_id is not None:
@@ -109,6 +113,18 @@ class SecretParameterArgs:
     def description(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "description", value)
 
+    @property
+    @pulumi.getter(name="dkmsInstanceId")
+    def dkms_instance_id(self) -> Optional[pulumi.Input[str]]:
+        """
+        The ID of the KMS instance.
+        """
+        return pulumi.get(self, "dkms_instance_id")
+
+    @dkms_instance_id.setter
+    def dkms_instance_id(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "dkms_instance_id", value)
+
     @property
     @pulumi.getter(name="keyId")
     def key_id(self) -> Optional[pulumi.Input[str]]:
@@ -162,7 +178,9 @@ class SecretParameterArgs:
 class _SecretParameterState:
     def __init__(__self__, *,
                  constraints: Optional[pulumi.Input[str]] = None,
+                 create_time: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
+                 dkms_instance_id: Optional[pulumi.Input[str]] = None,
                  key_id: Optional[pulumi.Input[str]] = None,
                  resource_group_id: Optional[pulumi.Input[str]] = None,
                  secret_parameter_name: Optional[pulumi.Input[str]] = None,
@@ -176,7 +194,9 @@ class _SecretParameterState:
                * `AllowedPattern`: The pattern that is allowed for the encryption parameter. It must be a regular expression.
                * `MinLength`: The minimum length of the encryption parameter.
                * `MaxLength`: The maximum length of the encryption parameter.
+        :param pulumi.Input[str] create_time: Parameter creation time
         :param pulumi.Input[str] description: The description of the encryption parameter. The description must be `1` to `200` characters in length.
+        :param pulumi.Input[str] dkms_instance_id: The ID of the KMS instance.
         :param pulumi.Input[str] key_id: The Customer Master Key (CMK) of Key Management Service (KMS) that is used to encrypt the parameter.
         :param pulumi.Input[str] resource_group_id: The ID of the Resource Group.
         :param pulumi.Input[str] secret_parameter_name: The name of the encryption parameter.  The name must be `2` to `180` characters in length, and can contain letters, digits, hyphens (-), forward slashes (/) and underscores (_). It cannot start with `ALIYUN`, `ACS`, `ALIBABA`, `ALICLOUD`, or `OOS`.
@@ -186,8 +206,12 @@ class _SecretParameterState:
         """
         if constraints is not None:
             pulumi.set(__self__, "constraints", constraints)
+        if create_time is not None:
+            pulumi.set(__self__, "create_time", create_time)
         if description is not None:
             pulumi.set(__self__, "description", description)
+        if dkms_instance_id is not None:
+            pulumi.set(__self__, "dkms_instance_id", dkms_instance_id)
         if key_id is not None:
             pulumi.set(__self__, "key_id", key_id)
         if resource_group_id is not None:
@@ -217,6 +241,18 @@ class _SecretParameterState:
     def constraints(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "constraints", value)
 
+    @property
+    @pulumi.getter(name="createTime")
+    def create_time(self) -> Optional[pulumi.Input[str]]:
+        """
+        Parameter creation time
+        """
+        return pulumi.get(self, "create_time")
+
+    @create_time.setter
+    def create_time(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "create_time", value)
+
     @property
     @pulumi.getter
     def description(self) -> Optional[pulumi.Input[str]]:
@@ -229,6 +265,18 @@ class _SecretParameterState:
     def description(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "description", value)
 
+    @property
+    @pulumi.getter(name="dkmsInstanceId")
+    def dkms_instance_id(self) -> Optional[pulumi.Input[str]]:
+        """
+        The ID of the KMS instance.
+        """
+        return pulumi.get(self, "dkms_instance_id")
+
+    @dkms_instance_id.setter
+    def dkms_instance_id(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "dkms_instance_id", value)
+
     @property
     @pulumi.getter(name="keyId")
     def key_id(self) -> Optional[pulumi.Input[str]]:
@@ -309,6 +357,7 @@ class SecretParameter(pulumi.CustomResource):
                  opts: Optional[pulumi.ResourceOptions] = None,
                  constraints: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
+                 dkms_instance_id: Optional[pulumi.Input[str]] = None,
                  key_id: Optional[pulumi.Input[str]] = None,
                  resource_group_id: Optional[pulumi.Input[str]] = None,
                  secret_parameter_name: Optional[pulumi.Input[str]] = None,
@@ -317,9 +366,9 @@ class SecretParameter(pulumi.CustomResource):
                  value: Optional[pulumi.Input[str]] = None,
                  __props__=None):
         """
-        Provides a OOS Secret Parameter resource.
+        Provides a Operation Orchestration Service (OOS) Secret Parameter resource.
 
-        For information about OOS Secret Parameter and how to use it, see [What is Secret Parameter](https://www.alibabacloud.com/help/en/doc-detail/183418.html).
+        For information about Operation Orchestration Service (OOS) Secret Parameter and how to use it, see [What is Secret Parameter](https://www.alibabacloud.com/help/en/doc-detail/183418.html).
 
         > **NOTE:** Available since v1.147.0+.
 
@@ -351,10 +400,10 @@ class SecretParameter(pulumi.CustomResource):
 
         ## Import
 
-        OOS Secret Parameter can be imported using the id, e.g.
+        Operation Orchestration Service (OOS) Secret Parameter can be imported using the id, e.g.
 
         ```sh
-        $ pulumi import alicloud:oos/secretParameter:SecretParameter example <secret_parameter_name>
+        $ pulumi import alicloud:oos/secretParameter:SecretParameter example <id>
         ```
 
         :param str resource_name: The name of the resource.
@@ -365,6 +414,7 @@ class SecretParameter(pulumi.CustomResource):
                * `MinLength`: The minimum length of the encryption parameter.
                * `MaxLength`: The maximum length of the encryption parameter.
         :param pulumi.Input[str] description: The description of the encryption parameter. The description must be `1` to `200` characters in length.
+        :param pulumi.Input[str] dkms_instance_id: The ID of the KMS instance.
         :param pulumi.Input[str] key_id: The Customer Master Key (CMK) of Key Management Service (KMS) that is used to encrypt the parameter.
         :param pulumi.Input[str] resource_group_id: The ID of the Resource Group.
         :param pulumi.Input[str] secret_parameter_name: The name of the encryption parameter.  The name must be `2` to `180` characters in length, and can contain letters, digits, hyphens (-), forward slashes (/) and underscores (_). It cannot start with `ALIYUN`, `ACS`, `ALIBABA`, `ALICLOUD`, or `OOS`.
@@ -379,9 +429,9 @@ class SecretParameter(pulumi.CustomResource):
                  args: SecretParameterArgs,
                  opts: Optional[pulumi.ResourceOptions] = None):
         """
-        Provides a OOS Secret Parameter resource.
+        Provides a Operation Orchestration Service (OOS) Secret Parameter resource.
 
-        For information about OOS Secret Parameter and how to use it, see [What is Secret Parameter](https://www.alibabacloud.com/help/en/doc-detail/183418.html).
+        For information about Operation Orchestration Service (OOS) Secret Parameter and how to use it, see [What is Secret Parameter](https://www.alibabacloud.com/help/en/doc-detail/183418.html).
 
         > **NOTE:** Available since v1.147.0+.
 
@@ -413,10 +463,10 @@ class SecretParameter(pulumi.CustomResource):
 
         ## Import
 
-        OOS Secret Parameter can be imported using the id, e.g.
+        Operation Orchestration Service (OOS) Secret Parameter can be imported using the id, e.g.
 
         ```sh
-        $ pulumi import alicloud:oos/secretParameter:SecretParameter example <secret_parameter_name>
+        $ pulumi import alicloud:oos/secretParameter:SecretParameter example <id>
         ```
 
         :param str resource_name: The name of the resource.
@@ -436,6 +486,7 @@ class SecretParameter(pulumi.CustomResource):
                  opts: Optional[pulumi.ResourceOptions] = None,
                  constraints: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
+                 dkms_instance_id: Optional[pulumi.Input[str]] = None,
                  key_id: Optional[pulumi.Input[str]] = None,
                  resource_group_id: Optional[pulumi.Input[str]] = None,
                  secret_parameter_name: Optional[pulumi.Input[str]] = None,
@@ -453,6 +504,7 @@ class SecretParameter(pulumi.CustomResource):
 
             __props__.__dict__["constraints"] = constraints
             __props__.__dict__["description"] = description
+            __props__.__dict__["dkms_instance_id"] = dkms_instance_id
             __props__.__dict__["key_id"] = key_id
             __props__.__dict__["resource_group_id"] = resource_group_id
             if secret_parameter_name is None and not opts.urn:
@@ -463,6 +515,7 @@ class SecretParameter(pulumi.CustomResource):
             if value is None and not opts.urn:
                 raise TypeError("Missing required property 'value'")
             __props__.__dict__["value"] = None if value is None else pulumi.Output.secret(value)
+            __props__.__dict__["create_time"] = None
         secret_opts = pulumi.ResourceOptions(additional_secret_outputs=["value"])
         opts = pulumi.ResourceOptions.merge(opts, secret_opts)
         super(SecretParameter, __self__).__init__(
@@ -476,7 +529,9 @@ class SecretParameter(pulumi.CustomResource):
             id: pulumi.Input[str],
             opts: Optional[pulumi.ResourceOptions] = None,
             constraints: Optional[pulumi.Input[str]] = None,
+            create_time: Optional[pulumi.Input[str]] = None,
             description: Optional[pulumi.Input[str]] = None,
+            dkms_instance_id: Optional[pulumi.Input[str]] = None,
             key_id: Optional[pulumi.Input[str]] = None,
             resource_group_id: Optional[pulumi.Input[str]] = None,
             secret_parameter_name: Optional[pulumi.Input[str]] = None,
@@ -495,7 +550,9 @@ class SecretParameter(pulumi.CustomResource):
                * `AllowedPattern`: The pattern that is allowed for the encryption parameter. It must be a regular expression.
                * `MinLength`: The minimum length of the encryption parameter.
                * `MaxLength`: The maximum length of the encryption parameter.
+        :param pulumi.Input[str] create_time: Parameter creation time
         :param pulumi.Input[str] description: The description of the encryption parameter. The description must be `1` to `200` characters in length.
+        :param pulumi.Input[str] dkms_instance_id: The ID of the KMS instance.
         :param pulumi.Input[str] key_id: The Customer Master Key (CMK) of Key Management Service (KMS) that is used to encrypt the parameter.
         :param pulumi.Input[str] resource_group_id: The ID of the Resource Group.
         :param pulumi.Input[str] secret_parameter_name: The name of the encryption parameter.  The name must be `2` to `180` characters in length, and can contain letters, digits, hyphens (-), forward slashes (/) and underscores (_). It cannot start with `ALIYUN`, `ACS`, `ALIBABA`, `ALICLOUD`, or `OOS`.
@@ -508,7 +565,9 @@ class SecretParameter(pulumi.CustomResource):
         __props__ = _SecretParameterState.__new__(_SecretParameterState)
 
         __props__.__dict__["constraints"] = constraints
+        __props__.__dict__["create_time"] = create_time
         __props__.__dict__["description"] = description
+        __props__.__dict__["dkms_instance_id"] = dkms_instance_id
         __props__.__dict__["key_id"] = key_id
         __props__.__dict__["resource_group_id"] = resource_group_id
         __props__.__dict__["secret_parameter_name"] = secret_parameter_name
@@ -529,6 +588,14 @@ class SecretParameter(pulumi.CustomResource):
         """
         return pulumi.get(self, "constraints")
 
+    @property
+    @pulumi.getter(name="createTime")
+    def create_time(self) -> pulumi.Output[str]:
+        """
+        Parameter creation time
+        """
+        return pulumi.get(self, "create_time")
+
     @property
     @pulumi.getter
     def description(self) -> pulumi.Output[Optional[str]]:
@@ -537,6 +604,14 @@ class SecretParameter(pulumi.CustomResource):
         """
         return pulumi.get(self, "description")
 
+    @property
+    @pulumi.getter(name="dkmsInstanceId")
+    def dkms_instance_id(self) -> pulumi.Output[Optional[str]]:
+        """
+        The ID of the KMS instance.
+        """
+        return pulumi.get(self, "dkms_instance_id")
+
     @property
     @pulumi.getter(name="keyId")
     def key_id(self) -> pulumi.Output[Optional[str]]:
@@ -563,7 +638,7 @@ class SecretParameter(pulumi.CustomResource):
 
     @property
     @pulumi.getter
-    def tags(self) -> pulumi.Output[Optional[Mapping[str, str]]]:
+    def tags(self) -> pulumi.Output[Mapping[str, str]]:
         """
         A mapping of tags to assign to the resource.
         """

pulumi_alicloud/oss/bucket.py

@@ -1161,7 +1161,7 @@ class Bucket(pulumi.CustomResource):
 
     @property
     @pulumi.getter
-    def bucket(self) -> pulumi.Output[Optional[str]]:
+    def bucket(self) -> pulumi.Output[str]:
         return pulumi.get(self, "bucket")
 
     @property

pulumi_alicloud/oss/bucket_policy.py

@@ -142,8 +142,7 @@ class BucketPolicy(pulumi.CustomResource):
                     "Resource": ["acs:oss:*:1234567890:*/*"],
                 }],
             }),
-            bucket=create_bucket.bucket,
-            opts = pulumi.ResourceOptions(depends_on=[create_bucket]))
+            bucket=create_bucket.bucket)
         ```
 
         ## Import
@@ -205,8 +204,7 @@ class BucketPolicy(pulumi.CustomResource):
                     "Resource": ["acs:oss:*:1234567890:*/*"],
                 }],
             }),
-            bucket=create_bucket.bucket,
-            opts = pulumi.ResourceOptions(depends_on=[create_bucket]))
+            bucket=create_bucket.bucket)
         ```
 
         ## Import

pulumi_alicloud/oss/bucket_referer.py

@@ -269,8 +269,7 @@ class BucketReferer(pulumi.CustomResource):
             referer_lists=[
                 "*.aliyun.com",
                 "*.example.com",
-            ],
-            opts = pulumi.ResourceOptions(depends_on=[create_bucket]))
+            ])
         ```
 
         ## Import
@@ -331,8 +330,7 @@ class BucketReferer(pulumi.CustomResource):
             referer_lists=[
                 "*.aliyun.com",
                 "*.example.com",
-            ],
-            opts = pulumi.ResourceOptions(depends_on=[create_bucket]))
+            ])
         ```
 
         ## Import

pulumi_alicloud/oss/get_buckets.py

@@ -98,13 +98,20 @@ def get_buckets(name_regex: Optional[str] = None,
     """
     This data source provides the OSS buckets of the current Alibaba Cloud user.
 
+    > **NOTE:** Available since v1.17.0.
+
     ## Example Usage
 
     ```python
     import pulumi
     import pulumi_alicloud as alicloud
+    import pulumi_random as random
 
-    oss_buckets_ds = alicloud.oss.get_buckets(name_regex="sample_oss_bucket")
+    default = random.index.Integer("default",
+        max=99999,
+        min=10000)
+    bucket = alicloud.oss.Bucket("bucket", bucket=f"oss-tf-example-{default['result']}")
+    oss_buckets_ds = alicloud.oss.get_buckets_output(name_regex=bucket.bucket)
     pulumi.export("firstOssBucketName", oss_buckets_ds.buckets[0].name)
     ```
 
@@ -130,13 +137,20 @@ def get_buckets_output(name_regex: Optional[pulumi.Input[Optional[str]]] = None,
     """
     This data source provides the OSS buckets of the current Alibaba Cloud user.
 
+    > **NOTE:** Available since v1.17.0.
+
     ## Example Usage
 
     ```python
     import pulumi
     import pulumi_alicloud as alicloud
+    import pulumi_random as random
 
-    oss_buckets_ds = alicloud.oss.get_buckets(name_regex="sample_oss_bucket")
+    default = random.index.Integer("default",
+        max=99999,
+        min=10000)
+    bucket = alicloud.oss.Bucket("bucket", bucket=f"oss-tf-example-{default['result']}")
+    oss_buckets_ds = alicloud.oss.get_buckets_output(name_regex=bucket.bucket)
     pulumi.export("firstOssBucketName", oss_buckets_ds.buckets[0].name)
     ```
 

pulumi_alicloud/oss/outputs.py

@@ -3024,14 +3024,14 @@ class GetBucketsBucketResult(dict):
                  logging: 'outputs.GetBucketsBucketLoggingResult',
                  name: str,
                  owner: str,
+                 policy: str,
                  redundancy_type: str,
                  referer_config: 'outputs.GetBucketsBucketRefererConfigResult',
                  server_side_encryption_rule: 'outputs.GetBucketsBucketServerSideEncryptionRuleResult',
                  storage_class: str,
                  tags: Mapping[str, str],
                  versioning: 'outputs.GetBucketsBucketVersioningResult',
-                 website: 'outputs.GetBucketsBucketWebsiteResult',
-                 policy: Optional[str] = None):
+                 website: 'outputs.GetBucketsBucketWebsiteResult'):
         """
         :param str acl: Bucket access control list. Possible values: `private`, `public-read` and `public-read-write`.
         :param Sequence['GetBucketsBucketCorsRuleArgs'] cors_rules: A list of CORS rule configurations. Each element contains the following attributes:
@@ -3043,6 +3043,7 @@ class GetBucketsBucketResult(dict):
         :param 'GetBucketsBucketLoggingArgs' logging: A list of one element containing configuration parameters used for storing access log information. It contains the following attributes:
         :param str name: Bucket name.
         :param str owner: Bucket owner.
+        :param str policy: The policies configured for a specified bucket.
         :param str redundancy_type: Redundancy type. Possible values: `LRS`, and `ZRS`.
         :param 'GetBucketsBucketRefererConfigArgs' referer_config: A list of one element containing referer configuration. It contains the following attributes:
         :param 'GetBucketsBucketServerSideEncryptionRuleArgs' server_side_encryption_rule: A configuration of default encryption for a bucket. It contains the following attributes:
@@ -3061,6 +3062,7 @@ class GetBucketsBucketResult(dict):
         pulumi.set(__self__, "logging", logging)
         pulumi.set(__self__, "name", name)
         pulumi.set(__self__, "owner", owner)
+        pulumi.set(__self__, "policy", policy)
         pulumi.set(__self__, "redundancy_type", redundancy_type)
         pulumi.set(__self__, "referer_config", referer_config)
         pulumi.set(__self__, "server_side_encryption_rule", server_side_encryption_rule)
@@ -3068,8 +3070,6 @@ class GetBucketsBucketResult(dict):
         pulumi.set(__self__, "tags", tags)
         pulumi.set(__self__, "versioning", versioning)
         pulumi.set(__self__, "website", website)
-        if policy is not None:
-            pulumi.set(__self__, "policy", policy)
 
     @property
     @pulumi.getter
@@ -3151,6 +3151,14 @@ class GetBucketsBucketResult(dict):
         """
         return pulumi.get(self, "owner")
 
+    @property
+    @pulumi.getter
+    def policy(self) -> str:
+        """
+        The policies configured for a specified bucket.
+        """
+        return pulumi.get(self, "policy")
+
     @property
     @pulumi.getter(name="redundancyType")
     def redundancy_type(self) -> str:
@@ -3207,11 +3215,6 @@ class GetBucketsBucketResult(dict):
         """
         return pulumi.get(self, "website")
 
-    @property
-    @pulumi.getter
-    def policy(self) -> Optional[str]:
-        return pulumi.get(self, "policy")
-
 
 @pulumi.output_type
 class GetBucketsBucketCorsRuleResult(dict):
@@ -3329,20 +3332,18 @@ class GetBucketsBucketLifecycleRuleResult(dict):
 @pulumi.output_type
 class GetBucketsBucketLifecycleRuleExpirationResult(dict):
     def __init__(__self__, *,
-                 date: Optional[str] = None,
-                 days: Optional[int] = None):
+                 date: str,
+                 days: int):
         """
         :param str date: Date after which the rule to take effect. The format is like 2017-03-09.
         :param int days: Indicate the number of days after the last object update until the rules take effect.
         """
-        if date is not None:
-            pulumi.set(__self__, "date", date)
-        if days is not None:
-            pulumi.set(__self__, "days", days)
+        pulumi.set(__self__, "date", date)
+        pulumi.set(__self__, "days", days)
 
     @property
     @pulumi.getter
-    def date(self) -> Optional[str]:
+    def date(self) -> str:
         """
         Date after which the rule to take effect. The format is like 2017-03-09.
         """
@@ -3350,7 +3351,7 @@ class GetBucketsBucketLifecycleRuleExpirationResult(dict):
 
     @property
     @pulumi.getter
-    def days(self) -> Optional[int]:
+    def days(self) -> int:
         """
         Indicate the number of days after the last object update until the rules take effect.
         """

pulumi_alicloud/pulumi-plugin.json

@@ -1,5 +1,5 @@
 {
   "resource": true,
   "name": "alicloud",
-  "version": "3.73.0-alpha.1736850863"
+  "version": "3.73.0-alpha.1736949061"
 }

pulumi_alicloud/sae/application.py

@@ -152,7 +152,18 @@ class ApplicationArgs:
                **NOTE:** Field `readiness` has been deprecated from provider version 1.211.0. New field `readiness_v2` instead.
         :param pulumi.Input['ApplicationReadinessV2Args'] readiness_v2: The readiness check settings of the container. If a container fails this health check multiple times, the container is stopped and then restarted. See `readiness_v2` below.
         :param pulumi.Input[str] security_group_id: Security group ID.
-        :param pulumi.Input[str] sls_configs: SLS  configuration.
+        :param pulumi.Input[str] sls_configs: Configuration for log collection to SLS. Valid parameter descriptions are as follows:
+               * `projectName`: Configures the project name on SLS.
+               * `logDir`: Path to the logs.
+               * `logType`: Type of logs. stdout indicates container standard output logs, and only one can be set; if not set, it means collecting file logs.
+               * `logstoreName`: Configures the log store name on SLS.
+               * `logtailName`: Configures the log tail name on SLS; if not specified, it means creating a new log tail.
+               
+               If you no longer need to use the SLS collection feature, you should set the value of this field to an empty string. There are two examples:
+               - Using SAE automatically created SLS resources: [{"logDir":"","logType":"stdout"},{"logDir":"/tmp/a.log"}].
+               - Using custom SLS resources: [{"projectName":"test-sls","logType":"stdout","logDir":"","logstoreName":"sae","logtailName":""},{"projectName":"test","logDir":"/tmp/a.log","logstoreName":"sae","logtailName":""}].
+               
+               **NOTE:** Projects that are automatically created with applications will be deleted along with the application deletion. Therefore, when selecting existing projects, you cannot choose projects automatically created by SAE.
         :param pulumi.Input[str] status: The status of the resource. Valid values: `RUNNING`, `STOPPED`, `UNKNOWN`.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tags: A mapping of tags to assign to the resource.
         :param pulumi.Input[int] termination_grace_period_seconds: Graceful offline timeout, the default is 30, the unit is seconds. The value range is 1~60. Valid values: [1,60].
@@ -1021,7 +1032,18 @@ class ApplicationArgs:
     @pulumi.getter(name="slsConfigs")
     def sls_configs(self) -> Optional[pulumi.Input[str]]:
         """
-        SLS  configuration.
+        Configuration for log collection to SLS. Valid parameter descriptions are as follows:
+        * `projectName`: Configures the project name on SLS.
+        * `logDir`: Path to the logs.
+        * `logType`: Type of logs. stdout indicates container standard output logs, and only one can be set; if not set, it means collecting file logs.
+        * `logstoreName`: Configures the log store name on SLS.
+        * `logtailName`: Configures the log tail name on SLS; if not specified, it means creating a new log tail.
+
+        If you no longer need to use the SLS collection feature, you should set the value of this field to an empty string. There are two examples:
+        - Using SAE automatically created SLS resources: [{"logDir":"","logType":"stdout"},{"logDir":"/tmp/a.log"}].
+        - Using custom SLS resources: [{"projectName":"test-sls","logType":"stdout","logDir":"","logstoreName":"sae","logtailName":""},{"projectName":"test","logDir":"/tmp/a.log","logstoreName":"sae","logtailName":""}].
+
+        **NOTE:** Projects that are automatically created with applications will be deleted along with the application deletion. Therefore, when selecting existing projects, you cannot choose projects automatically created by SAE.
         """
         return pulumi.get(self, "sls_configs")
 
@@ -1311,7 +1333,18 @@ class _ApplicationState:
         :param pulumi.Input['ApplicationReadinessV2Args'] readiness_v2: The readiness check settings of the container. If a container fails this health check multiple times, the container is stopped and then restarted. See `readiness_v2` below.
         :param pulumi.Input[int] replicas: Initial number of instances.
         :param pulumi.Input[str] security_group_id: Security group ID.
-        :param pulumi.Input[str] sls_configs: SLS  configuration.
+        :param pulumi.Input[str] sls_configs: Configuration for log collection to SLS. Valid parameter descriptions are as follows:
+               * `projectName`: Configures the project name on SLS.
+               * `logDir`: Path to the logs.
+               * `logType`: Type of logs. stdout indicates container standard output logs, and only one can be set; if not set, it means collecting file logs.
+               * `logstoreName`: Configures the log store name on SLS.
+               * `logtailName`: Configures the log tail name on SLS; if not specified, it means creating a new log tail.
+               
+               If you no longer need to use the SLS collection feature, you should set the value of this field to an empty string. There are two examples:
+               - Using SAE automatically created SLS resources: [{"logDir":"","logType":"stdout"},{"logDir":"/tmp/a.log"}].
+               - Using custom SLS resources: [{"projectName":"test-sls","logType":"stdout","logDir":"","logstoreName":"sae","logtailName":""},{"projectName":"test","logDir":"/tmp/a.log","logstoreName":"sae","logtailName":""}].
+               
+               **NOTE:** Projects that are automatically created with applications will be deleted along with the application deletion. Therefore, when selecting existing projects, you cannot choose projects automatically created by SAE.
         :param pulumi.Input[str] status: The status of the resource. Valid values: `RUNNING`, `STOPPED`, `UNKNOWN`.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tags: A mapping of tags to assign to the resource.
         :param pulumi.Input[int] termination_grace_period_seconds: Graceful offline timeout, the default is 30, the unit is seconds. The value range is 1~60. Valid values: [1,60].
@@ -2183,7 +2216,18 @@ class _ApplicationState:
     @pulumi.getter(name="slsConfigs")
     def sls_configs(self) -> Optional[pulumi.Input[str]]:
         """
-        SLS  configuration.
+        Configuration for log collection to SLS. Valid parameter descriptions are as follows:
+        * `projectName`: Configures the project name on SLS.
+        * `logDir`: Path to the logs.
+        * `logType`: Type of logs. stdout indicates container standard output logs, and only one can be set; if not set, it means collecting file logs.
+        * `logstoreName`: Configures the log store name on SLS.
+        * `logtailName`: Configures the log tail name on SLS; if not specified, it means creating a new log tail.
+
+        If you no longer need to use the SLS collection feature, you should set the value of this field to an empty string. There are two examples:
+        - Using SAE automatically created SLS resources: [{"logDir":"","logType":"stdout"},{"logDir":"/tmp/a.log"}].
+        - Using custom SLS resources: [{"projectName":"test-sls","logType":"stdout","logDir":"","logstoreName":"sae","logtailName":""},{"projectName":"test","logDir":"/tmp/a.log","logstoreName":"sae","logtailName":""}].
+
+        **NOTE:** Projects that are automatically created with applications will be deleted along with the application deletion. Therefore, when selecting existing projects, you cannot choose projects automatically created by SAE.
         """
         return pulumi.get(self, "sls_configs")
 
@@ -2541,7 +2585,18 @@ class Application(pulumi.CustomResource):
         :param pulumi.Input[Union['ApplicationReadinessV2Args', 'ApplicationReadinessV2ArgsDict']] readiness_v2: The readiness check settings of the container. If a container fails this health check multiple times, the container is stopped and then restarted. See `readiness_v2` below.
         :param pulumi.Input[int] replicas: Initial number of instances.
         :param pulumi.Input[str] security_group_id: Security group ID.
-        :param pulumi.Input[str] sls_configs: SLS  configuration.
+        :param pulumi.Input[str] sls_configs: Configuration for log collection to SLS. Valid parameter descriptions are as follows:
+               * `projectName`: Configures the project name on SLS.
+               * `logDir`: Path to the logs.
+               * `logType`: Type of logs. stdout indicates container standard output logs, and only one can be set; if not set, it means collecting file logs.
+               * `logstoreName`: Configures the log store name on SLS.
+               * `logtailName`: Configures the log tail name on SLS; if not specified, it means creating a new log tail.
+               
+               If you no longer need to use the SLS collection feature, you should set the value of this field to an empty string. There are two examples:
+               - Using SAE automatically created SLS resources: [{"logDir":"","logType":"stdout"},{"logDir":"/tmp/a.log"}].
+               - Using custom SLS resources: [{"projectName":"test-sls","logType":"stdout","logDir":"","logstoreName":"sae","logtailName":""},{"projectName":"test","logDir":"/tmp/a.log","logstoreName":"sae","logtailName":""}].
+               
+               **NOTE:** Projects that are automatically created with applications will be deleted along with the application deletion. Therefore, when selecting existing projects, you cannot choose projects automatically created by SAE.
         :param pulumi.Input[str] status: The status of the resource. Valid values: `RUNNING`, `STOPPED`, `UNKNOWN`.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tags: A mapping of tags to assign to the resource.
         :param pulumi.Input[int] termination_grace_period_seconds: Graceful offline timeout, the default is 30, the unit is seconds. The value range is 1~60. Valid values: [1,60].
@@ -2943,7 +2998,18 @@ class Application(pulumi.CustomResource):
         :param pulumi.Input[Union['ApplicationReadinessV2Args', 'ApplicationReadinessV2ArgsDict']] readiness_v2: The readiness check settings of the container. If a container fails this health check multiple times, the container is stopped and then restarted. See `readiness_v2` below.
         :param pulumi.Input[int] replicas: Initial number of instances.
         :param pulumi.Input[str] security_group_id: Security group ID.
-        :param pulumi.Input[str] sls_configs: SLS  configuration.
+        :param pulumi.Input[str] sls_configs: Configuration for log collection to SLS. Valid parameter descriptions are as follows:
+               * `projectName`: Configures the project name on SLS.
+               * `logDir`: Path to the logs.
+               * `logType`: Type of logs. stdout indicates container standard output logs, and only one can be set; if not set, it means collecting file logs.
+               * `logstoreName`: Configures the log store name on SLS.
+               * `logtailName`: Configures the log tail name on SLS; if not specified, it means creating a new log tail.
+               
+               If you no longer need to use the SLS collection feature, you should set the value of this field to an empty string. There are two examples:
+               - Using SAE automatically created SLS resources: [{"logDir":"","logType":"stdout"},{"logDir":"/tmp/a.log"}].
+               - Using custom SLS resources: [{"projectName":"test-sls","logType":"stdout","logDir":"","logstoreName":"sae","logtailName":""},{"projectName":"test","logDir":"/tmp/a.log","logstoreName":"sae","logtailName":""}].
+               
+               **NOTE:** Projects that are automatically created with applications will be deleted along with the application deletion. Therefore, when selecting existing projects, you cannot choose projects automatically created by SAE.
         :param pulumi.Input[str] status: The status of the resource. Valid values: `RUNNING`, `STOPPED`, `UNKNOWN`.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tags: A mapping of tags to assign to the resource.
         :param pulumi.Input[int] termination_grace_period_seconds: Graceful offline timeout, the default is 30, the unit is seconds. The value range is 1~60. Valid values: [1,60].
@@ -3497,7 +3563,18 @@ class Application(pulumi.CustomResource):
     @pulumi.getter(name="slsConfigs")
     def sls_configs(self) -> pulumi.Output[Optional[str]]:
         """
-        SLS  configuration.
+        Configuration for log collection to SLS. Valid parameter descriptions are as follows:
+        * `projectName`: Configures the project name on SLS.
+        * `logDir`: Path to the logs.
+        * `logType`: Type of logs. stdout indicates container standard output logs, and only one can be set; if not set, it means collecting file logs.
+        * `logstoreName`: Configures the log store name on SLS.
+        * `logtailName`: Configures the log tail name on SLS; if not specified, it means creating a new log tail.
+
+        If you no longer need to use the SLS collection feature, you should set the value of this field to an empty string. There are two examples:
+        - Using SAE automatically created SLS resources: [{"logDir":"","logType":"stdout"},{"logDir":"/tmp/a.log"}].
+        - Using custom SLS resources: [{"projectName":"test-sls","logType":"stdout","logDir":"","logstoreName":"sae","logtailName":""},{"projectName":"test","logDir":"/tmp/a.log","logstoreName":"sae","logtailName":""}].
+
+        **NOTE:** Projects that are automatically created with applications will be deleted along with the application deletion. Therefore, when selecting existing projects, you cannot choose projects automatically created by SAE.
         """
         return pulumi.get(self, "sls_configs")
 

pulumi_alicloud/sls/collection_policy.py

@@ -337,7 +337,7 @@ class CollectionPolicy(pulumi.CustomResource):
 
         Orchestration policies for cloud product log collection.
 
-        For information about SLS Collection Policy and how to use it, see [What is Collection Policy](https://www.alibabacloud.com/help/en/).
+        For information about SLS Collection Policy and how to use it, see [What is Collection Policy](https://www.alibabacloud.com/help/zh/sls/developer-reference/api-sls-2020-12-30-upsertcollectionpolicy).
 
         > **NOTE:** Available since v1.232.0.
 
@@ -372,7 +372,7 @@ class CollectionPolicy(pulumi.CustomResource):
 
         Orchestration policies for cloud product log collection.
 
-        For information about SLS Collection Policy and how to use it, see [What is Collection Policy](https://www.alibabacloud.com/help/en/).
+        For information about SLS Collection Policy and how to use it, see [What is Collection Policy](https://www.alibabacloud.com/help/zh/sls/developer-reference/api-sls-2020-12-30-upsertcollectionpolicy).
 
         > **NOTE:** Available since v1.232.0.
 

pulumi_alicloud/vpc/__init__.py

@@ -26,6 +26,11 @@ from .get_enhanced_nat_available_zones import *
 from .get_flow_log_service import *
 from .get_forward_entries import *
 from .get_havips import *
+from .get_ipam_ipam_pool_allocations import *
+from .get_ipam_ipam_pool_cidrs import *
+from .get_ipam_ipam_pools import *
+from .get_ipam_ipam_scopes import *
+from .get_ipam_ipams import *
 from .get_ipsec_servers import *
 from .get_ipv4_gateways import *
 from .get_ipv6_addresses import *