-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
google_project_organization_policy #1226
Merged
danawillow
merged 7 commits into
hashicorp:master
from
lawrenae:feature/google_project_organization_policy
Mar 26, 2018
Merged
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
81fe62b
support google_project_organization_policy
lawrenae 2fd9263
add documentation for google_project_organization_policy
lawrenae 85f72cb
remove "folder" references and cleanup docs
lawrenae e266296
fix tests
lawrenae b2979e8
un-parallelize tests
lawrenae f6e178d
add comment about non-parralel tests
lawrenae 0cde2c5
moving canonicalProjectId() to test
lawrenae File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
package google | ||
|
||
import ( | ||
"fmt" | ||
|
||
"github.com/hashicorp/terraform/helper/schema" | ||
"google.golang.org/api/cloudresourcemanager/v1" | ||
) | ||
|
||
func resourceGoogleProjectOrganizationPolicy() *schema.Resource { | ||
return &schema.Resource{ | ||
Create: resourceGoogleProjectOrganizationPolicyCreate, | ||
Read: resourceGoogleProjectOrganizationPolicyRead, | ||
Update: resourceGoogleProjectOrganizationPolicyUpdate, | ||
Delete: resourceGoogleProjectOrganizationPolicyDelete, | ||
|
||
Schema: mergeSchemas( | ||
schemaOrganizationPolicy, | ||
map[string]*schema.Schema{ | ||
"project": { | ||
Type: schema.TypeString, | ||
Required: true, | ||
ForceNew: true, | ||
}, | ||
}, | ||
), | ||
} | ||
} | ||
|
||
func resourceGoogleProjectOrganizationPolicyCreate(d *schema.ResourceData, meta interface{}) error { | ||
if err := setProjectOrganizationPolicy(d, meta); err != nil { | ||
return err | ||
} | ||
|
||
d.SetId(fmt.Sprintf("%s:%s", d.Get("project"), d.Get("constraint"))) | ||
|
||
return resourceGoogleProjectOrganizationPolicyRead(d, meta) | ||
} | ||
|
||
func resourceGoogleProjectOrganizationPolicyRead(d *schema.ResourceData, meta interface{}) error { | ||
config := meta.(*Config) | ||
project := prefixedProject(d.Get("project").(string)) | ||
|
||
policy, err := config.clientResourceManager.Projects.GetOrgPolicy(project, &cloudresourcemanager.GetOrgPolicyRequest{ | ||
Constraint: canonicalOrgPolicyConstraint(d.Get("constraint").(string)), | ||
}).Do() | ||
|
||
if err != nil { | ||
return handleNotFoundError(err, d, fmt.Sprintf("Organization policy for %s", project)) | ||
} | ||
|
||
d.Set("constraint", policy.Constraint) | ||
d.Set("boolean_policy", flattenBooleanOrganizationPolicy(policy.BooleanPolicy)) | ||
d.Set("list_policy", flattenListOrganizationPolicy(policy.ListPolicy)) | ||
d.Set("version", policy.Version) | ||
d.Set("etag", policy.Etag) | ||
d.Set("update_time", policy.UpdateTime) | ||
|
||
return nil | ||
} | ||
|
||
func resourceGoogleProjectOrganizationPolicyUpdate(d *schema.ResourceData, meta interface{}) error { | ||
if err := setProjectOrganizationPolicy(d, meta); err != nil { | ||
return err | ||
} | ||
|
||
return resourceGoogleProjectOrganizationPolicyRead(d, meta) | ||
} | ||
|
||
func resourceGoogleProjectOrganizationPolicyDelete(d *schema.ResourceData, meta interface{}) error { | ||
config := meta.(*Config) | ||
project := prefixedProject(d.Get("project").(string)) | ||
|
||
_, err := config.clientResourceManager.Projects.ClearOrgPolicy(project, &cloudresourcemanager.ClearOrgPolicyRequest{ | ||
Constraint: canonicalOrgPolicyConstraint(d.Get("constraint").(string)), | ||
}).Do() | ||
|
||
if err != nil { | ||
return err | ||
} | ||
|
||
return nil | ||
} | ||
|
||
func setProjectOrganizationPolicy(d *schema.ResourceData, meta interface{}) error { | ||
config := meta.(*Config) | ||
project := prefixedProject(d.Get("project").(string)) | ||
listPolicy, err := expandListOrganizationPolicy(d.Get("list_policy").([]interface{})) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
_, err = config.clientResourceManager.Projects.SetOrgPolicy(project, &cloudresourcemanager.SetOrgPolicyRequest{ | ||
Policy: &cloudresourcemanager.OrgPolicy{ | ||
Constraint: canonicalOrgPolicyConstraint(d.Get("constraint").(string)), | ||
BooleanPolicy: expandBooleanOrganizationPolicy(d.Get("boolean_policy").([]interface{})), | ||
ListPolicy: listPolicy, | ||
Version: int64(d.Get("version").(int)), | ||
Etag: d.Get("etag").(string), | ||
}, | ||
}).Do() | ||
|
||
return err | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since this is only used in the test, should it live in that file?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done!