Skip to content

Commit d00794f

Browse files
authored
Merge pull request #275 from platformsh/platform-now-upsun
config: apply Upsun branding updates to "platform"
2 parents fb85bea + 5ea159b commit d00794f

File tree

9 files changed

+73
-89
lines changed

9 files changed

+73
-89
lines changed

.gon.hcl

Lines changed: 0 additions & 17 deletions
This file was deleted.

.goreleaser.vendor.yaml.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ nfpms:
7979
- homepage: https://docs.upsun.com/anchors/fixed/cli/
8080
package_name: ${VENDOR_BINARY}-cli
8181
description: ${VENDOR_NAME} CLI
82-
maintainer: Antonis Kalipetis <antonis.kalipetis@platform.sh>
82+
maintainer: Antonis Kalipetis <antonis.kalipetis@upsun.com>
8383
license: MIT
8484
vendor: Platform.sh
8585
ids:

.goreleaser.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ brews:
215215

216216
commit_author:
217217
name: Antonis Kalipetis
218-
email: antonis.kalipetis@platform.sh
218+
email: antonis.kalipetis@upsun.com
219219

220220
homepage: https://docs.upsun.com/anchors/fixed/cli/
221221
description: Platform.sh CLI
@@ -245,7 +245,7 @@ brews:
245245

246246
commit_author:
247247
name: Antonis Kalipetis
248-
email: antonis.kalipetis@platform.sh
248+
email: antonis.kalipetis@upsun.com
249249

250250
homepage: https://docs.upsun.com/anchors/cli/
251251
description: Upsun CLI
@@ -274,7 +274,7 @@ scoops:
274274
directory: Scoops
275275
commit_author:
276276
name: Antonis Kalipetis
277-
email: antonis.kalipetis@platform.sh
277+
email: antonis.kalipetis@upsun.com
278278

279279
homepage: https://docs.upsun.com/anchors/fixed/cli/
280280
description: Platform.sh CLI
@@ -295,7 +295,7 @@ scoops:
295295
directory: Scoops
296296
commit_author:
297297
name: Antonis Kalipetis
298-
email: antonis.kalipetis@platform.sh
298+
email: antonis.kalipetis@upsun.com
299299

300300
homepage: https://docs.upsun.com/anchors/cli/
301301
description: Upsun CLI
@@ -310,7 +310,7 @@ nfpms:
310310
homepage: https://docs.upsun.com/anchors/fixed/cli/
311311
package_name: platformsh-cli
312312
description: Platform.sh CLI
313-
maintainer: Antonis Kalipetis <antonis.kalipetis@platform.sh>
313+
maintainer: Antonis Kalipetis <antonis.kalipetis@upsun.com>
314314
license: MIT
315315
vendor: Platform.sh
316316
ids:
@@ -329,7 +329,7 @@ nfpms:
329329
homepage: https://docs.upsun.com/anchors/cli/
330330
package_name: upsun-cli
331331
description: Upsun CLI
332-
maintainer: Antonis Kalipetis <antonis.kalipetis@platform.sh>
332+
maintainer: Antonis Kalipetis <antonis.kalipetis@upsun.com>
333333
license: MIT
334334
vendor: Platform.sh
335335
ids:

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PHP_VERSION = 8.2.29
22
LEGACY_CLI_VERSION = 4.26.0
33

4-
GORELEASER_ID ?= platform
4+
GORELEASER_ID ?= upsun
55

66
ifeq ($(GOOS), darwin)
77
GORELEASER_ID=$(GORELEASER_ID)-macos
@@ -71,10 +71,10 @@ goreleaser:
7171
command -v goreleaser >/dev/null || go install github.com/goreleaser/goreleaser/v2@$(GORELEASER_VERSION)
7272

7373
.PHONY: single
74-
single: goreleaser internal/legacy/archives/platform.phar php ## Build a single target release for Platform.sh or Upsun
74+
single: goreleaser internal/legacy/archives/platform.phar php ## Build a single target release
7575
PHP_VERSION=$(PHP_VERSION) LEGACY_CLI_VERSION=$(LEGACY_CLI_VERSION) goreleaser build --single-target --id=$(GORELEASER_ID) --snapshot --clean
7676

