Add new field filter to pubsub. #3759

AlbertSabate · 2020-07-21T09:38:13Z

Fixes: terraform-providers/terraform-provider-google/issues/6727

Release Note Template for Downstream PRs (will be copied)

pubsub: added `filter` field to `google_pubsub_subscription` resource

Fixes: hashicorp/terraform-provider-google#6727

google-cla · 2020-07-21T09:38:18Z

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.

What to do if you already signed the CLA

Individual signers

It's possible we don't have your GitHub username or you're using a different email address on your commit. Check your existing CLA data and verify that your email is set on your git commits.

Corporate signers

Your company has a Point of Contact who decides which employees are authorized to participate. Ask your POC to be added to the group of authorized contributors. If you don't know who your Point of Contact is, direct the Google project maintainer to go/cla#troubleshoot (Public version).
The email used to register you as an authorized contributor must be the email used for the Git commit. Check your existing CLA data and verify that your email is set on your git commits.
The email used to register you as an authorized contributor must also be attached to your GitHub account.

ℹ️ Googlers: Go here for more info.

modular-magician · 2020-07-21T09:39:17Z

Hello! I am a robot who works on Magic Modules PRs.

I have detected that you are a community contributor, so your PR will be assigned to someone with a commit-bit on this repo for initial review.

Thanks for your contribution! A human will be with you soon.

@slevenick, please review this PR or find an appropriate assignee.

modular-magician · 2020-07-21T09:44:41Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 2 files changed, 42 insertions(+), 6 deletions(-))
Terraform Beta: Diff ( 2 files changed, 42 insertions(+), 6 deletions(-))
Ansible: Diff ( 2 files changed, 16 insertions(+), 5 deletions(-))
TF Conversion: Diff ( 1 file changed, 10 insertions(+))
Inspec: Diff ( 4 files changed, 7 insertions(+))

AlbertSabate · 2020-07-21T09:45:44Z

@googlebot I signed it!

products/pubsub/api.yaml

modular-magician · 2020-07-21T16:30:24Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 2 files changed, 33 insertions(+))
Terraform Beta: Diff ( 2 files changed, 33 insertions(+))
Ansible: Diff ( 2 files changed, 28 insertions(+))
TF Conversion: Diff ( 1 file changed, 10 insertions(+))
Inspec: Diff ( 4 files changed, 7 insertions(+))

google-cla · 2020-07-22T11:37:52Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

tim-codes · 2020-07-22T11:41:29Z

@googlebot I fixed it.

google-cla · 2020-07-22T11:41:35Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

tim-codes · 2020-07-22T11:43:57Z

@googlebot I fixed it.

google-cla · 2020-07-22T11:44:05Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

modular-magician · 2020-07-22T11:44:20Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 3 files changed, 41 insertions(+), 7 deletions(-))
Terraform Beta: Diff ( 3 files changed, 41 insertions(+), 7 deletions(-))
Ansible: Diff ( 2 files changed, 28 insertions(+))
TF Conversion: Diff ( 1 file changed, 10 insertions(+))
Inspec: Diff ( 4 files changed, 7 insertions(+))

tim-codes · 2020-07-22T11:57:21Z

@slevenick I've added the filter field to the unit tests you mentioned :)

modular-magician · 2020-07-22T12:00:55Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 2 files changed, 33 insertions(+))
Terraform Beta: Diff ( 2 files changed, 33 insertions(+))
Ansible: Diff ( 2 files changed, 28 insertions(+))
TF Conversion: Diff ( 1 file changed, 10 insertions(+))
Inspec: Diff ( 4 files changed, 7 insertions(+))

modular-magician · 2020-07-22T12:02:29Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 3 files changed, 41 insertions(+), 7 deletions(-))
Terraform Beta: Diff ( 3 files changed, 41 insertions(+), 7 deletions(-))
Ansible: Diff ( 2 files changed, 28 insertions(+))
TF Conversion: Diff ( 1 file changed, 10 insertions(+))
Inspec: Diff ( 4 files changed, 7 insertions(+))

tim-codes · 2020-07-29T04:09:04Z

Hi @slevenick, wondering if we could get a final review on this? Is there anything we can do to expedite this getting merged? :)

slevenick

I'm unable to run these tests due to:

