pulumi-gcp 8.11.0__py3-none-any.whl → 8.11.0a1732282007__py3-none-any.whl

pulumi_gcp/artifactregistry/repository.py

@@ -1143,70 +1143,6 @@ class Repository(pulumi.CustomResource):
                 },
             })
         ```
-        ### Artifact Registry Repository Remote Common Repository With Artifact Registry Uri
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        project = gcp.organizations.get_project()
-        upstream_repo = gcp.artifactregistry.Repository("upstream_repo",
-            location="us-central1",
-            repository_id="example-upstream-repo",
-            description="example upstream repository",
-            format="DOCKER")
-        my_repo = gcp.artifactregistry.Repository("my-repo",
-            location="us-central1",
-            repository_id="example-common-remote",
-            description="example remote common repository with docker upstream",
-            format="DOCKER",
-            mode="REMOTE_REPOSITORY",
-            remote_repository_config={
-                "description": "pull-through cache of another Artifact Registry repository by URL",
-                "common_repository": {
-                    "uri": "https://us-central1-docker.pkg.dev//example-upstream-repo",
-                },
-            })
-        ```
-        ### Artifact Registry Repository Remote Common Repository With Custom Upstream
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        project = gcp.organizations.get_project()
-        example_remote_secret = gcp.secretmanager.Secret("example-remote-secret",
-            secret_id="example-secret",
-            replication={
-                "auto": {},
-            })
-        example_remote_secret_version = gcp.secretmanager.SecretVersion("example-remote-secret_version",
-            secret=example_remote_secret.id,
-            secret_data="remote-password")
-        secret_access = gcp.secretmanager.SecretIamMember("secret-access",
-            secret_id=example_remote_secret.id,
-            role="roles/secretmanager.secretAccessor",
-            member=f"serviceAccount:service-{project.number}@gcp-sa-artifactregistry.iam.gserviceaccount.com")
-        my_repo = gcp.artifactregistry.Repository("my-repo",
-            location="us-central1",
-            repository_id="example-docker-custom-remote",
-            description="example remote custom docker repository with credentials",
-            format="DOCKER",
-            mode="REMOTE_REPOSITORY",
-            remote_repository_config={
-                "description": "custom common docker remote with credentials",
-                "disable_upstream_validation": True,
-                "common_repository": {
-                    "uri": "https://registry-1.docker.io",
-                },
-                "upstream_credentials": {
-                    "username_password_credentials": {
-                        "username": "remote-username",
-                        "password_secret_version": example_remote_secret_version.name,
-                    },
-                },
-            })
-        ```
 
         ## Import
 
@@ -1727,70 +1663,6 @@ class Repository(pulumi.CustomResource):
                 },
             })
         ```
