Add guards against using distinct subscriptions between owner and child resources #3546
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
super-harsh
requested review from
davefellows,
theunrepentantgeek,
matthchr and
babbageclunk
as code owners
theunrepentantgeek
requested changes
Nov 13, 2023
matthchr
approved these changes
Nov 21, 2023
| @@ -809,7 +810,7 @@ func (r *azureDeploymentReconcilerInstance) deleteResource( | |||
| return ctrl.Result{}, nil | |||
| } | |||
|
|
|||
| err := checkSubscription(resourceID, r.ARMConnection.SubscriptionID()) // TODO: Possibly we should pass this in as a parameter? | |||
| err := r.checkSubscription(resourceID) // TODO: Possibly we should pass this in as a parameter? | |||
There was a problem hiding this comment.
minor: Probably can remove this TODO? I am not sure what it was referencing but the code seems OK to me now
| @@ -261,6 +274,18 @@ func (h ResourceHierarchy) fullyQualifiedARMIDImpl(subscriptionID string, origin | |||
| } | |||
| } | |||
|
|
|||
| func (h ResourceHierarchy) matchOwnerSubscription(subscriptionID string, ownerRID *arm.ResourceID) error { | |||
There was a problem hiding this comment.
minor:
- This method doesn't need to be on
ResourceHierarchy, as it doesn't seem to usehat all. It could just be a package scoped function. - The name
matchOwnerSubscriptionseems too specific to me. In reality this is just checking if the provided subscription matches the passed in ResourceID, so possibly we could rename to something likecheckARMIDHasSubscriptionorcheckARMIDMatchesSubscriptionor similar?
There was a problem hiding this comment.
Yep, I like it. Considering to move the method into genruntime/arm_id.go for re-usability.
| @@ -202,13 +219,9 @@ func (h ResourceHierarchy) fullyQualifiedARMIDImpl(subscriptionID string, origin | |||
| if err != nil { | |||
There was a problem hiding this comment.
If you take the checkARMIDHasSubscription suggestion below, also consider renaming this armID variable to ownerARMID so the check reads: checkARMIDHasSubscription(subscriptionID, ownerARMID)
theunrepentantgeek
approved these changes
Nov 22, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #3244
What this PR does / why we need it:
Adding check to match resource credential subscription with owner's subscription.