Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added name field to both custom project and org roles #3370

Merged
merged 4 commits into from
Apr 13, 2020
Merged

Added name field to both custom project and org roles #3370

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43396b7
added name field to both custom project and org roles
upodroid Apr 12, 2020
0d06b29
patched the schema to include computed values
upodroid Apr 13, 2020
e290faf
Update third_party/terraform/resources/resource_google_organization_i…
upodroid Apr 13, 2020
72c1289
Update third_party/terraform/resources/resource_google_project_iam_cu…
upodroid Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions third_party/terraform/resources/resource_google_organization_iam_custom_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ func resourceGoogleOrganizationIamCustomRoleRead(d *schema.ResourceData, meta in
d.Set("role_id", parsedRoleName.Name)
d.Set("org_id", parsedRoleName.OrgId)
d.Set("title", role.Title)
d.Set("name", role.Name)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

name won't appear in state until the field is established as part of the schema. It will need to be set to Computed: true as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do I set this in the schema definition on resourceGoogleProjectIamCustomRole function?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, within the schema map. Just needs to be set to a string and computed.

d.Set("description", role.Description)
d.Set("permissions", role.IncludedPermissions)
d.Set("stage", role.Stage)
Expand Down
1 change: 1 addition & 0 deletions third_party/terraform/resources/resource_google_project_iam_custom_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ func resourceGoogleProjectIamCustomRoleRead(d *schema.ResourceData, meta interfa

d.Set("role_id", GetResourceNameFromSelfLink(role.Name))
d.Set("title", role.Title)
d.Set("name", role.Name)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as the previous comment

d.Set("description", role.Description)
d.Set("permissions", role.IncludedPermissions)
d.Set("stage", role.Stage)
Expand Down
2 changes: 2 additions & 0 deletions ...arty/terraform/website/docs/r/google_organization_iam_custom_role.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ exported:

* `deleted` - (Optional) The current deleted state of the role.

* `name` - The name of the role which can be used with iam role bindings in the format `organizations/{{org_id}}/roles/{{role_id}}`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's separate out the definition and make the recommendation a bit more generic. Something like:

Suggested change
* `name` - The name of the role which can be used with iam role bindings in the format `organizations/{{org_id}}/roles/{{role_id}}`
* `name` - The name of the role in the format `organizations/{{org_id}}/roles/{{role_id}}`. Like `id`, this field can be used as a reference in other resources such as IAM role bindings.


## Import

Customized IAM organization role can be imported using their URI, e.g.
Expand Down
3 changes: 2 additions & 1 deletion third_party/terraform/website/docs/r/google_project_iam.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ Four different resources help you manage your IAM policy for a project. Each of
from anyone without organization-level access to the project. Proceed with caution.
It's not recommended to use `google_project_iam_policy` with your provider project
to avoid locking yourself out, and it should generally only be used with projects
fully managed by Terraform.
fully managed by Terraform. If you do use this resource, **import** the policy before
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
fully managed by Terraform. If you do use this resource, **import** the policy before
fully managed by Terraform. If you do use this resource, it is recommended to **import** the policy before

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick here

applying the change.

```hcl
resource "google_project_iam_policy" "project" {
Expand Down
4 changes: 3 additions & 1 deletion third_party/terraform/website/docs/r/google_project_iam_custom_role.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ The following arguments are supported:

* `stage` - (Optional) The current launch stage of the role.
Defaults to `GA`.
List of possible stages is [here](https://cloud.google.com/iam/reference/rest/v1/organizations.roles#Role.RoleLaunchStage).
List of possible stages is [here](https://cloud.google.com/iam/reference/rest/v1/projects.roles#Role.RoleLaunchStage).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like only the "organizations" version of the link works, this version doesn't point to role launch stages


* `description` - (Optional) A human-readable description for the role.

Expand All @@ -60,6 +60,8 @@ exported:

* `deleted` - (Optional) The current deleted state of the role.

* `name` - The name of the role which can be used with iam role bindings in the format `projects/{{project}}/roles/{{role_id}}`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the suggestion for google_organization_iam_custom_role


## Import

Customized IAM project role can be imported using their URI, e.g.
Expand Down