pulumi-gcp 7.20.0a1713984378__py3-none-any.whl → 7.21.0__py3-none-any.whl

pulumi_gcp/alloydb/outputs.py

@@ -36,6 +36,8 @@ __all__ = [
     'InstanceClientConnectionConfig',
     'InstanceClientConnectionConfigSslConfig',
     'InstanceMachineConfig',
+    'InstanceNetworkConfig',
+    'InstanceNetworkConfigAuthorizedExternalNetwork',
     'InstanceQueryInsightsConfig',
     'InstanceReadPoolConfig',
     'GetLocationsLocationResult',
@@ -1289,6 +1291,102 @@ class InstanceMachineConfig(dict):
         return pulumi.get(self, "cpu_count")
 
 
+@pulumi.output_type
+class InstanceNetworkConfig(dict):
+    @staticmethod
+    def __key_warning(key: str):
+        suggest = None
+        if key == "authorizedExternalNetworks":
+            suggest = "authorized_external_networks"
+        elif key == "enablePublicIp":
+            suggest = "enable_public_ip"
+
+        if suggest:
+            pulumi.log.warn(f"Key '{key}' not found in InstanceNetworkConfig. Access the value via the '{suggest}' property getter instead.")
+
+    def __getitem__(self, key: str) -> Any:
+        InstanceNetworkConfig.__key_warning(key)
+        return super().__getitem__(key)
+
+    def get(self, key: str, default = None) -> Any:
+        InstanceNetworkConfig.__key_warning(key)
+        return super().get(key, default)
+
+    def __init__(__self__, *,
+                 authorized_external_networks: Optional[Sequence['outputs.InstanceNetworkConfigAuthorizedExternalNetwork']] = None,
+                 enable_public_ip: Optional[bool] = None):
+        """
+        :param Sequence['InstanceNetworkConfigAuthorizedExternalNetworkArgs'] authorized_external_networks: A list of external networks authorized to access this instance. This
+               field is only allowed to be set when `enable_public_ip` is set to
+               true.
+               Structure is documented below.
+        :param bool enable_public_ip: Enabling public ip for the instance. If a user wishes to disable this,
+               please also clear the list of the authorized external networks set on
+               the same instance.
+        """
+        if authorized_external_networks is not None:
+            pulumi.set(__self__, "authorized_external_networks", authorized_external_networks)
+        if enable_public_ip is not None:
+            pulumi.set(__self__, "enable_public_ip", enable_public_ip)
+
+    @property
+    @pulumi.getter(name="authorizedExternalNetworks")
+    def authorized_external_networks(self) -> Optional[Sequence['outputs.InstanceNetworkConfigAuthorizedExternalNetwork']]:
+        """
+        A list of external networks authorized to access this instance. This
+        field is only allowed to be set when `enable_public_ip` is set to
+        true.
+        Structure is documented below.
+        """
+        return pulumi.get(self, "authorized_external_networks")
+
+    @property
+    @pulumi.getter(name="enablePublicIp")
+    def enable_public_ip(self) -> Optional[bool]:
+        """
+        Enabling public ip for the instance. If a user wishes to disable this,
+        please also clear the list of the authorized external networks set on
+        the same instance.
+        """
+        return pulumi.get(self, "enable_public_ip")
+
+
+@pulumi.output_type
+class InstanceNetworkConfigAuthorizedExternalNetwork(dict):
+    @staticmethod
+    def __key_warning(key: str):
+        suggest = None
+        if key == "cidrRange":
+            suggest = "cidr_range"
+
+        if suggest:
+            pulumi.log.warn(f"Key '{key}' not found in InstanceNetworkConfigAuthorizedExternalNetwork. Access the value via the '{suggest}' property getter instead.")
+
+    def __getitem__(self, key: str) -> Any:
+        InstanceNetworkConfigAuthorizedExternalNetwork.__key_warning(key)
+        return super().__getitem__(key)
+
+    def get(self, key: str, default = None) -> Any:
+        InstanceNetworkConfigAuthorizedExternalNetwork.__key_warning(key)
+        return super().get(key, default)
+
+    def __init__(__self__, *,
+                 cidr_range: Optional[str] = None):
+        """
+        :param str cidr_range: CIDR range for one authorized network of the instance.
+        """
+        if cidr_range is not None:
+            pulumi.set(__self__, "cidr_range", cidr_range)
+
+    @property
+    @pulumi.getter(name="cidrRange")
+    def cidr_range(self) -> Optional[str]:
+        """
+        CIDR range for one authorized network of the instance.
+        """
+        return pulumi.get(self, "cidr_range")
+
+
 @pulumi.output_type
 class InstanceQueryInsightsConfig(dict):
     @staticmethod

pulumi_gcp/apigee/environment.py

@@ -21,6 +21,7 @@ class EnvironmentArgs:
                  deployment_type: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  display_name: Optional[pulumi.Input[str]] = None,
+                 forward_proxy_uri: Optional[pulumi.Input[str]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  node_config: Optional[pulumi.Input['EnvironmentNodeConfigArgs']] = None,
                  type: Optional[pulumi.Input[str]] = None):
@@ -44,6 +45,7 @@ class EnvironmentArgs:
                Possible values are: `DEPLOYMENT_TYPE_UNSPECIFIED`, `PROXY`, `ARCHIVE`.
         :param pulumi.Input[str] description: Description of the environment.
         :param pulumi.Input[str] display_name: Display name of the environment.
+        :param pulumi.Input[str] forward_proxy_uri: Optional. URI of the forward proxy to be applied to the runtime instances in this environment. Must be in the format of {scheme}://{hostname}:{port}. Note that the scheme must be one of "http" or "https", and the port must be supplied.
         :param pulumi.Input[str] name: The resource ID of the environment.
         :param pulumi.Input['EnvironmentNodeConfigArgs'] node_config: NodeConfig for setting the min/max number of nodes associated with the environment.
                Structure is documented below.
@@ -62,6 +64,8 @@ class EnvironmentArgs:
             pulumi.set(__self__, "description", description)
         if display_name is not None:
             pulumi.set(__self__, "display_name", display_name)
+        if forward_proxy_uri is not None:
+            pulumi.set(__self__, "forward_proxy_uri", forward_proxy_uri)
         if name is not None:
             pulumi.set(__self__, "name", name)
         if node_config is not None:
@@ -142,6 +146,18 @@ class EnvironmentArgs:
     def display_name(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "display_name", value)
 
+    @property
+    @pulumi.getter(name="forwardProxyUri")
+    def forward_proxy_uri(self) -> Optional[pulumi.Input[str]]:
+        """
+        Optional. URI of the forward proxy to be applied to the runtime instances in this environment. Must be in the format of {scheme}://{hostname}:{port}. Note that the scheme must be one of "http" or "https", and the port must be supplied.
+        """
+        return pulumi.get(self, "forward_proxy_uri")
+
+    @forward_proxy_uri.setter
+    def forward_proxy_uri(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "forward_proxy_uri", value)
+
     @property
     @pulumi.getter
     def name(self) -> Optional[pulumi.Input[str]]:
@@ -191,6 +207,7 @@ class _EnvironmentState:
                  deployment_type: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  display_name: Optional[pulumi.Input[str]] = None,
+                 forward_proxy_uri: Optional[pulumi.Input[str]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  node_config: Optional[pulumi.Input['EnvironmentNodeConfigArgs']] = None,
                  org_id: Optional[pulumi.Input[str]] = None,
@@ -210,6 +227,7 @@ class _EnvironmentState:
                Possible values are: `DEPLOYMENT_TYPE_UNSPECIFIED`, `PROXY`, `ARCHIVE`.
         :param pulumi.Input[str] description: Description of the environment.
         :param pulumi.Input[str] display_name: Display name of the environment.
+        :param pulumi.Input[str] forward_proxy_uri: Optional. URI of the forward proxy to be applied to the runtime instances in this environment. Must be in the format of {scheme}://{hostname}:{port}. Note that the scheme must be one of "http" or "https", and the port must be supplied.
         :param pulumi.Input[str] name: The resource ID of the environment.
         :param pulumi.Input['EnvironmentNodeConfigArgs'] node_config: NodeConfig for setting the min/max number of nodes associated with the environment.
                Structure is documented below.
@@ -232,6 +250,8 @@ class _EnvironmentState:
             pulumi.set(__self__, "description", description)
         if display_name is not None:
             pulumi.set(__self__, "display_name", display_name)
+        if forward_proxy_uri is not None:
+            pulumi.set(__self__, "forward_proxy_uri", forward_proxy_uri)
         if name is not None:
             pulumi.set(__self__, "name", name)
         if node_config is not None:
@@ -298,6 +318,18 @@ class _EnvironmentState:
     def display_name(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "display_name", value)
 
+    @property
+    @pulumi.getter(name="forwardProxyUri")
+    def forward_proxy_uri(self) -> Optional[pulumi.Input[str]]:
+        """
+        Optional. URI of the forward proxy to be applied to the runtime instances in this environment. Must be in the format of {scheme}://{hostname}:{port}. Note that the scheme must be one of "http" or "https", and the port must be supplied.
+        """
+        return pulumi.get(self, "forward_proxy_uri")
+
+    @forward_proxy_uri.setter
+    def forward_proxy_uri(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "forward_proxy_uri", value)
+
     @property
     @pulumi.getter
     def name(self) -> Optional[pulumi.Input[str]]:
@@ -365,6 +397,7 @@ class Environment(pulumi.CustomResource):
                  deployment_type: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  display_name: Optional[pulumi.Input[str]] = None,
+                 forward_proxy_uri: Optional[pulumi.Input[str]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  node_config: Optional[pulumi.Input[pulumi.InputType['EnvironmentNodeConfigArgs']]] = None,
                  org_id: Optional[pulumi.Input[str]] = None,
@@ -443,6 +476,7 @@ class Environment(pulumi.CustomResource):
                Possible values are: `DEPLOYMENT_TYPE_UNSPECIFIED`, `PROXY`, `ARCHIVE`.
         :param pulumi.Input[str] description: Description of the environment.
         :param pulumi.Input[str] display_name: Display name of the environment.
+        :param pulumi.Input[str] forward_proxy_uri: Optional. URI of the forward proxy to be applied to the runtime instances in this environment. Must be in the format of {scheme}://{hostname}:{port}. Note that the scheme must be one of "http" or "https", and the port must be supplied.
         :param pulumi.Input[str] name: The resource ID of the environment.
         :param pulumi.Input[pulumi.InputType['EnvironmentNodeConfigArgs']] node_config: NodeConfig for setting the min/max number of nodes associated with the environment.
                Structure is documented below.
@@ -540,6 +574,7 @@ class Environment(pulumi.CustomResource):
                  deployment_type: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  display_name: Optional[pulumi.Input[str]] = None,
+                 forward_proxy_uri: Optional[pulumi.Input[str]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  node_config: Optional[pulumi.Input[pulumi.InputType['EnvironmentNodeConfigArgs']]] = None,
                  org_id: Optional[pulumi.Input[str]] = None,
@@ -557,6 +592,7 @@ class Environment(pulumi.CustomResource):
             __props__.__dict__["deployment_type"] = deployment_type
             __props__.__dict__["description"] = description
             __props__.__dict__["display_name"] = display_name
+            __props__.__dict__["forward_proxy_uri"] = forward_proxy_uri
             __props__.__dict__["name"] = name
             __props__.__dict__["node_config"] = node_config
             if org_id is None and not opts.urn:
@@ -577,6 +613,7 @@ class Environment(pulumi.CustomResource):
             deployment_type: Optional[pulumi.Input[str]] = None,
             description: Optional[pulumi.Input[str]] = None,
             display_name: Optional[pulumi.Input[str]] = None,
+            forward_proxy_uri: Optional[pulumi.Input[str]] = None,
             name: Optional[pulumi.Input[str]] = None,
             node_config: Optional[pulumi.Input[pulumi.InputType['EnvironmentNodeConfigArgs']]] = None,
             org_id: Optional[pulumi.Input[str]] = None,
@@ -601,6 +638,7 @@ class Environment(pulumi.CustomResource):
                Possible values are: `DEPLOYMENT_TYPE_UNSPECIFIED`, `PROXY`, `ARCHIVE`.
         :param pulumi.Input[str] description: Description of the environment.
         :param pulumi.Input[str] display_name: Display name of the environment.
+        :param pulumi.Input[str] forward_proxy_uri: Optional. URI of the forward proxy to be applied to the runtime instances in this environment. Must be in the format of {scheme}://{hostname}:{port}. Note that the scheme must be one of "http" or "https", and the port must be supplied.
         :param pulumi.Input[str] name: The resource ID of the environment.
         :param pulumi.Input[pulumi.InputType['EnvironmentNodeConfigArgs']] node_config: NodeConfig for setting the min/max number of nodes associated with the environment.
                Structure is documented below.
@@ -623,6 +661,7 @@ class Environment(pulumi.CustomResource):
         __props__.__dict__["deployment_type"] = deployment_type
         __props__.__dict__["description"] = description
         __props__.__dict__["display_name"] = display_name
+        __props__.__dict__["forward_proxy_uri"] = forward_proxy_uri
         __props__.__dict__["name"] = name
         __props__.__dict__["node_config"] = node_config
         __props__.__dict__["org_id"] = org_id
@@ -670,6 +709,14 @@ class Environment(pulumi.CustomResource):
         """
         return pulumi.get(self, "display_name")
 
+    @property
+    @pulumi.getter(name="forwardProxyUri")
+    def forward_proxy_uri(self) -> pulumi.Output[Optional[str]]:
+        """
+        Optional. URI of the forward proxy to be applied to the runtime instances in this environment. Must be in the format of {scheme}://{hostname}:{port}. Note that the scheme must be one of "http" or "https", and the port must be supplied.
+        """
+        return pulumi.get(self, "forward_proxy_uri")
+
     @property
     @pulumi.getter
     def name(self) -> pulumi.Output[str]:

pulumi_gcp/apigee/organization.py

@@ -18,8 +18,11 @@ class OrganizationArgs:
     def __init__(__self__, *,
                  project_id: pulumi.Input[str],
                  analytics_region: Optional[pulumi.Input[str]] = None,
+                 api_consumer_data_encryption_key_name: Optional[pulumi.Input[str]] = None,
+                 api_consumer_data_location: Optional[pulumi.Input[str]] = None,
                  authorized_network: Optional[pulumi.Input[str]] = None,
                  billing_type: Optional[pulumi.Input[str]] = None,
+                 control_plane_encryption_key_name: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  disable_vpc_peering: Optional[pulumi.Input[bool]] = None,
                  display_name: Optional[pulumi.Input[str]] = None,
@@ -34,10 +37,16 @@ class OrganizationArgs:
                
                - - -
         :param pulumi.Input[str] analytics_region: Primary GCP region for analytics data storage. For valid values, see [Create an Apigee organization](https://cloud.google.com/apigee/docs/api-platform/get-started/create-org).
+        :param pulumi.Input[str] api_consumer_data_encryption_key_name: Cloud KMS key name used for encrypting API consumer data.
+        :param pulumi.Input[str] api_consumer_data_location: This field is needed only for customers using non-default data residency regions.
+               Apigee stores some control plane data only in single region.
+               This field determines which single region Apigee should use.
         :param pulumi.Input[str] authorized_network: Compute Engine network used for Service Networking to be peered with Apigee runtime instances.
                See [Getting started with the Service Networking API](https://cloud.google.com/service-infrastructure/docs/service-networking/getting-started).
                Valid only when `RuntimeType` is set to CLOUD. The value can be updated only when there are no runtime instances. For example: "default".
         :param pulumi.Input[str] billing_type: Billing type of the Apigee organization. See [Apigee pricing](https://cloud.google.com/apigee/pricing).
+        :param pulumi.Input[str] control_plane_encryption_key_name: Cloud KMS key name used for encrypting control plane data that is stored in a multi region.
+               Only used for the data residency region "US" or "EU".
         :param pulumi.Input[str] description: Description of the Apigee organization.
         :param pulumi.Input[bool] disable_vpc_peering: Flag that specifies whether the VPC Peering through Private Google Access should be
                disabled between the consumer network and Apigee. Required if an `authorizedNetwork`
@@ -64,10 +73,16 @@ class OrganizationArgs:
         pulumi.set(__self__, "project_id", project_id)
         if analytics_region is not None:
             pulumi.set(__self__, "analytics_region", analytics_region)
+        if api_consumer_data_encryption_key_name is not None:
+            pulumi.set(__self__, "api_consumer_data_encryption_key_name", api_consumer_data_encryption_key_name)
+        if api_consumer_data_location is not None:
+            pulumi.set(__self__, "api_consumer_data_location", api_consumer_data_location)
         if authorized_network is not None:
             pulumi.set(__self__, "authorized_network", authorized_network)
         if billing_type is not None:
             pulumi.set(__self__, "billing_type", billing_type)
+        if control_plane_encryption_key_name is not None:
+            pulumi.set(__self__, "control_plane_encryption_key_name", control_plane_encryption_key_name)
         if description is not None:
             pulumi.set(__self__, "description", description)
         if disable_vpc_peering is not None:
@@ -110,6 +125,32 @@ class OrganizationArgs:
     def analytics_region(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "analytics_region", value)
 
+    @property
+    @pulumi.getter(name="apiConsumerDataEncryptionKeyName")
+    def api_consumer_data_encryption_key_name(self) -> Optional[pulumi.Input[str]]:
+        """
+        Cloud KMS key name used for encrypting API consumer data.
+        """
+        return pulumi.get(self, "api_consumer_data_encryption_key_name")
+
+    @api_consumer_data_encryption_key_name.setter
+    def api_consumer_data_encryption_key_name(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "api_consumer_data_encryption_key_name", value)
+
+    @property
+    @pulumi.getter(name="apiConsumerDataLocation")
+    def api_consumer_data_location(self) -> Optional[pulumi.Input[str]]:
+        """
+        This field is needed only for customers using non-default data residency regions.
+        Apigee stores some control plane data only in single region.
+        This field determines which single region Apigee should use.
+        """
+        return pulumi.get(self, "api_consumer_data_location")
+
+    @api_consumer_data_location.setter
+    def api_consumer_data_location(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "api_consumer_data_location", value)
+
     @property
     @pulumi.getter(name="authorizedNetwork")
     def authorized_network(self) -> Optional[pulumi.Input[str]]:
@@ -136,6 +177,19 @@ class OrganizationArgs:
     def billing_type(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "billing_type", value)
 
+    @property
+    @pulumi.getter(name="controlPlaneEncryptionKeyName")
+    def control_plane_encryption_key_name(self) -> Optional[pulumi.Input[str]]:
+        """
+        Cloud KMS key name used for encrypting control plane data that is stored in a multi region.
+        Only used for the data residency region "US" or "EU".
+        """
+        return pulumi.get(self, "control_plane_encryption_key_name")
+
+    @control_plane_encryption_key_name.setter
+    def control_plane_encryption_key_name(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "control_plane_encryption_key_name", value)
+
     @property
     @pulumi.getter
     def description(self) -> Optional[pulumi.Input[str]]:
@@ -240,10 +294,13 @@ class OrganizationArgs:
 class _OrganizationState:
     def __init__(__self__, *,
                  analytics_region: Optional[pulumi.Input[str]] = None,
+                 api_consumer_data_encryption_key_name: Optional[pulumi.Input[str]] = None,
+                 api_consumer_data_location: Optional[pulumi.Input[str]] = None,
                  apigee_project_id: Optional[pulumi.Input[str]] = None,
                  authorized_network: Optional[pulumi.Input[str]] = None,
                  billing_type: Optional[pulumi.Input[str]] = None,
                  ca_certificate: Optional[pulumi.Input[str]] = None,
+                 control_plane_encryption_key_name: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  disable_vpc_peering: Optional[pulumi.Input[bool]] = None,
                  display_name: Optional[pulumi.Input[str]] = None,
@@ -257,6 +314,10 @@ class _OrganizationState:
         """
         Input properties used for looking up and filtering Organization resources.
         :param pulumi.Input[str] analytics_region: Primary GCP region for analytics data storage. For valid values, see [Create an Apigee organization](https://cloud.google.com/apigee/docs/api-platform/get-started/create-org).
+        :param pulumi.Input[str] api_consumer_data_encryption_key_name: Cloud KMS key name used for encrypting API consumer data.
+        :param pulumi.Input[str] api_consumer_data_location: This field is needed only for customers using non-default data residency regions.
+               Apigee stores some control plane data only in single region.
+               This field determines which single region Apigee should use.
         :param pulumi.Input[str] apigee_project_id: Output only. Project ID of the Apigee Tenant Project.
         :param pulumi.Input[str] authorized_network: Compute Engine network used for Service Networking to be peered with Apigee runtime instances.
                See [Getting started with the Service Networking API](https://cloud.google.com/service-infrastructure/docs/service-networking/getting-started).
@@ -264,6 +325,8 @@ class _OrganizationState:
         :param pulumi.Input[str] billing_type: Billing type of the Apigee organization. See [Apigee pricing](https://cloud.google.com/apigee/pricing).
         :param pulumi.Input[str] ca_certificate: Output only. Base64-encoded public certificate for the root CA of the Apigee organization.
                Valid only when `RuntimeType` is CLOUD. A base64-encoded string.
+        :param pulumi.Input[str] control_plane_encryption_key_name: Cloud KMS key name used for encrypting control plane data that is stored in a multi region.
+               Only used for the data residency region "US" or "EU".
         :param pulumi.Input[str] description: Description of the Apigee organization.
         :param pulumi.Input[bool] disable_vpc_peering: Flag that specifies whether the VPC Peering through Private Google Access should be
                disabled between the consumer network and Apigee. Required if an `authorizedNetwork`
@@ -296,6 +359,10 @@ class _OrganizationState:
         """
         if analytics_region is not None:
             pulumi.set(__self__, "analytics_region", analytics_region)
+        if api_consumer_data_encryption_key_name is not None:
+            pulumi.set(__self__, "api_consumer_data_encryption_key_name", api_consumer_data_encryption_key_name)
+        if api_consumer_data_location is not None:
+            pulumi.set(__self__, "api_consumer_data_location", api_consumer_data_location)
         if apigee_project_id is not None:
             pulumi.set(__self__, "apigee_project_id", apigee_project_id)
         if authorized_network is not None:
@@ -304,6 +371,8 @@ class _OrganizationState:
             pulumi.set(__self__, "billing_type", billing_type)
         if ca_certificate is not None:
             pulumi.set(__self__, "ca_certificate", ca_certificate)
+        if control_plane_encryption_key_name is not None:
+            pulumi.set(__self__, "control_plane_encryption_key_name", control_plane_encryption_key_name)
         if description is not None:
             pulumi.set(__self__, "description", description)
         if disable_vpc_peering is not None:
@@ -337,6 +406,32 @@ class _OrganizationState:
     def analytics_region(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "analytics_region", value)
 
+    @property
+    @pulumi.getter(name="apiConsumerDataEncryptionKeyName")
+    def api_consumer_data_encryption_key_name(self) -> Optional[pulumi.Input[str]]:
+        """
+        Cloud KMS key name used for encrypting API consumer data.
+        """
+        return pulumi.get(self, "api_consumer_data_encryption_key_name")
+
+    @api_consumer_data_encryption_key_name.setter
+    def api_consumer_data_encryption_key_name(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "api_consumer_data_encryption_key_name", value)
+
+    @property
+    @pulumi.getter(name="apiConsumerDataLocation")
+    def api_consumer_data_location(self) -> Optional[pulumi.Input[str]]:
+        """
+        This field is needed only for customers using non-default data residency regions.
+        Apigee stores some control plane data only in single region.
+        This field determines which single region Apigee should use.
+        """
+        return pulumi.get(self, "api_consumer_data_location")
+
+    @api_consumer_data_location.setter
+    def api_consumer_data_location(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "api_consumer_data_location", value)
+
     @property
     @pulumi.getter(name="apigeeProjectId")
     def apigee_project_id(self) -> Optional[pulumi.Input[str]]:
@@ -388,6 +483,19 @@ class _OrganizationState:
     def ca_certificate(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "ca_certificate", value)
 
+    @property
+    @pulumi.getter(name="controlPlaneEncryptionKeyName")
+    def control_plane_encryption_key_name(self) -> Optional[pulumi.Input[str]]:
+        """
+        Cloud KMS key name used for encrypting control plane data that is stored in a multi region.
+        Only used for the data residency region "US" or "EU".
+        """
+        return pulumi.get(self, "control_plane_encryption_key_name")
+
+    @control_plane_encryption_key_name.setter
+    def control_plane_encryption_key_name(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "control_plane_encryption_key_name", value)
+
     @property
     @pulumi.getter
     def description(self) -> Optional[pulumi.Input[str]]:
@@ -534,8 +642,11 @@ class Organization(pulumi.CustomResource):
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
                  analytics_region: Optional[pulumi.Input[str]] = None,
+                 api_consumer_data_encryption_key_name: Optional[pulumi.Input[str]] = None,
+                 api_consumer_data_location: Optional[pulumi.Input[str]] = None,
                  authorized_network: Optional[pulumi.Input[str]] = None,
                  billing_type: Optional[pulumi.Input[str]] = None,
+                 control_plane_encryption_key_name: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  disable_vpc_peering: Optional[pulumi.Input[bool]] = None,
                  display_name: Optional[pulumi.Input[str]] = None,
@@ -681,10 +792,16 @@ class Organization(pulumi.CustomResource):
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[str] analytics_region: Primary GCP region for analytics data storage. For valid values, see [Create an Apigee organization](https://cloud.google.com/apigee/docs/api-platform/get-started/create-org).
+        :param pulumi.Input[str] api_consumer_data_encryption_key_name: Cloud KMS key name used for encrypting API consumer data.
+        :param pulumi.Input[str] api_consumer_data_location: This field is needed only for customers using non-default data residency regions.
+               Apigee stores some control plane data only in single region.
+               This field determines which single region Apigee should use.
         :param pulumi.Input[str] authorized_network: Compute Engine network used for Service Networking to be peered with Apigee runtime instances.
                See [Getting started with the Service Networking API](https://cloud.google.com/service-infrastructure/docs/service-networking/getting-started).
                Valid only when `RuntimeType` is set to CLOUD. The value can be updated only when there are no runtime instances. For example: "default".
         :param pulumi.Input[str] billing_type: Billing type of the Apigee organization. See [Apigee pricing](https://cloud.google.com/apigee/pricing).
+        :param pulumi.Input[str] control_plane_encryption_key_name: Cloud KMS key name used for encrypting control plane data that is stored in a multi region.
+               Only used for the data residency region "US" or "EU".
         :param pulumi.Input[str] description: Description of the Apigee organization.
         :param pulumi.Input[bool] disable_vpc_peering: Flag that specifies whether the VPC Peering through Private Google Access should be
                disabled between the consumer network and Apigee. Required if an `authorizedNetwork`
@@ -867,8 +984,11 @@ class Organization(pulumi.CustomResource):
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
                  analytics_region: Optional[pulumi.Input[str]] = None,
+                 api_consumer_data_encryption_key_name: Optional[pulumi.Input[str]] = None,
+                 api_consumer_data_location: Optional[pulumi.Input[str]] = None,
                  authorized_network: Optional[pulumi.Input[str]] = None,
                  billing_type: Optional[pulumi.Input[str]] = None,
+                 control_plane_encryption_key_name: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  disable_vpc_peering: Optional[pulumi.Input[bool]] = None,
                  display_name: Optional[pulumi.Input[str]] = None,
@@ -887,8 +1007,11 @@ class Organization(pulumi.CustomResource):
             __props__ = OrganizationArgs.__new__(OrganizationArgs)
 
             __props__.__dict__["analytics_region"] = analytics_region
+            __props__.__dict__["api_consumer_data_encryption_key_name"] = api_consumer_data_encryption_key_name
+            __props__.__dict__["api_consumer_data_location"] = api_consumer_data_location
             __props__.__dict__["authorized_network"] = authorized_network
             __props__.__dict__["billing_type"] = billing_type
+            __props__.__dict__["control_plane_encryption_key_name"] = control_plane_encryption_key_name
             __props__.__dict__["description"] = description
             __props__.__dict__["disable_vpc_peering"] = disable_vpc_peering
             __props__.__dict__["display_name"] = display_name
@@ -914,10 +1037,13 @@ class Organization(pulumi.CustomResource):
             id: pulumi.Input[str],
             opts: Optional[pulumi.ResourceOptions] = None,
             analytics_region: Optional[pulumi.Input[str]] = None,
+            api_consumer_data_encryption_key_name: Optional[pulumi.Input[str]] = None,
+            api_consumer_data_location: Optional[pulumi.Input[str]] = None,
             apigee_project_id: Optional[pulumi.Input[str]] = None,
             authorized_network: Optional[pulumi.Input[str]] = None,
             billing_type: Optional[pulumi.Input[str]] = None,
             ca_certificate: Optional[pulumi.Input[str]] = None,
+            control_plane_encryption_key_name: Optional[pulumi.Input[str]] = None,
             description: Optional[pulumi.Input[str]] = None,
             disable_vpc_peering: Optional[pulumi.Input[bool]] = None,
             display_name: Optional[pulumi.Input[str]] = None,
@@ -936,6 +1062,10 @@ class Organization(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[str] analytics_region: Primary GCP region for analytics data storage. For valid values, see [Create an Apigee organization](https://cloud.google.com/apigee/docs/api-platform/get-started/create-org).
+        :param pulumi.Input[str] api_consumer_data_encryption_key_name: Cloud KMS key name used for encrypting API consumer data.
+        :param pulumi.Input[str] api_consumer_data_location: This field is needed only for customers using non-default data residency regions.
+               Apigee stores some control plane data only in single region.
+               This field determines which single region Apigee should use.
         :param pulumi.Input[str] apigee_project_id: Output only. Project ID of the Apigee Tenant Project.
         :param pulumi.Input[str] authorized_network: Compute Engine network used for Service Networking to be peered with Apigee runtime instances.
                See [Getting started with the Service Networking API](https://cloud.google.com/service-infrastructure/docs/service-networking/getting-started).
@@ -943,6 +1073,8 @@ class Organization(pulumi.CustomResource):
         :param pulumi.Input[str] billing_type: Billing type of the Apigee organization. See [Apigee pricing](https://cloud.google.com/apigee/pricing).
         :param pulumi.Input[str] ca_certificate: Output only. Base64-encoded public certificate for the root CA of the Apigee organization.
                Valid only when `RuntimeType` is CLOUD. A base64-encoded string.
+        :param pulumi.Input[str] control_plane_encryption_key_name: Cloud KMS key name used for encrypting control plane data that is stored in a multi region.
+               Only used for the data residency region "US" or "EU".
         :param pulumi.Input[str] description: Description of the Apigee organization.
         :param pulumi.Input[bool] disable_vpc_peering: Flag that specifies whether the VPC Peering through Private Google Access should be
                disabled between the consumer network and Apigee. Required if an `authorizedNetwork`
@@ -978,10 +1110,13 @@ class Organization(pulumi.CustomResource):
         __props__ = _OrganizationState.__new__(_OrganizationState)
 
         __props__.__dict__["analytics_region"] = analytics_region
+        __props__.__dict__["api_consumer_data_encryption_key_name"] = api_consumer_data_encryption_key_name
+        __props__.__dict__["api_consumer_data_location"] = api_consumer_data_location
         __props__.__dict__["apigee_project_id"] = apigee_project_id
         __props__.__dict__["authorized_network"] = authorized_network
         __props__.__dict__["billing_type"] = billing_type
         __props__.__dict__["ca_certificate"] = ca_certificate
+        __props__.__dict__["control_plane_encryption_key_name"] = control_plane_encryption_key_name
         __props__.__dict__["description"] = description
         __props__.__dict__["disable_vpc_peering"] = disable_vpc_peering
         __props__.__dict__["display_name"] = display_name
@@ -1002,6 +1137,24 @@ class Organization(pulumi.CustomResource):
         """
         return pulumi.get(self, "analytics_region")
 
+    @property
+    @pulumi.getter(name="apiConsumerDataEncryptionKeyName")
+    def api_consumer_data_encryption_key_name(self) -> pulumi.Output[Optional[str]]:
+        """
+        Cloud KMS key name used for encrypting API consumer data.
+        """
+        return pulumi.get(self, "api_consumer_data_encryption_key_name")
+
+    @property
+    @pulumi.getter(name="apiConsumerDataLocation")
+    def api_consumer_data_location(self) -> pulumi.Output[Optional[str]]:
+        """
+        This field is needed only for customers using non-default data residency regions.
+        Apigee stores some control plane data only in single region.
+        This field determines which single region Apigee should use.
+        """
+        return pulumi.get(self, "api_consumer_data_location")
+
     @property
     @pulumi.getter(name="apigeeProjectId")
     def apigee_project_id(self) -> pulumi.Output[str]:
@@ -1037,6 +1190,15 @@ class Organization(pulumi.CustomResource):
         """
         return pulumi.get(self, "ca_certificate")
 
+    @property
+    @pulumi.getter(name="controlPlaneEncryptionKeyName")
+    def control_plane_encryption_key_name(self) -> pulumi.Output[Optional[str]]:
+        """
+        Cloud KMS key name used for encrypting control plane data that is stored in a multi region.
+        Only used for the data residency region "US" or "EU".
+        """
+        return pulumi.get(self, "control_plane_encryption_key_name")
+
     @property
     @pulumi.getter
     def description(self) -> pulumi.Output[Optional[str]]: