pulumi-gcp 7.12.0a1709102105__py3-none-any.whl → 7.12.0a1709133800__py3-none-any.whl

pulumi_gcp/kms/secret_ciphertext.py

@@ -191,14 +191,22 @@ class SecretCiphertext(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        keyring = gcp.kms.KeyRing("keyring", location="global")
+        keyring = gcp.kms.KeyRing("keyring",
+            name="keyring-example",
+            location="global")
         cryptokey = gcp.kms.CryptoKey("cryptokey",
+            name="crypto-key-example",
             key_ring=keyring.id,
             rotation_period="7776000s")
-        my_password = gcp.kms.SecretCiphertext("myPassword",
+        my_password = gcp.kms.SecretCiphertext("my_password",
             crypto_key=cryptokey.id,
             plaintext="my-secret-password")
         instance = gcp.compute.Instance("instance",
+            network_interfaces=[gcp.compute.InstanceNetworkInterfaceArgs(
+                access_configs=[gcp.compute.InstanceNetworkInterfaceAccessConfigArgs()],
+                network="default",
+            )],
+            name="my-instance",
             machine_type="e2-medium",
             zone="us-central1-a",
             boot_disk=gcp.compute.InstanceBootDiskArgs(
@@ -206,10 +214,6 @@ class SecretCiphertext(pulumi.CustomResource):
                     image="debian-cloud/debian-11",
                 ),
             ),
-            network_interfaces=[gcp.compute.InstanceNetworkInterfaceArgs(
-                network="default",
-                access_configs=[gcp.compute.InstanceNetworkInterfaceAccessConfigArgs()],
-            )],
             metadata={
                 "password": my_password.ciphertext,
             })
@@ -258,14 +262,22 @@ class SecretCiphertext(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        keyring = gcp.kms.KeyRing("keyring", location="global")
+        keyring = gcp.kms.KeyRing("keyring",
+            name="keyring-example",
+            location="global")
         cryptokey = gcp.kms.CryptoKey("cryptokey",
+            name="crypto-key-example",
             key_ring=keyring.id,
             rotation_period="7776000s")
-        my_password = gcp.kms.SecretCiphertext("myPassword",
+        my_password = gcp.kms.SecretCiphertext("my_password",
             crypto_key=cryptokey.id,
             plaintext="my-secret-password")
         instance = gcp.compute.Instance("instance",
+            network_interfaces=[gcp.compute.InstanceNetworkInterfaceArgs(
+                access_configs=[gcp.compute.InstanceNetworkInterfaceAccessConfigArgs()],
+                network="default",
+            )],
+            name="my-instance",
             machine_type="e2-medium",
             zone="us-central1-a",
             boot_disk=gcp.compute.InstanceBootDiskArgs(
@@ -273,10 +285,6 @@ class SecretCiphertext(pulumi.CustomResource):
                     image="debian-cloud/debian-11",
                 ),
             ),
-            network_interfaces=[gcp.compute.InstanceNetworkInterfaceArgs(
-                network="default",
-                access_configs=[gcp.compute.InstanceNetworkInterfaceAccessConfigArgs()],
-            )],
             metadata={
                 "password": my_password.ciphertext,
             })

pulumi_gcp/logging/billing_account_exclusion.py

@@ -216,6 +216,7 @@ class BillingAccountExclusion(pulumi.CustomResource):
         import pulumi_gcp as gcp
 
         my_exclusion = gcp.logging.BillingAccountExclusion("my-exclusion",
+            name="my-instance-debug-exclusion",
             billing_account="ABCDEF-012345-GHIJKL",
             description="Exclude GCE instance debug logs",
             filter="resource.type = gce_instance AND severity <= DEBUG")
@@ -258,6 +259,7 @@ class BillingAccountExclusion(pulumi.CustomResource):
         import pulumi_gcp as gcp
 
         my_exclusion = gcp.logging.BillingAccountExclusion("my-exclusion",
+            name="my-instance-debug-exclusion",
             billing_account="ABCDEF-012345-GHIJKL",
             description="Exclude GCE instance debug logs",
             filter="resource.type = gce_instance AND severity <= DEBUG")

pulumi_gcp/logging/billing_account_sink.py

@@ -371,8 +371,11 @@ class BillingAccountSink(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        log_bucket = gcp.storage.Bucket("log-bucket", location="US")
+        log_bucket = gcp.storage.Bucket("log-bucket",
+            name="billing-logging-bucket",
+            location="US")
         my_sink = gcp.logging.BillingAccountSink("my-sink",
+            name="my-sink",
             description="some explanation on what this is",
             billing_account="ABCDEF-012345-GHIJKL",
             destination=log_bucket.name.apply(lambda name: f"storage.googleapis.com/{name}"))
@@ -437,8 +440,11 @@ class BillingAccountSink(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        log_bucket = gcp.storage.Bucket("log-bucket", location="US")
+        log_bucket = gcp.storage.Bucket("log-bucket",
+            name="billing-logging-bucket",
+            location="US")
         my_sink = gcp.logging.BillingAccountSink("my-sink",
+            name="my-sink",
             description="some explanation on what this is",
             billing_account="ABCDEF-012345-GHIJKL",
             destination=log_bucket.name.apply(lambda name: f"storage.googleapis.com/{name}"))

pulumi_gcp/logging/folder_exclusion.py

@@ -231,6 +231,7 @@ class FolderExclusion(pulumi.CustomResource):
             display_name="My folder",
             parent="organizations/123456")
         my_exclusion = gcp.logging.FolderExclusion("my-exclusion",
+            name="my-instance-debug-exclusion",
             folder=my_folder.name,
             description="Exclude GCE instance debug logs",
             filter="resource.type = gce_instance AND severity <= DEBUG")
@@ -285,6 +286,7 @@ class FolderExclusion(pulumi.CustomResource):
             display_name="My folder",
             parent="organizations/123456")
         my_exclusion = gcp.logging.FolderExclusion("my-exclusion",
+            name="my-instance-debug-exclusion",
             folder=my_folder.name,
             description="Exclude GCE instance debug logs",
             filter="resource.type = gce_instance AND severity <= DEBUG")

pulumi_gcp/logging/folder_settings.py

@@ -240,20 +240,19 @@ class FolderSettings(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        my_folder = gcp.organizations.Folder("myFolder",
+        my_folder = gcp.organizations.Folder("my_folder",
             display_name="folder-name",
             parent="organizations/123456789")
+        example = gcp.logging.FolderSettings("example",
+            disable_default_sink=True,
+            folder=my_folder.folder_id,
+            kms_key_name="kms-key",
+            storage_location="us-central1")
         settings = gcp.logging.get_folder_settings_output(folder=my_folder.folder_id)
         iam = gcp.kms.CryptoKeyIAMMember("iam",
             crypto_key_id="kms-key",
             role="roles/cloudkms.cryptoKeyEncrypterDecrypter",
             member=settings.apply(lambda settings: f"serviceAccount:{settings.kms_service_account_id}"))
-        example = gcp.logging.FolderSettings("example",
-            disable_default_sink=True,
-            folder=my_folder.folder_id,
-            kms_key_name="kms-key",
-            storage_location="us-central1",
-            opts=pulumi.ResourceOptions(depends_on=[iam]))
         ```
 
         ## Import
@@ -306,20 +305,19 @@ class FolderSettings(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        my_folder = gcp.organizations.Folder("myFolder",
+        my_folder = gcp.organizations.Folder("my_folder",
             display_name="folder-name",
             parent="organizations/123456789")
+        example = gcp.logging.FolderSettings("example",
+            disable_default_sink=True,
+            folder=my_folder.folder_id,
+            kms_key_name="kms-key",
+            storage_location="us-central1")
         settings = gcp.logging.get_folder_settings_output(folder=my_folder.folder_id)
         iam = gcp.kms.CryptoKeyIAMMember("iam",
             crypto_key_id="kms-key",
             role="roles/cloudkms.cryptoKeyEncrypterDecrypter",
             member=settings.apply(lambda settings: f"serviceAccount:{settings.kms_service_account_id}"))
-        example = gcp.logging.FolderSettings("example",
-            disable_default_sink=True,
-            folder=my_folder.folder_id,
-            kms_key_name="kms-key",
-            storage_location="us-central1",
-            opts=pulumi.ResourceOptions(depends_on=[iam]))
         ```
 
         ## Import

pulumi_gcp/logging/folder_sink.py

@@ -408,11 +408,14 @@ class FolderSink(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        log_bucket = gcp.storage.Bucket("log-bucket", location="US")
+        log_bucket = gcp.storage.Bucket("log-bucket",
+            name="folder-logging-bucket",
+            location="US")
         my_folder = gcp.organizations.Folder("my-folder",
             display_name="My folder",
             parent="organizations/123456")
         my_sink = gcp.logging.FolderSink("my-sink",
+            name="my-sink",
             description="some explanation on what this is",
             folder=my_folder.name,
             destination=log_bucket.name.apply(lambda name: f"storage.googleapis.com/{name}"),
@@ -477,11 +480,14 @@ class FolderSink(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        log_bucket = gcp.storage.Bucket("log-bucket", location="US")
+        log_bucket = gcp.storage.Bucket("log-bucket",
+            name="folder-logging-bucket",
+            location="US")
         my_folder = gcp.organizations.Folder("my-folder",
             display_name="My folder",
             parent="organizations/123456")
         my_sink = gcp.logging.FolderSink("my-sink",
+            name="my-sink",
             description="some explanation on what this is",
             folder=my_folder.name,
             destination=log_bucket.name.apply(lambda name: f"storage.googleapis.com/{name}"),

pulumi_gcp/logging/linked_dataset.py

@@ -325,14 +325,14 @@ class LinkedDataset(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_linked_dataset_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingLinkedDatasetProjectBucketConfig",
+        logging_linked_dataset = gcp.logging.ProjectBucketConfig("logging_linked_dataset",
             location="global",
             project="my-project-name",
             enable_analytics=True,
             bucket_id="my-bucket")
-        logging_linked_dataset_linked_dataset = gcp.logging.LinkedDataset("loggingLinkedDatasetLinkedDataset",
+        logging_linked_dataset_linked_dataset = gcp.logging.LinkedDataset("logging_linked_dataset",
             link_id="mylink",
-            bucket=logging_linked_dataset_project_bucket_config.id,
+            bucket=logging_linked_dataset.id,
             description="Linked dataset test")
         ```
         ### Logging Linked Dataset All Params
@@ -341,18 +341,17 @@ class LinkedDataset(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_linked_dataset_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingLinkedDatasetProjectBucketConfig",
-            bucket_id="my-bucket",
-            enable_analytics=True,
+        logging_linked_dataset = gcp.logging.ProjectBucketConfig("logging_linked_dataset",
             location="global",
-            project="my-project-name")
-        logging_linked_dataset_linked_dataset = gcp.logging.LinkedDataset("loggingLinkedDatasetLinkedDataset",
-            bucket="my-bucket",
-            description="Linked dataset test",
+            project="my-project-name",
+            enable_analytics=True,
+            bucket_id="my-bucket")
+        logging_linked_dataset_linked_dataset = gcp.logging.LinkedDataset("logging_linked_dataset",
             link_id="mylink",
-            location="global",
+            bucket="my-bucket",
             parent="projects/my-project-name",
-            opts=pulumi.ResourceOptions(depends_on=["google_logging_project_bucket_config.logging_linked_dataset"]))
+            location="global",
+            description="Linked dataset test")
         ```
 
         ## Import
@@ -404,14 +403,14 @@ class LinkedDataset(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_linked_dataset_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingLinkedDatasetProjectBucketConfig",
+        logging_linked_dataset = gcp.logging.ProjectBucketConfig("logging_linked_dataset",
             location="global",
             project="my-project-name",
             enable_analytics=True,
             bucket_id="my-bucket")
-        logging_linked_dataset_linked_dataset = gcp.logging.LinkedDataset("loggingLinkedDatasetLinkedDataset",
+        logging_linked_dataset_linked_dataset = gcp.logging.LinkedDataset("logging_linked_dataset",
             link_id="mylink",
-            bucket=logging_linked_dataset_project_bucket_config.id,
+            bucket=logging_linked_dataset.id,
             description="Linked dataset test")
         ```
         ### Logging Linked Dataset All Params
@@ -420,18 +419,17 @@ class LinkedDataset(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_linked_dataset_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingLinkedDatasetProjectBucketConfig",
-            bucket_id="my-bucket",
-            enable_analytics=True,
+        logging_linked_dataset = gcp.logging.ProjectBucketConfig("logging_linked_dataset",
             location="global",
-            project="my-project-name")
-        logging_linked_dataset_linked_dataset = gcp.logging.LinkedDataset("loggingLinkedDatasetLinkedDataset",
-            bucket="my-bucket",
-            description="Linked dataset test",
+            project="my-project-name",
+            enable_analytics=True,
+            bucket_id="my-bucket")
+        logging_linked_dataset_linked_dataset = gcp.logging.LinkedDataset("logging_linked_dataset",
             link_id="mylink",
-            location="global",
+            bucket="my-bucket",
             parent="projects/my-project-name",
-            opts=pulumi.ResourceOptions(depends_on=["google_logging_project_bucket_config.logging_linked_dataset"]))
+            location="global",
+            description="Linked dataset test")
         ```
 
         ## Import

pulumi_gcp/logging/log_view.py

@@ -290,13 +290,14 @@ class LogView(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_log_view_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingLogViewProjectBucketConfig",
+        logging_log_view = gcp.logging.ProjectBucketConfig("logging_log_view",
             project="my-project-name",
             location="global",
             retention_days=30,
             bucket_id="_Default")
-        logging_log_view_log_view = gcp.logging.LogView("loggingLogViewLogView",
-            bucket=logging_log_view_project_bucket_config.id,
+        logging_log_view_log_view = gcp.logging.LogView("logging_log_view",
+            name="my-view",
+            bucket=logging_log_view.id,
             description="A logging view configured with Terraform",
             filter="SOURCE(\\"projects/myproject\\") AND resource.type = \\"gce_instance\\" AND LOG_ID(\\"stdout\\")")
         ```
@@ -347,13 +348,14 @@ class LogView(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_log_view_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingLogViewProjectBucketConfig",
+        logging_log_view = gcp.logging.ProjectBucketConfig("logging_log_view",
             project="my-project-name",
             location="global",
             retention_days=30,
             bucket_id="_Default")
-        logging_log_view_log_view = gcp.logging.LogView("loggingLogViewLogView",
-            bucket=logging_log_view_project_bucket_config.id,
+        logging_log_view_log_view = gcp.logging.LogView("logging_log_view",
+            name="my-view",
+            bucket=logging_log_view.id,
             description="A logging view configured with Terraform",
             filter="SOURCE(\\"projects/myproject\\") AND resource.type = \\"gce_instance\\" AND LOG_ID(\\"stdout\\")")
         ```

pulumi_gcp/logging/metric.py

@@ -486,38 +486,39 @@ class Metric(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_metric = gcp.logging.Metric("loggingMetric",
-            bucket_options=gcp.logging.MetricBucketOptionsArgs(
-                linear_buckets=gcp.logging.MetricBucketOptionsLinearBucketsArgs(
-                    num_finite_buckets=3,
-                    offset=1,
-                    width=1,
-                ),
-            ),
+        logging_metric = gcp.logging.Metric("logging_metric",
+            name="my-(custom)/metric",
             filter="resource.type=gae_app AND severity>=ERROR",
-            label_extractors={
-                "mass": "EXTRACT(jsonPayload.request)",
-                "sku": "EXTRACT(jsonPayload.id)",
-            },
             metric_descriptor=gcp.logging.MetricMetricDescriptorArgs(
-                display_name="My metric",
+                metric_kind="DELTA",
+                value_type="DISTRIBUTION",
+                unit="1",
                 labels=[
                     gcp.logging.MetricMetricDescriptorLabelArgs(
-                        description="amount of matter",
                         key="mass",
                         value_type="STRING",
+                        description="amount of matter",
                     ),
                     gcp.logging.MetricMetricDescriptorLabelArgs(
-                        description="Identifying number for item",
                         key="sku",
                         value_type="INT64",
+                        description="Identifying number for item",
                     ),
                 ],
-                metric_kind="DELTA",
-                unit="1",
-                value_type="DISTRIBUTION",
+                display_name="My metric",
             ),
-            value_extractor="EXTRACT(jsonPayload.request)")
+            value_extractor="EXTRACT(jsonPayload.request)",
+            label_extractors={
+                "mass": "EXTRACT(jsonPayload.request)",
+                "sku": "EXTRACT(jsonPayload.id)",
+            },
+            bucket_options=gcp.logging.MetricBucketOptionsArgs(
+                linear_buckets=gcp.logging.MetricBucketOptionsLinearBucketsArgs(
+                    num_finite_buckets=3,
+                    width=1,
+                    offset=1,
+                ),
+            ))
         ```
         ### Logging Metric Counter Basic
 
@@ -525,7 +526,8 @@ class Metric(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_metric = gcp.logging.Metric("loggingMetric",
+        logging_metric = gcp.logging.Metric("logging_metric",
+            name="my-(custom)/metric",
             filter="resource.type=gae_app AND severity>=ERROR",
             metric_descriptor=gcp.logging.MetricMetricDescriptorArgs(
                 metric_kind="DELTA",
@@ -538,20 +540,21 @@ class Metric(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_metric = gcp.logging.Metric("loggingMetric",
+        logging_metric = gcp.logging.Metric("logging_metric",
+            name="my-(custom)/metric",
             filter="resource.type=gae_app AND severity>=ERROR",
-            label_extractors={
-                "mass": "EXTRACT(jsonPayload.request)",
-            },
             metric_descriptor=gcp.logging.MetricMetricDescriptorArgs(
+                metric_kind="DELTA",
+                value_type="INT64",
                 labels=[gcp.logging.MetricMetricDescriptorLabelArgs(
-                    description="amount of matter",
                     key="mass",
                     value_type="STRING",
+                    description="amount of matter",
                 )],
-                metric_kind="DELTA",
-                value_type="INT64",
-            ))
+            ),
+            label_extractors={
+                "mass": "EXTRACT(jsonPayload.request)",
+            })
         ```
         ### Logging Metric Logging Bucket
 
@@ -559,13 +562,14 @@ class Metric(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_metric_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingMetricProjectBucketConfig",
+        logging_metric = gcp.logging.ProjectBucketConfig("logging_metric",
             location="global",
             project="my-project-name",
             bucket_id="_Default")
-        logging_metric_metric = gcp.logging.Metric("loggingMetricMetric",
+        logging_metric_metric = gcp.logging.Metric("logging_metric",
+            name="my-(custom)/metric",
             filter="resource.type=gae_app AND severity>=ERROR",
-            bucket_name=logging_metric_project_bucket_config.id)
+            bucket_name=logging_metric.id)
         ```
         ### Logging Metric Disabled
 
@@ -573,13 +577,14 @@ class Metric(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_metric = gcp.logging.Metric("loggingMetric",
-            disabled=True,
+        logging_metric = gcp.logging.Metric("logging_metric",
+            name="my-(custom)/metric",
             filter="resource.type=gae_app AND severity>=ERROR",
             metric_descriptor=gcp.logging.MetricMetricDescriptorArgs(
                 metric_kind="DELTA",
                 value_type="INT64",
-            ))
+            ),
+            disabled=True)
         ```
 
         ## Import
@@ -663,38 +668,39 @@ class Metric(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_metric = gcp.logging.Metric("loggingMetric",
-            bucket_options=gcp.logging.MetricBucketOptionsArgs(
-                linear_buckets=gcp.logging.MetricBucketOptionsLinearBucketsArgs(
-                    num_finite_buckets=3,
-                    offset=1,
-                    width=1,
-                ),
-            ),
+        logging_metric = gcp.logging.Metric("logging_metric",
+            name="my-(custom)/metric",
             filter="resource.type=gae_app AND severity>=ERROR",
-            label_extractors={
-                "mass": "EXTRACT(jsonPayload.request)",
-                "sku": "EXTRACT(jsonPayload.id)",
-            },
             metric_descriptor=gcp.logging.MetricMetricDescriptorArgs(
-                display_name="My metric",
+                metric_kind="DELTA",
+                value_type="DISTRIBUTION",
+                unit="1",
                 labels=[
                     gcp.logging.MetricMetricDescriptorLabelArgs(
-                        description="amount of matter",
                         key="mass",
                         value_type="STRING",
+                        description="amount of matter",
                     ),
                     gcp.logging.MetricMetricDescriptorLabelArgs(
-                        description="Identifying number for item",
                         key="sku",
                         value_type="INT64",
+                        description="Identifying number for item",
                     ),
                 ],
-                metric_kind="DELTA",
-                unit="1",
-                value_type="DISTRIBUTION",
+                display_name="My metric",
             ),
-            value_extractor="EXTRACT(jsonPayload.request)")
+            value_extractor="EXTRACT(jsonPayload.request)",
+            label_extractors={
+                "mass": "EXTRACT(jsonPayload.request)",
+                "sku": "EXTRACT(jsonPayload.id)",
+            },
+            bucket_options=gcp.logging.MetricBucketOptionsArgs(
+                linear_buckets=gcp.logging.MetricBucketOptionsLinearBucketsArgs(
+                    num_finite_buckets=3,
+                    width=1,
+                    offset=1,
+                ),
+            ))
         ```
         ### Logging Metric Counter Basic
 
@@ -702,7 +708,8 @@ class Metric(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_metric = gcp.logging.Metric("loggingMetric",
+        logging_metric = gcp.logging.Metric("logging_metric",
+            name="my-(custom)/metric",
             filter="resource.type=gae_app AND severity>=ERROR",
             metric_descriptor=gcp.logging.MetricMetricDescriptorArgs(
                 metric_kind="DELTA",
@@ -715,20 +722,21 @@ class Metric(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_metric = gcp.logging.Metric("loggingMetric",
+        logging_metric = gcp.logging.Metric("logging_metric",
+            name="my-(custom)/metric",
             filter="resource.type=gae_app AND severity>=ERROR",
-            label_extractors={
-                "mass": "EXTRACT(jsonPayload.request)",
-            },
             metric_descriptor=gcp.logging.MetricMetricDescriptorArgs(
+                metric_kind="DELTA",
+                value_type="INT64",
                 labels=[gcp.logging.MetricMetricDescriptorLabelArgs(
-                    description="amount of matter",
                     key="mass",
                     value_type="STRING",
+                    description="amount of matter",
                 )],
-                metric_kind="DELTA",
-                value_type="INT64",
-            ))
+            ),
+            label_extractors={
+                "mass": "EXTRACT(jsonPayload.request)",
+            })
         ```
         ### Logging Metric Logging Bucket
 
@@ -736,13 +744,14 @@ class Metric(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_metric_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingMetricProjectBucketConfig",
+        logging_metric = gcp.logging.ProjectBucketConfig("logging_metric",
             location="global",
             project="my-project-name",
             bucket_id="_Default")
-        logging_metric_metric = gcp.logging.Metric("loggingMetricMetric",
+        logging_metric_metric = gcp.logging.Metric("logging_metric",
+            name="my-(custom)/metric",
             filter="resource.type=gae_app AND severity>=ERROR",
-            bucket_name=logging_metric_project_bucket_config.id)
+            bucket_name=logging_metric.id)
         ```
         ### Logging Metric Disabled
 
@@ -750,13 +759,14 @@ class Metric(pulumi.CustomResource):
         import pulumi
         import pulumi_gcp as gcp
 
-        logging_metric = gcp.logging.Metric("loggingMetric",
-            disabled=True,
+        logging_metric = gcp.logging.Metric("logging_metric",
+            name="my-(custom)/metric",
             filter="resource.type=gae_app AND severity>=ERROR",
             metric_descriptor=gcp.logging.MetricMetricDescriptorArgs(
                 metric_kind="DELTA",
                 value_type="INT64",
-            ))
+            ),
+            disabled=True)
         ```
 
         ## Import

pulumi_gcp/logging/organization_exclusion.py

@@ -224,9 +224,10 @@ class OrganizationExclusion(pulumi.CustomResource):
         import pulumi_gcp as gcp
 
         my_exclusion = gcp.logging.OrganizationExclusion("my-exclusion",
+            name="my-instance-debug-exclusion",
+            org_id="123456789",
             description="Exclude GCE instance debug logs",
-            filter="resource.type = gce_instance AND severity <= DEBUG",
-            org_id="123456789")
+            filter="resource.type = gce_instance AND severity <= DEBUG")
         ```
 
         ## Import
@@ -274,9 +275,10 @@ class OrganizationExclusion(pulumi.CustomResource):
         import pulumi_gcp as gcp
 
         my_exclusion = gcp.logging.OrganizationExclusion("my-exclusion",
+            name="my-instance-debug-exclusion",
+            org_id="123456789",
             description="Exclude GCE instance debug logs",
-            filter="resource.type = gce_instance AND severity <= DEBUG",
-            org_id="123456789")
+            filter="resource.type = gce_instance AND severity <= DEBUG")
         ```
 
         ## Import