Skip to content

Commit de2beb7

Browse files
ignore read on ip range, make cidr range O+C (#5633) (#10943)
Signed-off-by: Modular Magician <[email protected]>
1 parent 9d5f69f commit de2beb7

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

.changelog/5633.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google/resource_apigee_instance.go

+1-7
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ Input format: "a.b.c.d/22"`,
9494
},
9595
"peering_cidr_range": {
9696
Type: schema.TypeString,
97+
Computed: true,
9798
Optional: true,
9899
ForceNew: true,
99100
Description: `The size of the CIDR block range that will be reserved by the instance. For valid values,
@@ -251,9 +252,6 @@ func resourceApigeeInstanceRead(d *schema.ResourceData, meta interface{}) error
251252
if err := d.Set("peering_cidr_range", flattenApigeeInstancePeeringCidrRange(res["peeringCidrRange"], d, config)); err != nil {
252253
return fmt.Errorf("Error reading Instance: %s", err)
253254
}
254-
if err := d.Set("ip_range", flattenApigeeInstanceIpRange(res["ipRange"], d, config)); err != nil {
255-
return fmt.Errorf("Error reading Instance: %s", err)
256-
}
257255
if err := d.Set("description", flattenApigeeInstanceDescription(res["description"], d, config)); err != nil {
258256
return fmt.Errorf("Error reading Instance: %s", err)
259257
}
@@ -369,10 +367,6 @@ func flattenApigeeInstancePeeringCidrRange(v interface{}, d *schema.ResourceData
369367
return v
370368
}
371369

372-
func flattenApigeeInstanceIpRange(v interface{}, d *schema.ResourceData, config *Config) interface{} {
373-
return v
374-
}
375-
376370
func flattenApigeeInstanceDescription(v interface{}, d *schema.ResourceData, config *Config) interface{} {
377371
return v
378372
}

google/resource_apigee_instance_generated_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func TestAccApigeeInstance_apigeeInstanceBasicTestExample(t *testing.T) {
4545
ResourceName: "google_apigee_instance.apigee_instance",
4646
ImportState: true,
4747
ImportStateVerify: true,
48-
ImportStateVerifyIgnore: []string{"org_id"},
48+
ImportStateVerifyIgnore: []string{"ip_range", "org_id"},
4949
},
5050
},
5151
})
@@ -137,7 +137,7 @@ func TestAccApigeeInstance_apigeeInstanceCidrRangeTestExample(t *testing.T) {
137137
ResourceName: "google_apigee_instance.apigee_instance",
138138
ImportState: true,
139139
ImportStateVerify: true,
140-
ImportStateVerifyIgnore: []string{"org_id"},
140+
ImportStateVerifyIgnore: []string{"ip_range", "org_id"},
141141
},
142142
},
143143
})
@@ -230,7 +230,7 @@ func TestAccApigeeInstance_apigeeInstanceIpRangeTestExample(t *testing.T) {
230230
ResourceName: "google_apigee_instance.apigee_instance",
231231
ImportState: true,
232232
ImportStateVerify: true,
233-
ImportStateVerifyIgnore: []string{"org_id"},
233+
ImportStateVerifyIgnore: []string{"ip_range", "org_id"},
234234
},
235235
},
236236
})

0 commit comments

Comments
 (0)