Cherry-picks to support 1.20.0 release. #2567

nat-henderson · 2018-12-04T00:45:27Z

This is a branch made up of every cherrypick I could easily include in this release (and some that weren't super easy... but it all compiles now and I'll be running CI tests ASAP).

Here's what we should do:

merge this into master.
release 1.20.0
do a giant revert commit - everything since e64502a.
merge 2.0.0 into master.

=====
(we had an old plan - it's here for reference)

~~merge this into master~~
~~release 1.20.0~~
~~wait for tf 0.12, revendor core libraries and etc on the 2.0.0 branch.~~
~~shudder, grit our teeth, and git fetch; git checkout tpg/2.0.0; git branch master -f; git push tpg master -f.~~

~~This will have the effect of throwing everything since~~

$ git merge-base master 2.0.0
e64502a0b5e22a40a6bce850a064480f2e0694da
$ git show e64502a0b5e22a40a6bce850a064480f2e0694da
commit e64502a0b5e22a40a6bce850a064480f2e0694da
Author: tf-release-bot <[email protected]>
Date:   Fri Oct 12 18:45:52 2018 +0000

    Cleanup after v1.19.1 release

away. That is 100% correct - this history is wrong and as far as I know, everything after that commit is also correctly merged into 2.0.0. A ping @rileykarson to confirm that 8a62911 is correctly merged into 2.0.0.

The only other commits between e64502a (the point of divergence between master and 2.0.0) and 2f6b39e (master, before this PR) are two reverts (which we can safely remove) and a typo fix (77a4497) which was added accidentally.

paddycarver

Just a couple of questions for things that jumped out at me that I couldn't find the rationale for. Sorry if the rationale is in the commits, I had a hard time trying to track them down.

My only real concern is that these changes are included as part of an entire commit that has been reviewed, and are included on purpose. Basically, that they're not mistakes with the cherrypicking.

paddycarver · 2018-12-04T19:14:37Z

google/iam_compute_subnetwork.go

@@ -12,22 +12,22 @@ import (

 var IamComputeSubnetworkSchema = map[string]*schema.Schema{
 	"subnetwork": {
-		Deprecated: "This resource is in beta and will be removed from this provider. Use it in the the google-beta provider instead. See https://terraform.io/docs/providers/google/provider_versions.html for more details.",
+		Deprecated: "This field is in beta and will be removed from this provider. Use it in the the google-beta provider instead. See https://terraform.io/docs/providers/google/provider_versions.html for more details.",


What's going on here?

Looks like #2271 did this, and this was the final state of the file at HEAD in 2.0.0. It was then removed (#2398). The "resource" text would be preferred here though.

I'm agreed on the resource text being preferred here, but don't know how possible that is.

google/resource_compute_firewall_test.go

nat-henderson · 2018-12-05T19:20:59Z

We have got a couple of fun ones here.

(copied from pr comment): Commit 47d4474 (the cherry-pick of 5b70a02) removes some scaffolding for tests that we didn't need over there on Earth-616, but which we do need in this timeline. I have fixed it by rebasing the branch onto itself, going back in this alternate timeline, and creating a new timeline in which that removal never happened. Someday I'll mistype a git command and be my own grandfather.
The stackdriver resources depend on replacevarsfortest, which was added as part of a PR that seems to introduce a breaking change, which we cannot have in this PR. Time for some selective cherry-picking! did you know git can do that? selective diff hunk adds! git: it's amazing.
vendor.json picked up a change to a vendored dependency but the actual change isn't here - wonder what happened there.

Fixes #2227

@rileykarson

/cc @rileykarson

@danawillow

/cc @danawillow

Fixes #2277

@rileykarson

/cc @rileykarson

@danawillow

/cc @danawillow

@danawillow

/cc @danawillow

@danawillow

/cc @danawillow

blocking GoogleCloudPlatform/magic-modules#630 This resource won't be tested between this merging and the MM pr merging

@rileykarson

/cc @rileykarson

@danawillow

/cc @danawillow Fixes #2286

rileykarson

I don't see anything egregiously wrong running through at a high level, and every code change I looked at in depth was correct.

CHANGELOG.md

danawillow

Skimmed through, looks reasonable

CHANGELOG.md

Co-Authored-By: ndmckinley <[email protected]>

nat-henderson · 2018-12-12T18:19:45Z

What! I accepted Riley's suggestion and now it told me I've dismissed your stale approvals! Man, I'm never clicking that button again.

rileykarson

oh that's so sad

nat-henderson · 2018-12-12T18:24:54Z

All right that's not good. We're gonna fix that.

#2645)

ghost · 2019-01-12T13:50:49Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. If you feel I made an error 🤖 🙉 , please reach out to my human friends 👉 [email protected]. Thanks!

ghost added the size/xxl label Dec 4, 2018

paddycarver self-requested a review December 4, 2018 19:11

paddycarver reviewed Dec 4, 2018

View reviewed changes

nat-henderson force-pushed the zany-git-stuff branch from a224551 to 62f53ea Compare December 5, 2018 19:47

nat-henderson mentioned this pull request Dec 6, 2018

Cherry-picks to support 1.20.0 release. hashicorp/terraform-provider-google-beta#187

Merged

modular-magician and others added 24 commits December 5, 2018 18:01

Add more import paths for google_service_account. (#2261)

09dd0ac

Update CHANGELOG.md

8f7a582

Docs: Make "All Providers" a backwards arrow (#2266)

0b03e92

Fix Composer Environment machineType parsing

48a7a94

Fixes #2227

Add import tests for google_cloudiot_registry (#2276)

890318b

 /cc @rileykarson

Add support for google_storage_object_access_control (#2256)

cf613b4

Update CHANGELOG.md

90cd274

Output from magician generating into ga and beta providers (#2271)

88f089f

 /cc @danawillow

use correct cloud console link (#2293)

4286109

More import formats and fix name validation for spanner databases

3ece928

Fixes #2277

Fix composer website (#2299)

47113ba

Added London and Sydney BigQuery regions

5a91d52

Update CHANGELOG.md

06d085b

Add support for google_cloudfunctions_function runtime (#2340)

1e90ab5

 /cc @rileykarson

Update CHANGELOG.md

c411523

support KMS encryption for instance templates

9bee241

Increase redis timeouts (#2351)

66b8853

 /cc @danawillow

Update composer timeouts (#2354)

8d64a91

 /cc @danawillow

add retries on create for container cluster (#2352)

6b1e539

 /cc @danawillow

Remove duplicate storage_object_access_control test. (#2349)

690bc65

blocking GoogleCloudPlatform/magic-modules#630 This resource won't be tested between this merging and the MM pr merging

Generate DefaultObjectAccessControl in Terraform (#2358)

3b603e0

 /cc @rileykarson

Update CHANGELOG.md

3432946

Fix typo in resource name (#2365)

1cbffe1

regional and private clusters are in GA now (#2364)

f3f283a

 /cc @danawillow Fixes #2286

nat-henderson requested review from rileykarson, paddycarver and chrisst December 12, 2018 03:18

paddycarver previously approved these changes Dec 12, 2018

View reviewed changes

rileykarson previously approved these changes Dec 12, 2018

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

danawillow previously approved these changes Dec 12, 2018

View reviewed changes

CHANGELOG.md Show resolved Hide resolved

Update CHANGELOG.md

2a96eab

Co-Authored-By: ndmckinley <[email protected]>

nat-henderson dismissed stale reviews from danawillow, rileykarson, and paddycarver via 2a96eab December 12, 2018 18:19

paddycarver previously approved these changes Dec 12, 2018

View reviewed changes

Update CHANGELOG.md

57062b9

nat-henderson dismissed paddycarver’s stale review via 57062b9 December 12, 2018 18:21

rileykarson previously approved these changes Dec 12, 2018

View reviewed changes

formatting of CHANGELOG.

b305551

nat-henderson dismissed rileykarson’s stale review via b305551 December 12, 2018 18:24

modular-magician and others added 6 commits December 12, 2018 11:11

Fix project services tests by using a service without any dependencies (

0fd99fc

#2645)

Fix for permadiff in container cluster caused by beta resource. (#2488)

3aff7f5

Fix deprecated convenience fields in disk.

c6c8c47

Accommodate the new iamcredentials service in tests

3a8411f

Fix project services tests by using a service without any dependencies (

9e526a3

#2645)

Fix spanner database iam binding import (#2603)

283a1e6

danawillow approved these changes Dec 13, 2018

View reviewed changes

nat-henderson merged commit 73d127a into master Dec 13, 2018

ghost locked and limited conversation to collaborators Jan 12, 2019

rileykarson deleted the zany-git-stuff branch March 1, 2019 00:25

rileykarson restored the zany-git-stuff branch March 1, 2019 00:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cherry-picks to support 1.20.0 release. #2567

Cherry-picks to support 1.20.0 release. #2567

nat-henderson commented Dec 4, 2018 •

edited

Loading

paddycarver left a comment

paddycarver Dec 4, 2018

rileykarson Dec 4, 2018

paddycarver Dec 4, 2018

nat-henderson commented Dec 5, 2018 •

edited

Loading

rileykarson left a comment

danawillow left a comment

nat-henderson commented Dec 12, 2018

rileykarson left a comment

nat-henderson commented Dec 12, 2018

ghost commented Jan 12, 2019

Cherry-picks to support 1.20.0 release. #2567

Cherry-picks to support 1.20.0 release. #2567

Conversation

nat-henderson commented Dec 4, 2018 • edited Loading

paddycarver left a comment

Choose a reason for hiding this comment

paddycarver Dec 4, 2018

Choose a reason for hiding this comment

rileykarson Dec 4, 2018

Choose a reason for hiding this comment

paddycarver Dec 4, 2018

Choose a reason for hiding this comment

nat-henderson commented Dec 5, 2018 • edited Loading

rileykarson left a comment

Choose a reason for hiding this comment

danawillow left a comment

Choose a reason for hiding this comment

nat-henderson commented Dec 12, 2018

rileykarson left a comment

Choose a reason for hiding this comment

nat-henderson commented Dec 12, 2018

ghost commented Jan 12, 2019

nat-henderson commented Dec 4, 2018 •

edited

Loading

nat-henderson commented Dec 5, 2018 •

edited

Loading