add subnetwork iam resources (#1305)

This commit is contained in:
Dana Hoffman 2018-04-06 17:38:48 -07:00 committed by GitHub
parent b9ccc1cbdd
commit cd0a462735
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 553 additions and 4 deletions

View File

@ -0,0 +1,161 @@
package google
import (
"fmt"
"strings"
"github.com/hashicorp/errwrap"
"github.com/hashicorp/terraform/helper/schema"
"google.golang.org/api/cloudresourcemanager/v1"
computeBeta "google.golang.org/api/compute/v0.beta"
)
var IamComputeSubnetworkSchema = map[string]*schema.Schema{
"subnetwork": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"project": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ForceNew: true,
},
"region": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ForceNew: true,
},
}
type ComputeSubnetworkIamUpdater struct {
project string
region string
resourceId string
Config *Config
}
func NewComputeSubnetworkIamUpdater(d *schema.ResourceData, config *Config) (ResourceIamUpdater, error) {
project, err := getProject(d, config)
if err != nil {
return nil, err
}
region, err := getRegion(d, config)
if err != nil {
return nil, err
}
return &ComputeSubnetworkIamUpdater{
project: project,
region: region,
resourceId: d.Get("subnetwork").(string),
Config: config,
}, nil
}
func ComputeSubnetworkIdParseFunc(d *schema.ResourceData, config *Config) error {
parts := strings.Split(d.Id(), "/")
var fv *RegionalFieldValue
if len(parts) == 3 {
// {project}/{region}/{name} syntax
fv = &RegionalFieldValue{
Project: parts[0],
Region: parts[1],
Name: parts[2],
resourceType: "subnetworks",
}
} else if len(parts) == 2 {
// /{region}/{name} syntax
project, err := getProject(d, config)
if err != nil {
return err
}
fv = &RegionalFieldValue{
Project: project,
Region: parts[0],
Name: parts[1],
resourceType: "subnetworks",
}
} else {
// We either have a name or a full self link, so use the field helper
var err error
fv, err = ParseSubnetworkFieldValue(d.Id(), d, config)
if err != nil {
return err
}
}
d.Set("subnetwork", fv.Name)
d.Set("project", fv.Project)
d.Set("region", fv.Region)
// Explicitly set the id so imported resources have the same ID format as non-imported ones.
d.SetId(fv.RelativeLink())
return nil
}
func (u *ComputeSubnetworkIamUpdater) GetResourceIamPolicy() (*cloudresourcemanager.Policy, error) {
p, err := u.Config.clientComputeBeta.Subnetworks.GetIamPolicy(u.project, u.region, u.resourceId).Do()
if err != nil {
return nil, errwrap.Wrapf(fmt.Sprintf("Error retrieving IAM policy for %s: {{err}}", u.DescribeResource()), err)
}
cloudResourcePolicy, err := computeBetaToResourceManagerPolicy(p)
if err != nil {
return nil, errwrap.Wrapf(fmt.Sprintf("Invalid IAM policy for %s: {{err}}", u.DescribeResource()), err)
}
return cloudResourcePolicy, nil
}
func (u *ComputeSubnetworkIamUpdater) SetResourceIamPolicy(policy *cloudresourcemanager.Policy) error {
computePolicy, err := resourceManagerToComputeBetaPolicy(policy)
if err != nil {
return errwrap.Wrapf(fmt.Sprintf("Invalid IAM policy for %s: {{err}}", u.DescribeResource()), err)
}
_, err = u.Config.clientComputeBeta.Subnetworks.SetIamPolicy(u.project, u.region, u.resourceId, computePolicy).Do()
if err != nil {
return errwrap.Wrapf(fmt.Sprintf("Error setting IAM policy for %s: {{err}}", u.DescribeResource()), err)
}
return nil
}
func (u *ComputeSubnetworkIamUpdater) GetResourceId() string {
return fmt.Sprintf("projects/%s/regions/%s/subnetworks/%s", u.project, u.region, u.resourceId)
}
func (u *ComputeSubnetworkIamUpdater) GetMutexKey() string {
return fmt.Sprintf("iam-compute-subnetwork-%s-%s-%s", u.project, u.region, u.resourceId)
}
func (u *ComputeSubnetworkIamUpdater) DescribeResource() string {
return fmt.Sprintf("Compute Subnetwork %s/%s/%s", u.project, u.region, u.resourceId)
}
func resourceManagerToComputeBetaPolicy(p *cloudresourcemanager.Policy) (*computeBeta.Policy, error) {
out := &computeBeta.Policy{}
err := Convert(p, out)
if err != nil {
return nil, errwrap.Wrapf("Cannot convert a resourcemanager policy to a compute policy: {{err}}", err)
}
return out, nil
}
func computeBetaToResourceManagerPolicy(p *computeBeta.Policy) (*cloudresourcemanager.Policy, error) {
out := &cloudresourcemanager.Policy{}
err := Convert(p, out)
if err != nil {
return nil, errwrap.Wrapf("Cannot convert a compute policy to a resourcemanager policy: {{err}}", err)
}
return out, nil
}

View File

@ -135,6 +135,9 @@ func Provider() terraform.ResourceProvider {
"google_compute_ssl_certificate": resourceComputeSslCertificate(),
"google_compute_ssl_policy": resourceComputeSslPolicy(),
"google_compute_subnetwork": resourceComputeSubnetwork(),
"google_compute_subnetwork_iam_binding": ResourceIamBindingWithImport(IamComputeSubnetworkSchema, NewComputeSubnetworkIamUpdater, ComputeSubnetworkIdParseFunc),
"google_compute_subnetwork_iam_member": ResourceIamMemberWithImport(IamComputeSubnetworkSchema, NewComputeSubnetworkIamUpdater, ComputeSubnetworkIdParseFunc),
"google_compute_subnetwork_iam_policy": ResourceIamPolicyWithImport(IamComputeSubnetworkSchema, NewComputeSubnetworkIamUpdater, ComputeSubnetworkIdParseFunc),
"google_compute_target_http_proxy": resourceComputeTargetHttpProxy(),
"google_compute_target_https_proxy": resourceComputeTargetHttpsProxy(),
"google_compute_target_tcp_proxy": resourceComputeTargetTcpProxy(),

View File

@ -0,0 +1,247 @@
package google
import (
"fmt"
"testing"
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
)
func TestAccComputeSubnetworkIamBinding(t *testing.T) {
t.Parallel()
account := acctest.RandomWithPrefix("tf-test")
role := "roles/compute.networkUser"
region := getTestRegionFromEnv()
subnetwork := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Steps: []resource.TestStep{
{
Config: testAccComputeSubnetworkIamBinding_basic(account, region, subnetwork, role),
},
resource.TestStep{
ResourceName: "google_compute_subnetwork_iam_binding.foo",
ImportStateId: fmt.Sprintf("%s/%s %s", region, subnetwork, role),
ImportState: true,
// ImportStateVerify: true, https://github.com/terraform-providers/terraform-provider-google/issues/1296
},
{
// Test Iam Binding update
Config: testAccComputeSubnetworkIamBinding_update(account, region, subnetwork, role),
},
resource.TestStep{
ResourceName: "google_compute_subnetwork_iam_binding.foo",
ImportStateId: fmt.Sprintf("%s/%s %s", region, subnetwork, role),
ImportState: true,
// ImportStateVerify: true, https://github.com/terraform-providers/terraform-provider-google/issues/1296
},
},
})
}
func TestAccComputeSubnetworkIamMember(t *testing.T) {
t.Parallel()
project := getTestProjectFromEnv()
account := acctest.RandomWithPrefix("tf-test")
role := "roles/compute.networkUser"
region := getTestRegionFromEnv()
subnetwork := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Steps: []resource.TestStep{
{
// Test Iam Member creation (no update for member, no need to test)
Config: testAccComputeSubnetworkIamMember_basic(account, region, subnetwork, role),
},
resource.TestStep{
ResourceName: "google_compute_subnetwork_iam_member.foo",
ImportStateId: fmt.Sprintf("%s/%s %s serviceAccount:%s@%s.iam.gserviceaccount.com", region, subnetwork, role, account, project),
ImportState: true,
// ImportStateVerify: true, https://github.com/terraform-providers/terraform-provider-google/issues/1296
},
},
})
}
func TestAccComputeSubnetworkIamPolicy(t *testing.T) {
t.Parallel()
project := getTestProjectFromEnv()
account := acctest.RandomWithPrefix("tf-test")
role := "roles/compute.networkUser"
region := getTestRegionFromEnv()
subnetwork := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Steps: []resource.TestStep{
{
Config: testAccComputeSubnetworkIamPolicy_basic(account, region, subnetwork, role),
},
// Test a few import formats
resource.TestStep{
ResourceName: "google_compute_subnetwork_iam_policy.foo",
ImportStateId: fmt.Sprintf("projects/%s/regions/%s/subnetworks/%s", project, region, subnetwork),
ImportState: true,
ImportStateVerify: true,
},
resource.TestStep{
ResourceName: "google_compute_subnetwork_iam_policy.foo",
ImportStateId: fmt.Sprintf("%s/%s/%s", project, region, subnetwork),
ImportState: true,
ImportStateVerify: true,
},
resource.TestStep{
ResourceName: "google_compute_subnetwork_iam_policy.foo",
ImportStateId: fmt.Sprintf("%s/%s", region, subnetwork),
ImportState: true,
ImportStateVerify: true,
},
resource.TestStep{
ResourceName: "google_compute_subnetwork_iam_policy.foo",
ImportStateId: fmt.Sprintf("%s", subnetwork),
ImportState: true,
ImportStateVerify: true,
},
},
})
}
func testAccComputeSubnetworkIamBinding_basic(account, region, subnetworkName, roleId string) string {
return fmt.Sprintf(`
resource "google_service_account" "test_account" {
account_id = "%s"
display_name = "Iam Testing Account"
}
resource "google_compute_network" "network" {
name = "%s"
auto_create_subnetworks = false
}
resource "google_compute_subnetwork" "subnetwork" {
name = "%s"
region = "%s"
ip_cidr_range = "10.1.0.0/16"
network = "${google_compute_network.network.name}"
}
resource "google_compute_subnetwork_iam_binding" "foo" {
project = "${google_compute_subnetwork.subnetwork.project}"
region = "${google_compute_subnetwork.subnetwork.region}"
subnetwork = "${google_compute_subnetwork.subnetwork.name}"
role = "%s"
members = ["serviceAccount:${google_service_account.test_account.email}"]
}
`, account, subnetworkName, subnetworkName, region, roleId)
}
func testAccComputeSubnetworkIamBinding_update(account, region, subnetworkName, roleId string) string {
return fmt.Sprintf(`
resource "google_service_account" "test_account" {
account_id = "%s"
display_name = "Iam Testing Account"
}
resource "google_service_account" "test_account_2" {
account_id = "%s-2"
display_name = "Iam Testing Account"
}
resource "google_compute_network" "network" {
name = "%s"
auto_create_subnetworks = false
}
resource "google_compute_subnetwork" "subnetwork" {
name = "%s"
region = "%s"
ip_cidr_range = "10.1.0.0/16"
network = "${google_compute_network.network.name}"
}
resource "google_compute_subnetwork_iam_binding" "foo" {
project = "${google_compute_subnetwork.subnetwork.project}"
region = "${google_compute_subnetwork.subnetwork.region}"
subnetwork = "${google_compute_subnetwork.subnetwork.name}"
role = "%s"
members = [
"serviceAccount:${google_service_account.test_account.email}",
"serviceAccount:${google_service_account.test_account_2.email}"
]
}
`, account, account, subnetworkName, subnetworkName, region, roleId)
}
func testAccComputeSubnetworkIamMember_basic(account, region, subnetworkName, roleId string) string {
return fmt.Sprintf(`
resource "google_service_account" "test_account" {
account_id = "%s"
display_name = "Iam Testing Account"
}
resource "google_compute_network" "network" {
name = "%s"
auto_create_subnetworks = false
}
resource "google_compute_subnetwork" "subnetwork" {
name = "%s"
region = "%s"
ip_cidr_range = "10.1.0.0/16"
network = "${google_compute_network.network.name}"
}
resource "google_compute_subnetwork_iam_member" "foo" {
project = "${google_compute_subnetwork.subnetwork.project}"
region = "${google_compute_subnetwork.subnetwork.region}"
subnetwork = "${google_compute_subnetwork.subnetwork.name}"
role = "%s"
member = "serviceAccount:${google_service_account.test_account.email}"
}
`, account, subnetworkName, subnetworkName, region, roleId)
}
func testAccComputeSubnetworkIamPolicy_basic(account, region, subnetworkName, roleId string) string {
return fmt.Sprintf(`
resource "google_service_account" "test_account" {
account_id = "%s"
display_name = "Iam Testing Account"
}
resource "google_compute_network" "network" {
name = "%s"
auto_create_subnetworks = false
}
resource "google_compute_subnetwork" "subnetwork" {
name = "%s"
region = "%s"
ip_cidr_range = "10.1.0.0/16"
network = "${google_compute_network.network.name}"
}
data "google_iam_policy" "foo" {
binding {
role = "%s"
members = ["serviceAccount:${google_service_account.test_account.email}"]
}
}
resource "google_compute_subnetwork_iam_policy" "foo" {
project = "${google_compute_subnetwork.subnetwork.project}"
region = "${google_compute_subnetwork.subnetwork.region}"
subnetwork = "${google_compute_subnetwork.subnetwork.name}"
policy_data = "${data.google_iam_policy.foo.policy_data}"
}
`, account, subnetworkName, subnetworkName, region, roleId)
}

