Skip to content

Commit b9ae926

Browse files
Update Google Projects docs (#4376) (#2855)
Co-authored-by: upodroid <[email protected]> Signed-off-by: Modular Magician <[email protected]> Co-authored-by: upodroid <[email protected]>
1 parent fdf0d90 commit b9ae926

File tree

4 files changed

+24
-22
lines changed

4 files changed

+24
-22
lines changed

.changelog/4376.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

website/docs/r/google_folder_organization_policy.html.markdown

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ description: |-
1010
# google\_folder\_organization\_policy
1111

1212
Allows management of Organization policies for a Google Folder. For more information see
13-
[the official
14-
documentation](https://cloud.google.com/resource-manager/docs/organization-policy/overview) and
13+
[the official documentation](https://cloud.google.com/resource-manager/docs/organization-policy/overview) and
1514
[API](https://cloud.google.com/resource-manager/reference/rest/v1/folders/setOrgPolicy).
1615

1716
## Example Usage

website/docs/r/google_project.html.markdown

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,20 @@ Allows creation and management of a Google Cloud Platform project.
1414
Projects created with this resource must be associated with an Organization.
1515
See the [Organization documentation](https://cloud.google.com/resource-manager/docs/quickstarts) for more details.
1616

17-
The service account used to run Terraform when creating a `google_project`
18-
resource must have `roles/resourcemanager.projectCreator`. See the
17+
The user or service account that is running Terraform when creating a `google_project`
18+
resource must have `roles/resourcemanager.projectCreator` on the specified organization. See the
1919
[Access Control for Organizations Using IAM](https://cloud.google.com/resource-manager/docs/access-control-org)
2020
doc for more information.
2121

22-
Note that prior to 0.8.5, `google_project` functioned like a data source,
23-
meaning any project referenced by it had to be created and managed outside
24-
Terraform. As of 0.8.5, `google_project` functions like any other Terraform
25-
resource, with Terraform creating and managing the project. To replicate the old
26-
behavior, either:
22+
~> This resource reads the specified billing account on every terraform apply and plan operation so you must have permissions on the specified billing account.
2723

28-
* Use the project ID directly in whatever is referencing the project, using the
29-
[google_project_iam_policy](/docs/providers/google/r/google_project_iam.html)
30-
to replace the old `policy_data` property.
31-
* Use the [import](/docs/import/usage.html) functionality
32-
to import your pre-existing project into Terraform, where it can be referenced and
33-
used just like always, keeping in mind that Terraform will attempt to undo any changes
34-
made outside Terraform.
24+
~> It is recommended to use the `constraints/compute.skipDefaultNetworkCreation` [constraint](/docs/providers/google/r/google_organization_policy.html) to remove the default network instead of setting `auto_create_network` to false.
3525

36-
~> It's important to note that any project resources that were added to your Terraform config
37-
prior to 0.8.5 will continue to function as they always have, and will not be managed by
38-
Terraform. Only newly added projects are affected.
26+
To get more information about projects, see:
27+
28+
* [API documentation](https://cloud.google.com/resource-manager/reference/rest/v1/projects)
29+
* How-to Guides
30+
* [Creating and managing projects](https://cloud.google.com/resource-manager/docs/creating-managing-projects)
3931

4032
## Example Usage
4133

@@ -85,8 +77,8 @@ The following arguments are supported:
8577

8678
* `billing_account` - (Optional) The alphanumeric ID of the billing account this project
8779
belongs to. The user or service account performing this operation with Terraform
88-
must have Billing Account Administrator privileges (`roles/billing.admin`) in
89-
the organization. See [Google Cloud Billing API Access Control](https://cloud.google.com/billing/v1/how-tos/access-control)
80+
must have at mininum Billing Account User privileges (`roles/billing.user`) on the billing account.
81+
See [Google Cloud Billing API Access Control](https://cloud.google.com/billing/docs/how-to/billing-access)
9082
for more details.
9183

9284
* `skip_delete` - (Optional) If true, the Terraform resource can be deleted

website/docs/r/google_project_default_service_accounts.html.markdown

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,15 @@ Allows management of Google Cloud Platform project default service accounts.
1414
When certain service APIs are enabled, Google Cloud Platform automatically creates service accounts to help get started, but
1515
this is not recommended for production environments as per [Google's documentation](https://cloud.google.com/iam/docs/service-accounts#default).
1616
See the [Organization documentation](https://cloud.google.com/resource-manager/docs/quickstarts) for more details.
17-
~> This resource works on a best-effort basis, as no API formally describes the default service accounts. If the default service accounts change their name or additional service accounts are added, this resource will need to be updated.
17+
18+
~> **WARNING** Some Google Cloud products do not work if the default service accounts are deleted so it is better to `DEPRIVILEGE` as
19+
Google **CAN NOT** recover service accounts that have been deleted for more than 30 days.
20+
Also Google recommends using the `constraints/iam.automaticIamGrantsForDefaultServiceAccounts` [constraint](/docs/providers/google/r/google_organization_policy.html)
21+
to disable automatic IAM Grants to default service accounts.
22+
23+
~> This resource works on a best-effort basis, as no API formally describes the default service accounts
24+
and it is for users who are unable to use constraints. If the default service accounts change their name
25+
or additional service accounts are added, this resource will need to be updated.
1826

1927
## Example Usage
2028

0 commit comments

Comments
 (0)