Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: replace targetId with id marker #2109

Merged

Conversation

yuwenma
Copy link
Collaborator

@yuwenma yuwenma commented Jun 22, 2024

This is a follow up PR to #1934 and blocks #2061

We need to fix the existing golden log to turn on the stricter PRESUBMIT check.

More context: many golden http log uses targetId (see https://github.com/GoogleCloudPlatform/k8s-config-connector/pull/2061/files#diff-45e74dc3e22d6fbc3f979edfe4959d40c702bf51bea40854de4e4ab393bb5330). Override the targetId may be a little bit too aggressive.

cc @acpana

@@ -127,7 +127,7 @@ X-Xss-Protection: 0
"selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}",
"startTime": "2024-04-01T12:34:56.123456Z",
"status": "RUNNING",
"targetId": "7780111738275460050",
"targetId": "1719033726205916358",
Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't get why this one wasn't replaced. Looking at the code it should have been, I think. Maybe/hopefully you just need to recapture the golden output here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

😆 ah, yes. I reminded myself to recapture the golden log while waiting for another full fixtures run. It took too long and I totally forgot this.

@google-oss-prow google-oss-prow bot added the lgtm label Jun 22, 2024
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@google-oss-prow google-oss-prow bot merged commit 405467f into GoogleCloudPlatform:master Jun 22, 2024
13 checks passed
@yuwenma yuwenma added this to the 1.120 milestone Jun 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants