pulumi-gcp 7.39.0a1726207510__py3-none-any.whl → 8.0.0a1__py3-none-any.whl

pulumi_gcp/organizations/folder.py

@@ -20,7 +20,8 @@ __all__ = ['FolderArgs', 'Folder']
 class FolderArgs:
     def __init__(__self__, *,
                  display_name: pulumi.Input[str],
-                 parent: pulumi.Input[str]):
+                 parent: pulumi.Input[str],
+                 deletion_protection: Optional[pulumi.Input[bool]] = None):
         """
         The set of arguments for constructing a Folder resource.
         :param pulumi.Input[str] display_name: The folder’s display name.
@@ -30,6 +31,8 @@ class FolderArgs:
         """
         pulumi.set(__self__, "display_name", display_name)
         pulumi.set(__self__, "parent", parent)
+        if deletion_protection is not None:
+            pulumi.set(__self__, "deletion_protection", deletion_protection)
 
     @property
     @pulumi.getter(name="displayName")
@@ -57,11 +60,21 @@ class FolderArgs:
     def parent(self, value: pulumi.Input[str]):
         pulumi.set(self, "parent", value)
 
+    @property
+    @pulumi.getter(name="deletionProtection")
+    def deletion_protection(self) -> Optional[pulumi.Input[bool]]:
+        return pulumi.get(self, "deletion_protection")
+
+    @deletion_protection.setter
+    def deletion_protection(self, value: Optional[pulumi.Input[bool]]):
+        pulumi.set(self, "deletion_protection", value)
+
 
 @pulumi.input_type
 class _FolderState:
     def __init__(__self__, *,
                  create_time: Optional[pulumi.Input[str]] = None,
+                 deletion_protection: Optional[pulumi.Input[bool]] = None,
                  display_name: Optional[pulumi.Input[str]] = None,
                  folder_id: Optional[pulumi.Input[str]] = None,
                  lifecycle_state: Optional[pulumi.Input[str]] = None,
@@ -81,6 +94,8 @@ class _FolderState:
         """
         if create_time is not None:
             pulumi.set(__self__, "create_time", create_time)
+        if deletion_protection is not None:
+            pulumi.set(__self__, "deletion_protection", deletion_protection)
         if display_name is not None:
             pulumi.set(__self__, "display_name", display_name)
         if folder_id is not None:
@@ -105,6 +120,15 @@ class _FolderState:
     def create_time(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "create_time", value)
 
+    @property
+    @pulumi.getter(name="deletionProtection")
+    def deletion_protection(self) -> Optional[pulumi.Input[bool]]:
+        return pulumi.get(self, "deletion_protection")
+
+    @deletion_protection.setter
+    def deletion_protection(self, value: Optional[pulumi.Input[bool]]):
+        pulumi.set(self, "deletion_protection", value)
+
     @property
     @pulumi.getter(name="displayName")
     def display_name(self) -> Optional[pulumi.Input[str]]:
@@ -173,6 +197,7 @@ class Folder(pulumi.CustomResource):
     def __init__(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
+                 deletion_protection: Optional[pulumi.Input[bool]] = None,
                  display_name: Optional[pulumi.Input[str]] = None,
                  parent: Optional[pulumi.Input[str]] = None,
                  __props__=None):
@@ -302,6 +327,7 @@ class Folder(pulumi.CustomResource):
     def _internal_init(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
+                 deletion_protection: Optional[pulumi.Input[bool]] = None,
                  display_name: Optional[pulumi.Input[str]] = None,
                  parent: Optional[pulumi.Input[str]] = None,
                  __props__=None):
@@ -313,6 +339,7 @@ class Folder(pulumi.CustomResource):
                 raise TypeError('__props__ is only valid when passed in combination with a valid opts.id to get an existing resource')
             __props__ = FolderArgs.__new__(FolderArgs)
 
+            __props__.__dict__["deletion_protection"] = deletion_protection
             if display_name is None and not opts.urn:
                 raise TypeError("Missing required property 'display_name'")
             __props__.__dict__["display_name"] = display_name
@@ -334,6 +361,7 @@ class Folder(pulumi.CustomResource):
             id: pulumi.Input[str],
             opts: Optional[pulumi.ResourceOptions] = None,
             create_time: Optional[pulumi.Input[str]] = None,
+            deletion_protection: Optional[pulumi.Input[bool]] = None,
             display_name: Optional[pulumi.Input[str]] = None,
             folder_id: Optional[pulumi.Input[str]] = None,
             lifecycle_state: Optional[pulumi.Input[str]] = None,
@@ -361,6 +389,7 @@ class Folder(pulumi.CustomResource):
         __props__ = _FolderState.__new__(_FolderState)
 
         __props__.__dict__["create_time"] = create_time
+        __props__.__dict__["deletion_protection"] = deletion_protection
         __props__.__dict__["display_name"] = display_name
         __props__.__dict__["folder_id"] = folder_id
         __props__.__dict__["lifecycle_state"] = lifecycle_state
@@ -377,6 +406,11 @@ class Folder(pulumi.CustomResource):
         """
         return pulumi.get(self, "create_time")
 
+    @property
+    @pulumi.getter(name="deletionProtection")
+    def deletion_protection(self) -> pulumi.Output[Optional[bool]]:
+        return pulumi.get(self, "deletion_protection")
+
     @property
     @pulumi.getter(name="displayName")
     def display_name(self) -> pulumi.Output[str]:

pulumi_gcp/organizations/get_active_folder.py

@@ -97,14 +97,6 @@ def get_active_folder(api_method: Optional[str] = None,
 
     ## Example Usage
 
-    ```python
-    import pulumi
-    import pulumi_gcp as gcp
-
-    department1 = gcp.organizations.get_active_folder(display_name="Department 1",
-        parent="organizations/1234567")
-    ```
-
 
     :param str api_method: The API method to use to search for the folder. Valid values are `LIST` and `SEARCH`. Default Value is `LIST`. `LIST` is [strongly consistent](https://cloud.google.com/resource-manager/reference/rest/v3/folders/list#:~:text=list()%20provides%20a-,strongly%20consistent,-view%20of%20the) and requires `resourcemanager.folders.list` on the parent folder, while `SEARCH` is [eventually consistent](https://cloud.google.com/resource-manager/reference/rest/v3/folders/search#:~:text=eventually%20consistent) and only returns folders that the user has `resourcemanager.folders.get` permission on.
     :param str display_name: The folder's display name.
@@ -135,14 +127,6 @@ def get_active_folder_output(api_method: Optional[pulumi.Input[Optional[str]]] =
 
     ## Example Usage
 
-    ```python
-    import pulumi
-    import pulumi_gcp as gcp
-
-    department1 = gcp.organizations.get_active_folder(display_name="Department 1",
-        parent="organizations/1234567")
-    ```
-
 
     :param str api_method: The API method to use to search for the folder. Valid values are `LIST` and `SEARCH`. Default Value is `LIST`. `LIST` is [strongly consistent](https://cloud.google.com/resource-manager/reference/rest/v3/folders/list#:~:text=list()%20provides%20a-,strongly%20consistent,-view%20of%20the) and requires `resourcemanager.folders.list` on the parent folder, while `SEARCH` is [eventually consistent](https://cloud.google.com/resource-manager/reference/rest/v3/folders/search#:~:text=eventually%20consistent) and only returns folders that the user has `resourcemanager.folders.get` permission on.
     :param str display_name: The folder's display name.

pulumi_gcp/organizations/get_client_config.py

@@ -26,10 +26,13 @@ class GetClientConfigResult:
     """
     A collection of values returned by getClientConfig.
     """
-    def __init__(__self__, access_token=None, id=None, project=None, region=None, zone=None):
+    def __init__(__self__, access_token=None, default_labels=None, id=None, project=None, region=None, zone=None):
         if access_token and not isinstance(access_token, str):
             raise TypeError("Expected argument 'access_token' to be a str")
         pulumi.set(__self__, "access_token", access_token)
+        if default_labels and not isinstance(default_labels, dict):
+            raise TypeError("Expected argument 'default_labels' to be a dict")
+        pulumi.set(__self__, "default_labels", default_labels)
         if id and not isinstance(id, str):
             raise TypeError("Expected argument 'id' to be a str")
         pulumi.set(__self__, "id", id)
@@ -51,6 +54,14 @@ class GetClientConfigResult:
         """
         return pulumi.get(self, "access_token")
 
+    @property
+    @pulumi.getter(name="defaultLabels")
+    def default_labels(self) -> Mapping[str, str]:
+        """
+        The default labels configured on the provider.
+        """
+        return pulumi.get(self, "default_labels")
+
     @property
     @pulumi.getter
     def id(self) -> str:
@@ -88,6 +99,7 @@ class AwaitableGetClientConfigResult(GetClientConfigResult):
             yield self
         return GetClientConfigResult(
             access_token=self.access_token,
+            default_labels=self.default_labels,
             id=self.id,
             project=self.project,
             region=self.region,
@@ -98,13 +110,7 @@ def get_client_config(opts: Optional[pulumi.InvokeOptions] = None) -> AwaitableG
     """
     ## Example Usage
 
-    ```python
-    import pulumi
-    import pulumi_gcp as gcp
-
-    current = gcp.organizations.get_client_config()
-    pulumi.export("project", current.project)
-    ```
+    ### Configure Kubernetes Provider With OAuth2 Access Token
     """
     __args__ = dict()
     opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
@@ -112,6 +118,7 @@ def get_client_config(opts: Optional[pulumi.InvokeOptions] = None) -> AwaitableG
 
     return AwaitableGetClientConfigResult(
         access_token=pulumi.get(__ret__, 'access_token'),
+        default_labels=pulumi.get(__ret__, 'default_labels'),
         id=pulumi.get(__ret__, 'id'),
         project=pulumi.get(__ret__, 'project'),
         region=pulumi.get(__ret__, 'region'),
@@ -123,12 +130,6 @@ def get_client_config_output(opts: Optional[pulumi.InvokeOptions] = None) -> pul
     """
     ## Example Usage
 
-    ```python
-    import pulumi
-    import pulumi_gcp as gcp
-
-    current = gcp.organizations.get_client_config()
-    pulumi.export("project", current.project)
-    ```
+    ### Configure Kubernetes Provider With OAuth2 Access Token
     """
     ...

pulumi_gcp/organizations/get_folder.py

@@ -26,10 +26,13 @@ class GetFolderResult:
     """
     A collection of values returned by getFolder.
     """
-    def __init__(__self__, create_time=None, display_name=None, folder=None, folder_id=None, id=None, lifecycle_state=None, lookup_organization=None, name=None, organization=None, parent=None):
+    def __init__(__self__, create_time=None, deletion_protection=None, display_name=None, folder=None, folder_id=None, id=None, lifecycle_state=None, lookup_organization=None, name=None, organization=None, parent=None):
         if create_time and not isinstance(create_time, str):
             raise TypeError("Expected argument 'create_time' to be a str")
         pulumi.set(__self__, "create_time", create_time)
+        if deletion_protection and not isinstance(deletion_protection, bool):
+            raise TypeError("Expected argument 'deletion_protection' to be a bool")
+        pulumi.set(__self__, "deletion_protection", deletion_protection)
         if display_name and not isinstance(display_name, str):
             raise TypeError("Expected argument 'display_name' to be a str")
         pulumi.set(__self__, "display_name", display_name)
@@ -66,6 +69,11 @@ class GetFolderResult:
         """
         return pulumi.get(self, "create_time")
 
+    @property
+    @pulumi.getter(name="deletionProtection")
+    def deletion_protection(self) -> bool:
+        return pulumi.get(self, "deletion_protection")
+
     @property
     @pulumi.getter(name="displayName")
     def display_name(self) -> str:
@@ -137,6 +145,7 @@ class AwaitableGetFolderResult(GetFolderResult):
             yield self
         return GetFolderResult(
             create_time=self.create_time,
+            deletion_protection=self.deletion_protection,
             display_name=self.display_name,
             folder=self.folder,
             folder_id=self.folder_id,
@@ -177,6 +186,7 @@ def get_folder(folder: Optional[str] = None,
 
     return AwaitableGetFolderResult(
         create_time=pulumi.get(__ret__, 'create_time'),
+        deletion_protection=pulumi.get(__ret__, 'deletion_protection'),
         display_name=pulumi.get(__ret__, 'display_name'),
         folder=pulumi.get(__ret__, 'folder'),
         folder_id=pulumi.get(__ret__, 'folder_id'),

pulumi_gcp/organizations/get_project.py

@@ -26,7 +26,7 @@ class GetProjectResult:
     """
     A collection of values returned by getProject.
     """
-    def __init__(__self__, auto_create_network=None, billing_account=None, deletion_policy=None, effective_labels=None, folder_id=None, id=None, labels=None, name=None, number=None, org_id=None, project_id=None, pulumi_labels=None, skip_delete=None):
+    def __init__(__self__, auto_create_network=None, billing_account=None, deletion_policy=None, effective_labels=None, folder_id=None, id=None, labels=None, name=None, number=None, org_id=None, project_id=None, pulumi_labels=None):
         if auto_create_network and not isinstance(auto_create_network, bool):
             raise TypeError("Expected argument 'auto_create_network' to be a bool")
         pulumi.set(__self__, "auto_create_network", auto_create_network)
@@ -63,9 +63,6 @@ class GetProjectResult:
         if pulumi_labels and not isinstance(pulumi_labels, dict):
             raise TypeError("Expected argument 'pulumi_labels' to be a dict")
         pulumi.set(__self__, "pulumi_labels", pulumi_labels)
-        if skip_delete and not isinstance(skip_delete, bool):
-            raise TypeError("Expected argument 'skip_delete' to be a bool")
-        pulumi.set(__self__, "skip_delete", skip_delete)
 
     @property
     @pulumi.getter(name="autoCreateNetwork")
@@ -133,11 +130,6 @@ class GetProjectResult:
     def pulumi_labels(self) -> Mapping[str, str]:
         return pulumi.get(self, "pulumi_labels")
 
-    @property
-    @pulumi.getter(name="skipDelete")
-    def skip_delete(self) -> bool:
-        return pulumi.get(self, "skip_delete")
-
 
 class AwaitableGetProjectResult(GetProjectResult):
     # pylint: disable=using-constant-test
@@ -156,8 +148,7 @@ class AwaitableGetProjectResult(GetProjectResult):
             number=self.number,
             org_id=self.org_id,
             project_id=self.project_id,
-            pulumi_labels=self.pulumi_labels,
-            skip_delete=self.skip_delete)
+            pulumi_labels=self.pulumi_labels)
 
 
 def get_project(project_id: Optional[str] = None,
@@ -197,8 +188,7 @@ def get_project(project_id: Optional[str] = None,
         number=pulumi.get(__ret__, 'number'),
         org_id=pulumi.get(__ret__, 'org_id'),
         project_id=pulumi.get(__ret__, 'project_id'),
-        pulumi_labels=pulumi.get(__ret__, 'pulumi_labels'),
-        skip_delete=pulumi.get(__ret__, 'skip_delete'))
+        pulumi_labels=pulumi.get(__ret__, 'pulumi_labels'))
 
 
 @_utilities.lift_output_func(get_project)

pulumi_gcp/organizations/project.py

@@ -26,8 +26,7 @@ class ProjectArgs:
                  labels: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  org_id: Optional[pulumi.Input[str]] = None,
-                 project_id: Optional[pulumi.Input[str]] = None,
-                 skip_delete: Optional[pulumi.Input[bool]] = None):
+                 project_id: Optional[pulumi.Input[str]] = None):
         """
         The set of arguments for constructing a Project resource.
         :param pulumi.Input[bool] auto_create_network: Create the 'default' network automatically. Default true. If set to false, the default network will be deleted. Note
@@ -54,11 +53,6 @@ class ProjectArgs:
                this forces the project to be migrated to the newly specified
                organization.
         :param pulumi.Input[str] project_id: The project ID. Changing this forces a new project to be created.
-        :param pulumi.Input[bool] skip_delete: If true, the resource can be deleted without
-               deleting the Project via the Google API. `skip_delete` is deprecated and will be
-               removed in 6.0.0. Please use deletion_policy instead. A `skip_delete` value of `false`
-               can be changed to a `deletion_policy` value of `DELETE` and a `skip_delete` value of `true`
-               to a `deletion_policy` value of `ABANDON` for equivalent behavior.
         """
         if auto_create_network is not None:
             pulumi.set(__self__, "auto_create_network", auto_create_network)
@@ -76,11 +70,6 @@ class ProjectArgs:
             pulumi.set(__self__, "org_id", org_id)
         if project_id is not None:
             pulumi.set(__self__, "project_id", project_id)
-        if skip_delete is not None:
-            warnings.warn("""skip_delete is deprecated and will be removed in 6.0.0. Please use deletion_policy instead. A skip_delete value of false can be changed to a deletion_policy value of DELETE and a skip_delete value of true to a deletion_policy value of ABANDON for equivalent behavior.""", DeprecationWarning)
-            pulumi.log.warn("""skip_delete is deprecated: skip_delete is deprecated and will be removed in 6.0.0. Please use deletion_policy instead. A skip_delete value of false can be changed to a deletion_policy value of DELETE and a skip_delete value of true to a deletion_policy value of ABANDON for equivalent behavior.""")
-        if skip_delete is not None:
-            pulumi.set(__self__, "skip_delete", skip_delete)
 
     @property
     @pulumi.getter(name="autoCreateNetwork")
@@ -192,23 +181,6 @@ class ProjectArgs:
     def project_id(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "project_id", value)
 
-    @property
-    @pulumi.getter(name="skipDelete")
-    @_utilities.deprecated("""skip_delete is deprecated and will be removed in 6.0.0. Please use deletion_policy instead. A skip_delete value of false can be changed to a deletion_policy value of DELETE and a skip_delete value of true to a deletion_policy value of ABANDON for equivalent behavior.""")
-    def skip_delete(self) -> Optional[pulumi.Input[bool]]:
-        """
-        If true, the resource can be deleted without
-        deleting the Project via the Google API. `skip_delete` is deprecated and will be
-        removed in 6.0.0. Please use deletion_policy instead. A `skip_delete` value of `false`
-        can be changed to a `deletion_policy` value of `DELETE` and a `skip_delete` value of `true`
-        to a `deletion_policy` value of `ABANDON` for equivalent behavior.
-        """
-        return pulumi.get(self, "skip_delete")
-
-    @skip_delete.setter
-    def skip_delete(self, value: Optional[pulumi.Input[bool]]):
-        pulumi.set(self, "skip_delete", value)
-
 
 @pulumi.input_type
 class _ProjectState:
@@ -223,8 +195,7 @@ class _ProjectState:
                  number: Optional[pulumi.Input[str]] = None,
                  org_id: Optional[pulumi.Input[str]] = None,
                  project_id: Optional[pulumi.Input[str]] = None,
-                 pulumi_labels: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None,
-                 skip_delete: Optional[pulumi.Input[bool]] = None):
+                 pulumi_labels: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None):
         """
         Input properties used for looking up and filtering Project resources.
         :param pulumi.Input[bool] auto_create_network: Create the 'default' network automatically. Default true. If set to false, the default network will be deleted. Note
@@ -254,11 +225,6 @@ class _ProjectState:
                organization.
         :param pulumi.Input[str] project_id: The project ID. Changing this forces a new project to be created.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] pulumi_labels: The combination of labels configured directly on the resource and default labels configured on the provider.
-        :param pulumi.Input[bool] skip_delete: If true, the resource can be deleted without
-               deleting the Project via the Google API. `skip_delete` is deprecated and will be
-               removed in 6.0.0. Please use deletion_policy instead. A `skip_delete` value of `false`
-               can be changed to a `deletion_policy` value of `DELETE` and a `skip_delete` value of `true`
-               to a `deletion_policy` value of `ABANDON` for equivalent behavior.
         """
         if auto_create_network is not None:
             pulumi.set(__self__, "auto_create_network", auto_create_network)
@@ -282,11 +248,6 @@ class _ProjectState:
             pulumi.set(__self__, "project_id", project_id)
         if pulumi_labels is not None:
             pulumi.set(__self__, "pulumi_labels", pulumi_labels)
-        if skip_delete is not None:
-            warnings.warn("""skip_delete is deprecated and will be removed in 6.0.0. Please use deletion_policy instead. A skip_delete value of false can be changed to a deletion_policy value of DELETE and a skip_delete value of true to a deletion_policy value of ABANDON for equivalent behavior.""", DeprecationWarning)
-            pulumi.log.warn("""skip_delete is deprecated: skip_delete is deprecated and will be removed in 6.0.0. Please use deletion_policy instead. A skip_delete value of false can be changed to a deletion_policy value of DELETE and a skip_delete value of true to a deletion_policy value of ABANDON for equivalent behavior.""")
-        if skip_delete is not None:
-            pulumi.set(__self__, "skip_delete", skip_delete)
 
     @property
     @pulumi.getter(name="autoCreateNetwork")
@@ -434,23 +395,6 @@ class _ProjectState:
     def pulumi_labels(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]):
         pulumi.set(self, "pulumi_labels", value)
 
-    @property
-    @pulumi.getter(name="skipDelete")
-    @_utilities.deprecated("""skip_delete is deprecated and will be removed in 6.0.0. Please use deletion_policy instead. A skip_delete value of false can be changed to a deletion_policy value of DELETE and a skip_delete value of true to a deletion_policy value of ABANDON for equivalent behavior.""")
-    def skip_delete(self) -> Optional[pulumi.Input[bool]]:
-        """
-        If true, the resource can be deleted without
-        deleting the Project via the Google API. `skip_delete` is deprecated and will be
-        removed in 6.0.0. Please use deletion_policy instead. A `skip_delete` value of `false`
-        can be changed to a `deletion_policy` value of `DELETE` and a `skip_delete` value of `true`
-        to a `deletion_policy` value of `ABANDON` for equivalent behavior.
-        """
-        return pulumi.get(self, "skip_delete")
-
-    @skip_delete.setter
-    def skip_delete(self, value: Optional[pulumi.Input[bool]]):
-        pulumi.set(self, "skip_delete", value)
-
 
 class Project(pulumi.CustomResource):
     @overload
@@ -465,7 +409,6 @@ class Project(pulumi.CustomResource):
                  name: Optional[pulumi.Input[str]] = None,
                  org_id: Optional[pulumi.Input[str]] = None,
                  project_id: Optional[pulumi.Input[str]] = None,
-                 skip_delete: Optional[pulumi.Input[bool]] = None,
                  __props__=None):
         """
         Allows creation and management of a Google Cloud Platform project.
@@ -551,11 +494,6 @@ class Project(pulumi.CustomResource):
                this forces the project to be migrated to the newly specified
                organization.
         :param pulumi.Input[str] project_id: The project ID. Changing this forces a new project to be created.
-        :param pulumi.Input[bool] skip_delete: If true, the resource can be deleted without
-               deleting the Project via the Google API. `skip_delete` is deprecated and will be
-               removed in 6.0.0. Please use deletion_policy instead. A `skip_delete` value of `false`
-               can be changed to a `deletion_policy` value of `DELETE` and a `skip_delete` value of `true`
-               to a `deletion_policy` value of `ABANDON` for equivalent behavior.
         """
         ...
     @overload
