pulumi-alicloud 3.60.0__py3-none-any.whl → 3.60.0a1721193564__py3-none-any.whl

pulumi_alicloud/apigateway/outputs.py

@@ -19,8 +19,6 @@ __all__ = [
     'ApiRequestConfig',
     'ApiRequestParameter',
     'ApiSystemParameter',
-    'InstanceToConnectVpcIpBlock',
-    'InstanceZoneVswitchSecurityGroup',
     'GetApisApiResult',
     'GetAppsAppResult',
     'GetBackendsBackendResult',
@@ -319,10 +317,6 @@ class ApiHttpServiceConfig(dict):
         suggest = None
         if key == "aoneName":
             suggest = "aone_name"
-        elif key == "contentTypeCategory":
-            suggest = "content_type_category"
-        elif key == "contentTypeValue":
-            suggest = "content_type_value"
 
         if suggest:
             pulumi.log.warn(f"Key '{key}' not found in ApiHttpServiceConfig. Access the value via the '{suggest}' property getter instead.")
@@ -340,17 +334,13 @@ class ApiHttpServiceConfig(dict):
                  method: str,
                  path: str,
                  timeout: int,
-                 aone_name: Optional[str] = None,
-                 content_type_category: Optional[str] = None,
-                 content_type_value: Optional[str] = None):
+                 aone_name: Optional[str] = None):
         """
         :param str address: The address of backend service.
         :param str method: The http method of backend service.
         :param str path: The path of backend service.
         :param int timeout: Backend service time-out time; unit: millisecond.
         :param str aone_name: The name of aone.
-        :param str content_type_category: The content type category of backend service which supports values of 'DEFAULT','CUSTOM' and 'CLIENT'.
-        :param str content_type_value: The content type value of backend service.
         """
         pulumi.set(__self__, "address", address)
         pulumi.set(__self__, "method", method)
@@ -358,10 +348,6 @@ class ApiHttpServiceConfig(dict):
         pulumi.set(__self__, "timeout", timeout)
         if aone_name is not None:
             pulumi.set(__self__, "aone_name", aone_name)
-        if content_type_category is not None:
-            pulumi.set(__self__, "content_type_category", content_type_category)
-        if content_type_value is not None:
-            pulumi.set(__self__, "content_type_value", content_type_value)
 
     @property
     @pulumi.getter
@@ -403,22 +389,6 @@ class ApiHttpServiceConfig(dict):
         """
         return pulumi.get(self, "aone_name")
 
-    @property
-    @pulumi.getter(name="contentTypeCategory")
-    def content_type_category(self) -> Optional[str]:
-        """
-        The content type category of backend service which supports values of 'DEFAULT','CUSTOM' and 'CLIENT'.
-        """
-        return pulumi.get(self, "content_type_category")
-
-    @property
-    @pulumi.getter(name="contentTypeValue")
-    def content_type_value(self) -> Optional[str]:
-        """
-        The content type value of backend service.
-        """
-        return pulumi.get(self, "content_type_value")
-
 
 @pulumi.output_type
 class ApiHttpVpcServiceConfig(dict):
@@ -427,12 +397,6 @@ class ApiHttpVpcServiceConfig(dict):
         suggest = None
         if key == "aoneName":
             suggest = "aone_name"
-        elif key == "contentTypeCategory":
-            suggest = "content_type_category"
-        elif key == "contentTypeValue":
-            suggest = "content_type_value"
-        elif key == "vpcScheme":
-            suggest = "vpc_scheme"
 
         if suggest:
             pulumi.log.warn(f"Key '{key}' not found in ApiHttpVpcServiceConfig. Access the value via the '{suggest}' property getter instead.")
@@ -450,19 +414,13 @@ class ApiHttpVpcServiceConfig(dict):
                  name: str,
                  path: str,
                  timeout: int,
-                 aone_name: Optional[str] = None,
-                 content_type_category: Optional[str] = None,
-                 content_type_value: Optional[str] = None,
-                 vpc_scheme: Optional[str] = None):
+                 aone_name: Optional[str] = None):
         """
         :param str method: The http method of backend service.
         :param str name: The name of vpc instance.
         :param str path: The path of backend service.
         :param int timeout: Backend service time-out time. Unit: millisecond.
         :param str aone_name: The name of aone.
