-
-
Notifications
You must be signed in to change notification settings - Fork 883
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
Prevent missing resource errors if custom configuration is used without default location #545
Prevent missing resource errors if custom configuration is used without default location #545
Conversation
@SteveMaddison would you be able to simplify as you suggested? We can merge as is but there's no reason to have the overrides here instead of setting the parameters directly on the default resource as you suggest. |
Sure, I thought I must've been overlooking something so just went for a minimal change. New commit pushed with all params going directly to the resource. |
Yeah, this will probably need to be re-based. I'm not traveling this week, so I'll aim to finish up #529 this week. |
@SteveMaddison could you rebase, and squash this to one commit? We'll get it merged. |
Merge upstream changes
I Think that's it, have a good look. CI failed but it appears to be unrelated. |
Looks good! And you're right, the CI issue isn't related. Could you please squash it to a single commit to keep the history clean? There's a helpful guide here if you're not sure how to do it: https://robots.thoughtbot.com/git-interactive-rebase-squash-amend-rewriting-history |
…o resource. Prevent missing resource errors if custom configuration is used without default location.
7111389
to
62c8a1e
Compare
Ended up resetting the branch but this looks like it has the same effect. |
Prevent missing resource errors if custom configuration is used without default location
Looks much better, thanks for the code! |
…ion_fix Prevent missing resource errors if custom configuration is used without default location
…ion_fix Prevent missing resource errors if custom configuration is used without default location
Could possibly be simplified by passing these four parameters directly to the resource definition for the default location.