Branding-related changes

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
 

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
 

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",

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,17 +56,29 @@ api:
   metrics: true
   teams: true
 
-  vendor_filter: 'platformsh'
+  vendor_filter: 'upsun'
 
 ssh:
   domain_wildcards: ['*.platform.sh']
 
 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: |
+    <img
+      src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIGlkPSJ1dWlkLTk2NDZkYjJkLTc3NjItNDc3Yy05MWMzLWE3OGZhNmY3ZTYzMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDAzLjM3IDI0OS4zIj48cGF0aCBkPSJtMTYzLjg4LDE0My40NmMtMi42LDAtNC44Mi0uNTctNi42Ny0xLjctMS44NS0xLjEzLTMuMjYtMi42NC00LjIyLTQuNTQtLjk2LTEuOS0xLjQ0LTQuMDMtMS40NC02LjM4di0yNC44OWgxMC44MnYyMi44YzAsMi4wMi41LDMuNTQsMS41MSw0LjU0czIuNDMsMS41MSw0LjI2LDEuNTFjMS42MywwLDMuMDgtLjM4LDQuMzMtMS4xNSwxLjI1LS43NywyLjI1LTEuODQsMi45OS0zLjIxLjc1LTEuMzcsMS4xMi0yLjk1LDEuMTItNC43MmwuOTQsOC44N2MtMS4yLDIuNjUtMi45Niw0Ljc5LTUuMjcsNi40Mi0yLjMxLDEuNjQtNS4xLDIuNDUtOC4zNywyLjQ1Wm0xMi45MS0uNzJ2LTguNjZoLS4yMnYtMjguMTNoMTAuODJ2MzYuNzloLTEwLjZaIi8+PHBhdGggZD0ibTIxNi42OSwxNDMuNDZjLTMuNTEsMC02LjMyLS44Mi04LjQ0LTIuNDUtMi4xMi0xLjYzLTMuMzctMy44Ny0zLjc1LTYuNzFsLjU4LS4wN3YyMy4zaC0xMC44MnYtNTEuNThoMTAuNnY4LjE1bC0uNjUtLjE0Yy41My0yLjY5LDEuOTctNC44Miw0LjMzLTYuMzgsMi4zNi0xLjU2LDUuMjctMi4zNCw4LjczLTIuMzRzNi4xOS43OCw4LjYyLDIuMzRjMi40MywxLjU2LDQuMywzLjc2LDUuNjMsNi42LDEuMzIsMi44NCwxLjk4LDYuMTgsMS45OCwxMC4wM3MtLjcsNy4yOS0yLjA5LDEwLjE3Yy0xLjQsMi44OS0zLjM0LDUuMTItNS44NCw2LjcxLTIuNSwxLjU5LTUuNDYsMi4zOC04Ljg3LDIuMzhabS0zLjAzLTguNjZjMi41NSwwLDQuNjItLjkxLDYuMi0yLjc0LDEuNTktMS44MywyLjM4LTQuNDIsMi4zOC03Ljc5cy0uODEtNS45NC0yLjQyLTcuNzJjLTEuNjEtMS43OC0zLjcyLTIuNjctNi4zMS0yLjY3cy00LjU2LjktNi4xNywyLjcxYy0xLjYxLDEuOC0yLjQyLDQuMzktMi40Miw3Ljc1cy44LDUuOTUsMi40Miw3Ljc1YzEuNjEsMS44LDMuNzIsMi43MSw2LjMxLDIuNzFaIi8+PHBhdGggZD0ibTI1NC40MiwxNDMuNDZjLTUuMzksMC05LjY3LTEuMDgtMTIuODQtMy4yNS0zLjE3LTIuMTctNC45MS01LjE1LTUuMTktOC45NWg5LjY3Yy4yNCwxLjYzLDEuMDcsMi44NywyLjQ5LDMuNzEsMS40Mi44NCwzLjM4LDEuMjYsNS44OCwxLjI2LDIuMjYsMCwzLjkxLS4zMyw0Ljk0LS45NywxLjAzLS42NSwxLjU1LTEuNTcsMS41NS0yLjc4LDAtLjkxLS4zLTEuNjItLjktMi4xMy0uNi0uNS0xLjctLjkyLTMuMjgtMS4yNmwtNS45Mi0xLjIzYy00LjM4LS45MS03LjYtMi4zLTkuNjctNC4xNS0yLjA3LTEuODUtMy4xLTQuMjQtMy4xLTcuMTgsMC0zLjU2LDEuMzctNi4zNCw0LjExLTguMzMsMi43NC0yLDYuNTYtMi45OSwxMS40Ny0yLjk5czguNzMuOTcsMTEuNjEsMi45MmMyLjg5LDEuOTUsNC40Nyw0LjY1LDQuNzYsOC4xMmgtOS42N2MtLjE5LTEuMjUtLjg3LTIuMi0yLjAyLTIuODVzLTIuNzktLjk3LTQuOTEtLjk3Yy0xLjkyLDAtMy4zNS4yOC00LjI5LjgzLS45NC41NS0xLjQxLDEuMzMtMS40MSwyLjM0LDAsLjg3LjM4LDEuNTUsMS4xNSwyLjA2Ljc3LjUsMi4wNC45NSwzLjgyLDEuMzNsNi42NCwxLjM3YzMuNy43Nyw2LjUsMi4yLDguNCw0LjI5LDEuOSwyLjA5LDIuODUsNC41NiwyLjg1LDcuMzksMCwzLjYxLTEuNDEsNi40MS00LjIyLDguNC0yLjgxLDItNi43OSwyLjk5LTExLjk0LDIuOTlaIi8+PHBhdGggZD0ibTI4Ni45NiwxNDMuNDZjLTIuNiwwLTQuODItLjU3LTYuNjctMS43LTEuODUtMS4xMy0zLjI2LTIuNjQtNC4yMi00LjU0LS45Ni0xLjktMS40NC00LjAzLTEuNDQtNi4zOHYtMjQuODloMTAuODJ2MjIuOGMwLDIuMDIuNSwzLjU0LDEuNTEsNC41NCwxLjAxLDEuMDEsMi40MywxLjUxLDQuMjYsMS41MSwxLjYzLDAsMy4wOC0uMzgsNC4zMy0xLjE1LDEuMjUtLjc3LDIuMjUtMS44NCwyLjk5LTMuMjEuNzQtMS4zNywxLjEyLTIuOTUsMS4xMi00LjcybC45NCw4Ljg3Yy0xLjIsMi42NS0yLjk2LDQuNzktNS4yNyw2LjQyLTIuMzEsMS42NC01LjEsMi40NS04LjM3LDIuNDVabTEyLjkxLS43MnYtOC42NmgtLjIydi0yOC4xM2gxMC44MnYzNi43OWgtMTAuNloiLz48cGF0aCBkPSJtMzE3LjMzLDE0Mi43M3YtMzYuNzloMTAuNnY4LjY2aC4yMnYyOC4xM2gtMTAuODJabTI1LjYxLDB2LTIyLjhjMC0yLjAyLS41Mi0zLjU0LTEuNTUtNC41NC0xLjAzLTEuMDEtMi41NC0xLjUxLTQuNTEtMS41MS0xLjY4LDAtMy4xOS4zOS00LjUxLDEuMTUtMS4zMi43Ny0yLjM2LDEuODMtMy4xLDMuMTctLjc1LDEuMzUtMS4xMiwyLjkzLTEuMTIsNC43NmwtLjk0LTguODdjMS4yLTIuNjksMi45Ny00Ljg0LDUuMy02LjQ2LDIuMzMtMS42MSw1LjIxLTIuNDIsOC42Mi0yLjQyLDQuMDksMCw3LjIxLDEuMTQsOS4zOCwzLjQzLDIuMTYsMi4yOSwzLjI1LDUuMzUsMy4yNSw5LjJ2MjQuODloLTEwLjgyWiIvPjxnIGlkPSJ1dWlkLTg2Yjg5MTUxLWU2NWMtNGRhZi1iNWM2LTI2ZmEwYzhlMzk0ZCI+PHBhdGggZD0ibTg5Ljc5LDEwMy4wNGMxMS45NiwwLDIxLjYzLDkuNjksMjEuNjMsMjEuNjNoMjEuNjNjMC0yMy44OS0xOS4zNi00My4yNy00My4yNy00My4yN3MtNDMuMjcsMTkuMzYtNDMuMjcsNDMuMjdoMjEuNjNjLjA1LTExLjk2LDkuNzQtMjEuNjMsMjEuNjctMjEuNjNaIi8+PHBhdGggZD0ibTk3LjEyLDE0NWM4LjM0LTMuMDEsMTQuMjktMTAuOTgsMTQuMjktMjAuMzRoLTQzLjI1YzAsOS4zNiw1Ljk2LDE3LjM1LDE0LjI5LDIwLjM0di4zN2gtMzAuNjRjNy4zMywxMy40MywyMS42LDIyLjU0LDM4LDIyLjU0czMwLjY0LTkuMTEsMzgtMjIuNTRoLTMwLjY5di0uMzdaIi8+PC9nPjwvc3ZnPg=="
+      alt=""
+      height="100"
+      class="icon">
+
+    <h1>{{title}}</h1>
+
+    {{content}}
+
 migrate:
   prompt: true
   docs_url: https://docs.upsun.com/anchors/fixed/cli/

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;