Remove the hook in favour of inline processing #813
+57
−162
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.
The "Hook" approach is a bit complicated. Rather than re-using the vanilla
clusterpyProvisioner.provision
function and passing in a hook to tweak it, we can just inline the respective code and guard it withif cluster.Provider == string(ZalandoEKSProvider)
. This way we achieve the same thing but can see the code in one place and start simplifying some duplication.Now with this, there's provider-specific code in the general
clusterpy.go
file which isn't ideal in the current setup. However, my goal is to refactor it further: rather than calling a big generalclusterpyProvisioner.provision
function from two different providers that requires to configure hooks for small modifications, we can just separate (maybe initially duplicate) the code for each provider and then extract a couple of shared functions into a common helper file.