-        :param str content_type_category: The content type category of backend service which supports values of 'DEFAULT','CUSTOM' and 'CLIENT'.
-        :param str content_type_value: The content type value of backend service.
-        :param str vpc_scheme: The vpc scheme of backend service which supports values of `HTTP` and `HTTPS`.
         """
         pulumi.set(__self__, "method", method)
         pulumi.set(__self__, "name", name)
@@ -470,12 +428,6 @@ class ApiHttpVpcServiceConfig(dict):
         pulumi.set(__self__, "timeout", timeout)
         if aone_name is not None:
             pulumi.set(__self__, "aone_name", aone_name)
-        if content_type_category is not None:
-            pulumi.set(__self__, "content_type_category", content_type_category)
-        if content_type_value is not None:
-            pulumi.set(__self__, "content_type_value", content_type_value)
-        if vpc_scheme is not None:
-            pulumi.set(__self__, "vpc_scheme", vpc_scheme)
 
     @property
     @pulumi.getter
@@ -517,30 +469,6 @@ class ApiHttpVpcServiceConfig(dict):
         """
         return pulumi.get(self, "aone_name")
 
-    @property
-    @pulumi.getter(name="contentTypeCategory")
-    def content_type_category(self) -> Optional[str]:
-        """
-        The content type category of backend service which supports values of 'DEFAULT','CUSTOM' and 'CLIENT'.
-        """
-        return pulumi.get(self, "content_type_category")
-
-    @property
-    @pulumi.getter(name="contentTypeValue")
-    def content_type_value(self) -> Optional[str]:
-        """
-        The content type value of backend service.
-        """
-        return pulumi.get(self, "content_type_value")
-
-    @property
-    @pulumi.getter(name="vpcScheme")
-    def vpc_scheme(self) -> Optional[str]:
-        """
-        The vpc scheme of backend service which supports values of `HTTP` and `HTTPS`.
-        """
-        return pulumi.get(self, "vpc_scheme")
-
 
 @pulumi.output_type
 class ApiMockServiceConfig(dict):
@@ -848,155 +776,6 @@ class ApiSystemParameter(dict):
         return pulumi.get(self, "name_service")
 
 
