fix: Gitpod and Codespaces can use HTTPS

[stasadev]

The Issue

• fix: make the primary URL https if the custom cert exists #5684

The refactored code had an incorrect condition for Gitpod and Codespaces.

• Codespaces: Drupal redirects at unusual places #6102 (comment)

The primary URL should point to the Gitpod or Codespaces URL.

$ ddev describe -j
...
"httpURLs": [
  "http://127.0.0.1:8080"
],
"httpsURLs": null,

How This PR Solves The Issue

I tried to add Gitpod and Codespaces generated URLs to httpURLs, it worked, but the result was confusing:

$ ddev describe -j
"httpURLs": [
  "https://d10-8080.app.github.dev",
  "http://127.0.0.1:8080"
],
"httpsURLs": null,

So I reverted the check for HTTP, and now it works as it should:

$ ddev describe -j
...
"httpURLs": [
  "http://127.0.0.1:8080"
],
"httpsURLs": [
  "https://d10-8080.app.github.dev"
],

Also ddev describe did not show All URLs with disabled router, so I moved the condition.

Manual Testing Instructions

Without using Codespaces:

export DDEV_PRETEND_CODESPACES=true CODESPACE_NAME=d10 GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN=app.github.dev
ddev start
ddev describe

A simple ddev describe comparison with stable DDEV will show the difference.

Before:

┌──────────────────────────────────────────────────────────────────────┐
│ Project: d10 ~/code/ddev/d10 http://127.0.0.1:8080                   │
│ Docker platform: linux-docker                                        │
│ Router: disabled                                                     │
├─────────┬──────┬────────────────────────────────┬────────────────────┤
│ SERVICE │ STAT │ URL/PORT                       │ INFO               │
├─────────┼──────┼────────────────────────────────┼────────────────────┤
│ web     │ OK   │ http://127.0.0.1:8080          │ php PHP8.3         │
│         │      │ InDocker: web:8025,443,80      │ nginx-fpm          │
│         │      │ Host: 127.0.0.1:8443,8080,8027 │ docroot:''         │
│         │      │                                │ Perf mode: none    │
│         │      │                                │ NodeJS:20          │
├─────────┼──────┼────────────────────────────────┼────────────────────┤
│ db      │ OK   │ InDocker: db:3306              │ mysql:8.0          │
│         │      │ Host: 127.0.0.1:3306           │ User/Pass: 'db/db' │
│         │      │                                │ or 'root/root'     │
├─────────┼──────┼────────────────────────────────┼────────────────────┤
│ Network │      │ bind-all-interfaces ENABLED    │                    │
└─────────┴──────┴────────────────────────────────┴────────────────────┘

After:

┌──────────────────────────────────────────────────────────────────────────┐
│ Project: d10 ~/code/ddev/d10 https://d10-8080.app.github.dev             │
│ Docker platform: linux-docker                                            │
│ Router: disabled                                                         │
├──────────┬──────┬───────────────────────────────────┬────────────────────┤
│ SERVICE  │ STAT │ URL/PORT                          │ INFO               │
├──────────┼──────┼───────────────────────────────────┼────────────────────┤
│ web      │ OK   │ https://d10-8080.app.github.dev   │ php PHP8.3         │
│          │      │ InDocker: web:443,80,8025         │ nginx-fpm          │
│          │      │ Host: 127.0.0.1:8443,8080,8027    │ docroot:''         │
│          │      │                                   │ Perf mode: none    │
│          │      │                                   │ NodeJS:20          │
├──────────┼──────┼───────────────────────────────────┼────────────────────┤
│ db       │ OK   │ InDocker: db:3306                 │ mysql:8.0          │
│          │      │ Host: 127.0.0.1:3306              │ User/Pass: 'db/db' │
│          │      │                                   │ or 'root/root'     │
├──────────┼──────┼───────────────────────────────────┼────────────────────┤
│ Network  │      │ bind-all-interfaces ENABLED       │                    │
└──────────┴──────┴───────────────────────────────────┴────────────────────┘

Automated Testing Overview

Related Issue Link(s)

Release/Deployment Notes

[github-actions]

Download the artifacts for this pull request:

• all-ddev-executables.zip
• ddev-linux-amd64.zip
• ddev-linux-arm64.zip
• ddev-macos-amd64.zip
• ddev-macos-arm64.zip
• ddev-windows-amd64-installer.zip

See Testing a PR.

[stasadev]

False alarm, this logic should remain unchanged:

• fix: make the primary URL https if the custom cert exists #5684 (comment)

[stasadev]

Reopening with updated PR description.

[rfay]

Looks good to me!

[rfay]

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.

[rfay]

@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.

[stasadev]

Okay, thanks for checking.
Then it only solves the problem with the primary URL found by @mandrasch.
I will pull it.