-
Notifications
You must be signed in to change notification settings - Fork 239
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: Move resolvers out of Adapter #2758
fix: Move resolvers out of Adapter #2758
Conversation
134fd49
to
29bb0c3
Compare
5a977ed
to
c6bec2b
Compare
The presubmit pause job failed, I think we need to increase the timeout of this job. |
@@ -673,7 +673,7 @@ func MaybeSkip(t *testing.T, name string, resources []*unstructured.Unstructured | |||
case schema.GroupKind{Group: "compute.cnrm.cloud.google.com", Kind: "ComputeNodeGroup"}: | |||
case schema.GroupKind{Group: "compute.cnrm.cloud.google.com", Kind: "ComputeNodeTemplate"}: | |||
case schema.GroupKind{Group: "compute.cnrm.cloud.google.com", Kind: "ComputeManagedSSLCertificate"}: | |||
//case schema.GroupKind{Group: "compute.cnrm.cloud.google.com", Kind: "ComputeServiceAttachment"}: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this intended?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, we started noticing this deletion issue in a forwarding rule test with service attachment dependency, and it blocked presubmits. So, we disabled this mock service. #1069
I added it back here because the issue has been addressed in this PR, and the presubmits all passed now.
|
||
--- | ||
|
||
POST https://compute.googleapis.com/compute/v1/projects/example-project-01/regions/us-west1/forwardingRules/${forwardingRuleID}/setLabels |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you know how the code change ends up with a new setLabels call? This looks weird
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I reason is I disabled this test before #1069, so I haven't updated its log to reflect the recent code changes(the set labels behavior during creation). I can collect the realGCP w/TF log to verify this change in the log is intended.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/approve
2 questions: otherwise looks good
@@ -1187,6 +1187,86 @@ X-Content-Type-Options: nosniff | |||
X-Frame-Options: SAMEORIGIN | |||
X-Xss-Protection: 0 | |||
|
|||
{ | |||
"IPProtocol": "TCP", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ipProtocal?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/approve
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: yuwenma 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 |
c6bec2b
to
3d71f57
Compare
1a82067
to
4e1eb35
Compare
4e1eb35
to
578953c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
a37ae6a
into
GoogleCloudPlatform:master
Change description
Deleting a resource does not require resolving dependencies. However, if dependencies are deleted prior to the resource itself, it will prevent the deletion of that resource.
Therefore, we should move resolvers to their own function outside the Adapter. We can resolve them during the create and update only.
Fixes #2621
Tests you have done
make ready-pr
to ensure this PR is ready for review.