Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TF] deprecate address as originally intended #627

Merged
merged 7 commits into from
Oct 29, 2018
Merged

[TF] deprecate address as originally intended #627

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
02b21fa
deprecate address as originally intended
chrisst Oct 26, 2018
145d462
fix forwarding tests after label removal (#603)
chrisst Oct 26, 2018
50f3e73
Remove assigned_nat_ip
chrisst Oct 26, 2018
56e44e1
Add unit tests for InSpec to CI (#623)
slevenick Oct 26, 2018
212a887
[Terraform]: Make google_storage_default_object_acl authoritative. (#…
rileykarson Oct 26, 2018
72d83a6
Merge 50f3e738fe3b4487d489f36dcbcc473a5f0520fb into 212a8872bd97f94e3…
chrisst Oct 26, 2018
475c943
Update tracked submodules -> HEAD on Mon Oct 29 18:30:57 UTC 2018
modular-magician Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions provider/terraform/resources/resource_compute_instance_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,18 +216,18 @@ func resourceComputeInstanceTemplate() *schema.Resource {
},

"address": &schema.Schema{
Type: schema.TypeString,
Computed: true, // Computed because it is set if network_ip is set.
Optional: true,
ForceNew: true,
},

"network_ip": &schema.Schema{
Type: schema.TypeString,
Computed: true, // Computed because it is set if address is set.
Computed: true, // Computed because it is set if network_ip is set.
Optional: true,
ForceNew: true,
Deprecated: "Please use address",
Deprecated: "Please use network_ip",
},

"network_ip": &schema.Schema{
Type: schema.TypeString,
Computed: true, // Computed because it is set if address is set.
Optional: true,
ForceNew: true,
},

"subnetwork": &schema.Schema{
Expand Down