pulumi-gcp 6.68.0a1698127103__py3-none-any.whl → 6.68.0a1698199636__py3-none-any.whl

pulumi_gcp/apigee/keystores_aliases_self_signed_cert.py

@@ -56,16 +56,40 @@ class KeystoresAliasesSelfSignedCertArgs:
     @staticmethod
     def _configure(
              _setter: Callable[[Any, Any], None],
-             alias: pulumi.Input[str],
-             environment: pulumi.Input[str],
-             keystore: pulumi.Input[str],
-             org_id: pulumi.Input[str],
-             sig_alg: pulumi.Input[str],
-             subject: pulumi.Input['KeystoresAliasesSelfSignedCertSubjectArgs'],
+             alias: Optional[pulumi.Input[str]] = None,
+             environment: Optional[pulumi.Input[str]] = None,
+             keystore: Optional[pulumi.Input[str]] = None,
+             org_id: Optional[pulumi.Input[str]] = None,
+             sig_alg: Optional[pulumi.Input[str]] = None,
+             subject: Optional[pulumi.Input['KeystoresAliasesSelfSignedCertSubjectArgs']] = None,
              cert_validity_in_days: Optional[pulumi.Input[int]] = None,
              key_size: Optional[pulumi.Input[str]] = None,
              subject_alternative_dns_names: Optional[pulumi.Input['KeystoresAliasesSelfSignedCertSubjectAlternativeDnsNamesArgs']] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if alias is None:
+            raise TypeError("Missing 'alias' argument")
+        if environment is None:
+            raise TypeError("Missing 'environment' argument")
+        if keystore is None:
+            raise TypeError("Missing 'keystore' argument")
+        if org_id is None and 'orgId' in kwargs:
+            org_id = kwargs['orgId']
+        if org_id is None:
+            raise TypeError("Missing 'org_id' argument")
+        if sig_alg is None and 'sigAlg' in kwargs:
+            sig_alg = kwargs['sigAlg']
+        if sig_alg is None:
+            raise TypeError("Missing 'sig_alg' argument")
+        if subject is None:
+            raise TypeError("Missing 'subject' argument")
+        if cert_validity_in_days is None and 'certValidityInDays' in kwargs:
+            cert_validity_in_days = kwargs['certValidityInDays']
+        if key_size is None and 'keySize' in kwargs:
+            key_size = kwargs['keySize']
+        if subject_alternative_dns_names is None and 'subjectAlternativeDnsNames' in kwargs:
+            subject_alternative_dns_names = kwargs['subjectAlternativeDnsNames']
+
         _setter("alias", alias)
         _setter("environment", environment)
         _setter("keystore", keystore)
@@ -253,7 +277,21 @@ class _KeystoresAliasesSelfSignedCertState:
              subject: Optional[pulumi.Input['KeystoresAliasesSelfSignedCertSubjectArgs']] = None,
              subject_alternative_dns_names: Optional[pulumi.Input['KeystoresAliasesSelfSignedCertSubjectAlternativeDnsNamesArgs']] = None,
              type: Optional[pulumi.Input[str]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if cert_validity_in_days is None and 'certValidityInDays' in kwargs:
+            cert_validity_in_days = kwargs['certValidityInDays']
+        if certs_infos is None and 'certsInfos' in kwargs:
+            certs_infos = kwargs['certsInfos']
+        if key_size is None and 'keySize' in kwargs:
+            key_size = kwargs['keySize']
+        if org_id is None and 'orgId' in kwargs:
+            org_id = kwargs['orgId']
+        if sig_alg is None and 'sigAlg' in kwargs:
+            sig_alg = kwargs['sigAlg']
+        if subject_alternative_dns_names is None and 'subjectAlternativeDnsNames' in kwargs:
+            subject_alternative_dns_names = kwargs['subjectAlternativeDnsNames']
+
         if alias is not None:
             _setter("alias", alias)
         if cert_validity_in_days is not None:
@@ -440,69 +478,6 @@ class KeystoresAliasesSelfSignedCert(pulumi.CustomResource):
             * [Creating an environment](https://cloud.google.com/apigee/docs/api-platform/get-started/create-environment)
 
         ## Example Usage
-        ### Apigee Env Keystore Alias Self Signed Cert
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        project = gcp.organizations.Project("project",
-            project_id="my-project",
-            org_id="123456789",
-            billing_account="000000-0000000-0000000-000000")
-        apigee = gcp.projects.Service("apigee",
-            project=project.project_id,
-            service="apigee.googleapis.com")
-        servicenetworking = gcp.projects.Service("servicenetworking",
-            project=project.project_id,
-            service="servicenetworking.googleapis.com",
-            opts=pulumi.ResourceOptions(depends_on=[apigee]))
-        compute = gcp.projects.Service("compute",
-            project=project.project_id,
-            service="compute.googleapis.com",
-            opts=pulumi.ResourceOptions(depends_on=[servicenetworking]))
-        apigee_network = gcp.compute.Network("apigeeNetwork", project=project.project_id,
-        opts=pulumi.ResourceOptions(depends_on=[compute]))
-        apigee_range = gcp.compute.GlobalAddress("apigeeRange",
-            purpose="VPC_PEERING",
-            address_type="INTERNAL",
-            prefix_length=16,
-            network=apigee_network.id,
-            project=project.project_id)
-        apigee_vpc_connection = gcp.servicenetworking.Connection("apigeeVpcConnection",
-            network=apigee_network.id,
-            service="servicenetworking.googleapis.com",
-            reserved_peering_ranges=[apigee_range.name],
-            opts=pulumi.ResourceOptions(depends_on=[servicenetworking]))
-        apigee_org = gcp.apigee.Organization("apigeeOrg",
-            analytics_region="us-central1",
-            project_id=project.project_id,
-            authorized_network=apigee_network.id,
-            opts=pulumi.ResourceOptions(depends_on=[
-                    apigee_vpc_connection,
-                    apigee,
-                ]))
-        apigee_environment_keystore_ss_alias_environment = gcp.apigee.Environment("apigeeEnvironmentKeystoreSsAliasEnvironment",
-            org_id=apigee_org.id,
-            description="Apigee Environment",
-            display_name="environment-1")
-        apigee_environment_keystore_alias = gcp.apigee.EnvKeystore("apigeeEnvironmentKeystoreAlias", env_id=apigee_environment_keystore_ss_alias_environment.id)
-        apigee_environment_keystore_ss_alias_keystores_aliases_self_signed_cert = gcp.apigee.KeystoresAliasesSelfSignedCert("apigeeEnvironmentKeystoreSsAliasKeystoresAliasesSelfSignedCert",
-            environment=apigee_environment_keystore_ss_alias_environment.name,
-            org_id=apigee_org.name,
-            keystore=apigee_environment_keystore_alias.name,
-            alias="alias",
-            key_size="1024",
-            sig_alg="SHA512withRSA",
-            cert_validity_in_days=4,
-            subject=gcp.apigee.KeystoresAliasesSelfSignedCertSubjectArgs(
-                common_name="selfsigned_example",
-                country_code="US",
-                locality="TX",
-                org="CCE",
-                org_unit="PSO",
-            ))
-        ```
 
         ## Import
 
@@ -548,69 +523,6 @@ class KeystoresAliasesSelfSignedCert(pulumi.CustomResource):
             * [Creating an environment](https://cloud.google.com/apigee/docs/api-platform/get-started/create-environment)
 
         ## Example Usage
-        ### Apigee Env Keystore Alias Self Signed Cert
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        project = gcp.organizations.Project("project",
-            project_id="my-project",
-            org_id="123456789",
-            billing_account="000000-0000000-0000000-000000")
-        apigee = gcp.projects.Service("apigee",
-            project=project.project_id,
-            service="apigee.googleapis.com")
-        servicenetworking = gcp.projects.Service("servicenetworking",
-            project=project.project_id,
-            service="servicenetworking.googleapis.com",
-            opts=pulumi.ResourceOptions(depends_on=[apigee]))
-        compute = gcp.projects.Service("compute",
-            project=project.project_id,
-            service="compute.googleapis.com",
-            opts=pulumi.ResourceOptions(depends_on=[servicenetworking]))
-        apigee_network = gcp.compute.Network("apigeeNetwork", project=project.project_id,
-        opts=pulumi.ResourceOptions(depends_on=[compute]))
-        apigee_range = gcp.compute.GlobalAddress("apigeeRange",
-            purpose="VPC_PEERING",
-            address_type="INTERNAL",
-            prefix_length=16,
-            network=apigee_network.id,
-            project=project.project_id)
-        apigee_vpc_connection = gcp.servicenetworking.Connection("apigeeVpcConnection",
-            network=apigee_network.id,
-            service="servicenetworking.googleapis.com",
-            reserved_peering_ranges=[apigee_range.name],
-            opts=pulumi.ResourceOptions(depends_on=[servicenetworking]))
-        apigee_org = gcp.apigee.Organization("apigeeOrg",
-            analytics_region="us-central1",
-            project_id=project.project_id,
-            authorized_network=apigee_network.id,
-            opts=pulumi.ResourceOptions(depends_on=[
-                    apigee_vpc_connection,
-                    apigee,
-                ]))
-        apigee_environment_keystore_ss_alias_environment = gcp.apigee.Environment("apigeeEnvironmentKeystoreSsAliasEnvironment",
-            org_id=apigee_org.id,
-            description="Apigee Environment",
-            display_name="environment-1")
-        apigee_environment_keystore_alias = gcp.apigee.EnvKeystore("apigeeEnvironmentKeystoreAlias", env_id=apigee_environment_keystore_ss_alias_environment.id)
-        apigee_environment_keystore_ss_alias_keystores_aliases_self_signed_cert = gcp.apigee.KeystoresAliasesSelfSignedCert("apigeeEnvironmentKeystoreSsAliasKeystoresAliasesSelfSignedCert",
-            environment=apigee_environment_keystore_ss_alias_environment.name,
-            org_id=apigee_org.name,
-            keystore=apigee_environment_keystore_alias.name,
-            alias="alias",
-            key_size="1024",
-            sig_alg="SHA512withRSA",
-            cert_validity_in_days=4,
-            subject=gcp.apigee.KeystoresAliasesSelfSignedCertSubjectArgs(
-                common_name="selfsigned_example",
-                country_code="US",
-                locality="TX",
-                org="CCE",
-                org_unit="PSO",
-            ))
-        ```
 
         ## Import
 
@@ -678,19 +590,11 @@ class KeystoresAliasesSelfSignedCert(pulumi.CustomResource):
             if sig_alg is None and not opts.urn:
                 raise TypeError("Missing required property 'sig_alg'")
             __props__.__dict__["sig_alg"] = sig_alg
-            if subject is not None and not isinstance(subject, KeystoresAliasesSelfSignedCertSubjectArgs):
-                subject = subject or {}
-                def _setter(key, value):
-                    subject[key] = value
-                KeystoresAliasesSelfSignedCertSubjectArgs._configure(_setter, **subject)
+            subject = _utilities.configure(subject, KeystoresAliasesSelfSignedCertSubjectArgs, True)
             if subject is None and not opts.urn:
                 raise TypeError("Missing required property 'subject'")
             __props__.__dict__["subject"] = subject
-            if subject_alternative_dns_names is not None and not isinstance(subject_alternative_dns_names, KeystoresAliasesSelfSignedCertSubjectAlternativeDnsNamesArgs):
-                subject_alternative_dns_names = subject_alternative_dns_names or {}
-                def _setter(key, value):
-                    subject_alternative_dns_names[key] = value
-                KeystoresAliasesSelfSignedCertSubjectAlternativeDnsNamesArgs._configure(_setter, **subject_alternative_dns_names)
+            subject_alternative_dns_names = _utilities.configure(subject_alternative_dns_names, KeystoresAliasesSelfSignedCertSubjectAlternativeDnsNamesArgs, True)
             __props__.__dict__["subject_alternative_dns_names"] = subject_alternative_dns_names
             __props__.__dict__["certs_infos"] = None
             __props__.__dict__["type"] = None

pulumi_gcp/apigee/nat_address.py

@@ -33,9 +33,15 @@ class NatAddressArgs:
     @staticmethod
     def _configure(
              _setter: Callable[[Any, Any], None],
-             instance_id: pulumi.Input[str],
+             instance_id: Optional[pulumi.Input[str]] = None,
              name: Optional[pulumi.Input[str]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if instance_id is None and 'instanceId' in kwargs:
+            instance_id = kwargs['instanceId']
+        if instance_id is None:
+            raise TypeError("Missing 'instance_id' argument")
+
         _setter("instance_id", instance_id)
         if name is not None:
             _setter("name", name)
@@ -101,7 +107,13 @@ class _NatAddressState:
              ip_address: Optional[pulumi.Input[str]] = None,
              name: Optional[pulumi.Input[str]] = None,
              state: Optional[pulumi.Input[str]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if instance_id is None and 'instanceId' in kwargs:
+            instance_id = kwargs['instanceId']
+        if ip_address is None and 'ipAddress' in kwargs:
+            ip_address = kwargs['ipAddress']
+
         if instance_id is not None:
             _setter("instance_id", instance_id)
         if ip_address is not None:
@@ -183,52 +195,6 @@ class NatAddress(pulumi.CustomResource):
             * [Provisioning NAT IPs](https://cloud.google.com/apigee/docs/api-platform/security/nat-provisioning)
 
         ## Example Usage
-        ### Apigee Nat Address Basic
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        current = gcp.organizations.get_client_config()
-        apigee_network = gcp.compute.Network("apigeeNetwork")
-        apigee_range = gcp.compute.GlobalAddress("apigeeRange",
-            purpose="VPC_PEERING",
-            address_type="INTERNAL",
-            prefix_length=21,
-            network=apigee_network.id)
-        apigee_vpc_connection = gcp.servicenetworking.Connection("apigeeVpcConnection",
-            network=apigee_network.id,
-            service="servicenetworking.googleapis.com",
-            reserved_peering_ranges=[apigee_range.name])
-        apigee_keyring = gcp.kms.KeyRing("apigeeKeyring", location="us-central1")
-        apigee_key = gcp.kms.CryptoKey("apigeeKey", key_ring=apigee_keyring.id)
-        apigee_sa = gcp.projects.ServiceIdentity("apigeeSa",
-            project=google_project["project"]["project_id"],
-            service=google_project_service["apigee"]["service"],
-            opts=pulumi.ResourceOptions(provider=google_beta))
-        apigee_sa_keyuser = gcp.kms.CryptoKeyIAMBinding("apigeeSaKeyuser",
-            crypto_key_id=apigee_key.id,
-            role="roles/cloudkms.cryptoKeyEncrypterDecrypter",
-            members=[apigee_sa.email.apply(lambda email: f"serviceAccount:{email}")])
-        apigee_org = gcp.apigee.Organization("apigeeOrg",
-            analytics_region="us-central1",
-            display_name="apigee-org",
-            description="Terraform-provisioned Apigee Org.",
-            project_id=current.project,
-            authorized_network=apigee_network.id,
-            runtime_database_encryption_key_name=apigee_key.id,
-            opts=pulumi.ResourceOptions(depends_on=[
-                    apigee_vpc_connection,
-                    apigee_sa_keyuser,
-                ]))
-        apigee_instance = gcp.apigee.Instance("apigeeInstance",
-            location="us-central1",
-            description="Terraform-managed Apigee Runtime Instance",
-            display_name="apigee-instance",
-            org_id=apigee_org.id,
-            disk_encryption_key_name=apigee_key.id)
-        apigee_nat = gcp.apigee.NatAddress("apigee-nat", instance_id=apigee_instance.id)
-        ```
 
         ## Import
 
@@ -268,52 +234,6 @@ class NatAddress(pulumi.CustomResource):
             * [Provisioning NAT IPs](https://cloud.google.com/apigee/docs/api-platform/security/nat-provisioning)
 
         ## Example Usage
-        ### Apigee Nat Address Basic
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        current = gcp.organizations.get_client_config()
-        apigee_network = gcp.compute.Network("apigeeNetwork")
-        apigee_range = gcp.compute.GlobalAddress("apigeeRange",
-            purpose="VPC_PEERING",
-            address_type="INTERNAL",
-            prefix_length=21,
-            network=apigee_network.id)
-        apigee_vpc_connection = gcp.servicenetworking.Connection("apigeeVpcConnection",
-            network=apigee_network.id,
-            service="servicenetworking.googleapis.com",
-            reserved_peering_ranges=[apigee_range.name])
-        apigee_keyring = gcp.kms.KeyRing("apigeeKeyring", location="us-central1")
-        apigee_key = gcp.kms.CryptoKey("apigeeKey", key_ring=apigee_keyring.id)
-        apigee_sa = gcp.projects.ServiceIdentity("apigeeSa",
-            project=google_project["project"]["project_id"],
-            service=google_project_service["apigee"]["service"],
-            opts=pulumi.ResourceOptions(provider=google_beta))
-        apigee_sa_keyuser = gcp.kms.CryptoKeyIAMBinding("apigeeSaKeyuser",
-            crypto_key_id=apigee_key.id,
-            role="roles/cloudkms.cryptoKeyEncrypterDecrypter",
-            members=[apigee_sa.email.apply(lambda email: f"serviceAccount:{email}")])
-        apigee_org = gcp.apigee.Organization("apigeeOrg",
-            analytics_region="us-central1",
-            display_name="apigee-org",
-            description="Terraform-provisioned Apigee Org.",
-            project_id=current.project,
-            authorized_network=apigee_network.id,
-            runtime_database_encryption_key_name=apigee_key.id,
-            opts=pulumi.ResourceOptions(depends_on=[
-                    apigee_vpc_connection,
-                    apigee_sa_keyuser,
-                ]))
-        apigee_instance = gcp.apigee.Instance("apigeeInstance",
-            location="us-central1",
-            description="Terraform-managed Apigee Runtime Instance",
-            display_name="apigee-instance",
-            org_id=apigee_org.id,
-            disk_encryption_key_name=apigee_key.id)
-        apigee_nat = gcp.apigee.NatAddress("apigee-nat", instance_id=apigee_instance.id)
-        ```
 
         ## Import
 

pulumi_gcp/apigee/organization.py

@@ -78,7 +78,7 @@ class OrganizationArgs:
     @staticmethod
     def _configure(
              _setter: Callable[[Any, Any], None],
-             project_id: pulumi.Input[str],
+             project_id: Optional[pulumi.Input[str]] = None,
              analytics_region: Optional[pulumi.Input[str]] = None,
              authorized_network: Optional[pulumi.Input[str]] = None,
              billing_type: Optional[pulumi.Input[str]] = None,
@@ -89,7 +89,27 @@ class OrganizationArgs:
              retention: Optional[pulumi.Input[str]] = None,
              runtime_database_encryption_key_name: Optional[pulumi.Input[str]] = None,
              runtime_type: Optional[pulumi.Input[str]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if project_id is None and 'projectId' in kwargs:
+            project_id = kwargs['projectId']
+        if project_id is None:
+            raise TypeError("Missing 'project_id' argument")
+        if analytics_region is None and 'analyticsRegion' in kwargs:
+            analytics_region = kwargs['analyticsRegion']
+        if authorized_network is None and 'authorizedNetwork' in kwargs:
+            authorized_network = kwargs['authorizedNetwork']
+        if billing_type is None and 'billingType' in kwargs:
+            billing_type = kwargs['billingType']
+        if disable_vpc_peering is None and 'disableVpcPeering' in kwargs:
+            disable_vpc_peering = kwargs['disableVpcPeering']
+        if display_name is None and 'displayName' in kwargs:
+            display_name = kwargs['displayName']
+        if runtime_database_encryption_key_name is None and 'runtimeDatabaseEncryptionKeyName' in kwargs:
+            runtime_database_encryption_key_name = kwargs['runtimeDatabaseEncryptionKeyName']
+        if runtime_type is None and 'runtimeType' in kwargs:
+            runtime_type = kwargs['runtimeType']
+
         _setter("project_id", project_id)
         if analytics_region is not None:
             _setter("analytics_region", analytics_region)
@@ -359,7 +379,31 @@ class _OrganizationState:
              runtime_database_encryption_key_name: Optional[pulumi.Input[str]] = None,
              runtime_type: Optional[pulumi.Input[str]] = None,
              subscription_type: Optional[pulumi.Input[str]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if analytics_region is None and 'analyticsRegion' in kwargs:
+            analytics_region = kwargs['analyticsRegion']
+        if apigee_project_id is None and 'apigeeProjectId' in kwargs:
+            apigee_project_id = kwargs['apigeeProjectId']
+        if authorized_network is None and 'authorizedNetwork' in kwargs:
+            authorized_network = kwargs['authorizedNetwork']
+        if billing_type is None and 'billingType' in kwargs:
+            billing_type = kwargs['billingType']
+        if ca_certificate is None and 'caCertificate' in kwargs:
+            ca_certificate = kwargs['caCertificate']
+        if disable_vpc_peering is None and 'disableVpcPeering' in kwargs:
+            disable_vpc_peering = kwargs['disableVpcPeering']
+        if display_name is None and 'displayName' in kwargs:
+            display_name = kwargs['displayName']
+        if project_id is None and 'projectId' in kwargs:
+            project_id = kwargs['projectId']
+        if runtime_database_encryption_key_name is None and 'runtimeDatabaseEncryptionKeyName' in kwargs:
+            runtime_database_encryption_key_name = kwargs['runtimeDatabaseEncryptionKeyName']
+        if runtime_type is None and 'runtimeType' in kwargs:
+            runtime_type = kwargs['runtimeType']
+        if subscription_type is None and 'subscriptionType' in kwargs:
+            subscription_type = kwargs['subscriptionType']
+
         if analytics_region is not None:
             _setter("analytics_region", analytics_region)
         if apigee_project_id is not None:
@@ -621,107 +665,6 @@ class Organization(pulumi.CustomResource):
             * [Creating an API organization](https://cloud.google.com/apigee/docs/api-platform/get-started/create-org)
 
         ## Example Usage
-        ### Apigee Organization Cloud Basic
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        current = gcp.organizations.get_client_config()
-        apigee_network = gcp.compute.Network("apigeeNetwork")
-        apigee_range = gcp.compute.GlobalAddress("apigeeRange",
-            purpose="VPC_PEERING",
-            address_type="INTERNAL",
-            prefix_length=16,
-            network=apigee_network.id)
-        apigee_vpc_connection = gcp.servicenetworking.Connection("apigeeVpcConnection",
-            network=apigee_network.id,
-            service="servicenetworking.googleapis.com",
-            reserved_peering_ranges=[apigee_range.name])
-        org = gcp.apigee.Organization("org",
-            analytics_region="us-central1",
-            project_id=current.project,
-            authorized_network=apigee_network.id,
-            opts=pulumi.ResourceOptions(depends_on=[apigee_vpc_connection]))
-        ```
-        ### Apigee Organization Cloud Basic Disable Vpc Peering
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        current = gcp.organizations.get_client_config()
-        org = gcp.apigee.Organization("org",
-            description="Terraform-provisioned basic Apigee Org without VPC Peering.",
-            analytics_region="us-central1",
-            project_id=current.project,
-            disable_vpc_peering=True)
-        ```
-        ### Apigee Organization Cloud Full
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        current = gcp.organizations.get_client_config()
-        apigee_network = gcp.compute.Network("apigeeNetwork")
-        apigee_range = gcp.compute.GlobalAddress("apigeeRange",
-            purpose="VPC_PEERING",
-            address_type="INTERNAL",
-            prefix_length=16,
-            network=apigee_network.id)
-        apigee_vpc_connection = gcp.servicenetworking.Connection("apigeeVpcConnection",
-            network=apigee_network.id,
-            service="servicenetworking.googleapis.com",
-            reserved_peering_ranges=[apigee_range.name])
-        apigee_keyring = gcp.kms.KeyRing("apigeeKeyring", location="us-central1")
-        apigee_key = gcp.kms.CryptoKey("apigeeKey", key_ring=apigee_keyring.id)
-        apigee_sa = gcp.projects.ServiceIdentity("apigeeSa",
-            project=google_project["project"]["project_id"],
-            service=google_project_service["apigee"]["service"],
-            opts=pulumi.ResourceOptions(provider=google_beta))
-        apigee_sa_keyuser = gcp.kms.CryptoKeyIAMBinding("apigeeSaKeyuser",
-            crypto_key_id=apigee_key.id,
-            role="roles/cloudkms.cryptoKeyEncrypterDecrypter",
-            members=[apigee_sa.email.apply(lambda email: f"serviceAccount:{email}")])
-        org = gcp.apigee.Organization("org",
-            analytics_region="us-central1",
-            display_name="apigee-org",
-            description="Auto-provisioned Apigee Org.",
-            project_id=current.project,
-            authorized_network=apigee_network.id,
-            runtime_database_encryption_key_name=apigee_key.id,
-            opts=pulumi.ResourceOptions(depends_on=[
-                    apigee_vpc_connection,
-                    apigee_sa_keyuser,
-                ]))
-        ```
-        ### Apigee Organization Cloud Full Disable Vpc Peering
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        current = gcp.organizations.get_client_config()
-        apigee_keyring = gcp.kms.KeyRing("apigeeKeyring", location="us-central1")
-        apigee_key = gcp.kms.CryptoKey("apigeeKey", key_ring=apigee_keyring.id)
-        apigee_sa = gcp.projects.ServiceIdentity("apigeeSa",
-            project=google_project["project"]["project_id"],
-            service=google_project_service["apigee"]["service"],
-            opts=pulumi.ResourceOptions(provider=google_beta))
-        apigee_sa_keyuser = gcp.kms.CryptoKeyIAMBinding("apigeeSaKeyuser",
-            crypto_key_id=apigee_key.id,
-            role="roles/cloudkms.cryptoKeyEncrypterDecrypter",
-            members=[apigee_sa.email.apply(lambda email: f"serviceAccount:{email}")])
-        org = gcp.apigee.Organization("org",
-            analytics_region="us-central1",
-            display_name="apigee-org",
-            description="Terraform-provisioned Apigee Org without VPC Peering.",
-            project_id=current.project,
-            disable_vpc_peering=True,
-            runtime_database_encryption_key_name=apigee_key.id,
-            opts=pulumi.ResourceOptions(depends_on=[apigee_sa_keyuser]))
-        ```
 
         ## Import
 
@@ -785,107 +728,6 @@ class Organization(pulumi.CustomResource):
             * [Creating an API organization](https://cloud.google.com/apigee/docs/api-platform/get-started/create-org)
 
         ## Example Usage
-        ### Apigee Organization Cloud Basic
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        current = gcp.organizations.get_client_config()
-        apigee_network = gcp.compute.Network("apigeeNetwork")
-        apigee_range = gcp.compute.GlobalAddress("apigeeRange",
-            purpose="VPC_PEERING",
-            address_type="INTERNAL",
-            prefix_length=16,
-            network=apigee_network.id)
-        apigee_vpc_connection = gcp.servicenetworking.Connection("apigeeVpcConnection",
-            network=apigee_network.id,
-            service="servicenetworking.googleapis.com",
-            reserved_peering_ranges=[apigee_range.name])
-        org = gcp.apigee.Organization("org",
-            analytics_region="us-central1",
-            project_id=current.project,
-            authorized_network=apigee_network.id,
-            opts=pulumi.ResourceOptions(depends_on=[apigee_vpc_connection]))
-        ```
-        ### Apigee Organization Cloud Basic Disable Vpc Peering
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        current = gcp.organizations.get_client_config()
-        org = gcp.apigee.Organization("org",
-            description="Terraform-provisioned basic Apigee Org without VPC Peering.",
-            analytics_region="us-central1",
-            project_id=current.project,
-            disable_vpc_peering=True)
-        ```
-        ### Apigee Organization Cloud Full
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        current = gcp.organizations.get_client_config()
-        apigee_network = gcp.compute.Network("apigeeNetwork")
-        apigee_range = gcp.compute.GlobalAddress("apigeeRange",
-            purpose="VPC_PEERING",
-            address_type="INTERNAL",
-            prefix_length=16,
-            network=apigee_network.id)
-        apigee_vpc_connection = gcp.servicenetworking.Connection("apigeeVpcConnection",
-            network=apigee_network.id,
-            service="servicenetworking.googleapis.com",
-            reserved_peering_ranges=[apigee_range.name])
-        apigee_keyring = gcp.kms.KeyRing("apigeeKeyring", location="us-central1")
-        apigee_key = gcp.kms.CryptoKey("apigeeKey", key_ring=apigee_keyring.id)
-        apigee_sa = gcp.projects.ServiceIdentity("apigeeSa",
-            project=google_project["project"]["project_id"],
-            service=google_project_service["apigee"]["service"],
-            opts=pulumi.ResourceOptions(provider=google_beta))
-        apigee_sa_keyuser = gcp.kms.CryptoKeyIAMBinding("apigeeSaKeyuser",
-            crypto_key_id=apigee_key.id,
-            role="roles/cloudkms.cryptoKeyEncrypterDecrypter",
-            members=[apigee_sa.email.apply(lambda email: f"serviceAccount:{email}")])
-        org = gcp.apigee.Organization("org",
-            analytics_region="us-central1",
-            display_name="apigee-org",
-            description="Auto-provisioned Apigee Org.",
-            project_id=current.project,
-            authorized_network=apigee_network.id,
-            runtime_database_encryption_key_name=apigee_key.id,
-            opts=pulumi.ResourceOptions(depends_on=[
-                    apigee_vpc_connection,
-                    apigee_sa_keyuser,
-                ]))
-        ```
-        ### Apigee Organization Cloud Full Disable Vpc Peering
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        current = gcp.organizations.get_client_config()
-        apigee_keyring = gcp.kms.KeyRing("apigeeKeyring", location="us-central1")
-        apigee_key = gcp.kms.CryptoKey("apigeeKey", key_ring=apigee_keyring.id)
-        apigee_sa = gcp.projects.ServiceIdentity("apigeeSa",
-            project=google_project["project"]["project_id"],
-            service=google_project_service["apigee"]["service"],
-            opts=pulumi.ResourceOptions(provider=google_beta))
-        apigee_sa_keyuser = gcp.kms.CryptoKeyIAMBinding("apigeeSaKeyuser",
-            crypto_key_id=apigee_key.id,
-            role="roles/cloudkms.cryptoKeyEncrypterDecrypter",
-            members=[apigee_sa.email.apply(lambda email: f"serviceAccount:{email}")])
-        org = gcp.apigee.Organization("org",
-            analytics_region="us-central1",
-            display_name="apigee-org",
-            description="Terraform-provisioned Apigee Org without VPC Peering.",
-            project_id=current.project,
-            disable_vpc_peering=True,
-            runtime_database_encryption_key_name=apigee_key.id,
-            opts=pulumi.ResourceOptions(depends_on=[apigee_sa_keyuser]))
-        ```
 
         ## Import
 
@@ -947,11 +789,7 @@ class Organization(pulumi.CustomResource):
             if project_id is None and not opts.urn:
                 raise TypeError("Missing required property 'project_id'")
             __props__.__dict__["project_id"] = project_id
-            if properties is not None and not isinstance(properties, OrganizationPropertiesArgs):
-                properties = properties or {}
-                def _setter(key, value):
-                    properties[key] = value
-                OrganizationPropertiesArgs._configure(_setter, **properties)
+            properties = _utilities.configure(properties, OrganizationPropertiesArgs, True)
             __props__.__dict__["properties"] = properties
             __props__.__dict__["retention"] = retention
             __props__.__dict__["runtime_database_encryption_key_name"] = runtime_database_encryption_key_name