Skip to content

Fix handling of 405 merge in progress#13770

Merged
ScottSuarez merged 5 commits intoGoogleCloudPlatform:mainfrom
ScottSuarez:merge-in-prog-fix
Apr 24, 2025
Merged

Fix handling of 405 merge in progress#13770
ScottSuarez merged 5 commits intoGoogleCloudPlatform:mainfrom
ScottSuarez:merge-in-prog-fix

Conversation

@ScottSuarez
Copy link
Copy Markdown
Contributor

Release Note Template for Downstream PRs (will be copied)

See Write release notes for guidance.


@ScottSuarez ScottSuarez requested a review from melinath April 24, 2025 17:27
@modular-magician
Copy link
Copy Markdown
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR hasn't generated any diffs, but I'll let you know if a future commit does.

@modular-magician
Copy link
Copy Markdown
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR hasn't generated any diffs, but I'll let you know if a future commit does.

Comment thread .ci/magician/github/get.go Outdated
}

err := utils.RequestCall(url, "GET", gh.token, &commit, nil)
err := utils.RequestCallSilent(url, "GET", gh.token, &commit, nil)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why does this need to be silent? We generally want to log all of these requests for debugging purposes.

Copy link
Copy Markdown
Contributor Author

@ScottSuarez ScottSuarez Apr 24, 2025

Choose a reason for hiding this comment

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

Thomas removed the printing of the result for POST requests because this API outputs a lot. I am pretty sure we are listing a lot of commits so I can understand.

I added the printing of the POST back but thomas was saying that this caused the test output to be too long. I don't think we should be testing this in a presubmit anyways but this is just to unblock adding back the POST result to console

Comment thread .ci/magician/github/set.go
Co-authored-by: Stephen Lewis (Burrows) <stephen.r.burrows@gmail.com>
@ScottSuarez ScottSuarez requested a review from melinath April 24, 2025 19:26
@modular-magician
Copy link
Copy Markdown
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR hasn't generated any diffs, but I'll let you know if a future commit does.

Copy link
Copy Markdown
Member

@melinath melinath left a comment

Choose a reason for hiding this comment

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

I would somewhat prefer that we fix the unit test to not call the API rather than remove logging, and I have a slight concern that this extra method will live longer than we want it to - but I don't currently feel strongly enough to block merging this.

Comment thread .ci/magician/utility/utils.go Outdated
Co-authored-by: Stephen Lewis (Burrows) <stephen.r.burrows@gmail.com>
@modular-magician
Copy link
Copy Markdown
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR hasn't generated any diffs, but I'll let you know if a future commit does.

@ScottSuarez ScottSuarez requested a review from melinath April 24, 2025 21:07
@ScottSuarez
Copy link
Copy Markdown
Contributor Author

I would somewhat prefer that we fix the unit test to not call the API rather than remove logging, and I have a slight concern that this extra method will live longer than we want it to - but I don't currently feel strongly enough to block merging this.

Okay, I changed the testcase instead. Note that this will mean the delete branch operation might be a bit noisy in cloud build.

for-examples:
https://api.github.com/repos/hashicorp/terraform-provider-google-beta/commits/8c6e61bb62d52c950008340deafc1e2a2041898a

@modular-magician
Copy link
Copy Markdown
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR hasn't generated any diffs, but I'll let you know if a future commit does.

Copy link
Copy Markdown
Member

@melinath melinath left a comment

Choose a reason for hiding this comment

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

ack re: noise.

@ScottSuarez ScottSuarez added this pull request to the merge queue Apr 24, 2025
Merged via the queue into GoogleCloudPlatform:main with commit ffdfe9e Apr 24, 2025
20 checks passed
@ScottSuarez ScottSuarez deleted the merge-in-prog-fix branch April 24, 2025 21:51
NandiniAgrawal15 pushed a commit to NandiniAgrawal15/magic-modules that referenced this pull request Apr 26, 2025
Co-authored-by: Stephen Lewis (Burrows) <stephen.r.burrows@gmail.com>
BBBmau pushed a commit to BBBmau/magic-modules that referenced this pull request May 13, 2025
Co-authored-by: Stephen Lewis (Burrows) <stephen.r.burrows@gmail.com>
BBBmau pushed a commit to BBBmau/magic-modules that referenced this pull request Jun 25, 2025
Co-authored-by: Stephen Lewis (Burrows) <stephen.r.burrows@gmail.com>
BBBmau pushed a commit to BBBmau/magic-modules that referenced this pull request Jun 25, 2025
Co-authored-by: Stephen Lewis (Burrows) <stephen.r.burrows@gmail.com>
jingqizz pushed a commit to jingqizz/magic-modules that referenced this pull request Jul 9, 2025
Co-authored-by: Stephen Lewis (Burrows) <stephen.r.burrows@gmail.com>
BBBmau pushed a commit to BBBmau/magic-modules that referenced this pull request Jul 28, 2025
Co-authored-by: Stephen Lewis (Burrows) <stephen.r.burrows@gmail.com>
BBBmau pushed a commit to BBBmau/magic-modules that referenced this pull request Jul 28, 2025
Co-authored-by: Stephen Lewis (Burrows) <stephen.r.burrows@gmail.com>
BBBmau pushed a commit to BBBmau/magic-modules that referenced this pull request Jul 28, 2025
Co-authored-by: Stephen Lewis (Burrows) <stephen.r.burrows@gmail.com>
BBBmau pushed a commit to BBBmau/magic-modules that referenced this pull request Jul 28, 2025
Co-authored-by: Stephen Lewis (Burrows) <stephen.r.burrows@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants