pulumi-aws 7.11.1__py3-none-any.whl → 7.12.0__py3-none-any.whl

pulumi_aws/ec2/image_block_public_access.py

@@ -19,12 +19,16 @@ __all__ = ['ImageBlockPublicAccessArgs', 'ImageBlockPublicAccess']
 @pulumi.input_type
 class ImageBlockPublicAccessArgs:
     def __init__(__self__, *,
-                 state: pulumi.Input[_builtins.str]):
+                 state: pulumi.Input[_builtins.str],
+                 region: Optional[pulumi.Input[_builtins.str]] = None):
         """
         The set of arguments for constructing a ImageBlockPublicAccess resource.
         :param pulumi.Input[_builtins.str] state: The state of block public access for AMIs at the account level in the configured AWS Region. Valid values: `unblocked` and `block-new-sharing`.
+        :param pulumi.Input[_builtins.str] region: Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
         """
         pulumi.set(__self__, "state", state)
+        if region is not None:
+            pulumi.set(__self__, "region", region)
 
     @_builtins.property
     @pulumi.getter
@@ -38,18 +42,46 @@ class ImageBlockPublicAccessArgs:
     def state(self, value: pulumi.Input[_builtins.str]):
         pulumi.set(self, "state", value)
 
+    @_builtins.property
+    @pulumi.getter
+    def region(self) -> Optional[pulumi.Input[_builtins.str]]:
+        """
+        Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
+        """
+        return pulumi.get(self, "region")
+
+    @region.setter
+    def region(self, value: Optional[pulumi.Input[_builtins.str]]):
+        pulumi.set(self, "region", value)
+
 
 @pulumi.input_type
 class _ImageBlockPublicAccessState:
     def __init__(__self__, *,
+                 region: Optional[pulumi.Input[_builtins.str]] = None,
                  state: Optional[pulumi.Input[_builtins.str]] = None):
         """
         Input properties used for looking up and filtering ImageBlockPublicAccess resources.
+        :param pulumi.Input[_builtins.str] region: Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
         :param pulumi.Input[_builtins.str] state: The state of block public access for AMIs at the account level in the configured AWS Region. Valid values: `unblocked` and `block-new-sharing`.
         """
+        if region is not None:
+            pulumi.set(__self__, "region", region)
         if state is not None:
             pulumi.set(__self__, "state", state)
 
+    @_builtins.property
+    @pulumi.getter
+    def region(self) -> Optional[pulumi.Input[_builtins.str]]:
+        """
+        Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
+        """
+        return pulumi.get(self, "region")
+
+    @region.setter
+    def region(self, value: Optional[pulumi.Input[_builtins.str]]):
+        pulumi.set(self, "region", value)
+
     @_builtins.property
     @pulumi.getter
     def state(self) -> Optional[pulumi.Input[_builtins.str]]:
@@ -69,6 +101,7 @@ class ImageBlockPublicAccess(pulumi.CustomResource):
     def __init__(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
+                 region: Optional[pulumi.Input[_builtins.str]] = None,
                  state: Optional[pulumi.Input[_builtins.str]] = None,
                  __props__=None):
         """
@@ -93,6 +126,7 @@ class ImageBlockPublicAccess(pulumi.CustomResource):
 
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
+        :param pulumi.Input[_builtins.str] region: Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
         :param pulumi.Input[_builtins.str] state: The state of block public access for AMIs at the account level in the configured AWS Region. Valid values: `unblocked` and `block-new-sharing`.
         """
         ...
@@ -136,6 +170,7 @@ class ImageBlockPublicAccess(pulumi.CustomResource):
     def _internal_init(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
+                 region: Optional[pulumi.Input[_builtins.str]] = None,
                  state: Optional[pulumi.Input[_builtins.str]] = None,
                  __props__=None):
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
@@ -146,6 +181,7 @@ class ImageBlockPublicAccess(pulumi.CustomResource):
                 raise TypeError('__props__ is only valid when passed in combination with a valid opts.id to get an existing resource')
             __props__ = ImageBlockPublicAccessArgs.__new__(ImageBlockPublicAccessArgs)
 
+            __props__.__dict__["region"] = region
             if state is None and not opts.urn:
                 raise TypeError("Missing required property 'state'")
             __props__.__dict__["state"] = state
@@ -159,6 +195,7 @@ class ImageBlockPublicAccess(pulumi.CustomResource):
     def get(resource_name: str,
             id: pulumi.Input[str],
             opts: Optional[pulumi.ResourceOptions] = None,
+            region: Optional[pulumi.Input[_builtins.str]] = None,
             state: Optional[pulumi.Input[_builtins.str]] = None) -> 'ImageBlockPublicAccess':
         """
         Get an existing ImageBlockPublicAccess resource's state with the given name, id, and optional extra
@@ -167,15 +204,25 @@ class ImageBlockPublicAccess(pulumi.CustomResource):
         :param str resource_name: The unique name of the resulting resource.
         :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
         :param pulumi.ResourceOptions opts: Options for the resource.
+        :param pulumi.Input[_builtins.str] region: Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
         :param pulumi.Input[_builtins.str] state: The state of block public access for AMIs at the account level in the configured AWS Region. Valid values: `unblocked` and `block-new-sharing`.
         """
         opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
 
         __props__ = _ImageBlockPublicAccessState.__new__(_ImageBlockPublicAccessState)
 
+        __props__.__dict__["region"] = region
         __props__.__dict__["state"] = state
         return ImageBlockPublicAccess(resource_name, opts=opts, __props__=__props__)
 
+    @_builtins.property
+    @pulumi.getter
+    def region(self) -> pulumi.Output[_builtins.str]:
+        """
+        Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
+        """
+        return pulumi.get(self, "region")
+
     @_builtins.property
     @pulumi.getter
     def state(self) -> pulumi.Output[_builtins.str]:

pulumi_aws/ec2/outputs.py

