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

pulumi_gcp/logging/linked_dataset.py

@@ -49,13 +49,23 @@ class LinkedDatasetArgs:
     @staticmethod
     def _configure(
              _setter: Callable[[Any, Any], None],
-             bucket: pulumi.Input[str],
-             link_id: pulumi.Input[str],
+             bucket: Optional[pulumi.Input[str]] = None,
+             link_id: Optional[pulumi.Input[str]] = None,
              bigquery_datasets: Optional[pulumi.Input[Sequence[pulumi.Input['LinkedDatasetBigqueryDatasetArgs']]]] = None,
              description: Optional[pulumi.Input[str]] = None,
              location: Optional[pulumi.Input[str]] = None,
              parent: Optional[pulumi.Input[str]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if bucket is None:
+            raise TypeError("Missing 'bucket' argument")
+        if link_id is None and 'linkId' in kwargs:
+            link_id = kwargs['linkId']
+        if link_id is None:
+            raise TypeError("Missing 'link_id' argument")
+        if bigquery_datasets is None and 'bigqueryDatasets' in kwargs:
+            bigquery_datasets = kwargs['bigqueryDatasets']
+
         _setter("bucket", bucket)
         _setter("link_id", link_id)
         if bigquery_datasets is not None:
@@ -203,7 +213,17 @@ class _LinkedDatasetState:
              location: Optional[pulumi.Input[str]] = None,
              name: Optional[pulumi.Input[str]] = None,
              parent: Optional[pulumi.Input[str]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if bigquery_datasets is None and 'bigqueryDatasets' in kwargs:
+            bigquery_datasets = kwargs['bigqueryDatasets']
+        if create_time is None and 'createTime' in kwargs:
+            create_time = kwargs['createTime']
+        if lifecycle_state is None and 'lifecycleState' in kwargs:
+            lifecycle_state = kwargs['lifecycleState']
+        if link_id is None and 'linkId' in kwargs:
+            link_id = kwargs['linkId']
+
         if bigquery_datasets is not None:
             _setter("bigquery_datasets", bigquery_datasets)
         if bucket is not None:
@@ -363,41 +383,6 @@ class LinkedDataset(pulumi.CustomResource):
             * [Official Documentation](https://cloud.google.com/logging/docs/apis)
 
         ## Example Usage
-        ### Logging Linked Dataset Basic
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        logging_linked_dataset_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingLinkedDatasetProjectBucketConfig",
-            location="global",
-            project="my-project-name",
-            enable_analytics=True,
-            bucket_id="my-bucket")
-        logging_linked_dataset_linked_dataset = gcp.logging.LinkedDataset("loggingLinkedDatasetLinkedDataset",
-            link_id="mylink",
-            bucket=logging_linked_dataset_project_bucket_config.id,
-            description="Linked dataset test")
-        ```
-        ### Logging Linked Dataset All Params
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        logging_linked_dataset_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingLinkedDatasetProjectBucketConfig",
-            bucket_id="my-bucket",
-            enable_analytics=True,
-            location="global",
-            project="my-project-name")
-        logging_linked_dataset_linked_dataset = gcp.logging.LinkedDataset("loggingLinkedDatasetLinkedDataset",
-            bucket="my-bucket",
-            description="Linked dataset test",
-            link_id="mylink",
-            location="global",
-            parent="projects/my-project-name",
-            opts=pulumi.ResourceOptions(depends_on=["google_logging_project_bucket_config.logging_linked_dataset"]))
-        ```
 
         ## Import
 
@@ -438,41 +423,6 @@ class LinkedDataset(pulumi.CustomResource):
             * [Official Documentation](https://cloud.google.com/logging/docs/apis)
 
         ## Example Usage
-        ### Logging Linked Dataset Basic
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        logging_linked_dataset_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingLinkedDatasetProjectBucketConfig",
-            location="global",
-            project="my-project-name",
-            enable_analytics=True,
-            bucket_id="my-bucket")
-        logging_linked_dataset_linked_dataset = gcp.logging.LinkedDataset("loggingLinkedDatasetLinkedDataset",
-            link_id="mylink",
-            bucket=logging_linked_dataset_project_bucket_config.id,
-            description="Linked dataset test")
-        ```
-        ### Logging Linked Dataset All Params
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        logging_linked_dataset_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingLinkedDatasetProjectBucketConfig",
-            bucket_id="my-bucket",
-            enable_analytics=True,
-            location="global",
-            project="my-project-name")
-        logging_linked_dataset_linked_dataset = gcp.logging.LinkedDataset("loggingLinkedDatasetLinkedDataset",
-            bucket="my-bucket",
-            description="Linked dataset test",
-            link_id="mylink",
-            location="global",
-            parent="projects/my-project-name",
-            opts=pulumi.ResourceOptions(depends_on=["google_logging_project_bucket_config.logging_linked_dataset"]))
-        ```
 
         ## Import
 

pulumi_gcp/logging/log_view.py

@@ -44,13 +44,17 @@ class LogViewArgs:
     @staticmethod
     def _configure(
              _setter: Callable[[Any, Any], None],
-             bucket: pulumi.Input[str],
+             bucket: Optional[pulumi.Input[str]] = None,
              description: Optional[pulumi.Input[str]] = None,
              filter: Optional[pulumi.Input[str]] = None,
              location: Optional[pulumi.Input[str]] = None,
              name: Optional[pulumi.Input[str]] = None,
              parent: Optional[pulumi.Input[str]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if bucket is None:
+            raise TypeError("Missing 'bucket' argument")
+
         _setter("bucket", bucket)
         if description is not None:
             _setter("description", description)
@@ -186,7 +190,13 @@ class _LogViewState:
              name: Optional[pulumi.Input[str]] = None,
              parent: Optional[pulumi.Input[str]] = None,
              update_time: Optional[pulumi.Input[str]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if create_time is None and 'createTime' in kwargs:
+            create_time = kwargs['createTime']
+        if update_time is None and 'updateTime' in kwargs:
+            update_time = kwargs['updateTime']
+
         if bucket is not None:
             _setter("bucket", bucket)
         if create_time is not None:
@@ -326,22 +336,6 @@ class LogView(pulumi.CustomResource):
             * [Official Documentation](https://cloud.google.com/logging/docs/apis)
 
         ## Example Usage
-        ### Logging Log View Basic
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        logging_log_view_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingLogViewProjectBucketConfig",
-            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,
-            description="A logging view configured with Terraform",
-            filter="SOURCE(\\"projects/myproject\\") AND resource.type = \\"gce_instance\\" AND LOG_ID(\\"stdout\\")")
-        ```
 
         ## Import
 
@@ -379,22 +373,6 @@ class LogView(pulumi.CustomResource):
             * [Official Documentation](https://cloud.google.com/logging/docs/apis)
 
         ## Example Usage
-        ### Logging Log View Basic
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        logging_log_view_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingLogViewProjectBucketConfig",
-            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,
-            description="A logging view configured with Terraform",
-            filter="SOURCE(\\"projects/myproject\\") AND resource.type = \\"gce_instance\\" AND LOG_ID(\\"stdout\\")")
-        ```
 
         ## Import
 

pulumi_gcp/logging/metric.py

@@ -81,7 +81,7 @@ class MetricArgs:
     @staticmethod
     def _configure(
              _setter: Callable[[Any, Any], None],
-             filter: pulumi.Input[str],
+             filter: Optional[pulumi.Input[str]] = None,
              bucket_name: Optional[pulumi.Input[str]] = None,
              bucket_options: Optional[pulumi.Input['MetricBucketOptionsArgs']] = None,
              description: Optional[pulumi.Input[str]] = None,
@@ -91,7 +91,21 @@ class MetricArgs:
              name: Optional[pulumi.Input[str]] = None,
              project: Optional[pulumi.Input[str]] = None,
              value_extractor: Optional[pulumi.Input[str]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if filter is None:
+            raise TypeError("Missing 'filter' argument")
+        if bucket_name is None and 'bucketName' in kwargs:
+            bucket_name = kwargs['bucketName']
+        if bucket_options is None and 'bucketOptions' in kwargs:
+            bucket_options = kwargs['bucketOptions']
+        if label_extractors is None and 'labelExtractors' in kwargs:
+            label_extractors = kwargs['labelExtractors']
+        if metric_descriptor is None and 'metricDescriptor' in kwargs:
+            metric_descriptor = kwargs['metricDescriptor']
+        if value_extractor is None and 'valueExtractor' in kwargs:
+            value_extractor = kwargs['valueExtractor']
+
         _setter("filter", filter)
         if bucket_name is not None:
             _setter("bucket_name", bucket_name)
@@ -337,7 +351,19 @@ class _MetricState:
              name: Optional[pulumi.Input[str]] = None,
              project: Optional[pulumi.Input[str]] = None,
              value_extractor: Optional[pulumi.Input[str]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if bucket_name is None and 'bucketName' in kwargs:
+            bucket_name = kwargs['bucketName']
+        if bucket_options is None and 'bucketOptions' in kwargs:
+            bucket_options = kwargs['bucketOptions']
+        if label_extractors is None and 'labelExtractors' in kwargs:
+            label_extractors = kwargs['labelExtractors']
+        if metric_descriptor is None and 'metricDescriptor' in kwargs:
+            metric_descriptor = kwargs['metricDescriptor']
+        if value_extractor is None and 'valueExtractor' in kwargs:
+            value_extractor = kwargs['valueExtractor']
+
         if bucket_name is not None:
             _setter("bucket_name", bucket_name)
         if bucket_options is not None:
@@ -534,107 +560,6 @@ class Metric(pulumi.CustomResource):
             * [Official Documentation](https://cloud.google.com/logging/docs/apis)
 
         ## Example Usage
-        ### Logging Metric Basic
-
-        ```python
-        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,
-                ),
-            ),
-            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",
-                labels=[
-                    gcp.logging.MetricMetricDescriptorLabelArgs(
-                        description="amount of matter",
-                        key="mass",
-                        value_type="STRING",
-                    ),
-                    gcp.logging.MetricMetricDescriptorLabelArgs(
-                        description="Identifying number for item",
-                        key="sku",
-                        value_type="INT64",
-                    ),
-                ],
-                metric_kind="DELTA",
-                unit="1",
-                value_type="DISTRIBUTION",
-            ),
-            value_extractor="EXTRACT(jsonPayload.request)")
-        ```
-        ### Logging Metric Counter Basic
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        logging_metric = gcp.logging.Metric("loggingMetric",
-            filter="resource.type=gae_app AND severity>=ERROR",
-            metric_descriptor=gcp.logging.MetricMetricDescriptorArgs(
-                metric_kind="DELTA",
-                value_type="INT64",
-            ))
-        ```
-        ### Logging Metric Counter Labels
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        logging_metric = gcp.logging.Metric("loggingMetric",
-            filter="resource.type=gae_app AND severity>=ERROR",
-            label_extractors={
-                "mass": "EXTRACT(jsonPayload.request)",
-            },
-            metric_descriptor=gcp.logging.MetricMetricDescriptorArgs(
-                labels=[gcp.logging.MetricMetricDescriptorLabelArgs(
-                    description="amount of matter",
-                    key="mass",
-                    value_type="STRING",
-                )],
-                metric_kind="DELTA",
-                value_type="INT64",
-            ))
-        ```
-        ### Logging Metric Logging Bucket
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        logging_metric_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingMetricProjectBucketConfig",
-            location="global",
-            project="my-project-name",
-            bucket_id="_Default")
-        logging_metric_metric = gcp.logging.Metric("loggingMetricMetric",
-            filter="resource.type=gae_app AND severity>=ERROR",
-            bucket_name=logging_metric_project_bucket_config.id)
-        ```
-        ### Logging Metric Disabled
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        logging_metric = gcp.logging.Metric("loggingMetric",
-            disabled=True,
-            filter="resource.type=gae_app AND severity>=ERROR",
-            metric_descriptor=gcp.logging.MetricMetricDescriptorArgs(
-                metric_kind="DELTA",
-                value_type="INT64",
-            ))
-        ```
 
         ## Import
 
@@ -705,107 +630,6 @@ class Metric(pulumi.CustomResource):
             * [Official Documentation](https://cloud.google.com/logging/docs/apis)
 
         ## Example Usage
-        ### Logging Metric Basic
-
-        ```python
-        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,
-                ),
-            ),
-            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",
-                labels=[
-                    gcp.logging.MetricMetricDescriptorLabelArgs(
-                        description="amount of matter",
-                        key="mass",
-                        value_type="STRING",
-                    ),
-                    gcp.logging.MetricMetricDescriptorLabelArgs(
-                        description="Identifying number for item",
-                        key="sku",
-                        value_type="INT64",
-                    ),
-                ],
-                metric_kind="DELTA",
-                unit="1",
-                value_type="DISTRIBUTION",
-            ),
-            value_extractor="EXTRACT(jsonPayload.request)")
-        ```
-        ### Logging Metric Counter Basic
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        logging_metric = gcp.logging.Metric("loggingMetric",
-            filter="resource.type=gae_app AND severity>=ERROR",
-            metric_descriptor=gcp.logging.MetricMetricDescriptorArgs(
-                metric_kind="DELTA",
-                value_type="INT64",
-            ))
-        ```
-        ### Logging Metric Counter Labels
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        logging_metric = gcp.logging.Metric("loggingMetric",
-            filter="resource.type=gae_app AND severity>=ERROR",
-            label_extractors={
-                "mass": "EXTRACT(jsonPayload.request)",
-            },
-            metric_descriptor=gcp.logging.MetricMetricDescriptorArgs(
-                labels=[gcp.logging.MetricMetricDescriptorLabelArgs(
-                    description="amount of matter",
-                    key="mass",
-                    value_type="STRING",
-                )],
-                metric_kind="DELTA",
-                value_type="INT64",
-            ))
-        ```
-        ### Logging Metric Logging Bucket
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        logging_metric_project_bucket_config = gcp.logging.ProjectBucketConfig("loggingMetricProjectBucketConfig",
-            location="global",
-            project="my-project-name",
-            bucket_id="_Default")
-        logging_metric_metric = gcp.logging.Metric("loggingMetricMetric",
-            filter="resource.type=gae_app AND severity>=ERROR",
-            bucket_name=logging_metric_project_bucket_config.id)
-        ```
-        ### Logging Metric Disabled
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        logging_metric = gcp.logging.Metric("loggingMetric",
-            disabled=True,
-            filter="resource.type=gae_app AND severity>=ERROR",
-            metric_descriptor=gcp.logging.MetricMetricDescriptorArgs(
-                metric_kind="DELTA",
-                value_type="INT64",
-            ))
-        ```
 
         ## Import
 
@@ -858,11 +682,7 @@ class Metric(pulumi.CustomResource):
             __props__ = MetricArgs.__new__(MetricArgs)
 
             __props__.__dict__["bucket_name"] = bucket_name
-            if bucket_options is not None and not isinstance(bucket_options, MetricBucketOptionsArgs):
-                bucket_options = bucket_options or {}
-                def _setter(key, value):
-                    bucket_options[key] = value
-                MetricBucketOptionsArgs._configure(_setter, **bucket_options)
+            bucket_options = _utilities.configure(bucket_options, MetricBucketOptionsArgs, True)
             __props__.__dict__["bucket_options"] = bucket_options
             __props__.__dict__["description"] = description
             __props__.__dict__["disabled"] = disabled
@@ -870,11 +690,7 @@ class Metric(pulumi.CustomResource):
                 raise TypeError("Missing required property 'filter'")
             __props__.__dict__["filter"] = filter
             __props__.__dict__["label_extractors"] = label_extractors
-            if metric_descriptor is not None and not isinstance(metric_descriptor, MetricMetricDescriptorArgs):
-                metric_descriptor = metric_descriptor or {}
-                def _setter(key, value):
-                    metric_descriptor[key] = value
-                MetricMetricDescriptorArgs._configure(_setter, **metric_descriptor)
+            metric_descriptor = _utilities.configure(metric_descriptor, MetricMetricDescriptorArgs, True)
             __props__.__dict__["metric_descriptor"] = metric_descriptor
             __props__.__dict__["name"] = name
             __props__.__dict__["project"] = project

pulumi_gcp/logging/organization_bucket_config.py

@@ -45,13 +45,27 @@ class OrganizationBucketConfigArgs:
     @staticmethod
     def _configure(
              _setter: Callable[[Any, Any], None],
-             bucket_id: pulumi.Input[str],
-             location: pulumi.Input[str],
-             organization: pulumi.Input[str],
+             bucket_id: Optional[pulumi.Input[str]] = None,
+             location: Optional[pulumi.Input[str]] = None,
+             organization: Optional[pulumi.Input[str]] = None,
              cmek_settings: Optional[pulumi.Input['OrganizationBucketConfigCmekSettingsArgs']] = None,
              description: Optional[pulumi.Input[str]] = None,
              retention_days: Optional[pulumi.Input[int]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if bucket_id is None and 'bucketId' in kwargs:
+            bucket_id = kwargs['bucketId']
+        if bucket_id is None:
+            raise TypeError("Missing 'bucket_id' argument")
+        if location is None:
+            raise TypeError("Missing 'location' argument")
+        if organization is None:
+            raise TypeError("Missing 'organization' argument")
+        if cmek_settings is None and 'cmekSettings' in kwargs:
+            cmek_settings = kwargs['cmekSettings']
+        if retention_days is None and 'retentionDays' in kwargs:
+            retention_days = kwargs['retentionDays']
+
         _setter("bucket_id", bucket_id)
         _setter("location", location)
         _setter("organization", organization)
@@ -183,7 +197,17 @@ class _OrganizationBucketConfigState:
              name: Optional[pulumi.Input[str]] = None,
              organization: Optional[pulumi.Input[str]] = None,
              retention_days: Optional[pulumi.Input[int]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if bucket_id is None and 'bucketId' in kwargs:
+            bucket_id = kwargs['bucketId']
+        if cmek_settings is None and 'cmekSettings' in kwargs:
+            cmek_settings = kwargs['cmekSettings']
+        if lifecycle_state is None and 'lifecycleState' in kwargs:
+            lifecycle_state = kwargs['lifecycleState']
+        if retention_days is None and 'retentionDays' in kwargs:
+            retention_days = kwargs['retentionDays']
+
         if bucket_id is not None:
             _setter("bucket_id", bucket_id)
         if cmek_settings is not None:
@@ -319,20 +343,6 @@ class OrganizationBucketConfig(pulumi.CustomResource):
 
         > **Note:** Logging buckets are automatically created for a given folder, project, organization, billingAccount and cannot be deleted. Creating a resource of this type will acquire and update the resource that already exists at the desired location. These buckets cannot be removed so deleting this resource will remove the bucket config from your state but will leave the logging bucket unchanged. The buckets that are currently automatically created are "_Default" and "_Required".
 
-        ## Example Usage
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        default = gcp.organizations.get_organization(organization="123456789")
-        basic = gcp.logging.OrganizationBucketConfig("basic",
-            organization=default.organization,
-            location="global",
-            retention_days=30,
-            bucket_id="_Default")
-        ```
-
         ## Import
 
         This resource can be imported using the following format:
@@ -365,20 +375,6 @@ class OrganizationBucketConfig(pulumi.CustomResource):
 
         > **Note:** Logging buckets are automatically created for a given folder, project, organization, billingAccount and cannot be deleted. Creating a resource of this type will acquire and update the resource that already exists at the desired location. These buckets cannot be removed so deleting this resource will remove the bucket config from your state but will leave the logging bucket unchanged. The buckets that are currently automatically created are "_Default" and "_Required".
 
-        ## Example Usage
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        default = gcp.organizations.get_organization(organization="123456789")
-        basic = gcp.logging.OrganizationBucketConfig("basic",
-            organization=default.organization,
-            location="global",
-            retention_days=30,
-            bucket_id="_Default")
-        ```
-
         ## Import
 
         This resource can be imported using the following format:
@@ -424,11 +420,7 @@ class OrganizationBucketConfig(pulumi.CustomResource):
             if bucket_id is None and not opts.urn:
                 raise TypeError("Missing required property 'bucket_id'")
             __props__.__dict__["bucket_id"] = bucket_id
-            if cmek_settings is not None and not isinstance(cmek_settings, OrganizationBucketConfigCmekSettingsArgs):
-                cmek_settings = cmek_settings or {}
-                def _setter(key, value):
-                    cmek_settings[key] = value
-                OrganizationBucketConfigCmekSettingsArgs._configure(_setter, **cmek_settings)
+            cmek_settings = _utilities.configure(cmek_settings, OrganizationBucketConfigCmekSettingsArgs, True)
             __props__.__dict__["cmek_settings"] = cmek_settings
             __props__.__dict__["description"] = description
             if location is None and not opts.urn:

pulumi_gcp/logging/organization_exclusion.py

@@ -41,12 +41,20 @@ class OrganizationExclusionArgs:
     @staticmethod
     def _configure(
              _setter: Callable[[Any, Any], None],
-             filter: pulumi.Input[str],
-             org_id: pulumi.Input[str],
+             filter: Optional[pulumi.Input[str]] = None,
+             org_id: Optional[pulumi.Input[str]] = None,
              description: Optional[pulumi.Input[str]] = None,
              disabled: Optional[pulumi.Input[bool]] = None,
              name: Optional[pulumi.Input[str]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if filter is None:
+            raise TypeError("Missing 'filter' 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")
+
         _setter("filter", filter)
         _setter("org_id", org_id)
         if description is not None:
@@ -155,7 +163,11 @@ class _OrganizationExclusionState:
              filter: Optional[pulumi.Input[str]] = None,
              name: Optional[pulumi.Input[str]] = None,
              org_id: Optional[pulumi.Input[str]] = None,
-             opts: Optional[pulumi.ResourceOptions]=None):
+             opts: Optional[pulumi.ResourceOptions] = None,
+             **kwargs):
+        if org_id is None and 'orgId' in kwargs:
+            org_id = kwargs['orgId']
+
         if description is not None:
             _setter("description", description)
         if disabled is not None:
@@ -251,18 +263,6 @@ class OrganizationExclusion(pulumi.CustomResource):
 
         > You can specify exclusions for log sinks created by the provider by using the exclusions field of `logging.OrganizationSink`
 
-        ## Example Usage
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        my_exclusion = gcp.logging.OrganizationExclusion("my-exclusion",
-            description="Exclude GCE instance debug logs",
-            filter="resource.type = gce_instance AND severity <= DEBUG",
-            org_id="123456789")
-        ```
-
         ## Import
 
         Organization-level logging exclusions can be imported using their URI, e.g.
@@ -297,18 +297,6 @@ class OrganizationExclusion(pulumi.CustomResource):
 
         > You can specify exclusions for log sinks created by the provider by using the exclusions field of `logging.OrganizationSink`
 
-        ## Example Usage
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        my_exclusion = gcp.logging.OrganizationExclusion("my-exclusion",
-            description="Exclude GCE instance debug logs",
-            filter="resource.type = gce_instance AND severity <= DEBUG",
-            org_id="123456789")
-        ```
-
         ## Import
 
         Organization-level logging exclusions can be imported using their URI, e.g.