diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8984f4d2f..15c036039 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,12 +1,10 @@
# Contributing
-Development of the Platform.sh Legacy CLI happens in public in the
-[GitHub repository](https://github.com/platformsh/legacy-cli).
+Development of the Legacy CLI happens in public in the [GitHub repository](https://github.com/platformsh/legacy-cli).
Issues and pull requests submitted via GitHub are very welcome.
-In the near future - to be confirmed - this may move to being a subtree split
-of the new CLI repository at: https://github.com/platformsh/cli
+The principal Upsun CLI repository is: https://github.com/platformsh/cli
## Developing locally
@@ -30,8 +28,8 @@ Run tests with:
## Developing in a docker container
-If you don't have PHP installed locally or for other reasons want to do development on the
-Platform.sh CLI inside a docker container, follow this procedure:
+If you don't have PHP installed locally or for other reasons want to do development on the CLI inside a docker
+container, follow this procedure:
Create a `.env` file based on the default one
diff --git a/README.md b/README.md
index 3d7293d25..421d9f87d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-The **Legacy** Platform.sh CLI is the legacy version of the command-line interface for [Platform.sh](https://platform.sh). For the **current Platform.sh CLI**, check [this repository](https://github.com/platformsh/cli).
+The **Legacy** CLI is the legacy version of the command-line interface for [Upsun (formerly Platform.sh)](https://upsun.com).
+
+For the **current Upsun CLI**, check [this repository](https://github.com/platformsh/cli).
## Install
@@ -53,7 +55,7 @@ scoop update platform
## Usage
-You can run the Platform.sh CLI in your shell by typing `platform`.
+You can run this CLI in your shell by typing `platform`.
platform
@@ -96,7 +98,7 @@ Other customization is available via environment variables, including:
* `PLATFORMSH_CLI_SSH_AUTO_LOAD_CERT`: set to 0 to disable automatic loading of an SSH certificate when running login or SSH commands
* `PLATFORMSH_CLI_REPORT_DEPRECATIONS`: set to 1 to enable PHP deprecation notices (suppressed by default). They will only be displayed in debug mode (`-vvv`).
* `CLICOLOR_FORCE`: set to 1 or 0 to force colorized output on or off, respectively
-* `http_proxy` or `https_proxy`: specify a proxy for connecting to Platform.sh
+* `http_proxy` or `https_proxy`: specify an HTTP proxy
## Known issues
diff --git a/composer.json b/composer.json
index 24118f1fa..b7adbaa81 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
{
"name": "platformsh/cli",
- "description": "Platform.sh CLI",
+ "description": "Upsun (formerly Platform.sh) CLI",
"license": "MIT",
"require": {
"php": ">=5.5.9",
diff --git a/config.yaml b/config.yaml
index fd13cd114..6f5ecb945 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,7 +1,11 @@
-# Platform.sh CLI configuration overrides.
+# Upsun CLI (Platform.sh compatibility) configuration overrides
# See config-defaults.yaml for the default values and a list of other required keys.
+#
+# Platform.sh is now Upsun.
+#
+# These are settings for the 'platform' command, which is available for backwards compatibility.
application:
- name: 'Platform.sh CLI'
+ name: 'Upsun CLI (Platform.sh compatibility)'
slug: 'platformsh-cli'
executable: 'platform'
env_prefix: 'PLATFORMSH_CLI_'
@@ -17,35 +21,31 @@ application:
- self:install
- self:update
-local:
- # A legacy project config file from versions < 3.
- project_config_legacy: 'platform-project.yaml'
-
service:
- name: 'Platform.sh'
+ name: 'Upsun (formerly Platform.sh)'
env_prefix: 'PLATFORM_'
project_config_dir: '.platform'
app_config_file: '.platform.app.yaml'
- console_url: 'https://console.platform.sh'
+ console_url: 'https://console.upsun.com'
- docs_url: 'https://docs.platform.sh'
- docs_search_url: 'https://docs.platform.sh/search.html?q={{ terms }}'
+ docs_url: 'https://docs.upsun.com'
+ docs_search_url: 'https://docs.upsun.com/search.html?q={{ terms }}'
- register_url: 'https://auth.api.platform.sh/register'
- reset_password_url: 'https://auth.api.platform.sh/reset-password'
+ register_url: 'https://auth.upsun.com/register'
+ reset_password_url: 'https://auth.upsun.com/reset-password'
- pricing_url: 'https://platform.sh/pricing'
+ pricing_url: 'https://upsun.com/pricing'
activity_type_list_url: 'https://docs.upsun.com/anchors/fixed/integrations/activity-scripts/type/'
runtime_operations_help_url: 'https://docs.upsun.com/anchors/fixed/app/runtime-operations/'
api:
- base_url: 'https://api.platform.sh'
+ base_url: 'https://api.upsun.com'
- auth_url: 'https://auth.api.platform.sh'
+ auth_url: 'https://auth.upsun.com'
oauth2_client_id: 'platform-cli'
organization_types: [flexible, fixed]
@@ -56,7 +56,7 @@ api:
metrics: true
teams: true
- vendor_filter: 'platformsh'
+ vendor_filter: 'upsun'
ssh:
domain_wildcards: ['*.platform.sh']
@@ -64,9 +64,21 @@ ssh:
detection:
git_remote_name: 'platform'
git_domain: 'platform.sh' # matches git.eu-5.platform.sh, etc.
- site_domains: ['platform.sh', 'platformsh.site', 'tst.site']
+ site_domains: ['platform.sh', 'platformsh.site', 'tst.site', 'upsunapp.com', 'upsun.app']
cluster_header: 'X-Platform-Cluster'
+browser_login:
+ body: |
+ 
+
+ {{title}}
+
+ {{content}}
+
migrate:
prompt: true
docs_url: https://docs.upsun.com/anchors/fixed/cli/
diff --git a/dist/dev-build-index.php b/dist/dev-build-index.php
index f6e3759e7..7b713a90a 100644
--- a/dist/dev-build-index.php
+++ b/dist/dev-build-index.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
/**
* @file
- * This is the index.php script for automated CLI builds on Platform.sh.
+ * This is the index.php script for automated CLI builds on Upsun.
*/
use Platformsh\Cli\Service\Config;