Skip to content

Commit abeecbe

Browse files
Made iam updaters accept TerraformResourceData interface (#4426) (#2895)
* Made iam updaters accept TerraformResourceData interface This allows for easier interoperability with terraform-validator, and is currently the standard for other functions used by terraform-google-conversion * Corrected make test errors Signed-off-by: Modular Magician <[email protected]>
1 parent 6582f9f commit abeecbe

File tree

60 files changed

+123
-115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+123
-115
lines changed

.changelog/4426.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google-beta/iam.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ type (
4545
}
4646

4747
// Factory for generating ResourceIamUpdater for given ResourceData resource
48-
newResourceIamUpdaterFunc func(d *schema.ResourceData, config *Config) (ResourceIamUpdater, error)
48+
newResourceIamUpdaterFunc func(d TerraformResourceData, config *Config) (ResourceIamUpdater, error)
4949

5050
// Describes how to modify a policy for a given Terraform IAM (_policy/_member/_binding/_audit_config) resource
5151
iamPolicyModifyFunc func(p *cloudresourcemanager.Policy) error

google-beta/iam_api_gateway_api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ var ApiGatewayApiIamSchema = map[string]*schema.Schema{
3939
type ApiGatewayApiIamUpdater struct {
4040
project string
4141
api string
42-
d *schema.ResourceData
42+
d TerraformResourceData
4343
Config *Config
4444
}
4545

46-
func ApiGatewayApiIamUpdaterProducer(d *schema.ResourceData, config *Config) (ResourceIamUpdater, error) {
46+
func ApiGatewayApiIamUpdaterProducer(d TerraformResourceData, config *Config) (ResourceIamUpdater, error) {
4747
values := make(map[string]string)
4848

4949
project, _ := getProject(d, config)

google-beta/iam_api_gateway_api_config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ type ApiGatewayApiConfigIamUpdater struct {
4545
project string
4646
api string
4747
apiConfig string
48-
d *schema.ResourceData
48+
d TerraformResourceData
4949
Config *Config
5050
}
5151

52-
func ApiGatewayApiConfigIamUpdaterProducer(d *schema.ResourceData, config *Config) (ResourceIamUpdater, error) {
52+
func ApiGatewayApiConfigIamUpdaterProducer(d TerraformResourceData, config *Config) (ResourceIamUpdater, error) {
5353
values := make(map[string]string)
5454

5555
project, _ := getProject(d, config)

google-beta/iam_api_gateway_gateway.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ type ApiGatewayGatewayIamUpdater struct {
4646
project string
4747
region string
4848
gateway string
49-
d *schema.ResourceData
49+
d TerraformResourceData
5050
Config *Config
5151
}
5252

53-
func ApiGatewayGatewayIamUpdaterProducer(d *schema.ResourceData, config *Config) (ResourceIamUpdater, error) {
53+
func ApiGatewayGatewayIamUpdaterProducer(d TerraformResourceData, config *Config) (ResourceIamUpdater, error) {
5454
values := make(map[string]string)
5555

5656
project, _ := getProject(d, config)

google-beta/iam_artifact_registry_repository.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ type ArtifactRegistryRepositoryIamUpdater struct {
4646
project string
4747
location string
4848
repository string
49-
d *schema.ResourceData
49+
d TerraformResourceData
5050
Config *Config
5151
}
5252

53-
func ArtifactRegistryRepositoryIamUpdaterProducer(d *schema.ResourceData, config *Config) (ResourceIamUpdater, error) {
53+
func ArtifactRegistryRepositoryIamUpdaterProducer(d TerraformResourceData, config *Config) (ResourceIamUpdater, error) {
5454
values := make(map[string]string)
5555

5656
project, _ := getProject(d, config)

google-beta/iam_big_query_table.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ type BigQueryTableIamUpdater struct {
4545
project string
4646
datasetId string
4747
tableId string
48-
d *schema.ResourceData
48+
d TerraformResourceData
4949
Config *Config
5050
}
5151

52-
func BigQueryTableIamUpdaterProducer(d *schema.ResourceData, config *Config) (ResourceIamUpdater, error) {
52+
func BigQueryTableIamUpdaterProducer(d TerraformResourceData, config *Config) (ResourceIamUpdater, error) {
5353
values := make(map[string]string)
5454

5555
project, _ := getProject(d, config)

google-beta/iam_bigquery_dataset.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ var bigqueryAccessPrimitiveToRoleMap = map[string]string{
3333
type BigqueryDatasetIamUpdater struct {
3434
project string
3535
datasetId string
36-
d *schema.ResourceData
36+
d TerraformResourceData
3737
Config *Config
3838
}
3939

40-
func NewBigqueryDatasetIamUpdater(d *schema.ResourceData, config *Config) (ResourceIamUpdater, error) {
40+
func NewBigqueryDatasetIamUpdater(d TerraformResourceData, config *Config) (ResourceIamUpdater, error) {
4141
project, err := getProject(d, config)
4242
if err != nil {
4343
return nil, err

google-beta/iam_bigtable_instance.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ var IamBigtableInstanceSchema = map[string]*schema.Schema{
2626
type BigtableInstanceIamUpdater struct {
2727
project string
2828
instance string
29-
d *schema.ResourceData
29+
d TerraformResourceData
3030
Config *Config
3131
}
3232

33-
func NewBigtableInstanceUpdater(d *schema.ResourceData, config *Config) (ResourceIamUpdater, error) {
33+
func NewBigtableInstanceUpdater(d TerraformResourceData, config *Config) (ResourceIamUpdater, error) {
3434
project, err := getProject(d, config)
3535
if err != nil {
3636
return nil, err

google-beta/iam_bigtable_table.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ type BigtableTableIamUpdater struct {
3333
project string
3434
instance string
3535
table string
36-
d *schema.ResourceData
36+
d TerraformResourceData
3737
Config *Config
3838
}
3939

40-
func NewBigtableTableUpdater(d *schema.ResourceData, config *Config) (ResourceIamUpdater, error) {
40+
func NewBigtableTableUpdater(d TerraformResourceData, config *Config) (ResourceIamUpdater, error) {
4141
project, err := getProject(d, config)
4242
if err != nil {
4343
return nil, err

0 commit comments

Comments
 (0)