mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-07-05 17:52:38 +00:00
Deprecate our authoritative stuff.
This commit is contained in:
parent
f2f276ea0b
commit
a586429bd7
|
@ -31,8 +31,9 @@ func resourceGoogleProjectIamPolicy() *schema.Resource {
|
||||||
DiffSuppressFunc: jsonPolicyDiffSuppress,
|
DiffSuppressFunc: jsonPolicyDiffSuppress,
|
||||||
},
|
},
|
||||||
"authoritative": &schema.Schema{
|
"authoritative": &schema.Schema{
|
||||||
Type: schema.TypeBool,
|
Type: schema.TypeBool,
|
||||||
Optional: true,
|
Optional: true,
|
||||||
|
Deprecated: "Use google_project_iam_policy_binding nad google_project_iam_policy_member instead.",
|
||||||
},
|
},
|
||||||
"etag": &schema.Schema{
|
"etag": &schema.Schema{
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
|
|
|
@ -86,8 +86,7 @@ func resourceGoogleServiceAccountCreate(d *schema.ResourceData, meta interface{}
|
||||||
|
|
||||||
// Retrieve existing IAM policy from project. This will be merged
|
// Retrieve existing IAM policy from project. This will be merged
|
||||||
// with the policy defined here.
|
// with the policy defined here.
|
||||||
// TODO(evanbrown): Add an 'authoritative' flag that allows policy
|
// TODO: overwrite existing policy, instead of merging it
|
||||||
// in manifest to overwrite existing policy.
|
|
||||||
p, err := getServiceAccountIamPolicy(sa.Name, config)
|
p, err := getServiceAccountIamPolicy(sa.Name, config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Could not find service account %q when applying IAM policy: %s", sa.Name, err)
|
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
|
// Retrieve existing IAM policy from project. This will be merged
|
||||||
// with the policy in the current state
|
// with the policy in the current state
|
||||||
// TODO(evanbrown): Add an 'authoritative' flag that allows policy
|
// TODO: overwrite existing policy instead of merging it
|
||||||
// in manifest to overwrite existing policy.
|
|
||||||
p, err := getServiceAccountIamPolicy(d.Id(), config)
|
p, err := getServiceAccountIamPolicy(d.Id(), config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
Loading…
Reference in New Issue
Block a user