@@ -17,6 +17,9 @@ from . import outputs
 from ._enums import *
 
 __all__ = [
+    'AllowedImagesSettingsImageCriterion',
+    'AllowedImagesSettingsImageCriterionCreationDateCondition',
+    'AllowedImagesSettingsImageCriterionDeprecationTimeCondition',
     'AmiCopyEbsBlockDevice',
     'AmiCopyEphemeralBlockDevice',
     'AmiEbsBlockDevice',
@@ -470,6 +473,170 @@ __all__ = [
     'GetVpnGatewayFilterResult',
 ]
 
+@pulumi.output_type
+class AllowedImagesSettingsImageCriterion(dict):
+    @staticmethod
+    def __key_warning(key: str):
+        suggest = None
+        if key == "creationDateCondition":
+            suggest = "creation_date_condition"
+        elif key == "deprecationTimeCondition":
+            suggest = "deprecation_time_condition"
+        elif key == "imageNames":
+            suggest = "image_names"
+        elif key == "imageProviders":
+            suggest = "image_providers"
+        elif key == "marketplaceProductCodes":
+            suggest = "marketplace_product_codes"
+
+        if suggest:
+            pulumi.log.warn(f"Key '{key}' not found in AllowedImagesSettingsImageCriterion. Access the value via the '{suggest}' property getter instead.")
+
+    def __getitem__(self, key: str) -> Any:
+        AllowedImagesSettingsImageCriterion.__key_warning(key)
+        return super().__getitem__(key)
+
+    def get(self, key: str, default = None) -> Any:
+        AllowedImagesSettingsImageCriterion.__key_warning(key)
+        return super().get(key, default)
+
+    def __init__(__self__, *,
+                 creation_date_condition: Optional['outputs.AllowedImagesSettingsImageCriterionCreationDateCondition'] = None,
+                 deprecation_time_condition: Optional['outputs.AllowedImagesSettingsImageCriterionDeprecationTimeCondition'] = None,
+                 image_names: Optional[Sequence[_builtins.str]] = None,
+                 image_providers: Optional[Sequence[_builtins.str]] = None,
+                 marketplace_product_codes: Optional[Sequence[_builtins.str]] = None):
+        """
+        :param 'AllowedImagesSettingsImageCriterionCreationDateConditionArgs' creation_date_condition: Condition based on AMI creation date. See `creation_date_condition` below.
+        :param 'AllowedImagesSettingsImageCriterionDeprecationTimeConditionArgs' deprecation_time_condition: Condition based on AMI deprecation time. See `deprecation_time_condition` below.
+        :param Sequence[_builtins.str] image_names: Set of AMI name patterns to allow. Maximum of 50 names.
+        :param Sequence[_builtins.str] image_providers: Set of image providers to allow. Maximum of 200 providers. Valid values include `amazon`, `aws-marketplace`, `aws-backup-vault`, `none`, or a 12-digit AWS account ID.
+        :param Sequence[_builtins.str] marketplace_product_codes: Set of AWS Marketplace product codes to allow. Maximum of 50 product codes.
+        """
+        if creation_date_condition is not None:
+            pulumi.set(__self__, "creation_date_condition", creation_date_condition)
+        if deprecation_time_condition is not None:
+            pulumi.set(__self__, "deprecation_time_condition", deprecation_time_condition)
+        if image_names is not None:
+            pulumi.set(__self__, "image_names", image_names)
+        if image_providers is not None:
+            pulumi.set(__self__, "image_providers", image_providers)
+        if marketplace_product_codes is not None:
+            pulumi.set(__self__, "marketplace_product_codes", marketplace_product_codes)
+
+    @_builtins.property
+    @pulumi.getter(name="creationDateCondition")
+    def creation_date_condition(self) -> Optional['outputs.AllowedImagesSettingsImageCriterionCreationDateCondition']:
+        """
+        Condition based on AMI creation date. See `creation_date_condition` below.
+        """
+        return pulumi.get(self, "creation_date_condition")
+
+    @_builtins.property
+    @pulumi.getter(name="deprecationTimeCondition")
+    def deprecation_time_condition(self) -> Optional['outputs.AllowedImagesSettingsImageCriterionDeprecationTimeCondition']:
+        """
+        Condition based on AMI deprecation time. See `deprecation_time_condition` below.
+        """
+        return pulumi.get(self, "deprecation_time_condition")
+
+    @_builtins.property
+    @pulumi.getter(name="imageNames")
+    def image_names(self) -> Optional[Sequence[_builtins.str]]:
+        """
+        Set of AMI name patterns to allow. Maximum of 50 names.
+        """
+        return pulumi.get(self, "image_names")
+
+    @_builtins.property
+    @pulumi.getter(name="imageProviders")
+    def image_providers(self) -> Optional[Sequence[_builtins.str]]:
+        """
+        Set of image providers to allow. Maximum of 200 providers. Valid values include `amazon`, `aws-marketplace`, `aws-backup-vault`, `none`, or a 12-digit AWS account ID.
+        """
+        return pulumi.get(self, "image_providers")
+
+    @_builtins.property
+    @pulumi.getter(name="marketplaceProductCodes")
+    def marketplace_product_codes(self) -> Optional[Sequence[_builtins.str]]:
+        """
+        Set of AWS Marketplace product codes to allow. Maximum of 50 product codes.
+        """
+        return pulumi.get(self, "marketplace_product_codes")
+
+
+@pulumi.output_type
+class AllowedImagesSettingsImageCriterionCreationDateCondition(dict):
+    @staticmethod
+    def __key_warning(key: str):
+        suggest = None
+        if key == "maximumDaysSinceCreated":
+            suggest = "maximum_days_since_created"
+
+        if suggest:
+            pulumi.log.warn(f"Key '{key}' not found in AllowedImagesSettingsImageCriterionCreationDateCondition. Access the value via the '{suggest}' property getter instead.")
+
+    def __getitem__(self, key: str) -> Any:
+        AllowedImagesSettingsImageCriterionCreationDateCondition.__key_warning(key)
+        return super().__getitem__(key)
+
+    def get(self, key: str, default = None) -> Any:
+        AllowedImagesSettingsImageCriterionCreationDateCondition.__key_warning(key)
+        return super().get(key, default)
+
+    def __init__(__self__, *,
+                 maximum_days_since_created: Optional[_builtins.int] = None):
+        """
+        :param _builtins.int maximum_days_since_created: Maximum number of days since the AMI was created.
+        """
+        if maximum_days_since_created is not None:
+            pulumi.set(__self__, "maximum_days_since_created", maximum_days_since_created)
+
+    @_builtins.property
+    @pulumi.getter(name="maximumDaysSinceCreated")
+    def maximum_days_since_created(self) -> Optional[_builtins.int]:
+        """
+        Maximum number of days since the AMI was created.
+        """
+        return pulumi.get(self, "maximum_days_since_created")
+
+
+@pulumi.output_type
+class AllowedImagesSettingsImageCriterionDeprecationTimeCondition(dict):
+    @staticmethod
+    def __key_warning(key: str):
+        suggest = None
+        if key == "maximumDaysSinceDeprecated":
+            suggest = "maximum_days_since_deprecated"
+
+        if suggest:
+            pulumi.log.warn(f"Key '{key}' not found in AllowedImagesSettingsImageCriterionDeprecationTimeCondition. Access the value via the '{suggest}' property getter instead.")
+
+    def __getitem__(self, key: str) -> Any:
+        AllowedImagesSettingsImageCriterionDeprecationTimeCondition.__key_warning(key)
+        return super().__getitem__(key)
+
+    def get(self, key: str, default = None) -> Any:
+        AllowedImagesSettingsImageCriterionDeprecationTimeCondition.__key_warning(key)
+        return super().get(key, default)
+
+    def __init__(__self__, *,
+                 maximum_days_since_deprecated: Optional[_builtins.int] = None):
+        """
+        :param _builtins.int maximum_days_since_deprecated: Maximum number of days since the AMI was deprecated. Setting this to `0` means no deprecated images are allowed.
+        """
+        if maximum_days_since_deprecated is not None:
+            pulumi.set(__self__, "maximum_days_since_deprecated", maximum_days_since_deprecated)
+
+    @_builtins.property
+    @pulumi.getter(name="maximumDaysSinceDeprecated")
+    def maximum_days_since_deprecated(self) -> Optional[_builtins.int]:
+        """
+        Maximum number of days since the AMI was deprecated. Setting this to `0` means no deprecated images are allowed.
+        """
+        return pulumi.get(self, "maximum_days_since_deprecated")
+
+
 @pulumi.output_type
 class AmiCopyEbsBlockDevice(dict):
     @staticmethod

pulumi_aws/ec2/security_group.py

@@ -544,9 +544,9 @@ class SecurityGroup(pulumi.CustomResource):
                     aws ec2 modify-vpc-endpoint --vpc-endpoint-id ${{ENDPOINT_ID}} --add-security-group-ids {tags.workaround2} --remove-security-group-ids {id}
         ,
             opts = pulumi.ResourceOptions(depends_on=[example]))
