{"action":"created","comment":{"url":"https://api.github.com/repos/mesosphere/dcos-cli/pulls/comments/45897014","id":45897014,"diff_hunk":"@@ -364,22 +364,33 @@ def _add(app_resource):\n     :returns: process return code\n     :rtype: int\n     \"\"\"\n-    application_resource = _get_resource(app_resource)\n+    application_resources = _get_resource(app_resource)\n \n     # Add application to marathon\n     client = marathon.create_client()\n \n     # Check that the application doesn't exist\n-    app_id = client.normalize_app_id(application_resource['id'])\n+    if not isinstance(application_resources, list):\n+        application_resources = [application_resources]\n \n-    try:\n-        client.get_app(app_id)\n-    except DCOSException as e:\n-        logger.exception(e)\n-    else:\n-        raise DCOSException(\"Application '{}' already exists\".format(app_id))\n+    error_msg = ''\n+    for application_resource in application_resources:\n+        app_id = client.normalize_app_id(application_resource['id'])\n+\n+        try:\n+            client.get_app(app_id)\n+        except DCOSException as e:\n+            logger.exception(e)\n+        else:\n+            if error_msg is not '':\n+                error_msg += \"\\n\"\n+            error_msg += \"Application '{}' already exists\".format(app_id)\n+\n+    # Abort entire deployment if any app(s) already exist\n+    if error_msg is not '':\n+        raise DCOSException(error_msg)","path":"cli/dcoscli/marathon/main.py","position":36,"original_position":36,"commit_id":"e2010bc973609170b54ab423f4de2aed4a2512c3","original_commit_id":"e2010bc973609170b54ab423f4de2aed4a2512c3","user":{"login":"jsancio","id":794394,"avatar_url":"https://avatars.githubusercontent.com/u/794394?v=3","gravatar_id":"","url":"https://api.github.com/users/jsancio","html_url":"https://github.com/jsancio","followers_url":"https://api.github.com/users/jsancio/followers","following_url":"https://api.github.com/users/jsancio/following{/other_user}","gists_url":"https://api.github.com/users/jsancio/gists{/gist_id}","starred_url":"https://api.github.com/users/jsancio/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jsancio/subscriptions","organizations_url":"https://api.github.com/users/jsancio/orgs","repos_url":"https://api.github.com/users/jsancio/repos","events_url":"https://api.github.com/users/jsancio/events{/privacy}","received_events_url":"https://api.github.com/users/jsancio/received_events","type":"User","site_admin":false},"body":"Let's write a tests for this condition. We are trying to add multiple applications and only one of them exists. The whole deployment should stop.","created_at":"2015-11-25T17:42:10Z","updated_at":"2015-11-25T17:42:10Z","html_url":"https://github.com/mesosphere/dcos-cli/pull/374#discussion_r45897014","pull_request_url":"https://api.github.com/repos/mesosphere/dcos-cli/pulls/374","_links":{"self":{"href":"https://api.github.com/repos/mesosphere/dcos-cli/pulls/comments/45897014"},"html":{"href":"https://github.com/mesosphere/dcos-cli/pull/374#discussion_r45897014"},"pull_request":{"href":"https://api.github.com/repos/mesosphere/dcos-cli/pulls/374"}}},"pull_request":{"url":"https://api.github.com/repos/mesosphere/dcos-cli/pulls/374","id":50532308,"html_url":"https://github.com/mesosphere/dcos-cli/pull/374","diff_url":"https://github.com/mesosphere/dcos-cli/pull/374.diff","patch_url":"https://github.com/mesosphere/dcos-cli/pull/374.patch","issue_url":"https://api.github.com/repos/mesosphere/dcos-cli/issues/374","number":374,"state":"open","locked":false,"title":"add support for app definitions with multiple apps in them","user":{"login":"lloesche","id":2124094,"avatar_url":"https://avatars.githubusercontent.com/u/2124094?v=3","gravatar_id":"","url":"https://api.github.com/users/lloesche","html_url":"https://github.com/lloesche","followers_url":"https://api.github.com/users/lloesche/followers","following_url":"https://api.github.com/users/lloesche/following{/other_user}","gists_url":"https://api.github.com/users/lloesche/gists{/gist_id}","starred_url":"https://api.github.com/users/lloesche/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lloesche/subscriptions","organizations_url":"https://api.github.com/users/lloesche/orgs","repos_url":"https://api.github.com/users/lloesche/repos","events_url":"https://api.github.com/users/lloesche/events{/privacy}","received_events_url":"https://api.github.com/users/lloesche/received_events","type":"User","site_admin":false},"body":"Marathon's /v2/apps API endpoint supports multiple apps. You can either PUT a single app `{}` or multiple apps `[{},{},{}]` in a single request. This PR adds support for the `dcos marathon` subcommand to handle multi app JSON files.","created_at":"2015-11-12T16:24:30Z","updated_at":"2015-11-25T17:42:10Z","closed_at":null,"merged_at":null,"merge_commit_sha":"a25ac2db40a248556c60e2623531994178c6e61a","assignee":{"login":"tamarrow","id":1292768,"avatar_url":"https://avatars.githubusercontent.com/u/1292768?v=3","gravatar_id":"","url":"https://api.github.com/users/tamarrow","html_url":"https://github.com/tamarrow","followers_url":"https://api.github.com/users/tamarrow/followers","following_url":"https://api.github.com/users/tamarrow/following{/other_user}","gists_url":"https://api.github.com/users/tamarrow/gists{/gist_id}","starred_url":"https://api.github.com/users/tamarrow/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tamarrow/subscriptions","organizations_url":"https://api.github.com/users/tamarrow/orgs","repos_url":"https://api.github.com/users/tamarrow/repos","events_url":"https://api.github.com/users/tamarrow/events{/privacy}","received_events_url":"https://api.github.com/users/tamarrow/received_events","type":"User","site_admin":false},"milestone":null,"commits_url":"https://api.github.com/repos/mesosphere/dcos-cli/pulls/374/commits","review_comments_url":"https://api.github.com/repos/mesosphere/dcos-cli/pulls/374/comments","review_comment_url":"https://api.github.com/repos/mesosphere/dcos-cli/pulls/comments{/number}","comments_url":"https://api.github.com/repos/mesosphere/dcos-cli/issues/374/comments","statuses_url":"https://api.github.com/repos/mesosphere/dcos-cli/statuses/e2010bc973609170b54ab423f4de2aed4a2512c3","head":{"label":"mesosphere:lloesche/multi-app-support","ref":"lloesche/multi-app-support","sha":"e2010bc973609170b54ab423f4de2aed4a2512c3","user":{"login":"mesosphere","id":3458585,"avatar_url":"https://avatars.githubusercontent.com/u/3458585?v=3","gravatar_id":"","url":"https://api.github.com/users/mesosphere","html_url":"https://github.com/mesosphere","followers_url":"https://api.github.com/users/mesosphere/followers","following_url":"https://api.github.com/users/mesosphere/following{/other_user}","gists_url":"https://api.github.com/users/mesosphere/gists{/gist_id}","starred_url":"https://api.github.com/users/mesosphere/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mesosphere/subscriptions","organizations_url":"https://api.github.com/users/mesosphere/orgs","repos_url":"https://api.github.com/users/mesosphere/repos","events_url":"https://api.github.com/users/mesosphere/events{/privacy}","received_events_url":"https://api.github.com/users/mesosphere/received_events","type":"Organization","site_admin":false},"repo":{"id":26653348,"name":"dcos-cli","full_name":"mesosphere/dcos-cli","owner":{"login":"mesosphere","id":3458585,"avatar_url":"https://avatars.githubusercontent.com/u/3458585?v=3","gravatar_id":"","url":"https://api.github.com/users/mesosphere","html_url":"https://github.com/mesosphere","followers_url":"https://api.github.com/users/mesosphere/followers","following_url":"https://api.github.com/users/mesosphere/following{/other_user}","gists_url":"https://api.github.com/users/mesosphere/gists{/gist_id}","starred_url":"https://api.github.com/users/mesosphere/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mesosphere/subscriptions","organizations_url":"https://api.github.com/users/mesosphere/orgs","repos_url":"https://api.github.com/users/mesosphere/repos","events_url":"https://api.github.com/users/mesosphere/events{/privacy}","received_events_url":"https://api.github.com/users/mesosphere/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mesosphere/dcos-cli","description":"The command line for your datacenter! ","fork":false,"url":"https://api.github.com/repos/mesosphere/dcos-cli","forks_url":"https://api.github.com/repos/mesosphere/dcos-cli/forks","keys_url":"https://api.github.com/repos/mesosphere/dcos-cli/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mesosphere/dcos-cli/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mesosphere/dcos-cli/teams","hooks_url":"https://api.github.com/repos/mesosphere/dcos-cli/hooks","issue_events_url":"https://api.github.com/repos/mesosphere/dcos-cli/issues/events{/number}","events_url":"https://api.github.com/repos/mesosphere/dcos-cli/events","assignees_url":"https://api.github.com/repos/mesosphere/dcos-cli/assignees{/user}","branches_url":"https://api.github.com/repos/mesosphere/dcos-cli/branches{/branch}","tags_url":"https://api.github.com/repos/mesosphere/dcos-cli/tags","blobs_url":"https://api.github.com/repos/mesosphere/dcos-cli/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mesosphere/dcos-cli/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mesosphere/dcos-cli/git/refs{/sha}","trees_url":"https://api.github.com/repos/mesosphere/dcos-cli/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mesosphere/dcos-cli/statuses/{sha}","languages_url":"https://api.github.com/repos/mesosphere/dcos-cli/languages","stargazers_url":"https://api.github.com/repos/mesosphere/dcos-cli/stargazers","contributors_url":"https://api.github.com/repos/mesosphere/dcos-cli/contributors","subscribers_url":"https://api.github.com/repos/mesosphere/dcos-cli/subscribers","subscription_url":"https://api.github.com/repos/mesosphere/dcos-cli/subscription","commits_url":"https://api.github.com/repos/mesosphere/dcos-cli/commits{/sha}","git_commits_url":"https://api.github.com/repos/mesosphere/dcos-cli/git/commits{/sha}","comments_url":"https://api.github.com/repos/mesosphere/dcos-cli/comments{/number}","issue_comment_url":"https://api.github.com/repos/mesosphere/dcos-cli/issues/comments{/number}","contents_url":"https://api.github.com/repos/mesosphere/dcos-cli/contents/{+path}","compare_url":"https://api.github.com/repos/mesosphere/dcos-cli/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mesosphere/dcos-cli/merges","archive_url":"https://api.github.com/repos/mesosphere/dcos-cli/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mesosphere/dcos-cli/downloads","issues_url":"https://api.github.com/repos/mesosphere/dcos-cli/issues{/number}","pulls_url":"https://api.github.com/repos/mesosphere/dcos-cli/pulls{/number}","milestones_url":"https://api.github.com/repos/mesosphere/dcos-cli/milestones{/number}","notifications_url":"https://api.github.com/repos/mesosphere/dcos-cli/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mesosphere/dcos-cli/labels{/name}","releases_url":"https://api.github.com/repos/mesosphere/dcos-cli/releases{/id}","created_at":"2014-11-14T19:11:48Z","updated_at":"2015-11-24T02:27:03Z","pushed_at":"2015-11-25T14:48:24Z","git_url":"git://github.com/mesosphere/dcos-cli.git","ssh_url":"git@github.com:mesosphere/dcos-cli.git","clone_url":"https://github.com/mesosphere/dcos-cli.git","svn_url":"https://github.com/mesosphere/dcos-cli","homepage":"http://docs.mesosphere.com/using/cli/","size":2149,"stargazers_count":59,"watchers_count":59,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":17,"mirror_url":null,"open_issues_count":6,"forks":17,"open_issues":6,"watchers":59,"default_branch":"master"}},"base":{"label":"mesosphere:master","ref":"master","sha":"1369a381ccebd52c59c6ee65c490f49d4a12d9b4","user":{"login":"mesosphere","id":3458585,"avatar_url":"https://avatars.githubusercontent.com/u/3458585?v=3","gravatar_id":"","url":"https://api.github.com/users/mesosphere","html_url":"https://github.com/mesosphere","followers_url":"https://api.github.com/users/mesosphere/followers","following_url":"https://api.github.com/users/mesosphere/following{/other_user}","gists_url":"https://api.github.com/users/mesosphere/gists{/gist_id}","starred_url":"https://api.github.com/users/mesosphere/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mesosphere/subscriptions","organizations_url":"https://api.github.com/users/mesosphere/orgs","repos_url":"https://api.github.com/users/mesosphere/repos","events_url":"https://api.github.com/users/mesosphere/events{/privacy}","received_events_url":"https://api.github.com/users/mesosphere/received_events","type":"Organization","site_admin":false},"repo":{"id":26653348,"name":"dcos-cli","full_name":"mesosphere/dcos-cli","owner":{"login":"mesosphere","id":3458585,"avatar_url":"https://avatars.githubusercontent.com/u/3458585?v=3","gravatar_id":"","url":"https://api.github.com/users/mesosphere","html_url":"https://github.com/mesosphere","followers_url":"https://api.github.com/users/mesosphere/followers","following_url":"https://api.github.com/users/mesosphere/following{/other_user}","gists_url":"https://api.github.com/users/mesosphere/gists{/gist_id}","starred_url":"https://api.github.com/users/mesosphere/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mesosphere/subscriptions","organizations_url":"https://api.github.com/users/mesosphere/orgs","repos_url":"https://api.github.com/users/mesosphere/repos","events_url":"https://api.github.com/users/mesosphere/events{/privacy}","received_events_url":"https://api.github.com/users/mesosphere/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mesosphere/dcos-cli","description":"The command line for your datacenter! ","fork":false,"url":"https://api.github.com/repos/mesosphere/dcos-cli","forks_url":"https://api.github.com/repos/mesosphere/dcos-cli/forks","keys_url":"https://api.github.com/repos/mesosphere/dcos-cli/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mesosphere/dcos-cli/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mesosphere/dcos-cli/teams","hooks_url":"https://api.github.com/repos/mesosphere/dcos-cli/hooks","issue_events_url":"https://api.github.com/repos/mesosphere/dcos-cli/issues/events{/number}","events_url":"https://api.github.com/repos/mesosphere/dcos-cli/events","assignees_url":"https://api.github.com/repos/mesosphere/dcos-cli/assignees{/user}","branches_url":"https://api.github.com/repos/mesosphere/dcos-cli/branches{/branch}","tags_url":"https://api.github.com/repos/mesosphere/dcos-cli/tags","blobs_url":"https://api.github.com/repos/mesosphere/dcos-cli/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mesosphere/dcos-cli/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mesosphere/dcos-cli/git/refs{/sha}","trees_url":"https://api.github.com/repos/mesosphere/dcos-cli/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mesosphere/dcos-cli/statuses/{sha}","languages_url":"https://api.github.com/repos/mesosphere/dcos-cli/languages","stargazers_url":"https://api.github.com/repos/mesosphere/dcos-cli/stargazers","contributors_url":"https://api.github.com/repos/mesosphere/dcos-cli/contributors","subscribers_url":"https://api.github.com/repos/mesosphere/dcos-cli/subscribers","subscription_url":"https://api.github.com/repos/mesosphere/dcos-cli/subscription","commits_url":"https://api.github.com/repos/mesosphere/dcos-cli/commits{/sha}","git_commits_url":"https://api.github.com/repos/mesosphere/dcos-cli/git/commits{/sha}","comments_url":"https://api.github.com/repos/mesosphere/dcos-cli/comments{/number}","issue_comment_url":"https://api.github.com/repos/mesosphere/dcos-cli/issues/comments{/number}","contents_url":"https://api.github.com/repos/mesosphere/dcos-cli/contents/{+path}","compare_url":"https://api.github.com/repos/mesosphere/dcos-cli/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mesosphere/dcos-cli/merges","archive_url":"https://api.github.com/repos/mesosphere/dcos-cli/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mesosphere/dcos-cli/downloads","issues_url":"https://api.github.com/repos/mesosphere/dcos-cli/issues{/number}","pulls_url":"https://api.github.com/repos/mesosphere/dcos-cli/pulls{/number}","milestones_url":"https://api.github.com/repos/mesosphere/dcos-cli/milestones{/number}","notifications_url":"https://api.github.com/repos/mesosphere/dcos-cli/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mesosphere/dcos-cli/labels{/name}","releases_url":"https://api.github.com/repos/mesosphere/dcos-cli/releases{/id}","created_at":"2014-11-14T19:11:48Z","updated_at":"2015-11-24T02:27:03Z","pushed_at":"2015-11-25T14:48:24Z","git_url":"git://github.com/mesosphere/dcos-cli.git","ssh_url":"git@github.com:mesosphere/dcos-cli.git","clone_url":"https://github.com/mesosphere/dcos-cli.git","svn_url":"https://github.com/mesosphere/dcos-cli","homepage":"http://docs.mesosphere.com/using/cli/","size":2149,"stargazers_count":59,"watchers_count":59,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":17,"mirror_url":null,"open_issues_count":6,"forks":17,"open_issues":6,"watchers":59,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/mesosphere/dcos-cli/pulls/374"},"html":{"href":"https://github.com/mesosphere/dcos-cli/pull/374"},"issue":{"href":"https://api.github.com/repos/mesosphere/dcos-cli/issues/374"},"comments":{"href":"https://api.github.com/repos/mesosphere/dcos-cli/issues/374/comments"},"review_comments":{"href":"https://api.github.com/repos/mesosphere/dcos-cli/pulls/374/comments"},"review_comment":{"href":"https://api.github.com/repos/mesosphere/dcos-cli/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/mesosphere/dcos-cli/pulls/374/commits"},"statuses":{"href":"https://api.github.com/repos/mesosphere/dcos-cli/statuses/e2010bc973609170b54ab423f4de2aed4a2512c3"}}}}