Skip to content
This repository has been archived by the owner on Oct 16, 2023. It is now read-only.

chore: migrate to main branch #111

Merged
merged 7 commits into from
Aug 24, 2021
Merged

chore: migrate to main branch #111

merged 7 commits into from
Aug 24, 2021

Conversation

dandhlee
Copy link
Contributor

@dandhlee dandhlee commented Aug 24, 2021

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:

  • Make sure to open an issue as a bug/issue before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea
  • Ensure the tests and linter pass
  • Code coverage does not decrease (if any source code was changed)
  • Appropriate docs were updated (if necessary)

Fixes #110 🦕

@dandhlee dandhlee requested a review from parthea August 24, 2021 03:54
@dandhlee dandhlee requested a review from a team as a code owner August 24, 2021 03:54
@google-cla google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label Aug 24, 2021
@product-auto-label product-auto-label bot added the api: iam Issues related to the googleapis/python-iam API. label Aug 24, 2021
@dandhlee dandhlee requested a review from a team as a code owner August 24, 2021 03:55
Copy link

@plamut plamut left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, could not find any references to master, whitelist, etc. anymore apart from those in replacement rules.

BTW, when can we expect the code generator to generate the code using the main branch so that those replacement rules will not be needed anymore?

@dandhlee
Copy link
Contributor Author

@plamut we'll sweep through the repositories first, then make template updates, then revert the replacement rules back. It shouldn't be long!

@plamut
Copy link

plamut commented Aug 24, 2021

OK then, although it feels like extra work. :)

@dandhlee
Copy link
Contributor Author

It is, but I think we're doing it so that we don't accidentally move stuff to the main branch and have things crash (template change sends 120+ PRs simultaneously), doing this slowly will ensure we don't break things along the way and minimize the impact as little as possible to prod, at the expense of some manhours which I think is affordable... maybe 😴

Copy link
Contributor

@parthea parthea left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor observations, otherwise LGTM.

README.rst Outdated
@@ -10,7 +10,7 @@ creation of service accounts, which you can use to authenticate to Google and ma
- `Product Documentation`_

.. |ga| image:: https://img.shields.io/badge/support-GA-gold.svg
:target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#general-availability
:target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#general-availability
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I get 404 with the new link

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Presumably this will resolve itself once that repo is migrated and the main branch is created?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will, but to Tony's point we shouldn't let users see a 404. I'll have it reverted for now.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that's true, I thought the migration will happen simultaneously, but that's somewhat optimistic. 🙂 Tony is right here.

UPGRADING.md Outdated
@@ -72,7 +72,7 @@ In `google-cloud-iam<2.0.0`, parameters required by the API were positional para

In the 2.0.0 release, all methods have a single positional parameter `request`. Method docstrings indicate whether a parameter is required or optional.

Some methods have additional keyword only parameters. The available parameters depend on the [`google.api.method_signature` annotation](https://github.com/googleapis/googleapis/blob/master/google/iam/credentials/v1/iamcredentials.proto#L49) specified by the API producer.
Some methods have additional keyword only parameters. The available parameters depend on the [`google.api.method_signature` annotation](https://github.com/googleapis/googleapis/blob/main/google/iam/credentials/v1/iamcredentials.proto#L49) specified by the API producer.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I get 404 with the new link

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

See https://github.com/GoogleCloudPlatform/python-docs-samples/blob/main/AUTHORING_GUIDE.md
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I get 404 with the new link

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@dandhlee dandhlee added the owlbot:run Add this label to trigger the Owlbot post processor. label Aug 24, 2021
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Aug 24, 2021
@dandhlee dandhlee changed the title docs: migrate to main branch chore: migrate to main branch Aug 24, 2021
@dandhlee dandhlee merged commit 7c0dbdd into main Aug 24, 2021
@dandhlee dandhlee deleted the to_main branch August 24, 2021 22:28
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
api: iam Issues related to the googleapis/python-iam API. cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Migrate to main branch
3 participants