Failed code merges are suppressed using --no-interaction with terminus multidev:merge-from-dev

[dslatkin]

Platform

• MacOS
• Linux
• WSL2

Installed Via

• Homebrew
• Apt Package
• Manually

PHP Version

• 7.4x
• 8.0
• 8.1

Terminus Version

3.3.0

Command Executed

terminus --no-interaction multidev:merge-from-dev

Expected behavior

If attempting to merge master (from dev) into the multidev environment would produce a merge conflict, I would expect this command to always report the merge as a failure due to the conflict:

$ terminus multidev:merge-from-dev example-site.example-env
 [error]  CONFLICT (content): Merge conflict in composer.lock 
$ terminus --yes multidev:merge-from-dev example-site.example-env
 [error]  CONFLICT (content): Merge conflict in composer.lock 
$ terminus --no-interaction multidev:merge-from-dev example-site.example-env
 [error]  CONFLICT (content): Merge conflict in composer.lock 

Actual behavior

The failure does get reported using default options or with --yes, but using --no-interaction (even with the --yes option) acts as if the merge happened successfully, when it didn't:

$ terminus multidev:merge-from-dev example-site.example-env
 [error]  CONFLICT (content): Merge conflict in composer.lock 
$ terminus --yes multidev:merge-from-dev example-site.example-env
 [error]  CONFLICT (content): Merge conflict in composer.lock 
$ terminus --no-interaction multidev:merge-from-dev example-site.example-env
 [notice] Merged the dev environment into newlook.

In my case the merge conflict happens to be with my composer.lock file having been updated independently in both environments, so there is an actual merge conflict I need to resolve manually.