-        ### Artifact Registry Repository Remote Common Repository With Artifact Registry Uri
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        project = gcp.organizations.get_project()
-        upstream_repo = gcp.artifactregistry.Repository("upstream_repo",
-            location="us-central1",
-            repository_id="example-upstream-repo",
-            description="example upstream repository",
-            format="DOCKER")
-        my_repo = gcp.artifactregistry.Repository("my-repo",
-            location="us-central1",
-            repository_id="example-common-remote",
-            description="example remote common repository with docker upstream",
-            format="DOCKER",
-            mode="REMOTE_REPOSITORY",
-            remote_repository_config={
-                "description": "pull-through cache of another Artifact Registry repository by URL",
-                "common_repository": {
-                    "uri": "https://us-central1-docker.pkg.dev//example-upstream-repo",
-                },
-            })
-        ```
-        ### Artifact Registry Repository Remote Common Repository With Custom Upstream
-
-        ```python
-        import pulumi
-        import pulumi_gcp as gcp
-
-        project = gcp.organizations.get_project()
-        example_remote_secret = gcp.secretmanager.Secret("example-remote-secret",
-            secret_id="example-secret",
-            replication={
-                "auto": {},
-            })
-        example_remote_secret_version = gcp.secretmanager.SecretVersion("example-remote-secret_version",
-            secret=example_remote_secret.id,
-            secret_data="remote-password")
-        secret_access = gcp.secretmanager.SecretIamMember("secret-access",
-            secret_id=example_remote_secret.id,
-            role="roles/secretmanager.secretAccessor",
-            member=f"serviceAccount:service-{project.number}@gcp-sa-artifactregistry.iam.gserviceaccount.com")
-        my_repo = gcp.artifactregistry.Repository("my-repo",
-            location="us-central1",
-            repository_id="example-docker-custom-remote",
-            description="example remote custom docker repository with credentials",
-            format="DOCKER",
-            mode="REMOTE_REPOSITORY",
-            remote_repository_config={
-                "description": "custom common docker remote with credentials",
-                "disable_upstream_validation": True,
-                "common_repository": {
-                    "uri": "https://registry-1.docker.io",
-                },
-                "upstream_credentials": {
-                    "username_password_credentials": {
-                        "username": "remote-username",
-                        "password_secret_version": example_remote_secret_version.name,
-                    },
-                },
-            })
-        ```
 
         ## Import
 

pulumi_gcp/assuredworkloads/workload.py

@@ -38,7 +38,7 @@ class WorkloadArgs:
                  workload_options: Optional[pulumi.Input['WorkloadWorkloadOptionsArgs']] = None):
         """
         The set of arguments for constructing a Workload resource.
-        :param pulumi.Input[str] compliance_regime: Required. Immutable. Compliance Regime associated with this workload. Possible values: COMPLIANCE_REGIME_UNSPECIFIED, IL4, CJIS, FEDRAMP_HIGH, FEDRAMP_MODERATE, US_REGIONAL_ACCESS, HIPAA, HITRUST, EU_REGIONS_AND_SUPPORT, CA_REGIONS_AND_SUPPORT, ITAR, AU_REGIONS_AND_US_SUPPORT, ASSURED_WORKLOADS_FOR_PARTNERS, ISR_REGIONS, ISR_REGIONS_AND_SUPPORT, CA_PROTECTED_B, IL5, IL2, JP_REGIONS_AND_SUPPORT, KSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS, REGIONAL_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS_WITH_US_SUPPORT, IRS_1075
+        :param pulumi.Input[str] compliance_regime: Required. Immutable. Compliance Regime associated with this workload. Possible values: COMPLIANCE_REGIME_UNSPECIFIED, IL4, CJIS, FEDRAMP_HIGH, FEDRAMP_MODERATE, US_REGIONAL_ACCESS, HIPAA, HITRUST, EU_REGIONS_AND_SUPPORT, CA_REGIONS_AND_SUPPORT, ITAR, AU_REGIONS_AND_US_SUPPORT, ASSURED_WORKLOADS_FOR_PARTNERS, ISR_REGIONS, ISR_REGIONS_AND_SUPPORT, CA_PROTECTED_B, IL5, IL2, JP_REGIONS_AND_SUPPORT, KSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS, REGIONAL_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS_WITH_US_SUPPORT
         :param pulumi.Input[str] display_name: Required. The user-assigned display name of the Workload. When present it must be between 4 to 30 characters. Allowed characters are: lowercase and uppercase letters, numbers, hyphen, and spaces. Example: My Workload
         :param pulumi.Input[str] location: The location for the resource
         :param pulumi.Input[str] organization: The organization for the resource
@@ -92,7 +92,7 @@ class WorkloadArgs:
     @pulumi.getter(name="complianceRegime")
     def compliance_regime(self) -> pulumi.Input[str]:
         """
-        Required. Immutable. Compliance Regime associated with this workload. Possible values: COMPLIANCE_REGIME_UNSPECIFIED, IL4, CJIS, FEDRAMP_HIGH, FEDRAMP_MODERATE, US_REGIONAL_ACCESS, HIPAA, HITRUST, EU_REGIONS_AND_SUPPORT, CA_REGIONS_AND_SUPPORT, ITAR, AU_REGIONS_AND_US_SUPPORT, ASSURED_WORKLOADS_FOR_PARTNERS, ISR_REGIONS, ISR_REGIONS_AND_SUPPORT, CA_PROTECTED_B, IL5, IL2, JP_REGIONS_AND_SUPPORT, KSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS, REGIONAL_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS_WITH_US_SUPPORT, IRS_1075
+        Required. Immutable. Compliance Regime associated with this workload. Possible values: COMPLIANCE_REGIME_UNSPECIFIED, IL4, CJIS, FEDRAMP_HIGH, FEDRAMP_MODERATE, US_REGIONAL_ACCESS, HIPAA, HITRUST, EU_REGIONS_AND_SUPPORT, CA_REGIONS_AND_SUPPORT, ITAR, AU_REGIONS_AND_US_SUPPORT, ASSURED_WORKLOADS_FOR_PARTNERS, ISR_REGIONS, ISR_REGIONS_AND_SUPPORT, CA_PROTECTED_B, IL5, IL2, JP_REGIONS_AND_SUPPORT, KSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS, REGIONAL_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS_WITH_US_SUPPORT
         """
         return pulumi.get(self, "compliance_regime")
 
@@ -307,7 +307,7 @@ class _WorkloadState:
         """
         Input properties used for looking up and filtering Workload resources.
         :param pulumi.Input[str] billing_account: Optional. Input only. The billing account used for the resources which are direct children of workload. This billing account is initially associated with the resources created as part of Workload creation. After the initial creation of these resources, the customer can change the assigned billing account. The resource name has the form `billingAccounts/{billing_account_id}`. For example, `billingAccounts/012345-567890-ABCDEF`.
-        :param pulumi.Input[str] compliance_regime: Required. Immutable. Compliance Regime associated with this workload. Possible values: COMPLIANCE_REGIME_UNSPECIFIED, IL4, CJIS, FEDRAMP_HIGH, FEDRAMP_MODERATE, US_REGIONAL_ACCESS, HIPAA, HITRUST, EU_REGIONS_AND_SUPPORT, CA_REGIONS_AND_SUPPORT, ITAR, AU_REGIONS_AND_US_SUPPORT, ASSURED_WORKLOADS_FOR_PARTNERS, ISR_REGIONS, ISR_REGIONS_AND_SUPPORT, CA_PROTECTED_B, IL5, IL2, JP_REGIONS_AND_SUPPORT, KSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS, REGIONAL_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS_WITH_US_SUPPORT, IRS_1075
+        :param pulumi.Input[str] compliance_regime: Required. Immutable. Compliance Regime associated with this workload. Possible values: COMPLIANCE_REGIME_UNSPECIFIED, IL4, CJIS, FEDRAMP_HIGH, FEDRAMP_MODERATE, US_REGIONAL_ACCESS, HIPAA, HITRUST, EU_REGIONS_AND_SUPPORT, CA_REGIONS_AND_SUPPORT, ITAR, AU_REGIONS_AND_US_SUPPORT, ASSURED_WORKLOADS_FOR_PARTNERS, ISR_REGIONS, ISR_REGIONS_AND_SUPPORT, CA_PROTECTED_B, IL5, IL2, JP_REGIONS_AND_SUPPORT, KSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS, REGIONAL_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS_WITH_US_SUPPORT
         :param pulumi.Input[Sequence[pulumi.Input['WorkloadComplianceStatusArgs']]] compliance_statuses: Output only. Count of active Violations in the Workload.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] compliant_but_disallowed_services: Output only. Urls for services which are compliant for this Assured Workload, but which are currently disallowed by the ResourceUsageRestriction org policy. Invoke workloads.restrictAllowedResources endpoint to allow your project developers to use these services in their environment.
         :param pulumi.Input[str] create_time: Output only. Immutable. The Workload creation timestamp.
@@ -406,7 +406,7 @@ class _WorkloadState:
     @pulumi.getter(name="complianceRegime")
     def compliance_regime(self) -> Optional[pulumi.Input[str]]:
         """
-        Required. Immutable. Compliance Regime associated with this workload. Possible values: COMPLIANCE_REGIME_UNSPECIFIED, IL4, CJIS, FEDRAMP_HIGH, FEDRAMP_MODERATE, US_REGIONAL_ACCESS, HIPAA, HITRUST, EU_REGIONS_AND_SUPPORT, CA_REGIONS_AND_SUPPORT, ITAR, AU_REGIONS_AND_US_SUPPORT, ASSURED_WORKLOADS_FOR_PARTNERS, ISR_REGIONS, ISR_REGIONS_AND_SUPPORT, CA_PROTECTED_B, IL5, IL2, JP_REGIONS_AND_SUPPORT, KSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS, REGIONAL_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS_WITH_US_SUPPORT, IRS_1075
+        Required. Immutable. Compliance Regime associated with this workload. Possible values: COMPLIANCE_REGIME_UNSPECIFIED, IL4, CJIS, FEDRAMP_HIGH, FEDRAMP_MODERATE, US_REGIONAL_ACCESS, HIPAA, HITRUST, EU_REGIONS_AND_SUPPORT, CA_REGIONS_AND_SUPPORT, ITAR, AU_REGIONS_AND_US_SUPPORT, ASSURED_WORKLOADS_FOR_PARTNERS, ISR_REGIONS, ISR_REGIONS_AND_SUPPORT, CA_PROTECTED_B, IL5, IL2, JP_REGIONS_AND_SUPPORT, KSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS, REGIONAL_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS_WITH_US_SUPPORT
         """
         return pulumi.get(self, "compliance_regime")
 
@@ -853,7 +853,7 @@ class Workload(pulumi.CustomResource):
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[str] billing_account: Optional. Input only. The billing account used for the resources which are direct children of workload. This billing account is initially associated with the resources created as part of Workload creation. After the initial creation of these resources, the customer can change the assigned billing account. The resource name has the form `billingAccounts/{billing_account_id}`. For example, `billingAccounts/012345-567890-ABCDEF`.
-        :param pulumi.Input[str] compliance_regime: Required. Immutable. Compliance Regime associated with this workload. Possible values: COMPLIANCE_REGIME_UNSPECIFIED, IL4, CJIS, FEDRAMP_HIGH, FEDRAMP_MODERATE, US_REGIONAL_ACCESS, HIPAA, HITRUST, EU_REGIONS_AND_SUPPORT, CA_REGIONS_AND_SUPPORT, ITAR, AU_REGIONS_AND_US_SUPPORT, ASSURED_WORKLOADS_FOR_PARTNERS, ISR_REGIONS, ISR_REGIONS_AND_SUPPORT, CA_PROTECTED_B, IL5, IL2, JP_REGIONS_AND_SUPPORT, KSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS, REGIONAL_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS_WITH_US_SUPPORT, IRS_1075
+        :param pulumi.Input[str] compliance_regime: Required. Immutable. Compliance Regime associated with this workload. Possible values: COMPLIANCE_REGIME_UNSPECIFIED, IL4, CJIS, FEDRAMP_HIGH, FEDRAMP_MODERATE, US_REGIONAL_ACCESS, HIPAA, HITRUST, EU_REGIONS_AND_SUPPORT, CA_REGIONS_AND_SUPPORT, ITAR, AU_REGIONS_AND_US_SUPPORT, ASSURED_WORKLOADS_FOR_PARTNERS, ISR_REGIONS, ISR_REGIONS_AND_SUPPORT, CA_PROTECTED_B, IL5, IL2, JP_REGIONS_AND_SUPPORT, KSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS, REGIONAL_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS_WITH_US_SUPPORT
         :param pulumi.Input[str] display_name: Required. The user-assigned display name of the Workload. When present it must be between 4 to 30 characters. Allowed characters are: lowercase and uppercase letters, numbers, hyphen, and spaces. Example: My Workload
         :param pulumi.Input[bool] enable_sovereign_controls: Optional. Indicates the sovereignty status of the given workload. Currently meant to be used by Europe/Canada customers.
         :param pulumi.Input[Union['WorkloadKmsSettingsArgs', 'WorkloadKmsSettingsArgsDict']] kms_settings: **DEPRECATED** Input only. Settings used to create a CMEK crypto key. When set, a project with a KMS CMEK key is provisioned. This field is deprecated as of Feb 28, 2022. In order to create a Keyring, callers should specify, ENCRYPTION_KEYS_PROJECT or KEYRING in ResourceSettings.resource_type field.
@@ -1129,7 +1129,7 @@ class Workload(pulumi.CustomResource):
         :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[str] billing_account: Optional. Input only. The billing account used for the resources which are direct children of workload. This billing account is initially associated with the resources created as part of Workload creation. After the initial creation of these resources, the customer can change the assigned billing account. The resource name has the form `billingAccounts/{billing_account_id}`. For example, `billingAccounts/012345-567890-ABCDEF`.
-        :param pulumi.Input[str] compliance_regime: Required. Immutable. Compliance Regime associated with this workload. Possible values: COMPLIANCE_REGIME_UNSPECIFIED, IL4, CJIS, FEDRAMP_HIGH, FEDRAMP_MODERATE, US_REGIONAL_ACCESS, HIPAA, HITRUST, EU_REGIONS_AND_SUPPORT, CA_REGIONS_AND_SUPPORT, ITAR, AU_REGIONS_AND_US_SUPPORT, ASSURED_WORKLOADS_FOR_PARTNERS, ISR_REGIONS, ISR_REGIONS_AND_SUPPORT, CA_PROTECTED_B, IL5, IL2, JP_REGIONS_AND_SUPPORT, KSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS, REGIONAL_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS_WITH_US_SUPPORT, IRS_1075
+        :param pulumi.Input[str] compliance_regime: Required. Immutable. Compliance Regime associated with this workload. Possible values: COMPLIANCE_REGIME_UNSPECIFIED, IL4, CJIS, FEDRAMP_HIGH, FEDRAMP_MODERATE, US_REGIONAL_ACCESS, HIPAA, HITRUST, EU_REGIONS_AND_SUPPORT, CA_REGIONS_AND_SUPPORT, ITAR, AU_REGIONS_AND_US_SUPPORT, ASSURED_WORKLOADS_FOR_PARTNERS, ISR_REGIONS, ISR_REGIONS_AND_SUPPORT, CA_PROTECTED_B, IL5, IL2, JP_REGIONS_AND_SUPPORT, KSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS, REGIONAL_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS_WITH_US_SUPPORT
         :param pulumi.Input[Sequence[pulumi.Input[Union['WorkloadComplianceStatusArgs', 'WorkloadComplianceStatusArgsDict']]]] compliance_statuses: Output only. Count of active Violations in the Workload.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] compliant_but_disallowed_services: Output only. Urls for services which are compliant for this Assured Workload, but which are currently disallowed by the ResourceUsageRestriction org policy. Invoke workloads.restrictAllowedResources endpoint to allow your project developers to use these services in their environment.
         :param pulumi.Input[str] create_time: Output only. Immutable. The Workload creation timestamp.
@@ -1204,7 +1204,7 @@ class Workload(pulumi.CustomResource):
     @pulumi.getter(name="complianceRegime")
     def compliance_regime(self) -> pulumi.Output[str]:
         """
-        Required. Immutable. Compliance Regime associated with this workload. Possible values: COMPLIANCE_REGIME_UNSPECIFIED, IL4, CJIS, FEDRAMP_HIGH, FEDRAMP_MODERATE, US_REGIONAL_ACCESS, HIPAA, HITRUST, EU_REGIONS_AND_SUPPORT, CA_REGIONS_AND_SUPPORT, ITAR, AU_REGIONS_AND_US_SUPPORT, ASSURED_WORKLOADS_FOR_PARTNERS, ISR_REGIONS, ISR_REGIONS_AND_SUPPORT, CA_PROTECTED_B, IL5, IL2, JP_REGIONS_AND_SUPPORT, KSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS, REGIONAL_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS_WITH_US_SUPPORT, IRS_1075
+        Required. Immutable. Compliance Regime associated with this workload. Possible values: COMPLIANCE_REGIME_UNSPECIFIED, IL4, CJIS, FEDRAMP_HIGH, FEDRAMP_MODERATE, US_REGIONAL_ACCESS, HIPAA, HITRUST, EU_REGIONS_AND_SUPPORT, CA_REGIONS_AND_SUPPORT, ITAR, AU_REGIONS_AND_US_SUPPORT, ASSURED_WORKLOADS_FOR_PARTNERS, ISR_REGIONS, ISR_REGIONS_AND_SUPPORT, CA_PROTECTED_B, IL5, IL2, JP_REGIONS_AND_SUPPORT, KSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS, REGIONAL_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS, HEALTHCARE_AND_LIFE_SCIENCES_CONTROLS_WITH_US_SUPPORT
         """
         return pulumi.get(self, "compliance_regime")
 

pulumi_gcp/backupdisasterrecovery/__init__.py

@@ -8,10 +8,8 @@ import typing
 from .backup_plan import *
 from .backup_plan_association import *
 from .backup_vault import *
-from .get_backup import *
 from .get_backup_plan import *
 from .get_backup_plan_association import *
-from .get_backup_vault import *
 from .get_data_source import *
 from .get_management_server import *
 from .management_server import *

pulumi_gcp/backupdisasterrecovery/backup_plan.py

@@ -337,7 +337,7 @@ class BackupPlan(pulumi.CustomResource):
 
         my_backup_vault = gcp.backupdisasterrecovery.BackupVault("my_backup_vault",
             location="us-central1",
-            backup_vault_id="backup-vault-simple-test",
+            backup_vault_id="bv-bp-test",
             backup_minimum_enforced_retention_duration="100000s")
         my_backup_plan_1 = gcp.backupdisasterrecovery.BackupPlan("my-backup-plan-1",
             location="us-central1",
@@ -410,7 +410,7 @@ class BackupPlan(pulumi.CustomResource):
 
         my_backup_vault = gcp.backupdisasterrecovery.BackupVault("my_backup_vault",
             location="us-central1",
-            backup_vault_id="backup-vault-simple-test",
+            backup_vault_id="bv-bp-test",
             backup_minimum_enforced_retention_duration="100000s")
         my_backup_plan_1 = gcp.backupdisasterrecovery.BackupPlan("my-backup-plan-1",
             location="us-central1",

pulumi_gcp/backupdisasterrecovery/backup_vault.py

@@ -808,8 +808,6 @@ class BackupVault(pulumi.CustomResource):
                  project: Optional[pulumi.Input[str]] = None,
                  __props__=None):
         """
-        Container to store and organize immutable and indelible backups.
-
         ## Example Usage
 
         ### Backup Dr Backup Vault Full
@@ -823,14 +821,14 @@ class BackupVault(pulumi.CustomResource):
             backup_vault_id="backup-vault-test",
             description="This is a second backup vault built by Terraform.",
             backup_minimum_enforced_retention_duration="100000s",
-            annotations={
-                "annotations1": "bar1",
-                "annotations2": "baz1",
-            },
             labels={
                 "foo": "bar1",
                 "bar": "baz1",
             },
+            annotations={
+                "annotations1": "bar1",
+                "annotations2": "baz1",
+            },
             force_update=True,
             access_restriction="WITHIN_ORGANIZATION",
             ignore_inactive_datasources=True,
@@ -907,8 +905,6 @@ class BackupVault(pulumi.CustomResource):
                  args: BackupVaultArgs,
                  opts: Optional[pulumi.ResourceOptions] = None):
         """
-        Container to store and organize immutable and indelible backups.
-
         ## Example Usage
 
         ### Backup Dr Backup Vault Full
@@ -922,14 +918,14 @@ class BackupVault(pulumi.CustomResource):
             backup_vault_id="backup-vault-test",
             description="This is a second backup vault built by Terraform.",
             backup_minimum_enforced_retention_duration="100000s",
-            annotations={
-                "annotations1": "bar1",
-                "annotations2": "baz1",
-            },
             labels={
                 "foo": "bar1",
                 "bar": "baz1",
             },
+            annotations={
+                "annotations1": "bar1",
+                "annotations2": "baz1",
+            },
             force_update=True,
             access_restriction="WITHIN_ORGANIZATION",
             ignore_inactive_datasources=True,

pulumi_gcp/backupdisasterrecovery/get_backup_plan.py

@@ -179,7 +179,7 @@ def get_backup_plan(backup_plan_id: Optional[str] = None,
 def get_backup_plan_output(backup_plan_id: Optional[pulumi.Input[str]] = None,
                            location: Optional[pulumi.Input[str]] = None,
                            project: Optional[pulumi.Input[Optional[str]]] = None,
-                           opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetBackupPlanResult]:
+                           opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetBackupPlanResult]:
     """
     Use this data source to access information about an existing resource.
     """
@@ -187,7 +187,7 @@ def get_backup_plan_output(backup_plan_id: Optional[pulumi.Input[str]] = None,
     __args__['backupPlanId'] = backup_plan_id
     __args__['location'] = location
     __args__['project'] = project
-    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('gcp:backupdisasterrecovery/getBackupPlan:getBackupPlan', __args__, opts=opts, typ=GetBackupPlanResult)
     return __ret__.apply(lambda __response__: GetBackupPlanResult(
         backup_plan_id=pulumi.get(__response__, 'backup_plan_id'),

pulumi_gcp/backupdisasterrecovery/get_backup_plan_association.py

@@ -203,7 +203,7 @@ def get_backup_plan_association(backup_plan_association_id: Optional[str] = None
 def get_backup_plan_association_output(backup_plan_association_id: Optional[pulumi.Input[str]] = None,
                                        location: Optional[pulumi.Input[str]] = None,
                                        project: Optional[pulumi.Input[Optional[str]]] = None,
-                                       opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetBackupPlanAssociationResult]:
+                                       opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetBackupPlanAssociationResult]:
     """
     ## Example Usage
 
@@ -225,7 +225,7 @@ def get_backup_plan_association_output(backup_plan_association_id: Optional[pulu
     __args__['backupPlanAssociationId'] = backup_plan_association_id
     __args__['location'] = location
     __args__['project'] = project
-    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('gcp:backupdisasterrecovery/getBackupPlanAssociation:getBackupPlanAssociation', __args__, opts=opts, typ=GetBackupPlanAssociationResult)
     return __ret__.apply(lambda __response__: GetBackupPlanAssociationResult(
         backup_plan=pulumi.get(__response__, 'backup_plan'),

pulumi_gcp/backupdisasterrecovery/get_data_source.py

@@ -232,7 +232,7 @@ def get_data_source_output(backup_vault_id: Optional[pulumi.Input[str]] = None,
                            data_source_id: Optional[pulumi.Input[str]] = None,
                            location: Optional[pulumi.Input[str]] = None,
                            project: Optional[pulumi.Input[str]] = None,
-                           opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetDataSourceResult]:
+                           opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetDataSourceResult]:
     """
     Use this data source to access information about an existing resource.
     """
@@ -241,7 +241,7 @@ def get_data_source_output(backup_vault_id: Optional[pulumi.Input[str]] = None,
     __args__['dataSourceId'] = data_source_id
     __args__['location'] = location
     __args__['project'] = project
-    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('gcp:backupdisasterrecovery/getDataSource:getDataSource', __args__, opts=opts, typ=GetDataSourceResult)
     return __ret__.apply(lambda __response__: GetDataSourceResult(
         backup_config_infos=pulumi.get(__response__, 'backup_config_infos'),

pulumi_gcp/backupdisasterrecovery/get_management_server.py

@@ -140,7 +140,7 @@ def get_management_server(location: Optional[str] = None,
         project=pulumi.get(__ret__, 'project'),
         type=pulumi.get(__ret__, 'type'))
 def get_management_server_output(location: Optional[pulumi.Input[str]] = None,
-                                 opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetManagementServerResult]:
+                                 opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetManagementServerResult]:
     """
     ## Example Usage
 
@@ -153,7 +153,7 @@ def get_management_server_output(location: Optional[pulumi.Input[str]] = None,
     """
     __args__ = dict()
     __args__['location'] = location
-    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('gcp:backupdisasterrecovery/getManagementServer:getManagementServer', __args__, opts=opts, typ=GetManagementServerResult)
     return __ret__.apply(lambda __response__: GetManagementServerResult(
         id=pulumi.get(__response__, 'id'),

pulumi_gcp/backupdisasterrecovery/outputs.py

@@ -24,7 +24,6 @@ __all__ = [
     'BackupPlanBackupRuleStandardScheduleWeekDayOfMonth',
     'ManagementServerManagementUri',
     'ManagementServerNetwork',
-    'GetBackupBackupResult',
     'GetBackupPlanAssociationRulesConfigInfoResult',
     'GetBackupPlanAssociationRulesConfigInfoLastBackupErrorResult',
     'GetBackupPlanBackupRuleResult',
@@ -565,68 +564,6 @@ class ManagementServerNetwork(dict):
         return pulumi.get(self, "peering_mode")
 
 
-@pulumi.output_type
-class GetBackupBackupResult(dict):
-    def __init__(__self__, *,
-                 backup_id: str,
-                 backup_vault_id: str,
-                 data_source_id: str,
-                 location: str,
-                 name: str):
-        """
-        :param str backup_id: Id of the requesting object, Backup.
-        :param str backup_vault_id: Name of the Backup Vault associated with Backup.
-        :param str data_source_id: Name of the Data Source associated with Backup.
-        :param str location: Location of the resource.
-        :param str name: Name of the resource.
-        """
-        pulumi.set(__self__, "backup_id", backup_id)
-        pulumi.set(__self__, "backup_vault_id", backup_vault_id)
-        pulumi.set(__self__, "data_source_id", data_source_id)
-        pulumi.set(__self__, "location", location)
-        pulumi.set(__self__, "name", name)
-
-    @property
-    @pulumi.getter(name="backupId")
-    def backup_id(self) -> str:
-        """
-        Id of the requesting object, Backup.
-        """
-        return pulumi.get(self, "backup_id")
-
-    @property
-    @pulumi.getter(name="backupVaultId")
-    def backup_vault_id(self) -> str:
-        """
-        Name of the Backup Vault associated with Backup.
-        """
-        return pulumi.get(self, "backup_vault_id")
-
-    @property
-    @pulumi.getter(name="dataSourceId")
-    def data_source_id(self) -> str:
-        """
-        Name of the Data Source associated with Backup.
-        """
-        return pulumi.get(self, "data_source_id")
-
-    @property
-    @pulumi.getter
-    def location(self) -> str:
-        """
-        Location of the resource.
-        """
-        return pulumi.get(self, "location")
-
-    @property
-    @pulumi.getter
-    def name(self) -> str:
-        """
-        Name of the resource.
-        """
-        return pulumi.get(self, "name")
-
-
 @pulumi.output_type
 class GetBackupPlanAssociationRulesConfigInfoResult(dict):
     def __init__(__self__, *,

pulumi_gcp/beyondcorp/get_app_connection.py

@@ -197,7 +197,7 @@ def get_app_connection(name: Optional[str] = None,
 def get_app_connection_output(name: Optional[pulumi.Input[str]] = None,
                               project: Optional[pulumi.Input[Optional[str]]] = None,
                               region: Optional[pulumi.Input[Optional[str]]] = None,
-                              opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetAppConnectionResult]:
+                              opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetAppConnectionResult]:
     """
     Get information about a Google BeyondCorp App Connection.
 
@@ -223,7 +223,7 @@ def get_app_connection_output(name: Optional[pulumi.Input[str]] = None,
     __args__['name'] = name
     __args__['project'] = project
     __args__['region'] = region
-    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('gcp:beyondcorp/getAppConnection:getAppConnection', __args__, opts=opts, typ=GetAppConnectionResult)
     return __ret__.apply(lambda __response__: GetAppConnectionResult(
         application_endpoints=pulumi.get(__response__, 'application_endpoints'),

pulumi_gcp/beyondcorp/get_app_connector.py

@@ -177,7 +177,7 @@ def get_app_connector(name: Optional[str] = None,
 def get_app_connector_output(name: Optional[pulumi.Input[str]] = None,
                              project: Optional[pulumi.Input[Optional[str]]] = None,
                              region: Optional[pulumi.Input[Optional[str]]] = None,
-                             opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetAppConnectorResult]:
+                             opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetAppConnectorResult]:
     """
     Get information about a Google BeyondCorp App Connector.
 
@@ -203,7 +203,7 @@ def get_app_connector_output(name: Optional[pulumi.Input[str]] = None,
     __args__['name'] = name
     __args__['project'] = project
     __args__['region'] = region
-    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('gcp:beyondcorp/getAppConnector:getAppConnector', __args__, opts=opts, typ=GetAppConnectorResult)
     return __ret__.apply(lambda __response__: GetAppConnectorResult(
         display_name=pulumi.get(__response__, 'display_name'),

pulumi_gcp/beyondcorp/get_app_gateway.py

@@ -207,7 +207,7 @@ def get_app_gateway(name: Optional[str] = None,
 def get_app_gateway_output(name: Optional[pulumi.Input[str]] = None,
                            project: Optional[pulumi.Input[Optional[str]]] = None,
                            region: Optional[pulumi.Input[Optional[str]]] = None,
-                           opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetAppGatewayResult]:
+                           opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetAppGatewayResult]:
     """
     Get information about a Google BeyondCorp App Gateway.
 
@@ -233,7 +233,7 @@ def get_app_gateway_output(name: Optional[pulumi.Input[str]] = None,
     __args__['name'] = name
     __args__['project'] = project
     __args__['region'] = region
-    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('gcp:beyondcorp/getAppGateway:getAppGateway', __args__, opts=opts, typ=GetAppGatewayResult)
     return __ret__.apply(lambda __response__: GetAppGatewayResult(
         allocated_connections=pulumi.get(__response__, 'allocated_connections'),