TestAccPubsubSubscription_basic: testing.go:674: Step 0 error: Missing newline after argument: On /opt/teamcity-agent/temp/buildTmp/tf-test443133719/main.tf line 9: An argument definition must end with a newline.

Are you able to run the pubsub subscription tests?

google-cla · 2020-08-04T09:33:30Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

google-cla · 2020-08-04T09:34:15Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

google-cla · 2020-08-04T09:34:49Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

tim-codes · 2020-08-04T09:35:42Z

@googlebot I consent.

modular-magician · 2020-08-04T09:40:19Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 3 files changed, 41 insertions(+), 7 deletions(-))
Terraform Beta: Diff ( 3 files changed, 41 insertions(+), 7 deletions(-))
Ansible: Diff ( 2 files changed, 28 insertions(+))
TF Conversion: Diff ( 1 file changed, 10 insertions(+))
Inspec: Diff ( 4 files changed, 7 insertions(+))

tim-codes · 2020-08-04T09:41:31Z

@slevenick how can I see more information on the current build failure?

slevenick · 2020-08-05T18:04:48Z

@slevenick how can I see more information on the current build failure?

I believe the issue is when running the tests with the new argument that contains an escaped string here: https://github.com/GoogleCloudPlatform/magic-modules/pull/3759/files#diff-36779956add430400ebf1b5e3b29f0d6R47

It's ending up with an incorrect terraform config, probably without the necessary line breaks. I'd put that attributes line directly into the test config.

modular-magician · 2020-08-11T16:00:07Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 3 files changed, 36 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 3 files changed, 36 insertions(+), 2 deletions(-))
Ansible: Diff ( 2 files changed, 27 insertions(+))
TF Conversion: Diff ( 1 file changed, 10 insertions(+))
Inspec: Diff ( 4 files changed, 7 insertions(+))

tim-codes · 2020-08-11T16:14:45Z

@slevenick, I've added the suggested fix, checks seem to be passing now 👍

@slevenick how can I see more information on the current build failure?

I believe the issue is when running the tests with the new argument that contains an escaped string here: https://github.com/GoogleCloudPlatform/magic-modules/pull/3759/files#diff-36779956add430400ebf1b5e3b29f0d6R47

It's ending up with an incorrect terraform config, probably without the necessary line breaks. I'd put that attributes line directly into the test config.

slevenick · 2020-08-11T16:51:23Z

third_party/terraform/tests/resource_pubsub_subscription_test.go

-  topic = google_pubsub_topic.foo.id
+  name   = "%s"
+  topic  = google_pubsub_topic.foo.id
+  filter = "attributes.foo = "bar""


The quotes here will need to be escaped, probably something like this:

filter = "attributes.foo = \"bar\""

Otherwise terraform will complain that this config is invalid

modular-magician · 2020-08-11T17:00:54Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 3 files changed, 36 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 3 files changed, 36 insertions(+), 2 deletions(-))
Ansible: Diff ( 2 files changed, 27 insertions(+))
TF Conversion: Diff ( 1 file changed, 10 insertions(+))
Inspec: Diff ( 4 files changed, 7 insertions(+))

tim-codes · 2020-08-11T17:05:35Z

@slevenick

The quotes here will need to be escaped

done

slevenick

Thanks for the addition!

tim-codes · 2020-08-11T20:26:14Z

Thanks for the help @slevenick, great to see this merged! Will this be added to the 3.34.0 release?

slevenick · 2020-08-11T20:28:27Z

@tim-codes nope, the 3.34.0 release went out this morning. I'd expect this in 3.35.0 ETA early next week

Add new field filter to pubsub.

833c2a8

Fixes: hashicorp/terraform-provider-google#6727

google-cla bot added the cla: no label Jul 21, 2020

modular-magician requested a review from slevenick July 21, 2020 09:39

google-cla bot added cla: yes and removed cla: no labels Jul 21, 2020

slevenick reviewed Jul 21, 2020

View reviewed changes

products/pubsub/api.yaml Outdated Show resolved Hide resolved

Fixed filter name, it was improperly set.

2a4bc37

google-cla bot added cla: no and removed cla: yes labels Jul 22, 2020

tim-codes force-pushed the master branch from f5c6914 to 2a4bc37 Compare July 22, 2020 11:54