-        example_resource = null.index.Resource("example", triggers={
-            rerunUponChangeOf: std.join(separator=,,
-                input=example_aws_vpc_endpoint.security_group_ids).result,
+        example_resource = null.Resource("example", triggers={
+            "rerunUponChangeOf": std.join(separator=",",
+                input=example_aws_vpc_endpoint["securityGroupIds"]).result,
         })
         example_resource_provisioner0 = command.local.Command("exampleResourceProvisioner0", create=f            aws ec2 modify-vpc-endpoint --vpc-endpoint-id {example_aws_vpc_endpoint.id} --remove-security-group-ids {default.id}
         ,
@@ -745,9 +745,9 @@ class SecurityGroup(pulumi.CustomResource):
                     aws ec2 modify-vpc-endpoint --vpc-endpoint-id ${{ENDPOINT_ID}} --add-security-group-ids {tags.workaround2} --remove-security-group-ids {id}
         ,
             opts = pulumi.ResourceOptions(depends_on=[example]))
-        example_resource = null.index.Resource("example", triggers={
-            rerunUponChangeOf: std.join(separator=,,
-                input=example_aws_vpc_endpoint.security_group_ids).result,
+        example_resource = null.Resource("example", triggers={
+            "rerunUponChangeOf": std.join(separator=",",
+                input=example_aws_vpc_endpoint["securityGroupIds"]).result,
         })
         example_resource_provisioner0 = command.local.Command("exampleResourceProvisioner0", create=f            aws ec2 modify-vpc-endpoint --vpc-endpoint-id {example_aws_vpc_endpoint.id} --remove-security-group-ids {default.id}
         ,

pulumi_aws/ec2/serial_console_access.py

@@ -19,13 +19,17 @@ __all__ = ['SerialConsoleAccessArgs', 'SerialConsoleAccess']
 @pulumi.input_type
 class SerialConsoleAccessArgs:
     def __init__(__self__, *,
-                 enabled: Optional[pulumi.Input[_builtins.bool]] = None):
+                 enabled: Optional[pulumi.Input[_builtins.bool]] = None,
+                 region: Optional[pulumi.Input[_builtins.str]] = None):
         """
         The set of arguments for constructing a SerialConsoleAccess resource.
         :param pulumi.Input[_builtins.bool] enabled: Whether or not serial console access is enabled. Valid values are `true` or `false`. Defaults to `true`.
+        :param pulumi.Input[_builtins.str] region: Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
         """
         if enabled is not None:
             pulumi.set(__self__, "enabled", enabled)
+        if region is not None:
+            pulumi.set(__self__, "region", region)
 
     @_builtins.property
     @pulumi.getter
@@ -39,17 +43,33 @@ class SerialConsoleAccessArgs:
     def enabled(self, value: Optional[pulumi.Input[_builtins.bool]]):
         pulumi.set(self, "enabled", value)
 
+    @_builtins.property
+    @pulumi.getter
+    def region(self) -> Optional[pulumi.Input[_builtins.str]]:
+        """
+        Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
+        """
+        return pulumi.get(self, "region")
+
+    @region.setter
+    def region(self, value: Optional[pulumi.Input[_builtins.str]]):
+        pulumi.set(self, "region", value)
+
 
 @pulumi.input_type
 class _SerialConsoleAccessState:
     def __init__(__self__, *,
-                 enabled: Optional[pulumi.Input[_builtins.bool]] = None):
+                 enabled: Optional[pulumi.Input[_builtins.bool]] = None,
+                 region: Optional[pulumi.Input[_builtins.str]] = None):
         """
         Input properties used for looking up and filtering SerialConsoleAccess resources.
         :param pulumi.Input[_builtins.bool] enabled: Whether or not serial console access is enabled. Valid values are `true` or `false`. Defaults to `true`.
+        :param pulumi.Input[_builtins.str] region: Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
         """
         if enabled is not None:
             pulumi.set(__self__, "enabled", enabled)
+        if region is not None:
+            pulumi.set(__self__, "region", region)
 
     @_builtins.property
     @pulumi.getter
@@ -63,6 +83,18 @@ class _SerialConsoleAccessState:
     def enabled(self, value: Optional[pulumi.Input[_builtins.bool]]):
         pulumi.set(self, "enabled", value)
 
+    @_builtins.property
+    @pulumi.getter
+    def region(self) -> Optional[pulumi.Input[_builtins.str]]:
+        """
+        Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
+        """
+        return pulumi.get(self, "region")
+
+    @region.setter
+    def region(self, value: Optional[pulumi.Input[_builtins.str]]):
+        pulumi.set(self, "region", value)
+
 
 @pulumi.type_token("aws:ec2/serialConsoleAccess:SerialConsoleAccess")
 class SerialConsoleAccess(pulumi.CustomResource):
@@ -71,6 +103,7 @@ class SerialConsoleAccess(pulumi.CustomResource):
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
                  enabled: Optional[pulumi.Input[_builtins.bool]] = None,
+                 region: Optional[pulumi.Input[_builtins.str]] = None,
                  __props__=None):
         """
         Provides a resource to manage whether serial console access is enabled for your AWS account in the current AWS region.
@@ -97,6 +130,7 @@ class SerialConsoleAccess(pulumi.CustomResource):
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[_builtins.bool] enabled: Whether or not serial console access is enabled. Valid values are `true` or `false`. Defaults to `true`.
+        :param pulumi.Input[_builtins.str] region: Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
         """
         ...
     @overload
@@ -142,6 +176,7 @@ class SerialConsoleAccess(pulumi.CustomResource):
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
                  enabled: Optional[pulumi.Input[_builtins.bool]] = None,
+                 region: Optional[pulumi.Input[_builtins.str]] = None,
                  __props__=None):
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
         if not isinstance(opts, pulumi.ResourceOptions):
@@ -152,6 +187,7 @@ class SerialConsoleAccess(pulumi.CustomResource):
             __props__ = SerialConsoleAccessArgs.__new__(SerialConsoleAccessArgs)
 
             __props__.__dict__["enabled"] = enabled
+            __props__.__dict__["region"] = region
         super(SerialConsoleAccess, __self__).__init__(
             'aws:ec2/serialConsoleAccess:SerialConsoleAccess',
             resource_name,
@@ -162,7 +198,8 @@ class SerialConsoleAccess(pulumi.CustomResource):
     def get(resource_name: str,
             id: pulumi.Input[str],
             opts: Optional[pulumi.ResourceOptions] = None,
-            enabled: Optional[pulumi.Input[_builtins.bool]] = None) -> 'SerialConsoleAccess':
+            enabled: Optional[pulumi.Input[_builtins.bool]] = None,
+            region: Optional[pulumi.Input[_builtins.str]] = None) -> 'SerialConsoleAccess':
         """
         Get an existing SerialConsoleAccess resource's state with the given name, id, and optional extra
         properties used to qualify the lookup.
@@ -171,12 +208,14 @@ class SerialConsoleAccess(pulumi.CustomResource):
         :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[_builtins.bool] enabled: Whether or not serial console access is enabled. Valid values are `true` or `false`. Defaults to `true`.
+        :param pulumi.Input[_builtins.str] region: Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
         """
         opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
 
         __props__ = _SerialConsoleAccessState.__new__(_SerialConsoleAccessState)
 
         __props__.__dict__["enabled"] = enabled
+        __props__.__dict__["region"] = region
         return SerialConsoleAccess(resource_name, opts=opts, __props__=__props__)
 
     @_builtins.property
@@ -187,3 +226,11 @@ class SerialConsoleAccess(pulumi.CustomResource):
         """
         return pulumi.get(self, "enabled")
 
+    @_builtins.property
+    @pulumi.getter
+    def region(self) -> pulumi.Output[_builtins.str]:
+        """
+        Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
+        """
+        return pulumi.get(self, "region")
+

pulumi_aws/ec2/vpc_endpoint.py

@@ -875,6 +875,52 @@ class VpcEndpoint(pulumi.CustomResource):
             vpc_id=example_aws_vpc["id"])
         ```
 
+        ### Non-AWS Service
+
+        ```python
+        import pulumi
+        import pulumi_aws as aws
+
+        ptfe_service = aws.ec2.VpcEndpoint("ptfe_service",
+            vpc_id=vpc_id,
+            service_name=ptfe_service_config,
+            vpc_endpoint_type="Interface",
+            security_group_ids=[ptfe_service_aws_security_group["id"]],
+            subnet_ids=[subnet_ids],
+            private_dns_enabled=False)
+        internal = aws.route53.get_zone(name="vpc.internal.",
+            private_zone=True,
+            vpc_id=vpc_id)
+        ptfe_service_record = aws.route53.Record("ptfe_service",
+            zone_id=internal.zone_id,
+            name=f"ptfe.{internal.name}",
+            type=aws.route53.RecordType.CNAME,
+            ttl=300,
+            records=[ptfe_service.dns_entries[0].dns_name])
+        ```
+
+        > **NOTE The `dns_entry` output is a list of maps:** This provider interpolation support for lists of maps requires the `lookup` and `[]` until full support of lists of maps is available
+
+        ## Import
+
+        ### Identity Schema
+
+        #### Required
+
+        * `id` - (String) ID of the VPC endpoint.
+
+        #### Optional
+
+        * `account_id` (String) AWS Account where this resource is managed.
+
+        * `region` (String) Region where this resource is managed.
+
+        Using `pulumi import`, import VPC Endpoints using the VPC endpoint `id`. For example:
+
+        console
+
+        % pulumi import aws_vpc_endpoint.example vpce-3ecf2a57
+
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[_builtins.bool] auto_accept: Accept the VPC endpoint (the VPC endpoint and service need to be in the same AWS account).
@@ -1025,6 +1071,52 @@ class VpcEndpoint(pulumi.CustomResource):
             vpc_id=example_aws_vpc["id"])
         ```
 
+        ### Non-AWS Service
+
+        ```python
+        import pulumi
+        import pulumi_aws as aws
+
+        ptfe_service = aws.ec2.VpcEndpoint("ptfe_service",
+            vpc_id=vpc_id,
+            service_name=ptfe_service_config,
+            vpc_endpoint_type="Interface",
+            security_group_ids=[ptfe_service_aws_security_group["id"]],
+            subnet_ids=[subnet_ids],
+            private_dns_enabled=False)
+        internal = aws.route53.get_zone(name="vpc.internal.",
+            private_zone=True,
+            vpc_id=vpc_id)
+        ptfe_service_record = aws.route53.Record("ptfe_service",
+            zone_id=internal.zone_id,
+            name=f"ptfe.{internal.name}",
+            type=aws.route53.RecordType.CNAME,
+            ttl=300,
+            records=[ptfe_service.dns_entries[0].dns_name])
+        ```
+
+        > **NOTE The `dns_entry` output is a list of maps:** This provider interpolation support for lists of maps requires the `lookup` and `[]` until full support of lists of maps is available
+
+        ## Import
+
+        ### Identity Schema
+
+        #### Required
+
+        * `id` - (String) ID of the VPC endpoint.
+
+        #### Optional
+
+        * `account_id` (String) AWS Account where this resource is managed.
+
+        * `region` (String) Region where this resource is managed.
+
+        Using `pulumi import`, import VPC Endpoints using the VPC endpoint `id`. For example:
+
+        console
+
+        % pulumi import aws_vpc_endpoint.example vpce-3ecf2a57
+
         :param str resource_name: The name of the resource.
         :param VpcEndpointArgs args: The arguments to use to populate this resource's properties.
         :param pulumi.ResourceOptions opts: Options for the resource.

pulumi_aws/ec2clientvpn/authorization_rule.py

@@ -28,7 +28,7 @@ class AuthorizationRuleArgs:
         """
         The set of arguments for constructing a AuthorizationRule resource.
         :param pulumi.Input[_builtins.str] client_vpn_endpoint_id: The ID of the Client VPN endpoint.
-        :param pulumi.Input[_builtins.str] target_network_cidr: The IPv4 address range, in CIDR notation, of the network to which the authorization rule applies.
+        :param pulumi.Input[_builtins.str] target_network_cidr: The IPv4 or IPv6 address range, in CIDR notation, of the network to which the authorization rule applies.
         :param pulumi.Input[_builtins.str] access_group_id: The ID of the group to which the authorization rule grants access. One of `access_group_id` or `authorize_all_groups` must be set.
         :param pulumi.Input[_builtins.bool] authorize_all_groups: Indicates whether the authorization rule grants access to all clients. One of `access_group_id` or `authorize_all_groups` must be set.
         :param pulumi.Input[_builtins.str] description: A brief description of the authorization rule.
@@ -61,7 +61,7 @@ class AuthorizationRuleArgs:
     @pulumi.getter(name="targetNetworkCidr")
     def target_network_cidr(self) -> pulumi.Input[_builtins.str]:
         """
-        The IPv4 address range, in CIDR notation, of the network to which the authorization rule applies.
+        The IPv4 or IPv6 address range, in CIDR notation, of the network to which the authorization rule applies.
         """
         return pulumi.get(self, "target_network_cidr")
 
@@ -134,7 +134,7 @@ class _AuthorizationRuleState:
         :param pulumi.Input[_builtins.str] client_vpn_endpoint_id: The ID of the Client VPN endpoint.
         :param pulumi.Input[_builtins.str] description: A brief description of the authorization rule.
         :param pulumi.Input[_builtins.str] region: Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
-        :param pulumi.Input[_builtins.str] target_network_cidr: The IPv4 address range, in CIDR notation, of the network to which the authorization rule applies.
+        :param pulumi.Input[_builtins.str] target_network_cidr: The IPv4 or IPv6 address range, in CIDR notation, of the network to which the authorization rule applies.
         """
         if access_group_id is not None:
             pulumi.set(__self__, "access_group_id", access_group_id)
@@ -213,7 +213,7 @@ class _AuthorizationRuleState:
     @pulumi.getter(name="targetNetworkCidr")
     def target_network_cidr(self) -> Optional[pulumi.Input[_builtins.str]]:
         """
-        The IPv4 address range, in CIDR notation, of the network to which the authorization rule applies.
+        The IPv4 or IPv6 address range, in CIDR notation, of the network to which the authorization rule applies.
         """
         return pulumi.get(self, "target_network_cidr")
 
@@ -275,7 +275,7 @@ class AuthorizationRule(pulumi.CustomResource):
         :param pulumi.Input[_builtins.str] client_vpn_endpoint_id: The ID of the Client VPN endpoint.
         :param pulumi.Input[_builtins.str] description: A brief description of the authorization rule.
         :param pulumi.Input[_builtins.str] region: Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
-        :param pulumi.Input[_builtins.str] target_network_cidr: The IPv4 address range, in CIDR notation, of the network to which the authorization rule applies.
+        :param pulumi.Input[_builtins.str] target_network_cidr: The IPv4 or IPv6 address range, in CIDR notation, of the network to which the authorization rule applies.
         """
         ...
     @overload
@@ -384,7 +384,7 @@ class AuthorizationRule(pulumi.CustomResource):
         :param pulumi.Input[_builtins.str] client_vpn_endpoint_id: The ID of the Client VPN endpoint.
         :param pulumi.Input[_builtins.str] description: A brief description of the authorization rule.
         :param pulumi.Input[_builtins.str] region: Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
-        :param pulumi.Input[_builtins.str] target_network_cidr: The IPv4 address range, in CIDR notation, of the network to which the authorization rule applies.
+        :param pulumi.Input[_builtins.str] target_network_cidr: The IPv4 or IPv6 address range, in CIDR notation, of the network to which the authorization rule applies.
         """
         opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
 
@@ -442,7 +442,7 @@ class AuthorizationRule(pulumi.CustomResource):
     @pulumi.getter(name="targetNetworkCidr")
     def target_network_cidr(self) -> pulumi.Output[_builtins.str]:
         """
-        The IPv4 address range, in CIDR notation, of the network to which the authorization rule applies.
+        The IPv4 or IPv6 address range, in CIDR notation, of the network to which the authorization rule applies.
         """
         return pulumi.get(self, "target_network_cidr")