public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-09 11:38:29 +00:00
Code Issues Projects Releases Wiki Activity

add diffsuppress for iam custom role stage. fixes TPG #1801 (#2370)

Browse Source
This commit is contained in:
The Magician 2018-10-31 09:10:44 -07:00 committed by Nathan McKinley
parent 898babb55a
commit c27ec182be
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
google/resource_google_organization_iam_custom_role.go
View File

@ -2,6 +2,7 @@ package google
import ( import (
"fmt" "fmt"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
"google.golang.org/api/iam/v1" "google.golang.org/api/iam/v1"
@ -44,6 +45,7 @@ func resourceGoogleOrganizationIamCustomRole() *schema.Resource {
Optional: true, Optional: true,
Default: "GA", Default: "GA",
ValidateFunc: validation.StringInSlice([]string{"ALPHA", "BETA", "GA", "DEPRECATED", "DISABLED", "EAP"}, false), ValidateFunc: validation.StringInSlice([]string{"ALPHA", "BETA", "GA", "DEPRECATED", "DISABLED", "EAP"}, false),
DiffSuppressFunc: emptyOrDefaultStringSuppress("ALPHA"),
}, },
"description": { "description": {
Type: schema.TypeString, Type: schema.TypeString,

2
google/resource_google_project_iam_custom_role.go
View File

@ -2,6 +2,7 @@ package google
import ( import (
"fmt" "fmt"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
"google.golang.org/api/iam/v1" "google.golang.org/api/iam/v1"
@ -45,6 +46,7 @@ func resourceGoogleProjectIamCustomRole() *schema.Resource {
Optional: true, Optional: true,
Default: "GA", Default: "GA",
ValidateFunc: validation.StringInSlice([]string{"ALPHA", "BETA", "GA", "DEPRECATED", "DISABLED", "EAP"}, false), ValidateFunc: validation.StringInSlice([]string{"ALPHA", "BETA", "GA", "DEPRECATED", "DISABLED", "EAP"}, false),
DiffSuppressFunc: emptyOrDefaultStringSuppress("ALPHA"),
}, },
"description": { "description": {
Type: schema.TypeString, Type: schema.TypeString,