google-cla bot added cla: yes and removed cla: no labels Jul 22, 2020

add filter key to pubsub subscription unit test

5265ede

slevenick requested changes Jul 29, 2020

View reviewed changes

robertsahlin mentioned this pull request Jul 29, 2020

Support pubsub subscription filters pulumi/pulumi-gcp#397

Closed

google-cla bot added cla: no and removed cla: yes labels Aug 4, 2020

tim-codes force-pushed the master branch from 87978d1 to 5265ede Compare August 4, 2020 09:34

spaces not tabs!

c5aab75

google-cla bot added cla: yes and removed cla: no labels Aug 4, 2020

hardcode filter value in test

8bb10e6

slevenick requested changes Aug 11, 2020

View reviewed changes

revert remove escaped quotes

8f1a1f4

slevenick self-requested a review August 11, 2020 18:12

slevenick approved these changes Aug 11, 2020

View reviewed changes

slevenick merged commit 951bd59 into GoogleCloudPlatform:master Aug 11, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add new field filter to pubsub. #3759

Add new field filter to pubsub. #3759

AlbertSabate commented Jul 21, 2020

google-cla bot commented Jul 21, 2020

modular-magician commented Jul 21, 2020

modular-magician commented Jul 21, 2020

AlbertSabate commented Jul 21, 2020

modular-magician commented Jul 21, 2020

google-cla bot commented Jul 22, 2020

tim-codes commented Jul 22, 2020

google-cla bot commented Jul 22, 2020

tim-codes commented Jul 22, 2020

google-cla bot commented Jul 22, 2020

modular-magician commented Jul 22, 2020

tim-codes commented Jul 22, 2020

modular-magician commented Jul 22, 2020

modular-magician commented Jul 22, 2020

tim-codes commented Jul 29, 2020

slevenick left a comment

google-cla bot commented Aug 4, 2020

google-cla bot commented Aug 4, 2020

google-cla bot commented Aug 4, 2020

tim-codes commented Aug 4, 2020

modular-magician commented Aug 4, 2020

tim-codes commented Aug 4, 2020

slevenick commented Aug 5, 2020

modular-magician commented Aug 11, 2020

tim-codes commented Aug 11, 2020

slevenick Aug 11, 2020

modular-magician commented Aug 11, 2020

tim-codes commented Aug 11, 2020 •

edited

Loading

slevenick left a comment

tim-codes commented Aug 11, 2020

slevenick commented Aug 11, 2020

Add new field filter to pubsub. #3759

Add new field filter to pubsub. #3759

Conversation

AlbertSabate commented Jul 21, 2020

google-cla bot commented Jul 21, 2020

What to do if you already signed the CLA

Individual signers

Corporate signers

modular-magician commented Jul 21, 2020

modular-magician commented Jul 21, 2020

Diff report:

AlbertSabate commented Jul 21, 2020

modular-magician commented Jul 21, 2020

Diff report:

google-cla bot commented Jul 22, 2020

tim-codes commented Jul 22, 2020

google-cla bot commented Jul 22, 2020

tim-codes commented Jul 22, 2020

google-cla bot commented Jul 22, 2020

modular-magician commented Jul 22, 2020

Diff report:

tim-codes commented Jul 22, 2020

modular-magician commented Jul 22, 2020

Diff report:

modular-magician commented Jul 22, 2020

Diff report:

tim-codes commented Jul 29, 2020

slevenick left a comment

Choose a reason for hiding this comment

google-cla bot commented Aug 4, 2020

google-cla bot commented Aug 4, 2020

google-cla bot commented Aug 4, 2020

tim-codes commented Aug 4, 2020

modular-magician commented Aug 4, 2020

Diff report:

tim-codes commented Aug 4, 2020

slevenick commented Aug 5, 2020

modular-magician commented Aug 11, 2020

Diff report:

tim-codes commented Aug 11, 2020

slevenick Aug 11, 2020

Choose a reason for hiding this comment

modular-magician commented Aug 11, 2020

Diff report:

tim-codes commented Aug 11, 2020 • edited Loading

slevenick left a comment

Choose a reason for hiding this comment

tim-codes commented Aug 11, 2020

slevenick commented Aug 11, 2020

tim-codes commented Aug 11, 2020 •

edited

Loading