d.Set default parameters (#3349) (#1935)

modular-magician · web-flow · commit 14defaf2a555 · 2020-04-06T14:05:08.000-07:00
Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/3349.txt b/.changelog/3349.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+iap: `project` can now be unset in `iap_web_iam_member` and will read from the default `project`
+```
diff --git a/google-beta/iam_binary_authorization_attestor.go b/google-beta/iam_binary_authorization_attestor.go
@@ -48,7 +48,7 @@ func BinaryAuthorizationAttestorIamUpdaterProducer(d *schema.ResourceData, confi
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 	if v, ok := d.GetOk("attestor"); ok {
diff --git a/google-beta/iam_cloud_functions_cloud_function.go b/google-beta/iam_cloud_functions_cloud_function.go
@@ -55,12 +55,12 @@ func CloudFunctionsCloudFunctionIamUpdaterProducer(d *schema.ResourceData, confi
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 	region, _ := getRegion(d, config)
 	if region != "" {
-		values["region"] = region
+		d.Set("region", region)
 	}
 	values["region"] = region
 	if v, ok := d.GetOk("cloud_function"); ok {
diff --git a/google-beta/iam_cloud_run_service.go b/google-beta/iam_cloud_run_service.go
@@ -55,12 +55,12 @@ func CloudRunServiceIamUpdaterProducer(d *schema.ResourceData, config *Config) (
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 	location, _ := getLocation(d, config)
 	if location != "" {
-		values["location"] = location
+		d.Set("location", location)
 	}
 	values["location"] = location
 	if v, ok := d.GetOk("service"); ok {
diff --git a/google-beta/iam_compute_instance.go b/google-beta/iam_compute_instance.go
@@ -55,12 +55,12 @@ func ComputeInstanceIamUpdaterProducer(d *schema.ResourceData, config *Config) (
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 	zone, _ := getZone(d, config)
 	if zone != "" {
-		values["zone"] = zone
+		d.Set("zone", zone)
 	}
 	values["zone"] = zone
 	if v, ok := d.GetOk("instance_name"); ok {
diff --git a/google-beta/iam_compute_subnetwork.go b/google-beta/iam_compute_subnetwork.go
@@ -55,12 +55,12 @@ func ComputeSubnetworkIamUpdaterProducer(d *schema.ResourceData, config *Config)
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 	region, _ := getRegion(d, config)
 	if region != "" {
-		values["region"] = region
+		d.Set("region", region)
 	}
 	values["region"] = region
 	if v, ok := d.GetOk("subnetwork"); ok {
diff --git a/google-beta/iam_iap_app_engine_service.go b/google-beta/iam_iap_app_engine_service.go
@@ -54,7 +54,7 @@ func IapAppEngineServiceIamUpdaterProducer(d *schema.ResourceData, config *Confi
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 	if v, ok := d.GetOk("app_id"); ok {
diff --git a/google-beta/iam_iap_app_engine_version.go b/google-beta/iam_iap_app_engine_version.go
@@ -60,7 +60,7 @@ func IapAppEngineVersionIamUpdaterProducer(d *schema.ResourceData, config *Confi
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 	if v, ok := d.GetOk("app_id"); ok {
diff --git a/google-beta/iam_iap_tunnel_instance.go b/google-beta/iam_iap_tunnel_instance.go
@@ -55,12 +55,12 @@ func IapTunnelInstanceIamUpdaterProducer(d *schema.ResourceData, config *Config)
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 	zone, _ := getZone(d, config)
 	if zone != "" {
-		values["zone"] = zone
+		d.Set("zone", zone)
 	}
 	values["zone"] = zone
 	if v, ok := d.GetOk("instance"); ok {
diff --git a/google-beta/iam_iap_web.go b/google-beta/iam_iap_web.go
@@ -42,7 +42,7 @@ func IapWebIamUpdaterProducer(d *schema.ResourceData, config *Config) (ResourceI
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 
diff --git a/google-beta/iam_iap_web_backend_service.go b/google-beta/iam_iap_web_backend_service.go
@@ -48,7 +48,7 @@ func IapWebBackendServiceIamUpdaterProducer(d *schema.ResourceData, config *Conf
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 	if v, ok := d.GetOk("web_backend_service"); ok {
diff --git a/google-beta/iam_iap_web_type_app_engine.go b/google-beta/iam_iap_web_type_app_engine.go
@@ -62,7 +62,7 @@ func IapWebTypeAppEngineIamUpdaterProducer(d *schema.ResourceData, config *Confi
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 	if v, ok := d.GetOk("app_id"); ok {
diff --git a/google-beta/iam_iap_web_type_compute.go b/google-beta/iam_iap_web_type_compute.go
@@ -42,7 +42,7 @@ func IapWebTypeComputeIamUpdaterProducer(d *schema.ResourceData, config *Config)
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 
diff --git a/google-beta/iam_pubsub_topic.go b/google-beta/iam_pubsub_topic.go
@@ -48,7 +48,7 @@ func PubsubTopicIamUpdaterProducer(d *schema.ResourceData, config *Config) (Reso
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 	if v, ok := d.GetOk("topic"); ok {
diff --git a/google-beta/iam_runtime_config_config.go b/google-beta/iam_runtime_config_config.go
@@ -48,7 +48,7 @@ func RuntimeConfigConfigIamUpdaterProducer(d *schema.ResourceData, config *Confi
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 	if v, ok := d.GetOk("config"); ok {
diff --git a/google-beta/iam_secret_manager_secret.go b/google-beta/iam_secret_manager_secret.go
@@ -48,7 +48,7 @@ func SecretManagerSecretIamUpdaterProducer(d *schema.ResourceData, config *Confi
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 	if v, ok := d.GetOk("secret_id"); ok {
diff --git a/google-beta/iam_source_repo_repository.go b/google-beta/iam_source_repo_repository.go
@@ -57,7 +57,7 @@ func SourceRepoRepositoryIamUpdaterProducer(d *schema.ResourceData, config *Conf
 
 	project, _ := getProject(d, config)
 	if project != "" {
-		values["project"] = project
+		d.Set("project", project)
 	}
 	values["project"] = project
 	if v, ok := d.GetOk("repository"); ok {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+iap: `project` can now be unset in `iap_web_iam_member` and will read from the default `project`
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func BinaryAuthorizationAttestorIamUpdaterProducer(d *schema.ResourceData, confi`
`48`	`48`
`49`	`49`	`project, _ := getProject(d, config)`
`50`	`50`	`if project != "" {`
`51`		`- values["project"] = project`
	`51`	`+ d.Set("project", project)`
`52`	`52`	`}`
`53`	`53`	`values["project"] = project`
`54`	`54`	`if v, ok := d.GetOk("attestor"); ok {`
Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,12 @@ func CloudFunctionsCloudFunctionIamUpdaterProducer(d *schema.ResourceData, confi`
`55`	`55`
`56`	`56`	`project, _ := getProject(d, config)`
`57`	`57`	`if project != "" {`
`58`		`- values["project"] = project`
	`58`	`+ d.Set("project", project)`
`59`	`59`	`}`
`60`	`60`	`values["project"] = project`
`61`	`61`	`region, _ := getRegion(d, config)`
`62`	`62`	`if region != "" {`
`63`		`- values["region"] = region`
	`63`	`+ d.Set("region", region)`
`64`	`64`	`}`
`65`	`65`	`values["region"] = region`
`66`	`66`	`if v, ok := d.GetOk("cloud_function"); ok {`
Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,12 @@ func CloudRunServiceIamUpdaterProducer(d schema.ResourceData, config Config) (`
`55`	`55`
`56`	`56`	`project, _ := getProject(d, config)`
`57`	`57`	`if project != "" {`
`58`		`- values["project"] = project`
	`58`	`+ d.Set("project", project)`
`59`	`59`	`}`
`60`	`60`	`values["project"] = project`
`61`	`61`	`location, _ := getLocation(d, config)`
`62`	`62`	`if location != "" {`
`63`		`- values["location"] = location`
	`63`	`+ d.Set("location", location)`
`64`	`64`	`}`
`65`	`65`	`values["location"] = location`
`66`	`66`	`if v, ok := d.GetOk("service"); ok {`
Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,12 @@ func ComputeInstanceIamUpdaterProducer(d schema.ResourceData, config Config) (`
`55`	`55`
`56`	`56`	`project, _ := getProject(d, config)`
`57`	`57`	`if project != "" {`
`58`		`- values["project"] = project`
	`58`	`+ d.Set("project", project)`
`59`	`59`	`}`
`60`	`60`	`values["project"] = project`
`61`	`61`	`zone, _ := getZone(d, config)`
`62`	`62`	`if zone != "" {`
`63`		`- values["zone"] = zone`
	`63`	`+ d.Set("zone", zone)`
`64`	`64`	`}`
`65`	`65`	`values["zone"] = zone`
`66`	`66`	`if v, ok := d.GetOk("instance_name"); ok {`
Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,12 @@ func ComputeSubnetworkIamUpdaterProducer(d schema.ResourceData, config Config)`
`55`	`55`
`56`	`56`	`project, _ := getProject(d, config)`
`57`	`57`	`if project != "" {`
`58`		`- values["project"] = project`
	`58`	`+ d.Set("project", project)`
`59`	`59`	`}`
`60`	`60`	`values["project"] = project`
`61`	`61`	`region, _ := getRegion(d, config)`
`62`	`62`	`if region != "" {`
`63`		`- values["region"] = region`
	`63`	`+ d.Set("region", region)`
`64`	`64`	`}`
`65`	`65`	`values["region"] = region`
`66`	`66`	`if v, ok := d.GetOk("subnetwork"); ok {`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func IapAppEngineServiceIamUpdaterProducer(d schema.ResourceData, config Confi`
`54`	`54`
`55`	`55`	`project, _ := getProject(d, config)`
`56`	`56`	`if project != "" {`
`57`		`- values["project"] = project`
	`57`	`+ d.Set("project", project)`
`58`	`58`	`}`
`59`	`59`	`values["project"] = project`
`60`	`60`	`if v, ok := d.GetOk("app_id"); ok {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func IapAppEngineVersionIamUpdaterProducer(d schema.ResourceData, config Confi`
`60`	`60`
`61`	`61`	`project, _ := getProject(d, config)`
`62`	`62`	`if project != "" {`
`63`		`- values["project"] = project`
	`63`	`+ d.Set("project", project)`
`64`	`64`	`}`
`65`	`65`	`values["project"] = project`
`66`	`66`	`if v, ok := d.GetOk("app_id"); ok {`
Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,12 @@ func IapTunnelInstanceIamUpdaterProducer(d schema.ResourceData, config Config)`
`55`	`55`
`56`	`56`	`project, _ := getProject(d, config)`
`57`	`57`	`if project != "" {`
`58`		`- values["project"] = project`
	`58`	`+ d.Set("project", project)`
`59`	`59`	`}`
`60`	`60`	`values["project"] = project`
`61`	`61`	`zone, _ := getZone(d, config)`
`62`	`62`	`if zone != "" {`
`63`		`- values["zone"] = zone`
	`63`	`+ d.Set("zone", zone)`
`64`	`64`	`}`
`65`	`65`	`values["zone"] = zone`
`66`	`66`	`if v, ok := d.GetOk("instance"); ok {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func IapWebIamUpdaterProducer(d schema.ResourceData, config Config) (ResourceI`
`42`	`42`
`43`	`43`	`project, _ := getProject(d, config)`
`44`	`44`	`if project != "" {`
`45`		`- values["project"] = project`
	`45`	`+ d.Set("project", project)`
`46`	`46`	`}`
`47`	`47`	`values["project"] = project`
`48`	`48`