@@ -644,7 +582,6 @@ class Project(pulumi.CustomResource):
                  name: Optional[pulumi.Input[str]] = None,
                  org_id: Optional[pulumi.Input[str]] = None,
                  project_id: Optional[pulumi.Input[str]] = None,
-                 skip_delete: Optional[pulumi.Input[bool]] = None,
                  __props__=None):
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
         if not isinstance(opts, pulumi.ResourceOptions):
@@ -662,7 +599,6 @@ class Project(pulumi.CustomResource):
             __props__.__dict__["name"] = name
             __props__.__dict__["org_id"] = org_id
             __props__.__dict__["project_id"] = project_id
-            __props__.__dict__["skip_delete"] = skip_delete
             __props__.__dict__["effective_labels"] = None
             __props__.__dict__["number"] = None
             __props__.__dict__["pulumi_labels"] = None
@@ -688,8 +624,7 @@ class Project(pulumi.CustomResource):
             number: Optional[pulumi.Input[str]] = None,
             org_id: Optional[pulumi.Input[str]] = None,
             project_id: Optional[pulumi.Input[str]] = None,
-            pulumi_labels: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None,
-            skip_delete: Optional[pulumi.Input[bool]] = None) -> 'Project':
+            pulumi_labels: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None) -> 'Project':
         """
         Get an existing Project resource's state with the given name, id, and optional extra
         properties used to qualify the lookup.
@@ -724,11 +659,6 @@ class Project(pulumi.CustomResource):
                organization.
         :param pulumi.Input[str] project_id: The project ID. Changing this forces a new project to be created.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] pulumi_labels: The combination of labels configured directly on the resource and default labels configured on the provider.
-        :param pulumi.Input[bool] skip_delete: If true, the resource can be deleted without
-               deleting the Project via the Google API. `skip_delete` is deprecated and will be
-               removed in 6.0.0. Please use deletion_policy instead. A `skip_delete` value of `false`
-               can be changed to a `deletion_policy` value of `DELETE` and a `skip_delete` value of `true`
-               to a `deletion_policy` value of `ABANDON` for equivalent behavior.
         """
         opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
 
