Skip to content

Commit 1176430

Browse files
Revert "Allow api_gateway_gateway to change" (#4592) (#3058)
This reverts commit 11c7a203155c56ac780f78a5c5b0dfc75877923c. Signed-off-by: Modular Magician <[email protected]>
1 parent c3d0aba commit 1176430

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

.changelog/4592.txt

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

google-beta/resource_api_gateway_gateway.go

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ func resourceApiGatewayGateway() *schema.Resource {
4545
"api_config": {
4646
Type: schema.TypeString,
4747
Required: true,
48+
ForceNew: true,
4849
DiffSuppressFunc: compareResourceNames,
4950
Description: `Resource name of the API Config for this Gateway. Format: projects/{project}/locations/global/apis/{api}/configs/{apiConfig}`,
5051
},
@@ -255,12 +256,6 @@ func resourceApiGatewayGatewayUpdate(d *schema.ResourceData, meta interface{}) e
255256
} else if v, ok := d.GetOkExists("display_name"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, displayNameProp)) {
256257
obj["displayName"] = displayNameProp
257258
}
258-
apiConfigProp, err := expandApiGatewayGatewayApiConfig(d.Get("api_config"), d, config)
259-
if err != nil {
260-
return err
261-
} else if v, ok := d.GetOkExists("api_config"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, apiConfigProp)) {
262-
obj["apiConfig"] = apiConfigProp
263-
}
264259
labelsProp, err := expandApiGatewayGatewayLabels(d.Get("labels"), d, config)
265260
if err != nil {
266261
return err
@@ -280,10 +275,6 @@ func resourceApiGatewayGatewayUpdate(d *schema.ResourceData, meta interface{}) e
280275
updateMask = append(updateMask, "displayName")
281276
}
282277

283-
if d.HasChange("api_config") {
284-
updateMask = append(updateMask, "apiConfig")
285-
}
286-
287278
if d.HasChange("labels") {
288279
updateMask = append(updateMask, "labels")
289280
}

google-beta/resource_dataflow_flex_template_job_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1010
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
11-
compute "google.golang.org/api/compute/v1"
11+
"google.golang.org/api/compute/v1"
1212
)
1313

1414
func TestAccDataflowFlexTemplateJob_basic(t *testing.T) {

google-beta/resource_dataproc_cluster_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ import (
1313
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1414
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1515

16-
"google.golang.org/api/googleapi"
17-
1816
dataproc "google.golang.org/api/dataproc/v1beta2"
17+
"google.golang.org/api/googleapi"
1918
)
2019

2120
func TestDataprocExtractInitTimeout(t *testing.T) {

0 commit comments

Comments
 (0)