Make #admin_domain private and fix DomainSubstitution deprecation warnings #3001
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
josemigallas
force-pushed
the
deprecations/domain_substitution_account
branch
2 times, most recently
from
f217251
to
2871f97
Compare
josemigallas
changed the title
akostadinov
reviewed
Jun 30, 2022
akostadinov
reviewed
Jun 30, 2022
akostadinov
reviewed
Jun 30, 2022
akostadinov
reviewed
Jun 30, 2022
josemigallas
force-pushed
the
deprecations/domain_substitution_account
branch
8 times, most recently
from
cdd4b66
to
bbd1a6c
Compare
akostadinov
reviewed
Jul 4, 2022
akostadinov
reviewed
Jul 4, 2022
akostadinov
reviewed
Jul 4, 2022
mayorova
requested changes
Jul 4, 2022
josemigallas
commented
Jul 4, 2022
test/unit/account_test.rb
Outdated
| @@ -361,6 +361,7 @@ def setup | |||
|
|
|||
| assert_equal "amazing-name-123.#{ThreeScale.config.superdomain}", account.domain | |||
| assert_equal "amazing-name-123-admin.#{ThreeScale.config.superdomain}", account.internal_admin_domain | |||
| assert_equal "amazing-name-123-admin.#{ThreeScale.config.superdomain}", account.external_admin_domain | |||
There was a problem hiding this comment.
akostadinov
reviewed
Jul 4, 2022
|
I think lines |
josemigallas
force-pushed
the
deprecations/domain_substitution_account
branch
from
e94c2e0
to
b534f4c
Compare
akostadinov
reviewed
Jul 5, 2022
mayorova
requested changes
Jul 5, 2022
- #external_self_domain - #internal_self_domain - #self_domain - #admin_domain - #domain in favor of: - internal_admin_domain - external_admin_domain - internal_domain - external_domain
josemigallas
force-pushed
the
deprecations/domain_substitution_account
branch
from
b534f4c
to
47c5d55
Compare
mayorova
requested changes
Jul 8, 2022
mayorova
reviewed
Jul 11, 2022
| @@ -1,4 +1,4 @@ | |||
| <% unless request.host == site_account.admin_domain %> | |||
| <% unless request.host == site_account.external_admin_domain%> | |||
There was a problem hiding this comment.
I doubt in this case, as I am not sure if request.host is supposed to be before or after substitution...
But on the other hand, I couldn't even find where this partial is used, I guess it might not be used anywhere.
josemigallas
commented
Jul 15, 2022
mayorova
approved these changes
Jul 18, 2022
akostadinov
pushed a commit
that referenced
this pull request
Jul 19, 2022
…nings (#3001) [domain_substitution] makes #admin_domain private and stop using self_domain/domain in favor of internal/external versions (THREESCALE-8523)
akostadinov
pushed a commit
that referenced
this pull request
Aug 5, 2022
…nings (#3001) [domain_substitution] makes #admin_domain private and stop using self_domain/domain in favor of internal/external versions (THREESCALE-8523)
akostadinov
pushed a commit
that referenced
this pull request
Aug 8, 2022
…nings (#3001) [domain_substitution] makes #admin_domain private and stop using self_domain/domain in favor of internal/external versions (THREESCALE-8523)
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.
TLDR (too long don't review)
admin_domain -> internal_admin_domain / external_admin_domainself_domain -> internal_admin_domain / external_admin_domainmatch_internal_self_domain? -> match_internal_admin_domain?domain -> internal_domain / external_domain"internal" domain reads directly from DB (internal use) whereas "external" domain is meant to be exposed in UI and API responses (external use)