Skip to content

Commit

Permalink
Fix gcp_auth_backend_role test
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ginja
Ginja committed Jan 30, 2019
1 parent 8887cbd commit 864ccc2
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 41 deletions.
47 changes: 30 additions & 17 deletions vault/resource_gcp_auth_backend_role.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,33 +30,28 @@ func gcpAuthBackendRoleResource() *schema.Resource {
Required: true,
ForceNew: true,
},
"project_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"ttl": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Computed: false,
},
"max_ttl": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Computed: false,
},
"period": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Computed: false,
},
"policies": {
Type: schema.TypeSet,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Optional: true,
Computed: true,
Computed: false,
},
"bound_service_accounts": {
Type: schema.TypeSet,
Expand All @@ -66,37 +61,45 @@ func gcpAuthBackendRoleResource() *schema.Resource {
Optional: true,
Computed: true,
},
"bound_projects": {
Type: schema.TypeSet,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Optional: true,
Computed: false,
},
"bound_zones": {
Type: schema.TypeSet,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Optional: true,
Computed: true,
Computed: false,
},
"bound_regions": {
Type: schema.TypeSet,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Optional: true,
Computed: true,
Computed: false,
},
"bound_instance_groups": {
Type: schema.TypeSet,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Optional: true,
Computed: true,
Computed: false,
},
"bound_labels": {
Type: schema.TypeSet,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Optional: true,
Computed: true,
Computed: false,
},
"backend": {
Type: schema.TypeString,
Expand Down Expand Up @@ -129,10 +132,6 @@ func gcpAuthResourceWrite(d *schema.ResourceData, meta interface{}) error {
data["type"] = v.(string)
}

if v, ok := d.GetOk("project_id"); ok {
data["project_id"] = v.(string)
}

if v, ok := d.GetOk("ttl"); ok {
data["ttl"] = v.(string)
}
Expand All @@ -153,6 +152,10 @@ func gcpAuthResourceWrite(d *schema.ResourceData, meta interface{}) error {
data["bound_service_accounts"] = v.(*schema.Set).List()
}

if v, ok := d.GetOk("bound_projects"); ok {
data["bound_projects"] = v.(*schema.Set).List()
}

if v, ok := d.GetOk("bound_zones"); ok {
data["bound_zones"] = v.(*schema.Set).List()
}
Expand Down Expand Up @@ -207,6 +210,10 @@ func gcpAuthResourceUpdate(d *schema.ResourceData, meta interface{}) error {
data["bound_service_accounts"] = v.(*schema.Set).List()
}

if v, ok := d.GetOk("bound_projects"); ok {
data["bound_projects"] = v.(*schema.Set).List()
}

if v, ok := d.GetOk("bound_zones"); ok {
data["bound_zones"] = v.(*schema.Set).List()
}
Expand Down Expand Up @@ -275,6 +282,12 @@ func gcpAuthResourceRead(d *schema.ResourceData, meta interface{}) error {
schema.HashString, accounts.([]interface{})))
}

if projects, ok := resp.Data["bound_projects"]; ok {
d.Set("bound_projects",
schema.NewSet(
schema.HashString, projects.([]interface{})))
}

if zones, ok := resp.Data["bound_zones"]; ok {
d.Set("bound_zones", schema.NewSet(schema.HashString, zones.([]interface{})))
}
Expand Down
48 changes: 24 additions & 24 deletions vault/resource_gcp_auth_backend_role_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,12 @@ func testGCPAuthBackendRoleCheck_attrs(backend, name string) resource.TestCheckF
}

attrs := map[string]string{
"type": "role_type",
"project_id": "project_id",
"type": "type",
"ttl": "ttl",
"max_ttl": "max_ttl",
"period": "period",
"policies": "policies",
"bound_projects": "bound_projects",
"bound_service_accounts": "bound_service_accounts",
"bound_regions": "bound_regions",
"bound_zones": "bound_zones",
Expand Down Expand Up @@ -196,19 +196,19 @@ func testGCPAuthBackendRoleConfig_basic(backend, name, serviceAccount, projectId
return fmt.Sprintf(`
resource "vault_auth_backend" "gcp" {
path = "%s"
type = "gcp"
path = "%s"
type = "gcp"
}
resource "vault_gcp_auth_backend_role" "test" {
backend = "${vault_auth_backend.gcp.path}"
role = "%s"
type = "iam"
bound_service_accounts = ["%s"]
project_id = "%s"
ttl = 300
max_ttl = 600
policies = ["policy_a", "policy_b"]
backend = "${vault_auth_backend.gcp.path}"
role = "%s"
type = "iam"
bound_service_accounts = ["%s"]
bound_projects = ["%s"]
ttl = 300
max_ttl = 600
policies = ["policy_a", "policy_b"]
}
`, backend, name, serviceAccount, projectId)

Expand All @@ -219,21 +219,21 @@ func testGCPAuthBackendRoleConfig_gce(backend, name, projectId string) string {
return fmt.Sprintf(`
resource "vault_auth_backend" "gcp" {
path = "%s"
type = "gcp"
path = "%s"
type = "gcp"
}
resource "vault_gcp_auth_backend_role" "test" {
backend = "${vault_auth_backend.gcp.path}"
role = "%s"
type = "gce"
project_id = "%s"
ttl = 300
max_ttl = 600
policies = ["policy_a", "policy_b"]
bound_regions = ["eu-west2"]
bound_zones = ["europe-west2-c"]
bound_labels = ["foo"]
backend = "${vault_auth_backend.gcp.path}"
role = "%s"
type = "gce"
bound_projects = ["%s"]
ttl = 300
max_ttl = 600
policies = ["policy_a", "policy_b"]
bound_regions = ["eu-west2"]
bound_zones = ["europe-west2-c"]
bound_labels = ["foo"]
}
`, backend, name, projectId)

Expand Down

0 comments on commit 864ccc2

Please sign in to comment.