-
-
Notifications
You must be signed in to change notification settings - Fork 579
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: Gitpod and Codespaces can use HTTPS #5943
fix: Gitpod and Codespaces can use HTTPS #5943
Conversation
Download the artifacts for this pull request:
See Testing a PR. |
False alarm, this logic should remain unchanged: |
Reopening with updated PR description. |
0583863
to
42ebfab
Compare
42ebfab
to
315b63e
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.
Looks good to me!
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 believe this is correct, but it does not solve #6102. I tried this on codespaces, and once you log in to a Drupal site it redirects to an inappropriate URL.
@rfay ➜ /workspaces/d10simple (main) $ ddev --version
ddev version v1.23.0-27-g315b63ea8
@rfay ➜ /workspaces/d10simple (main) $ ddev describe
┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
│ Project: d10simple /workspaces/d10simple https://probable-computing-machine-x5797jj6rfvqx5-8080.app.github. │
│ dev │
│ Docker platform: linux-docker │
│ Router: disabled │
├─────────┬──────┬───────────────────────────────────────────────────────────────────────┬────────────────────┤
│ SERVICE │ STAT │ URL/PORT │ INFO │
├─────────┼──────┼───────────────────────────────────────────────────────────────────────┼────────────────────┤
│ web │ OK │ https://probable-computing-machine-x5797jj6rfvqx5-8080.app.github.dev │ drupal10 PHP8.2 │
│ │ │ InDocker: web:443,80,8025 │ nginx-fpm │
│ │ │ Host: 127.0.0.1:8443,8080,8027 │ docroot:'web' │
│ │ │ │ Perf mode: none │
│ │ │ │ NodeJS:20 │
├─────────┼──────┼───────────────────────────────────────────────────────────────────────┼────────────────────┤
│ db │ OK │ InDocker: db:3306 │ mariadb:10.11 │
│ │ │ Host: 127.0.0.1:3306 │ User/Pass: 'db/db' │
│ │ │ │ or 'root/root' │
├─────────┼──────┼───────────────────────────────────────────────────────────────────────┼────────────────────┤
│ Network │ │ bind-all-interfaces ENABLED │ │
└─────────┴──────┴───────────────────────────────────────────────────────────────────────┴────────────────────┘
@rfay ➜ /workspaces/d10simple (main) $ ddev launch
@rfay ➜ /workspaces/d10simple (main) $ # ddev launch takes me to https://probable-computing-machine-x5797jj6rfvqx5-8080.app.github.dev/
@rfay ➜ /workspaces/d10simple (main) $ # When you log in it at /user it redirect to invalid https://probable-computing-machine-x5797jj6rfvqx5-8080.app.github.dev:8080/en/user/1?check_logged_in=1
There may certainly be something here that is Drupal's fault, but I haven't seen it in other situations.
It's OK to pull this if you think it should go in now, but doesn't fix the original problem.
@stasadev it's your call whether to pull this and it's an incremental improvement or whether we should defer it and figure out the rest of what's going on with codespaces. We can either hold it back and move forward with release or we can pull it (does no harm as far as I can see, although I didn't test on gitpod). Either way, we're good to do a release. |
Okay, thanks for checking. |
The Issue
The refactored code had an incorrect condition for Gitpod and Codespaces.
The primary URL should point to the Gitpod or Codespaces URL.
How This PR Solves The Issue
I tried to add Gitpod and Codespaces generated URLs to httpURLs, it worked, but the result was confusing:
So I reverted the check for HTTP, and now it works as it should:
Also
ddev describe
did not showAll URLs
with disabled router, so I moved the condition.Manual Testing Instructions
Without using Codespaces:
A simple
ddev describe
comparison with stable DDEV will show the difference.Before:
After:
Automated Testing Overview
Related Issue Link(s)
Release/Deployment Notes