@@ -745,7 +675,6 @@ class Project(pulumi.CustomResource):
         __props__.__dict__["org_id"] = org_id
         __props__.__dict__["project_id"] = project_id
         __props__.__dict__["pulumi_labels"] = pulumi_labels
-        __props__.__dict__["skip_delete"] = skip_delete
         return Project(resource_name, opts=opts, __props__=__props__)
 
     @property
@@ -850,16 +779,3 @@ class Project(pulumi.CustomResource):
         """
         return pulumi.get(self, "pulumi_labels")
 
-    @property
-    @pulumi.getter(name="skipDelete")
-    @_utilities.deprecated("""skip_delete is deprecated and will be removed in 6.0.0. Please use deletion_policy instead. A skip_delete value of false can be changed to a deletion_policy value of DELETE and a skip_delete value of true to a deletion_policy value of ABANDON for equivalent behavior.""")
-    def skip_delete(self) -> pulumi.Output[bool]:
-        """
-        If true, the resource can be deleted without
-        deleting the Project via the Google API. `skip_delete` is deprecated and will be
-        removed in 6.0.0. Please use deletion_policy instead. A `skip_delete` value of `false`
-        can be changed to a `deletion_policy` value of `DELETE` and a `skip_delete` value of `true`
-        to a `deletion_policy` value of `ABANDON` for equivalent behavior.
-        """
-        return pulumi.get(self, "skip_delete")
-

pulumi_gcp/orgpolicy/policy.py

@@ -228,7 +228,8 @@ class Policy(pulumi.CustomResource):
         basic = gcp.organizations.Project("basic",
             project_id="id",
             name="id",
-            org_id="123456789")
+            org_id="123456789",
+            deletion_policy="DELETE")
         primary = gcp.orgpolicy.Policy("primary",
             name=basic.name.apply(lambda name: f"projects/{name}/policies/iam.disableServiceAccountKeyUpload"),
             parent=basic.name.apply(lambda name: f"projects/{name}"),
@@ -246,7 +247,8 @@ class Policy(pulumi.CustomResource):
 
         basic = gcp.organizations.Folder("basic",
             parent="organizations/123456789",
-            display_name="folder")
+            display_name="folder",
+            deletion_protection=False)
         primary = gcp.orgpolicy.Policy("primary",
             name=basic.name.apply(lambda name: f"{name}/policies/gcp.resourceLocations"),
             parent=basic.name,
@@ -279,7 +281,8 @@ class Policy(pulumi.CustomResource):
         basic = gcp.organizations.Project("basic",
             project_id="id",
             name="id",
-            org_id="123456789")
+            org_id="123456789",
+            deletion_policy="DELETE")
         primary = gcp.orgpolicy.Policy("primary",
             name=basic.name.apply(lambda name: f"projects/{name}/policies/gcp.resourceLocations"),
             parent=basic.name.apply(lambda name: f"projects/{name}"),
@@ -386,7 +389,8 @@ class Policy(pulumi.CustomResource):
         basic = gcp.organizations.Project("basic",
             project_id="id",
             name="id",
-            org_id="123456789")
+            org_id="123456789",
+            deletion_policy="DELETE")
         primary = gcp.orgpolicy.Policy("primary",
             name=basic.name.apply(lambda name: f"projects/{name}/policies/iam.disableServiceAccountKeyUpload"),
             parent=basic.name.apply(lambda name: f"projects/{name}"),
@@ -404,7 +408,8 @@ class Policy(pulumi.CustomResource):
 
         basic = gcp.organizations.Folder("basic",
             parent="organizations/123456789",
-            display_name="folder")
+            display_name="folder",
+            deletion_protection=False)
         primary = gcp.orgpolicy.Policy("primary",
             name=basic.name.apply(lambda name: f"{name}/policies/gcp.resourceLocations"),
             parent=basic.name,
@@ -437,7 +442,8 @@ class Policy(pulumi.CustomResource):
         basic = gcp.organizations.Project("basic",
             project_id="id",
             name="id",
-            org_id="123456789")
+            org_id="123456789",
+            deletion_policy="DELETE")
         primary = gcp.orgpolicy.Policy("primary",
             name=basic.name.apply(lambda name: f"projects/{name}/policies/gcp.resourceLocations"),
             parent=basic.name.apply(lambda name: f"projects/{name}"),