77-
.PHONY: snapshot ## Build a snapshot release for Platform.sh and Upsun
77+
.PHONY: snapshot ## Build a snapshot release
7878
snapshot: goreleaser internal/legacy/archives/platform.phar php
7979
PHP_VERSION=$(PHP_VERSION) LEGACY_CLI_VERSION=$(LEGACY_CLI_VERSION) goreleaser build --snapshot --clean
8080

@@ -83,7 +83,7 @@ clean-phar: ## Clean up the legacy CLI phar
8383
rm -f internal/legacy/archives/platform.phar
8484

8585
.PHONY: release
86-
release: goreleaser clean-phar internal/legacy/archives/platform.phar php ## Release the Platform.sh and Upsun CLIs
86+
release: goreleaser clean-phar internal/legacy/archives/platform.phar php ## Create and publish a release
8787
PHP_VERSION=$(PHP_VERSION) LEGACY_CLI_VERSION=$(LEGACY_CLI_VERSION) goreleaser release --clean
8888
VERSION=$(VERSION) bash cloudsmith.sh
8989

README.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Platform.sh CLI
1+
# Upsun CLI
22

3-
The **Platform.sh CLI** is the official command-line interface for [Platform.sh](https://platform.sh). Use this tool to interact with your [Platform.sh](https://platform.sh) projects, and to build them locally for development purposes.
3+
The **Upsun CLI** is the official command-line interface for [Upsun](https://upsun.com) (formerly Platform.sh).
44

5-
This repository hosts the source code and releases of the new CLI.
5+
This repository hosts the source code and releases of the CLI.
66

77
> This product includes PHP software, freely available from [the PHP website](https://www.php.net/software)
88
@@ -183,25 +183,23 @@ yum upgrade -y platformsh-cli
183183

184184
## Under the hood
185185

186-
The New Platform.sh CLI is built with backwards compatibility in mind. This is why we've embedded PHP, so that all Legacy PHP CLI commands can be executed in the exact same way, making sure that nothing breaks when you switch to it.
187-
188186
## Building binaries, snapshots and releases
189187

190188
Build a single binary
191189

192190
```console
193-
# Build a single binary for Platform.sh
194191
make single
195-
# Build a single binary for Upsun
196-
make single GORELEASER_ID=upsun
197192
```
198193

199194
Build a snapshot
200195

201196
```console
202-
# Build and snapshot for Platform.sh and Upsun
203197
make snapshot
204-
# Build a snapshot for a vendor
198+
```
199+
200+
Build a snapshot for a vendor
201+
202+
```console
205203
# Download the config file at internal/config/embedded-config.yaml
206204
make vendor-snapshot VENDOR_NAME='Upsun staging' VENDOR_BINARY='upsunstg'
207205
```
@@ -212,7 +210,7 @@ Create a release
212210
# First, create a new tag, if not already on a Git tag
213211
git tag -f -m 'Release v5.0.0' '5.0.0'
214212

215-
# Create a release for Platform.sh and Upsun
213+
# Create a release
216214
# Expose a GITHUB_TOKEN to use for the release
217215
make release
218216

installer.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Platform.sh CLI installer
2+
# Upsun CLI installer
33

44
set -euo pipefail
55

@@ -11,10 +11,10 @@ set -euo pipefail
1111

1212
: "${URL:=https://github.com/platformsh/cli/releases/download}"
1313

14-
# Force Platform.sh CLI installation in this directory instead of system directory
14+
# Force Upsun CLI installation in this directory instead of system directory
1515
: "${INSTALL_DIR:=}"
1616

17-
# Platform.sh CLI version to install
17+
# Upsun CLI version to install
1818
: "${VERSION:=}"
1919

2020
# macOS specifics
@@ -24,8 +24,8 @@ set -euo pipefail
2424
# GitHub token check
2525
: "${GITHUB_TOKEN:=}"
2626

27-
# Platform.sh CLI vendor to install
28-
: "${VENDOR:=platformsh}"
27+
# Upsun CLI vendor to install
28+
: "${VENDOR:=upsun}"
2929

3030
# CI specifics
3131
: "${CI:=}"
@@ -34,7 +34,7 @@ set -euo pipefail
3434

3535
# global variables
3636
binary="platform"
37-
vendor_name="Platform.sh"
37+
vendor_name="Upsun (formerly Platform.sh)"
3838
cloudsmith_repository="cli"
3939
cmd_shasum=""
4040
cmd_sudo=""
@@ -45,8 +45,8 @@ kernel=""
4545
machine=""
4646
version=""
4747
package="platformsh-cli"
48-
docs_url="https://docs.platform.sh"
49-
support_url="https://platform.sh/contact"
48+
docs_url="https://docs.upsun.com"
49+
support_url="https://upsun.com/contact"
5050

5151
if [ "$VENDOR" == "upsun" ]; then
5252
BREW_FORMULA="platformsh/tap/upsun-cli"

internal/config/platformsh-cli.yaml

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,51 @@
1-
# Platform.sh CLI configuration
1+
# Upsun CLI (Platform.sh compatibility) configuration
22
#
3-
# Based on the legacy CLI config in https://github.com/platformsh/legacy-cli/blob/main/config.yaml
3+
# Platform.sh is now Upsun.
44
#
5-
# See ../internal/config/schema.go for the required keys
5+
# These are settings for the 'platform' command, which is available for backwards compatibility.
66
wrapper:
77
homebrew_tap: platformsh/tap/platformsh-cli
88
github_repo: platformsh/cli
99

1010
application:
11-
name: 'Platform.sh CLI'
11+
name: 'Upsun CLI (Platform.sh compatibility)'
1212
slug: 'platformsh-cli'
1313
executable: 'platform'
1414
env_prefix: 'PLATFORMSH_CLI_'
1515
user_config_dir: '.platformsh'
1616

17-
package_name: 'platformsh/cli'
18-
installer_url: 'https://platform.sh/cli/installer'
19-
manifest_url: 'https://platform.sh/cli/manifest.json'
20-
github_repo: 'platformsh/legacy-cli'
21-
2217
mark_unwrapped_legacy: true
2318

2419
disabled_commands:
2520
- self:install
2621
- self:update
2722

28-
local:
29-
# A legacy project config file from versions < 3.
30-
project_config_legacy: 'platform-project.yaml'
31-
3223
service:
33-
name: 'Platform.sh'
24+
name: 'Upsun (formerly Platform.sh)'
3425
env_prefix: 'PLATFORM_'
3526

3627
project_config_dir: '.platform'
3728
app_config_file: '.platform.app.yaml'
3829
project_config_flavor: 'platform'
3930

40-
console_url: 'https://console.platform.sh'
31+
console_url: 'https://console.upsun.com'
4132

42-
docs_url: 'https://docs.platform.sh'
43-
docs_search_url: 'https://docs.platform.sh/search.html?q={{ terms }}'
33+
docs_url: 'https://docs.upsun.com'
34+
docs_search_url: 'https://docs.upsun.com/search.html?q={{ terms }}'
4435

45-
register_url: 'https://auth.api.platform.sh/register'
46-
reset_password_url: 'https://auth.api.platform.sh/reset-password'
36+
register_url: 'https://auth.upsun.com/register'
37+
reset_password_url: 'https://auth.upsun.com/reset-password'
4738

48-
pricing_url: 'https://platform.sh/pricing'
39+
pricing_url: 'https://upsun.com/pricing'
4940

5041
activity_type_list_url: 'https://docs.upsun.com/anchors/fixed/integrations/activity-scripts/type/'
5142

5243
runtime_operations_help_url: 'https://docs.upsun.com/anchors/fixed/app/runtime-operations/'
5344

5445
api:
55-
base_url: 'https://api.platform.sh'
46+
base_url: 'https://api.upsun.com'
5647

57-
auth_url: 'https://auth.api.platform.sh'
48+
auth_url: 'https://auth.upsun.com'
5849
oauth2_client_id: 'platform-cli'
5950

6051
organization_types: [flexible, fixed]
@@ -65,17 +56,29 @@ api:
6556
metrics: true
6657
teams: true
6758

68-
vendor_filter: 'platformsh'
59+
vendor_filter: 'upsun'
6960

7061
ssh:
7162
domain_wildcards: ['*.platform.sh']
7263

7364
detection:
7465
git_remote_name: 'platform'
7566
git_domain: 'platform.sh' # matches git.eu-5.platform.sh, etc.
76-
site_domains: ['platform.sh', 'platformsh.site', 'tst.site']
67+
site_domains: ['platform.sh', 'platformsh.site', 'tst.site', 'upsunapp.com', 'upsun.app']
7768
cluster_header: 'X-Platform-Cluster'
7869

70+
browser_login:
71+
body: |
72+
<img
73+
src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIGlkPSJ1dWlkLTk2NDZkYjJkLTc3NjItNDc3Yy05MWMzLWE3OGZhNmY3ZTYzMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDAzLjM3IDI0OS4zIj48cGF0aCBkPSJtMTYzLjg4LDE0My40NmMtMi42LDAtNC44Mi0uNTctNi42Ny0xLjctMS44NS0xLjEzLTMuMjYtMi42NC00LjIyLTQuNTQtLjk2LTEuOS0xLjQ0LTQuMDMtMS40NC02LjM4di0yNC44OWgxMC44MnYyMi44YzAsMi4wMi41LDMuNTQsMS41MSw0LjU0czIuNDMsMS41MSw0LjI2LDEuNTFjMS42MywwLDMuMDgtLjM4LDQuMzMtMS4xNSwxLjI1LS43NywyLjI1LTEuODQsMi45OS0zLjIxLjc1LTEuMzcsMS4xMi0yLjk1LDEuMTItNC43MmwuOTQsOC44N2MtMS4yLDIuNjUtMi45Niw0Ljc5LTUuMjcsNi40Mi0yLjMxLDEuNjQtNS4xLDIuNDUtOC4zNywyLjQ1Wm0xMi45MS0uNzJ2LTguNjZoLS4yMnYtMjguMTNoMTAuODJ2MzYuNzloLTEwLjZaIi8+PHBhdGggZD0ibTIxNi42OSwxNDMuNDZjLTMuNTEsMC02LjMyLS44Mi04LjQ0LTIuNDUtMi4xMi0xLjYzLTMuMzctMy44Ny0zLjc1LTYuNzFsLjU4LS4wN3YyMy4zaC0xMC44MnYtNTEuNThoMTAuNnY4LjE1bC0uNjUtLjE0Yy41My0yLjY5LDEuOTctNC44Miw0LjMzLTYuMzgsMi4zNi0xLjU2LDUuMjctMi4zNCw4LjczLTIuMzRzNi4xOS43OCw4LjYyLDIuMzRjMi40MywxLjU2LDQuMywzLjc2LDUuNjMsNi42LDEuMzIsMi44NCwxLjk4LDYuMTgsMS45OCwxMC4wM3MtLjcsNy4yOS0yLjA5LDEwLjE3Yy0xLjQsMi44OS0zLjM0LDUuMTItNS44NCw2LjcxLTIuNSwxLjU5LTUuNDYsMi4zOC04Ljg3LDIuMzhabS0zLjAzLTguNjZjMi41NSwwLDQuNjItLjkxLDYuMi0yLjc0LDEuNTktMS44MywyLjM4LTQuNDIsMi4zOC03Ljc5cy0uODEtNS45NC0yLjQyLTcuNzJjLTEuNjEtMS43OC0zLjcyLTIuNjctNi4zMS0yLjY3cy00LjU2LjktNi4xNywyLjcxYy0xLjYxLDEuOC0yLjQyLDQuMzktMi40Miw3Ljc1cy44LDUuOTUsMi40Miw3Ljc1YzEuNjEsMS44LDMuNzIsMi43MSw2LjMxLDIuNzFaIi8+PHBhdGggZD0ibTI1NC40MiwxNDMuNDZjLTUuMzksMC05LjY3LTEuMDgtMTIuODQtMy4yNS0zLjE3LTIuMTctNC45MS01LjE1LTUuMTktOC45NWg5LjY3Yy4yNCwxLjYzLDEuMDcsMi44NywyLjQ5LDMuNzEsMS40Mi44NCwzLjM4LDEuMjYsNS44OCwxLjI2LDIuMjYsMCwzLjkxLS4zMyw0Ljk0LS45NywxLjAzLS42NSwxLjU1LTEuNTcsMS41NS0yLjc4LDAtLjkxLS4zLTEuNjItLjktMi4xMy0uNi0uNS0xLjctLjkyLTMuMjgtMS4yNmwtNS45Mi0xLjIzYy00LjM4LS45MS03LjYtMi4zLTkuNjctNC4xNS0yLjA3LTEuODUtMy4xLTQuMjQtMy4xLTcuMTgsMC0zLjU2LDEuMzctNi4zNCw0LjExLTguMzMsMi43NC0yLDYuNTYtMi45OSwxMS40Ny0yLjk5czguNzMuOTcsMTEuNjEsMi45MmMyLjg5LDEuOTUsNC40Nyw0LjY1LDQuNzYsOC4xMmgtOS42N2MtLjE5LTEuMjUtLjg3LTIuMi0yLjAyLTIuODVzLTIuNzktLjk3LTQuOTEtLjk3Yy0xLjkyLDAtMy4zNS4yOC00LjI5LjgzLS45NC41NS0xLjQxLDEuMzMtMS40MSwyLjM0LDAsLjg3LjM4LDEuNTUsMS4xNSwyLjA2Ljc3LjUsMi4wNC45NSwzLjgyLDEuMzNsNi42NCwxLjM3YzMuNy43Nyw2LjUsMi4yLDguNCw0LjI5LDEuOSwyLjA5LDIuODUsNC41NiwyLjg1LDcuMzksMCwzLjYxLTEuNDEsNi40MS00LjIyLDguNC0yLjgxLDItNi43OSwyLjk5LTExLjk0LDIuOTlaIi8+PHBhdGggZD0ibTI4Ni45NiwxNDMuNDZjLTIuNiwwLTQuODItLjU3LTYuNjctMS43LTEuODUtMS4xMy0zLjI2LTIuNjQtNC4yMi00LjU0LS45Ni0xLjktMS40NC00LjAzLTEuNDQtNi4zOHYtMjQuODloMTAuODJ2MjIuOGMwLDIuMDIuNSwzLjU0LDEuNTEsNC41NCwxLjAxLDEuMDEsMi40MywxLjUxLDQuMjYsMS41MSwxLjYzLDAsMy4wOC0uMzgsNC4zMy0xLjE1LDEuMjUtLjc3LDIuMjUtMS44NCwyLjk5LTMuMjEuNzQtMS4zNywxLjEyLTIuOTUsMS4xMi00LjcybC45NCw4Ljg3Yy0xLjIsMi42NS0yLjk2LDQuNzktNS4yNyw2LjQyLTIuMzEsMS42NC01LjEsMi40NS04LjM3LDIuNDVabTEyLjkxLS43MnYtOC42NmgtLjIydi0yOC4xM2gxMC44MnYzNi43OWgtMTAuNloiLz48cGF0aCBkPSJtMzE3LjMzLDE0Mi43M3YtMzYuNzloMTAuNnY4LjY2aC4yMnYyOC4xM2gtMTAuODJabTI1LjYxLDB2LTIyLjhjMC0yLjAyLS41Mi0zLjU0LTEuNTUtNC41NC0xLjAzLTEuMDEtMi41NC0xLjUxLTQuNTEtMS41MS0xLjY4LDAtMy4xOS4zOS00LjUxLDEuMTUtMS4zMi43Ny0yLjM2LDEuODMtMy4xLDMuMTctLjc1LDEuMzUtMS4xMiwyLjkzLTEuMTIsNC43NmwtLjk0LTguODdjMS4yLTIuNjksMi45Ny00Ljg0LDUuMy02LjQ2LDIuMzMtMS42MSw1LjIxLTIuNDIsOC42Mi0yLjQyLDQuMDksMCw3LjIxLDEuMTQsOS4zOCwzLjQzLDIuMTYsMi4yOSwzLjI1LDUuMzUsMy4yNSw5LjJ2MjQuODloLTEwLjgyWiIvPjxnIGlkPSJ1dWlkLTg2Yjg5MTUxLWU2NWMtNGRhZi1iNWM2LTI2ZmEwYzhlMzk0ZCI+PHBhdGggZD0ibTg5Ljc5LDEwMy4wNGMxMS45NiwwLDIxLjYzLDkuNjksMjEuNjMsMjEuNjNoMjEuNjNjMC0yMy44OS0xOS4zNi00My4yNy00My4yNy00My4yN3MtNDMuMjcsMTkuMzYtNDMuMjcsNDMuMjdoMjEuNjNjLjA1LTExLjk2LDkuNzQtMjEuNjMsMjEuNjctMjEuNjNaIi8+PHBhdGggZD0ibTk3LjEyLDE0NWM4LjM0LTMuMDEsMTQuMjktMTAuOTgsMTQuMjktMjAuMzRoLTQzLjI1YzAsOS4zNiw1Ljk2LDE3LjM1LDE0LjI5LDIwLjM0di4zN2gtMzAuNjRjNy4zMywxMy40MywyMS42LDIyLjU0LDM4LDIyLjU0czMwLjY0LTkuMTEsMzgtMjIuNTRoLTMwLjY5di0uMzdaIi8+PC9nPjwvc3ZnPg=="
74+
alt=""
75+
height="100"
76+
class="icon">
77+
78+
<h1>{{title}}</h1>
79+
80+
{{content}}
81+
7982
migrate:
8083
prompt: true
8184
docs_url: https://docs.upsun.com/anchors/fixed/cli/

internal/config/schema.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ type Config struct {
2626

2727
Application struct {
2828
// Fields required for both the PHP and Go applications.
29-
Name string `validate:"required"` // e.g. "Platform.sh CLI"
30-
EnvPrefix string `validate:"required" yaml:"env_prefix"` // e.g. "PLATFORMSH_CLI_"
31-
Executable string `validate:"required"` // e.g. "platform"
32-
Slug string `validate:"required,ascii"` // e.g. "platformsh-cli"
33-
UserConfigDir string `validate:"required" yaml:"user_config_dir"` // e.g. ".platformsh"
29+
Name string `validate:"required"` // e.g. "Upsun CLI"
30+
EnvPrefix string `validate:"required" yaml:"env_prefix"` // e.g. "UPSUN_CLI_"
31+
Executable string `validate:"required"` // e.g. "upsun"
32+
Slug string `validate:"required,ascii"` // e.g. "upsun-cli"
33+
UserConfigDir string `validate:"required" yaml:"user_config_dir"` // e.g. ".upsun"
3434
UserStateFile string `validate:"omitempty" yaml:"user_state_file,omitempty"` // defaults to "state.json"
3535
WritableUserDir string `validate:"omitempty" yaml:"writable_user_dir,omitempty"` // defaults to UserConfigDir
3636
TempSubDir string `validate:"omitempty" yaml:"tmp_sub_dir,omitempty"` // defaults to Slug+"-tmp"
@@ -42,32 +42,32 @@ type Config struct {
4242

4343
// Fields only needed by the PHP (legacy) CLI, at least for now.
4444
API struct {
45-
BaseURL string `validate:"required,url" yaml:"base_url"` // e.g. "https://api.platform.sh"
46-
AuthURL string `validate:"omitempty,url" yaml:"auth_url,omitempty"` // e.g. "https://auth.api.platform.sh"
45+
BaseURL string `validate:"required,url" yaml:"base_url"` // e.g. "https://api.upsun.com"
46+
AuthURL string `validate:"omitempty,url" yaml:"auth_url,omitempty"` // e.g. "https://auth.upsun.com"
4747

4848
UserAgent string `validate:"omitempty" yaml:"user_agent,omitempty"` // a template - see UserAgent method
4949
SessionID string `validate:"omitempty,ascii" yaml:"session_id,omitempty"` // the ID for the authentication session - defaults to "default"
5050

5151
OAuth2ClientID string `validate:"omitempty" yaml:"oauth2_client_id,omitempty"` // e.g. "upsun-cli"
52-
OAuth2AuthorizeURL string `validate:"required_without=AuthURL,omitempty,url" yaml:"oauth2_auth_url,omitempty"` // e.g. "https://auth.api.platform.sh/oauth2/authorize"
53-
OAuth2RevokeURL string `validate:"required_without=AuthURL,omitempty,url" yaml:"oauth2_revoke_url,omitempty"` // e.g. "https://auth.api.platform.sh/oauth2/revoke"
54-
OAuth2TokenURL string `validate:"required_without=AuthURL,omitempty,url" yaml:"oauth2_token_url,omitempty"` // e.g. "https://auth.api.platform.sh/oauth2/token"
55-
CertifierURL string `validate:"required_without=AuthURL,omitempty,url" yaml:"certifier_url,omitempty"` // e.g. "https://ssh.api.platform.sh"
52+
OAuth2AuthorizeURL string `validate:"required_without=AuthURL,omitempty,url" yaml:"oauth2_auth_url,omitempty"` // e.g. "https://auth.upsun.com/oauth2/authorize"
53+
OAuth2RevokeURL string `validate:"required_without=AuthURL,omitempty,url" yaml:"oauth2_revoke_url,omitempty"` // e.g. "https://auth.upsun.com/oauth2/revoke"
54+
OAuth2TokenURL string `validate:"required_without=AuthURL,omitempty,url" yaml:"oauth2_token_url,omitempty"` // e.g. "https://auth.upsun.com/oauth2/token"
55+
CertifierURL string `validate:"required_without=AuthURL,omitempty,url" yaml:"certifier_url,omitempty"` // No longer used
5656

5757
AIServiceURL string `validate:"omitempty,url" yaml:"ai_url,omitempty"` // The AI service URL, e.g. "https://ai.upsun.com".
5858
EnableOrganizations bool `validate:"omitempty" yaml:"organizations,omitempty"` // Whether the "organizations" feature is enabled.
5959
} `validate:"required"`
6060
Detection struct {
61-
GitRemoteName string `validate:"required" yaml:"git_remote_name"` // e.g. "platform"
62-
SiteDomains []string `validate:"required" yaml:"site_domains"` // e.g. ["platformsh.site", "tst.site"]
61+
GitRemoteName string `validate:"required" yaml:"git_remote_name"` // e.g. "upsun"
62+
SiteDomains []string `validate:"required" yaml:"site_domains"` // e.g. ["upsunapp.com", "upsun.app"]
6363
} `validate:"required"`
6464
Service struct {
65-
Name string `validate:"required"` // e.g. "Platform.sh"
65+
Name string `validate:"required"` // e.g. "Upsun"
6666
EnvPrefix string `validate:"required" yaml:"env_prefix"` // e.g. "PLATFORM_"
6767
ProjectConfigDir string `validate:"required" yaml:"project_config_dir"` // e.g. ".platform"
6868
ProjectConfigFlavor string `validate:"omitempty" yaml:"project_config_flavor,omitempty"` // default: "platform"
69-
ConsoleURL string `validate:"omitempty,url" yaml:"console_url,omitempty"` // e.g. "https://console.platform.sh"
70-
DocsURL string `validate:"omitempty,url" yaml:"docs_url,omitempty"` // e.g. "https://docs.platform.sh"
69+
ConsoleURL string `validate:"omitempty,url" yaml:"console_url,omitempty"` // e.g. "https://console.upsun.com"
70+
DocsURL string `validate:"omitempty,url" yaml:"docs_url,omitempty"` // e.g. "https://docs.upsun.com"
7171
} `validate:"required"`
7272
SSH struct {
7373
DomainWildcards []string `validate:"required" yaml:"domain_wildcards"` // e.g. ["*.platform.sh"]

internal/config/upsun-cli.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ ssh:
7474

7575
detection:
7676
git_remote_name: "upsun"
77-
git_domain: "upsun.com"
78-
site_domains: ["platformsh.site", "tst.site", "upsunapp.com"]
77+
git_domain: "platform.sh" # matches git.eu-5.platform.sh, etc.
78+
site_domains: ["platformsh.site", "tst.site", "upsunapp.com", "upsun.app"]
7979
cluster_header: 'X-Platform-Cluster'
8080

8181
browser_login:

0 commit comments

Comments
 (0)