Here is the output with --no-interaction -vvv (like the above commands I've obfuscated the site and environment names:

$ terminus --no-interaction -vvv multidev:merge-from-dev example-site.example-env
 [info] #### REQUEST ####
Headers: {"User-Agent":"Terminus/3.3.0 (php_version=8.1.2-1ubuntu2.14&script=/usr/local/bin/terminus)","Accept":"application/json","X-Pantheon-Trace-Id":"ed22fe7a-062b-fa82-e657-b5ab741dfb42","X-Pantheon-Terminus-Command":"{\"command\":\"multidev:merge-from-dev\",\"arguments\":{\"command\":\"multidev:merge-from-dev\",\"site_env\":\"example-site.example-env\"},\"options\":{\"updatedb\":false,\"help\":false,\"quiet\":false,\"verbose\":true,\"version\":false,\"ansi\":null,\"no-interaction\":true,\"define\":[],\"yes\":false},\"truncated\":false}","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/site-names/example-site
Method: GET
Body: null
 [info] #### REQUEST ####
Headers: {"User-Agent":"Terminus/3.3.0 (php_version=8.1.2-1ubuntu2.14&script=/usr/local/bin/terminus)","Accept":"application/json","X-Pantheon-Trace-Id":"ed22fe7a-062b-fa82-e657-b5ab741dfb42","X-Pantheon-Terminus-Command":"{\"command\":\"multidev:merge-from-dev\",\"arguments\":{\"command\":\"multidev:merge-from-dev\",\"site_env\":\"example-site.example-env\"},\"options\":{\"updatedb\":false,\"help\":false,\"quiet\":false,\"verbose\":true,\"version\":false,\"ansi\":null,\"no-interaction\":true,\"define\":[],\"yes\":false},\"truncated\":false}","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/8e2e0adb-3c04-4fbc-b4a5-c6ae8a11398b?site_state=true
Method: GET
Body: null
 [info] #### REQUEST ####
Headers: {"User-Agent":"Terminus/3.3.0 (php_version=8.1.2-1ubuntu2.14&script=/usr/local/bin/terminus)","Accept":"application/json","X-Pantheon-Trace-Id":"ed22fe7a-062b-fa82-e657-b5ab741dfb42","X-Pantheon-Terminus-Command":"{\"command\":\"multidev:merge-from-dev\",\"arguments\":{\"command\":\"multidev:merge-from-dev\",\"site_env\":\"example-site.example-env\"},\"options\":{\"updatedb\":false,\"help\":false,\"quiet\":false,\"verbose\":true,\"version\":false,\"ansi\":null,\"no-interaction\":true,\"define\":[],\"yes\":false},\"truncated\":false}","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/8e2e0adb-3c04-4fbc-b4a5-c6ae8a11398b/environments
Method: GET
Body: null
 [info] #### REQUEST ####
Headers: {"User-Agent":"Terminus/3.3.0 (php_version=8.1.2-1ubuntu2.14&script=/usr/local/bin/terminus)","Accept":"application/json","X-Pantheon-Trace-Id":"ed22fe7a-062b-fa82-e657-b5ab741dfb42","X-Pantheon-Terminus-Command":"{\"command\":\"multidev:merge-from-dev\",\"arguments\":{\"command\":\"multidev:merge-from-dev\",\"site_env\":\"example-site.example-env\"},\"options\":{\"updatedb\":false,\"help\":false,\"quiet\":false,\"verbose\":true,\"version\":false,\"ansi\":null,\"no-interaction\":true,\"define\":[],\"yes\":false},\"truncated\":false}","Authorization":"**HIDDEN**","Content-Type":"application/json","Content-Length":83}
URI: https://terminus.pantheon.io:443/api/sites/8e2e0adb-3c04-4fbc-b4a5-c6ae8a11398b/environments/example-env/workflows
Method: POST
Body: {"type":"merge_dev_into_cloud_development_environment","params":{"updatedb":false}}
 [info] #### REQUEST ####
Headers: {"User-Agent":"Terminus/3.3.0 (php_version=8.1.2-1ubuntu2.14&script=/usr/local/bin/terminus)","Accept":"application/json","X-Pantheon-Trace-Id":"ed22fe7a-062b-fa82-e657-b5ab741dfb42","X-Pantheon-Terminus-Command":"{\"command\":\"multidev:merge-from-dev\",\"arguments\":{\"command\":\"multidev:merge-from-dev\",\"site_env\":\"example-site.example-env\"},\"options\":{\"updatedb\":false,\"help\":false,\"quiet\":false,\"verbose\":true,\"version\":false,\"ansi\":null,\"no-interaction\":true,\"define\":[],\"yes\":false},\"truncated\":false}","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/8e2e0adb-3c04-4fbc-b4a5-c6ae8a11398b/workflows/b1434c8a-a120-11ee-ba1a-121a092e0041
Method: GET
Body: null
 [info] #### REQUEST ####
Headers: {"User-Agent":"Terminus/3.3.0 (php_version=8.1.2-1ubuntu2.14&script=/usr/local/bin/terminus)","Accept":"application/json","X-Pantheon-Trace-Id":"ed22fe7a-062b-fa82-e657-b5ab741dfb42","X-Pantheon-Terminus-Command":"{\"command\":\"multidev:merge-from-dev\",\"arguments\":{\"command\":\"multidev:merge-from-dev\",\"site_env\":\"example-site.example-env\"},\"options\":{\"updatedb\":false,\"help\":false,\"quiet\":false,\"verbose\":true,\"version\":false,\"ansi\":null,\"no-interaction\":true,\"define\":[],\"yes\":false},\"truncated\":false}","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/8e2e0adb-3c04-4fbc-b4a5-c6ae8a11398b/workflows/b1434c8a-a120-11ee-ba1a-121a092e0041
Method: GET
Body: null
 [info] #### REQUEST ####
Headers: {"User-Agent":"Terminus/3.3.0 (php_version=8.1.2-1ubuntu2.14&script=/usr/local/bin/terminus)","Accept":"application/json","X-Pantheon-Trace-Id":"ed22fe7a-062b-fa82-e657-b5ab741dfb42","X-Pantheon-Terminus-Command":"{\"command\":\"multidev:merge-from-dev\",\"arguments\":{\"command\":\"multidev:merge-from-dev\",\"site_env\":\"example-site.example-env\"},\"options\":{\"updatedb\":false,\"help\":false,\"quiet\":false,\"verbose\":true,\"version\":false,\"ansi\":null,\"no-interaction\":true,\"define\":[],\"yes\":false},\"truncated\":false}","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/8e2e0adb-3c04-4fbc-b4a5-c6ae8a11398b/workflows/b1434c8a-a120-11ee-ba1a-121a092e0041
Method: GET
Body: null
 [info] #### REQUEST ####
Headers: {"User-Agent":"Terminus/3.3.0 (php_version=8.1.2-1ubuntu2.14&script=/usr/local/bin/terminus)","Accept":"application/json","X-Pantheon-Trace-Id":"ed22fe7a-062b-fa82-e657-b5ab741dfb42","X-Pantheon-Terminus-Command":"{\"command\":\"multidev:merge-from-dev\",\"arguments\":{\"command\":\"multidev:merge-from-dev\",\"site_env\":\"example-site.example-env\"},\"options\":{\"updatedb\":false,\"help\":false,\"quiet\":false,\"verbose\":true,\"version\":false,\"ansi\":null,\"no-interaction\":true,\"define\":[],\"yes\":false},\"truncated\":false}","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/8e2e0adb-3c04-4fbc-b4a5-c6ae8a11398b/workflows/b1434c8a-a120-11ee-ba1a-121a092e0041
Method: GET
Body: null
 [info] #### REQUEST ####
Headers: {"User-Agent":"Terminus/3.3.0 (php_version=8.1.2-1ubuntu2.14&script=/usr/local/bin/terminus)","Accept":"application/json","X-Pantheon-Trace-Id":"ed22fe7a-062b-fa82-e657-b5ab741dfb42","X-Pantheon-Terminus-Command":"{\"command\":\"multidev:merge-from-dev\",\"arguments\":{\"command\":\"multidev:merge-from-dev\",\"site_env\":\"example-site.example-env\"},\"options\":{\"updatedb\":false,\"help\":false,\"quiet\":false,\"verbose\":true,\"version\":false,\"ansi\":null,\"no-interaction\":true,\"define\":[],\"yes\":false},\"truncated\":false}","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/8e2e0adb-3c04-4fbc-b4a5-c6ae8a11398b/workflows/b1434c8a-a120-11ee-ba1a-121a092e0041
Method: GET
Body: null
 [info] #### REQUEST ####
Headers: {"User-Agent":"Terminus/3.3.0 (php_version=8.1.2-1ubuntu2.14&script=/usr/local/bin/terminus)","Accept":"application/json","X-Pantheon-Trace-Id":"ed22fe7a-062b-fa82-e657-b5ab741dfb42","X-Pantheon-Terminus-Command":"{\"command\":\"multidev:merge-from-dev\",\"arguments\":{\"command\":\"multidev:merge-from-dev\",\"site_env\":\"example-site.example-env\"},\"options\":{\"updatedb\":false,\"help\":false,\"quiet\":false,\"verbose\":true,\"version\":false,\"ansi\":null,\"no-interaction\":true,\"define\":[],\"yes\":false},\"truncated\":false}","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/8e2e0adb-3c04-4fbc-b4a5-c6ae8a11398b/workflows/b1434c8a-a120-11ee-ba1a-121a092e0041
Method: GET
Body: null
 [info] #### REQUEST ####
Headers: {"User-Agent":"Terminus/3.3.0 (php_version=8.1.2-1ubuntu2.14&script=/usr/local/bin/terminus)","Accept":"application/json","X-Pantheon-Trace-Id":"ed22fe7a-062b-fa82-e657-b5ab741dfb42","X-Pantheon-Terminus-Command":"{\"command\":\"multidev:merge-from-dev\",\"arguments\":{\"command\":\"multidev:merge-from-dev\",\"site_env\":\"example-site.example-env\"},\"options\":{\"updatedb\":false,\"help\":false,\"quiet\":false,\"verbose\":true,\"version\":false,\"ansi\":null,\"no-interaction\":true,\"define\":[],\"yes\":false},\"truncated\":false}","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/8e2e0adb-3c04-4fbc-b4a5-c6ae8a11398b/workflows/b1434c8a-a120-11ee-ba1a-121a092e0041
Method: GET
Body: null
 [info] #### REQUEST ####
Headers: {"User-Agent":"Terminus/3.3.0 (php_version=8.1.2-1ubuntu2.14&script=/usr/local/bin/terminus)","Accept":"application/json","X-Pantheon-Trace-Id":"ed22fe7a-062b-fa82-e657-b5ab741dfb42","X-Pantheon-Terminus-Command":"{\"command\":\"multidev:merge-from-dev\",\"arguments\":{\"command\":\"multidev:merge-from-dev\",\"site_env\":\"example-site.example-env\"},\"options\":{\"updatedb\":false,\"help\":false,\"quiet\":false,\"verbose\":true,\"version\":false,\"ansi\":null,\"no-interaction\":true,\"define\":[],\"yes\":false},\"truncated\":false}","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/8e2e0adb-3c04-4fbc-b4a5-c6ae8a11398b/workflows/b1434c8a-a120-11ee-ba1a-121a092e0041
Method: GET
Body: null
 [notice] Merged the dev environment into example-env.