Generate subnetwork for terraform. #276

nat-henderson · 2018-06-15T01:39:03Z

Six notes:

Adds a few fields to Subnetwork which were present in Terraform but
not elsewhere (because they're in beta).
Changes terraform so that it's possible to rename a field with child
fields. Previously, the ordering of overrides was undefined, so it was
possible to rename a field from 'foo' to 'bar' - and then when it came
time to apply an override to 'foo.baz', it would crash since there's no
field called 'foo'. Now we apply overrides in reverse order of level of
nestedness, so child fields are overriden first.
Forces 'id_format' to be a valid import format.
Sets subnetwork to be non-updateable, so that ansible/puppet/chef will
destroy/recreate (and so terraform will use custom-update
appropriately).
Adds beta generation to generate-terraform.sh. By the
zero-one-infinity rule, the right thing to do is to add a 'beta
detector' and start automatically picking the version in that script...
maybe next quarter. :)
Removed the ability to update enable_flow_logs. According to the
docs, this never worked - patch can only update secondaryIpRange,
role (which does not exist - I filed a bug) and
allow_subnet_cidr_routes_overlap, which is a field that cannot be set at
create-time, only updated, and which I decided to omit. In any event,
no enable_flow_logs updates.
https://cloud.google.com/compute/docs/reference/rest/beta/subnetworks/patch

[all]

Updates to subnetwork docs, removes broken 'update' function.

[terraform]

Autogenerate Subnetwork.

[puppet]

[puppet-compute]

[puppet-sql]

[puppet-storage]

[chef]

[chef-compute]

[chef-sql]

[chef-storage]

[ansible]

Six notes: - Adds a few fields to Subnetwork which were present in Terraform but not elsewhere (because they're in beta). - Changes terraform so that it's possible to rename a field with child fields. Previously, the ordering of overrides was undefined, so it was possible to rename a field from 'foo' to 'bar' - and then when it came time to apply an override to 'foo.baz', it would crash since there's no field called 'foo'. Now we apply overrides in reverse order of level of nestedness, so child fields are overriden first. - Forces 'id_format' to be a valid import format. - Sets subnetwork to be non-updateable, so that ansible/puppet/chef will destroy/recreate (and so terraform will use custom-update appropriately). - Adds beta generation to generate-terraform.sh. By the zero-one-infinity rule, the *right* thing to do is to add a 'beta detector' and start automatically picking the version in that script... maybe next quarter. :) - Removed the ability to update enable_flow_logs. According to the docs, this never worked - patch can only update secondaryIpRange, role (which does not exist - I filed a bug) and allow_subnet_cidr_routes_overlap, which is a field that cannot be set at create-time, only updated, and which I decided to omit. In any event, no enable_flow_logs updates. https://cloud.google.com/compute/docs/reference/rest/beta/subnetworks/patch

modular-magician · 2018-06-15T01:51:38Z

I am a robot that works on MagicModules PRs!

I built this PR into one or more PRs on other repositories, and when those are closed, this PR will also be merged and closed.
depends: hashicorp/terraform-provider-google#1661
depends: modular-magician/ansible#30
depends: GoogleCloudPlatform/puppet-google-compute#47
depends: GoogleCloudPlatform/chef-google-compute#17

modular-magician · 2018-06-15T02:21:50Z

I am (still) a robot that works on MagicModules PRs!

I just wanted to let you know that your changes (as of commit 4cad672) have been included in your existing downstream PRs.

modular-magician · 2018-06-15T02:40:58Z

I am (still) a robot that works on MagicModules PRs!

I just wanted to let you know that your changes (as of commit d76a4de) have been included in your existing downstream PRs.

modular-magician · 2018-06-15T02:53:50Z

I am (still) a robot that works on MagicModules PRs!

I just wanted to let you know that your changes (as of commit d775d8b) have been included in your existing downstream PRs.

modular-magician · 2018-06-15T03:10:38Z

I am (still) a robot that works on MagicModules PRs!

I just wanted to let you know that your changes (as of commit 3dd2a22) have been included in your existing downstream PRs.

modular-magician · 2018-06-15T23:02:03Z

I am (still) a robot that works on MagicModules PRs!

I just wanted to let you know that your changes (as of commit 74f999c) have been included in your existing downstream PRs.

danawillow · 2018-06-16T00:15:09Z

templates/terraform/resource.erb

 <% settable_properties.each do |prop| -%>
 	<%= prop.api_name -%>Prop, err := expand<%= resource_name -%><%= titlelize_property(prop) -%>(d.Get("<%= Google::StringUtils.underscore(prop.name) -%>"), d, config)
 	if err != nil {
 		return err
+	} else if v, ok := d.GetOkExists("<%= Google::StringUtils.underscore(prop.name) -%>"); ok || !reflect.DeepEqual(v, <%= prop.api_name -%>Prop) {


Let me make sure I understand the second half of the statement. This seems to handle the case where the value was not set (therefore its value will be the zero value) and its value (the zero value) is not equal to what expand produced. So this is for if it wasn't set, but we still do stuff in expand for it? So things like region would be the example case, right? Is there another type of field that would do it? Either way, mind adding a comment (in ruby blocks is fine) explaining this case?

You got it, and you're 100% right. I will add a comment as soon as I am convinced, myself, that it works. :)

danawillow · 2018-06-16T00:16:23Z

.ci/magic-modules/generate-terraform.sh

@@ -29,6 +29,7 @@ bundle exec compiler -p products/redis -e terraform -o "${GOPATH}/src/github.com

 # Resources that were already using beta APIs before they started being autogenerated
 bundle exec compiler -v beta -p products/compute -t Address -e terraform -o "${GOPATH}/src/github.com/terraform-providers/terraform-provider-google/"
+bundle exec compiler -v beta -p products/compute -t Subnetwork -e terraform -o "${GOPATH}/src/github.com/terraform-providers/terraform-provider-google/"


nit: -t takes a list, so you should be able to just do -t Address,Subnetwork (probably should verify this for sure though)

In preparation for testing Ansible linters on CI

nat-henderson · 2018-06-18T19:52:26Z

Bummer, this introduces an issue with SslProxy that looks related - I'm on it.

… api.yaml.

modular-magician · 2018-06-18T21:02:57Z

I am (still) a robot that works on MagicModules PRs!

I just wanted to let you know that your changes (as of commit 21372bc) have been included in your existing downstream PRs.

Merged PR #273.

…e point of all this. (:

nat-henderson · 2018-06-18T21:56:38Z

Okay, to fix that I did have to introduce the concept analogous to SendEmptyValue, which I don't love, but which I really do think is the only way. Here it is. Tests pass with this code.

modular-magician · 2018-06-18T23:18:27Z

I am (still) a robot that works on MagicModules PRs!

I just wanted to let you know that your changes (as of commit fa91844) have been included in your existing downstream PRs.

…o access it

Tracked submodules are build/puppet/compute build/puppet/sql build/puppet/storage build/chef/compute build/chef/sql build/chef/storage build/terraform build/ansible.

modular-magician · 2018-06-19T21:12:47Z

I am (still) a robot that works on MagicModules PRs!

I just wanted to let you know that your changes (as of commit cd384c4) have been included in your existing downstream PRs.

modular-magician added the downstream-generated label Jun 15, 2018

Travis.

d2640ac

nat-henderson added 2 commits June 14, 2018 19:28

Further tweaks to which fields are required.

804ece2

Mistake about input/required.

9363cd6

RangeName is also required.

c3eb1b1

nat-henderson added 2 commits June 15, 2018 10:44

Docs changes, moved region to computed/optional.

3db8223

Remove all the scaffolding for NullFields and ForceSendFields.

ff72c9f

danawillow reviewed Jun 16, 2018

View reviewed changes

Skip 2 Ansible Storage resources without examples

bf1f844

In preparation for testing Ansible linters on CI

Added the ability to specify whether we ought to send empty values to…

98bc2e9

… api.yaml.

rambleraptor and others added 2 commits June 18, 2018 14:18

AnsibleModule validation should use quotes around default values (#273)

ca97dbd

Merged PR #273.

Obviously flow logs need to be sent when they're empty... that was th…

f76707c

…e point of all this. (:

nat-henderson added 2 commits June 18, 2018 15:13

Add comment explaining send_empty_value.

a0542ab

Generate beta APIs all on one line.

8be431a

danawillow approved these changes Jun 19, 2018

View reviewed changes

rambleraptor added 3 commits June 19, 2018 10:23

Ansible - Adding back in fetch and using the proper object property t…

014d5e4

…o access it

Magician - run linting tests on Ansible

f8ddb63

Changing Ansible script because wrong path

0fa072a

rambleraptor and others added 3 commits June 19, 2018 13:44

Must install tox first

244dccf

Merge 8be431a into 244dccf

5082179

Update tracked submodules -> HEAD on Tue Jun 19 20:58:07 UTC 2018

c98ffb7

Tracked submodules are build/puppet/compute build/puppet/sql build/puppet/storage build/chef/compute build/chef/sql build/chef/storage build/terraform build/ansible.

modular-magician merged commit d27c675 into master Jun 19, 2018

modular-magician added the downstream-generated label Jun 19, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Generate subnetwork for terraform. #276

Generate subnetwork for terraform. #276

nat-henderson commented Jun 15, 2018

modular-magician commented Jun 15, 2018

modular-magician commented Jun 15, 2018

modular-magician commented Jun 15, 2018

modular-magician commented Jun 15, 2018

modular-magician commented Jun 15, 2018

modular-magician commented Jun 15, 2018

danawillow Jun 16, 2018

nat-henderson Jun 18, 2018

danawillow Jun 16, 2018

nat-henderson commented Jun 18, 2018

modular-magician commented Jun 18, 2018

nat-henderson commented Jun 18, 2018

modular-magician commented Jun 18, 2018

modular-magician commented Jun 19, 2018

Generate subnetwork for terraform. #276

Generate subnetwork for terraform. #276

Conversation

nat-henderson commented Jun 15, 2018

[all]

[terraform]

[puppet]

[puppet-compute]

[puppet-sql]

[puppet-storage]

[chef]

[chef-compute]

[chef-sql]

[chef-storage]

[ansible]

modular-magician commented Jun 15, 2018

modular-magician commented Jun 15, 2018

modular-magician commented Jun 15, 2018

modular-magician commented Jun 15, 2018

modular-magician commented Jun 15, 2018

modular-magician commented Jun 15, 2018

danawillow Jun 16, 2018

Choose a reason for hiding this comment

nat-henderson Jun 18, 2018

Choose a reason for hiding this comment

danawillow Jun 16, 2018

Choose a reason for hiding this comment

nat-henderson commented Jun 18, 2018

modular-magician commented Jun 18, 2018

nat-henderson commented Jun 18, 2018

modular-magician commented Jun 18, 2018

modular-magician commented Jun 19, 2018