-@pulumi.output_type
-class InstanceToConnectVpcIpBlock(dict):
-    @staticmethod
-    def __key_warning(key: str):
-        suggest = None
-        if key == "cidrBlock":
-            suggest = "cidr_block"
-        elif key == "vswitchId":
-            suggest = "vswitch_id"
-        elif key == "zoneId":
-            suggest = "zone_id"
-
-        if suggest:
-            pulumi.log.warn(f"Key '{key}' not found in InstanceToConnectVpcIpBlock. Access the value via the '{suggest}' property getter instead.")
-
-    def __getitem__(self, key: str) -> Any:
-        InstanceToConnectVpcIpBlock.__key_warning(key)
-        return super().__getitem__(key)
-
-    def get(self, key: str, default = None) -> Any:
-        InstanceToConnectVpcIpBlock.__key_warning(key)
-        return super().get(key, default)
-
-    def __init__(__self__, *,
-                 cidr_block: str,
-                 customized: Optional[bool] = None,
-                 vswitch_id: Optional[str] = None,
-                 zone_id: Optional[str] = None):
-        """
-        :param str cidr_block: The CIDR block of the VSwitch.
-        :param bool customized: Specifies whether the IP block is customized.
-        :param str vswitch_id: The VSwitch ID.
-        :param str zone_id: The zone ID.
-        """
-        pulumi.set(__self__, "cidr_block", cidr_block)
-        if customized is not None:
-            pulumi.set(__self__, "customized", customized)
-        if vswitch_id is not None:
-            pulumi.set(__self__, "vswitch_id", vswitch_id)
-        if zone_id is not None:
-            pulumi.set(__self__, "zone_id", zone_id)
-
-    @property
-    @pulumi.getter(name="cidrBlock")
-    def cidr_block(self) -> str:
-        """
-        The CIDR block of the VSwitch.
-        """
-        return pulumi.get(self, "cidr_block")
-
-    @property
-    @pulumi.getter
-    def customized(self) -> Optional[bool]:
-        """
-        Specifies whether the IP block is customized.
-        """
-        return pulumi.get(self, "customized")
-
-    @property
-    @pulumi.getter(name="vswitchId")
-    def vswitch_id(self) -> Optional[str]:
-        """
-        The VSwitch ID.
-        """
-        return pulumi.get(self, "vswitch_id")
-
-    @property
-    @pulumi.getter(name="zoneId")
-    def zone_id(self) -> Optional[str]:
-        """
-        The zone ID.
-        """
-        return pulumi.get(self, "zone_id")
-
-
-@pulumi.output_type
-class InstanceZoneVswitchSecurityGroup(dict):
-    @staticmethod
-    def __key_warning(key: str):
-        suggest = None
-        if key == "cidrBlock":
-            suggest = "cidr_block"
-        elif key == "securityGroup":
-            suggest = "security_group"
-        elif key == "vswitchId":
-            suggest = "vswitch_id"
-        elif key == "zoneId":
-            suggest = "zone_id"
-
-        if suggest:
-            pulumi.log.warn(f"Key '{key}' not found in InstanceZoneVswitchSecurityGroup. Access the value via the '{suggest}' property getter instead.")
-
-    def __getitem__(self, key: str) -> Any:
-        InstanceZoneVswitchSecurityGroup.__key_warning(key)
-        return super().__getitem__(key)
-
-    def get(self, key: str, default = None) -> Any:
-        InstanceZoneVswitchSecurityGroup.__key_warning(key)
-        return super().get(key, default)
-
-    def __init__(__self__, *,
-                 cidr_block: str,
-                 security_group: str,
-                 vswitch_id: str,
-                 zone_id: str):
-        """
-        :param str cidr_block: The CIDR block of the VSwitch.
-        :param str security_group: The ID of the security group.
-        :param str vswitch_id: The VSwitch ID.
-        :param str zone_id: The zone ID.
-        """
-        pulumi.set(__self__, "cidr_block", cidr_block)
-        pulumi.set(__self__, "security_group", security_group)
-        pulumi.set(__self__, "vswitch_id", vswitch_id)
-        pulumi.set(__self__, "zone_id", zone_id)
-
-    @property
-    @pulumi.getter(name="cidrBlock")
-    def cidr_block(self) -> str:
-        """
-        The CIDR block of the VSwitch.
-        """
-        return pulumi.get(self, "cidr_block")
-
-    @property
-    @pulumi.getter(name="securityGroup")
-    def security_group(self) -> str:
-        """
-        The ID of the security group.
-        """
-        return pulumi.get(self, "security_group")
-
-    @property
-    @pulumi.getter(name="vswitchId")
-    def vswitch_id(self) -> str:
-        """
-        The VSwitch ID.
-        """
-        return pulumi.get(self, "vswitch_id")
-
-    @property
-    @pulumi.getter(name="zoneId")
-    def zone_id(self) -> str:
-        """
-        The zone ID.
-        """
-        return pulumi.get(self, "zone_id")
-
-
 @pulumi.output_type
 class GetApisApiResult(dict):
     def __init__(__self__, *,

pulumi_alicloud/apigateway/plugin_attachment.py

@@ -184,28 +184,28 @@ class PluginAttachment(pulumi.CustomResource):
             description=name,
             auth_type="APP",
             force_nonce_check=False,
-            request_config={
-                "protocol": "HTTP",
-                "method": "GET",
-                "path": "/example/path",
-                "mode": "MAPPING",
-            },
+            request_config=alicloud.apigateway.ApiRequestConfigArgs(
+                protocol="HTTP",
+                method="GET",
+                path="/example/path",
+                mode="MAPPING",
+            ),
             service_type="HTTP",
-            http_service_config={
-                "address": "http://apigateway-backend.alicloudapi.com:8080",
-                "method": "GET",
-                "path": "/web/cloudapi",
-                "timeout": 12,
-                "aone_name": "cloudapi-openapi",
-            },
-            request_parameters=[{
-                "name": "example",
-                "type": "STRING",
-                "required": "OPTIONAL",
-                "in_": "QUERY",
-                "in_service": "QUERY",
-                "name_service": "exampleservice",
-            }],
+            http_service_config=alicloud.apigateway.ApiHttpServiceConfigArgs(
+                address="http://apigateway-backend.alicloudapi.com:8080",
+                method="GET",
+                path="/web/cloudapi",
+                timeout=12,
+                aone_name="cloudapi-openapi",
+            ),
+            request_parameters=[alicloud.apigateway.ApiRequestParameterArgs(
+                name="example",
+                type="STRING",
+                required="OPTIONAL",
+                in_="QUERY",
+                in_service="QUERY",
+                name_service="exampleservice",
+            )],
             stage_names=[
                 "RELEASE",
                 "TEST",
@@ -265,28 +265,28 @@ class PluginAttachment(pulumi.CustomResource):
             description=name,
             auth_type="APP",
             force_nonce_check=False,
-            request_config={
-                "protocol": "HTTP",
-                "method": "GET",
-                "path": "/example/path",
-                "mode": "MAPPING",
-            },
+            request_config=alicloud.apigateway.ApiRequestConfigArgs(
+                protocol="HTTP",
+                method="GET",
+                path="/example/path",
+                mode="MAPPING",
+            ),
             service_type="HTTP",
-            http_service_config={
-                "address": "http://apigateway-backend.alicloudapi.com:8080",
-                "method": "GET",
-                "path": "/web/cloudapi",
-                "timeout": 12,
-                "aone_name": "cloudapi-openapi",
-            },
-            request_parameters=[{
-                "name": "example",
-                "type": "STRING",
-                "required": "OPTIONAL",
-                "in_": "QUERY",
-                "in_service": "QUERY",
-                "name_service": "exampleservice",
-            }],
+            http_service_config=alicloud.apigateway.ApiHttpServiceConfigArgs(
+                address="http://apigateway-backend.alicloudapi.com:8080",
+                method="GET",
+                path="/web/cloudapi",
+                timeout=12,
+                aone_name="cloudapi-openapi",
+            ),
+            request_parameters=[alicloud.apigateway.ApiRequestParameterArgs(
+                name="example",
+                type="STRING",
+                required="OPTIONAL",
+                in_="QUERY",
+                in_service="QUERY",
+                name_service="exampleservice",
+            )],
             stage_names=[
                 "RELEASE",
                 "TEST",

pulumi_alicloud/apigateway/vpc_access.py

@@ -187,7 +187,7 @@ class VpcAccess(pulumi.CustomResource):
             name="terraform-example",
             description="New security group",
             vpc_id=example_network.id)
-        example_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
+        example_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
             owners="system")
         example_instance = alicloud.ecs.Instance("example",
             availability_zone=example.zones[0].id,
@@ -249,7 +249,7 @@ class VpcAccess(pulumi.CustomResource):
             name="terraform-example",
             description="New security group",
             vpc_id=example_network.id)
-        example_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
+        example_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
             owners="system")
         example_instance = alicloud.ecs.Instance("example",
             availability_zone=example.zones[0].id,