View File

@ -3,10 +3,11 @@ package google
import (
"errors"
"fmt"
"github.com/hashicorp/terraform/helper/schema"
"google.golang.org/api/cloudresourcemanager/v1"
"log"
"strings"
"github.com/hashicorp/terraform/helper/schema"
"google.golang.org/api/cloudresourcemanager/v1"
)
var iamBindingSchema = map[string]*schema.Schema{

View File

@ -1,7 +1,7 @@
---
layout: "google"
page_title: "Google: google_compute_subnetwork"
sidebar_current: "docs-google-compute-subnetwork"
sidebar_current: "docs-google-compute-subnetwork-x"
description: |-
Manages a subnetwork within GCE.
---

View File

@ -0,0 +1,125 @@
---
layout: "google"
page_title: "Google: google_compute_subnetwork_iam"
sidebar_current: "docs-google-compute-subnetwork-iam"
description: |-
Collection of resources to manage IAM policy for a GCE subnetwork.
---
# IAM policy for GCE subnetwork
Three different resources help you manage your IAM policy for GCE subnetwork. Each of these resources serves a different use case:
* `google_compute_subnetwork_iam_policy`: Authoritative. Sets the IAM policy for the subnetwork and replaces any existing policy already attached.
* `google_compute_subnetwork_iam_binding`: Authoritative for a given role. Updates the IAM policy to grant a role to a list of members. Other roles within the IAM policy for the subnetwork are preserved.
* `google_compute_subnetwork_iam_member`: Non-authoritative. Updates the IAM policy to grant a role to a new member. Other members for the role for the subnetwork are preserved.
~> **Note:** `google_compute_subnetwork_iam_policy` **cannot** be used in conjunction with `google_compute_subnetwork_iam_binding` and `google_compute_subnetwork_iam_member` or they will fight over what your policy should be.
~> **Note:** `google_compute_subnetwork_iam_binding` resources **can be** used in conjunction with `google_compute_subnetwork_iam_member` resources **only if** they do not grant privilege to the same role.
~> **Note:** These entire resources are in [Beta](/docs/providers/google/index.html#beta-features)
## google\_compute\_subnetwork\_iam\_policy
```hcl
data "google_iam_policy" "admin" {
binding {
role = "roles/editor"
members = [
"user:jane@example.com",
]
}
}
resource "google_compute_subnetwork_iam_policy" "subnet" {
subnetwork = "your-subnetwork-id"
policy_data = "${data.google_iam_policy.admin.policy_data}"
}
```
## google\_compute\_subnetwork\_iam\_binding
```hcl
resource "google_compute_subnetwork_iam_binding" "subnet" {
subnetwork = "your-subnetwork-id"
role = "roles/compute.networkUser"
members = [
"user:jane@example.com",
]
}
```
## google\compute\_subnetwork\_iam\_member
```hcl
resource "google_compute_subnetwork_iam_member" "subnet" {
subnetwork = "your-subnetwork-id"
role = "roles/compute.networkUser"
member = "user:jane@example.com"
}
```
## Argument Reference
The following arguments are supported:
* `subnetwork` - (Required) The name of the subnetwork.
* `member/members` - (Required) Identities that will be granted the privilege in `role`.
Each entry can have one of the following values:
* **allUsers**: A special identifier that represents anyone who is on the internet; with or without a Google account.
* **allAuthenticatedUsers**: A special identifier that represents anyone who is authenticated with a Google account or a service account.
* **user:{emailid}**: An email address that represents a specific Google account. For example, alice@gmail.com or joe@example.com.
* **serviceAccount:{emailid}**: An email address that represents a service account. For example, my-other-app@appspot.gserviceaccount.com.
* **group:{emailid}**: An email address that represents a Google group. For example, admins@example.com.
* **domain:{domain}**: A Google Apps domain name that represents all the users of that domain. For example, google.com or example.com.
* `role` - (Required) The role that should be applied. Only one
`google_compute_subnetwork_iam_binding` can be used per role. Note that custom roles must be of the format
`[projects|organizations]/{parent-name}/roles/{role-name}`.
* `policy_data` - (Required only by `google_compute_subnetwork_iam_policy`) The policy data generated by
a `google_iam_policy` data source.
* `project` - (Optional) The ID of the project in which the resource belongs. If it
is not provided, the provider project is used.
* `region` - (Optional) The region of the subnetwork. If
unspecified, this defaults to the region configured in the provider.
## Attributes Reference
In addition to the arguments listed above, the following computed attributes are
exported:
* `etag` - (Computed) The etag of the subnetwork's IAM policy.
## Import
For all import syntaxes, the "resource in question" can take any of the following forms:
* full self link or relative link (projects/{{project}}/region/{{region}}/subnetworks/{{name}})
* {{project}}/{{region}}/{{name}}
* {{region}}/{{name}} (project is taken from provider project)
* {{name}} (project and region are taken from provider project)
IAM member imports use space-delimited identifiers; the resource in question, the role, and the account, e.g.
```
$ terraform import google_compute_subnetwork_iam_member.subnet "project-name/region-name/subnetwork-name roles/compute.networkUser foo@example.com"
```
IAM binding imports use space-delimited identifiers; the resource in question and the role, e.g.
```
$ terraform import google_compute_subnetwork_iam_binding.subnet "project-name/region-name/subnetwork-name roles/compute.networkUser"
```
IAM policy imports use the identifier of the resource in question, e.g.
```
$ terraform import google_compute_subnetwork_iam_policy.subnet project-name/region-name/subnetwork-name
```

View File

@ -356,10 +356,22 @@
<a href="/docs/providers/google/r/compute_ssl_policy.html">google_compute_ssl_policy</a>
</li>
<li<%= sidebar_current("docs-google-compute-subnetwork") %>>
<li<%= sidebar_current("docs-google-compute-subnetwork-x") %>>
<a href="/docs/providers/google/r/compute_subnetwork.html">google_compute_subnetwork</a>
</li>
<li<%= sidebar_current("docs-google-compute-subnetwork-iam") %>>
<a href="/docs/providers/google/r/compute_subnetwork_iam.html">google_compute_subnetwork_iam_binding</a>
</li>
<li<%= sidebar_current("docs-google-compute-subnetwork-iam") %>>
<a href="/docs/providers/google/r/compute_subnetwork_iam.html">google_compute_subnetwork_iam_member</a>
</li>
<li<%= sidebar_current("docs-google-compute-subnetwork-iam") %>>
<a href="/docs/providers/google/r/compute_subnetwork_iam.html">google_compute_subnetwork_iam_policy</a>
</li>
<li<%= sidebar_current("docs-google-compute-target-http-proxy") %>>
<a href="/docs/providers/google/r/compute_target_http_proxy.html">google_compute_target_http_proxy</a>
</li>