public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-03 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Deprecate our authoritative stuff.

Browse Source
This commit is contained in:
Paddy 2017-09-28 15:36:40 -07:00
parent f2f276ea0b
commit a586429bd7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
google/resource_google_project_iam_policy.go
View File

@ -31,8 +31,9 @@ func resourceGoogleProjectIamPolicy() *schema.Resource {
DiffSuppressFunc: jsonPolicyDiffSuppress,
},
"authoritative": &schema.Schema{
Type: schema.TypeBool,
Optional: true,
Type: schema.TypeBool,
Optional: true,
Deprecated: "Use google_project_iam_policy_binding nad google_project_iam_policy_member instead.",
},
"etag": &schema.Schema{
Type: schema.TypeString,

6
google/resource_google_service_account.go
View File

@ -86,8 +86,7 @@ func resourceGoogleServiceAccountCreate(d *schema.ResourceData, meta interface{}
// Retrieve existing IAM policy from project. This will be merged
// with the policy defined here.
// TODO(evanbrown): Add an 'authoritative' flag that allows policy
// in manifest to overwrite existing policy.
// TODO: overwrite existing policy, instead of merging it
p, err := getServiceAccountIamPolicy(sa.Name, config)
if err != nil {
return fmt.Errorf("Could not find service account %q when applying IAM policy: %s", sa.Name, err)
@ -212,8 +211,7 @@ func resourceGoogleServiceAccountUpdate(d *schema.ResourceData, meta interface{}
// Retrieve existing IAM policy from project. This will be merged
// with the policy in the current state
// TODO(evanbrown): Add an 'authoritative' flag that allows policy
// in manifest to overwrite existing policy.
// TODO: overwrite existing policy instead of merging it
p, err := getServiceAccountIamPolicy(d.Id(), config)
if err != nil {
return err