{"action":"created","comment":{"url":"https://api.github.com/repos/zalando-stups/taupage/pulls/comments/36745902","id":36745902,"diff_hunk":"@@ -186,29 +184,14 @@ def registry_login(config: dict, registry: str):\n         logging.warning('Docker registry seems not to be Pier One, skipping OAuth login')\n         return\n     pierone_url = 'https://{}'.format(registry)\n-    token_url = config.get('token_service_url')\n \n-    if not token_url:\n-        logging.warning('No token service URL configured in Taupage YAML (\"token_service_url\" property)')\n-        return\n-\n-    path = os.path.join(CREDENTIALS_DIR, 'user.json')\n-\n-    while not os.path.exists(path):\n-        logging.info('Waiting for berry to download OAuth credentials to {}..'.format(path))\n-        time.sleep(5)\n-\n-    with open(path) as fd:\n-        credentials = json.load(fd)\n-\n-    user = credentials.get('application_username')\n-    passwd = credentials.get('application_password')\n+    token = get_token(config, 'pierone', ['uid'])\n \n-    if not user or not passwd:\n-        logging.warning('Invalid OAuth credentials: application user and/or password missing in %s', path)\n+    if not token or 'access_token' not in token:\n+        logging.warning('Missing OAuth token for Pier One login')","path":"runtime/opt/taupage/runtime/Docker.py","position":45,"original_position":45,"commit_id":"7f03219c700f132cc3485136f2b97c4cf99aec2f","original_commit_id":"7f03219c700f132cc3485136f2b97c4cf99aec2f","user":{"login":"prayerslayer","id":878512,"avatar_url":"https://avatars.githubusercontent.com/u/878512?v=3","gravatar_id":"","url":"https://api.github.com/users/prayerslayer","html_url":"https://github.com/prayerslayer","followers_url":"https://api.github.com/users/prayerslayer/followers","following_url":"https://api.github.com/users/prayerslayer/following{/other_user}","gists_url":"https://api.github.com/users/prayerslayer/gists{/gist_id}","starred_url":"https://api.github.com/users/prayerslayer/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/prayerslayer/subscriptions","organizations_url":"https://api.github.com/users/prayerslayer/orgs","repos_url":"https://api.github.com/users/prayerslayer/repos","events_url":"https://api.github.com/users/prayerslayer/events{/privacy}","received_events_url":"https://api.github.com/users/prayerslayer/received_events","type":"User","site_admin":false},"body":"Ah, true, forgot about that option.","created_at":"2015-08-11T13:46:41Z","updated_at":"2015-08-11T13:46:41Z","html_url":"https://github.com/zalando-stups/taupage/pull/117#discussion_r36745902","pull_request_url":"https://api.github.com/repos/zalando-stups/taupage/pulls/117","_links":{"self":{"href":"https://api.github.com/repos/zalando-stups/taupage/pulls/comments/36745902"},"html":{"href":"https://github.com/zalando-stups/taupage/pull/117#discussion_r36745902"},"pull_request":{"href":"https://api.github.com/repos/zalando-stups/taupage/pulls/117"}}},"pull_request":{"url":"https://api.github.com/repos/zalando-stups/taupage/pulls/117","id":42104961,"html_url":"https://github.com/zalando-stups/taupage/pull/117","diff_url":"https://github.com/zalando-stups/taupage/pull/117.diff","patch_url":"https://github.com/zalando-stups/taupage/pull/117.patch","issue_url":"https://api.github.com/repos/zalando-stups/taupage/issues/117","number":117,"state":"open","locked":false,"title":"Issue 116: Use OAuth access token URL instead of Token Service by default","user":{"login":"hjacobs","id":510328,"avatar_url":"https://avatars.githubusercontent.com/u/510328?v=3","gravatar_id":"","url":"https://api.github.com/users/hjacobs","html_url":"https://github.com/hjacobs","followers_url":"https://api.github.com/users/hjacobs/followers","following_url":"https://api.github.com/users/hjacobs/following{/other_user}","gists_url":"https://api.github.com/users/hjacobs/gists{/gist_id}","starred_url":"https://api.github.com/users/hjacobs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hjacobs/subscriptions","organizations_url":"https://api.github.com/users/hjacobs/orgs","repos_url":"https://api.github.com/users/hjacobs/repos","events_url":"https://api.github.com/users/hjacobs/events{/privacy}","received_events_url":"https://api.github.com/users/hjacobs/received_events","type":"User","site_admin":false},"body":"Untested fix for #116, for review","created_at":"2015-08-11T08:39:00Z","updated_at":"2015-08-11T13:46:41Z","closed_at":null,"merged_at":null,"merge_commit_sha":"f265fe03c2dbd7f0b2e4543bc0829bb23eee9941","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/zalando-stups/taupage/pulls/117/commits","review_comments_url":"https://api.github.com/repos/zalando-stups/taupage/pulls/117/comments","review_comment_url":"https://api.github.com/repos/zalando-stups/taupage/pulls/comments{/number}","comments_url":"https://api.github.com/repos/zalando-stups/taupage/issues/117/comments","statuses_url":"https://api.github.com/repos/zalando-stups/taupage/statuses/7f03219c700f132cc3485136f2b97c4cf99aec2f","head":{"label":"zalando-stups:issue-116","ref":"issue-116","sha":"7f03219c700f132cc3485136f2b97c4cf99aec2f","user":{"login":"zalando-stups","id":11431876,"avatar_url":"https://avatars.githubusercontent.com/u/11431876?v=3","gravatar_id":"","url":"https://api.github.com/users/zalando-stups","html_url":"https://github.com/zalando-stups","followers_url":"https://api.github.com/users/zalando-stups/followers","following_url":"https://api.github.com/users/zalando-stups/following{/other_user}","gists_url":"https://api.github.com/users/zalando-stups/gists{/gist_id}","starred_url":"https://api.github.com/users/zalando-stups/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zalando-stups/subscriptions","organizations_url":"https://api.github.com/users/zalando-stups/orgs","repos_url":"https://api.github.com/users/zalando-stups/repos","events_url":"https://api.github.com/users/zalando-stups/events{/privacy}","received_events_url":"https://api.github.com/users/zalando-stups/received_events","type":"Organization","site_admin":false},"repo":{"id":32066393,"name":"taupage","full_name":"zalando-stups/taupage","owner":{"login":"zalando-stups","id":11431876,"avatar_url":"https://avatars.githubusercontent.com/u/11431876?v=3","gravatar_id":"","url":"https://api.github.com/users/zalando-stups","html_url":"https://github.com/zalando-stups","followers_url":"https://api.github.com/users/zalando-stups/followers","following_url":"https://api.github.com/users/zalando-stups/following{/other_user}","gists_url":"https://api.github.com/users/zalando-stups/gists{/gist_id}","starred_url":"https://api.github.com/users/zalando-stups/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zalando-stups/subscriptions","organizations_url":"https://api.github.com/users/zalando-stups/orgs","repos_url":"https://api.github.com/users/zalando-stups/repos","events_url":"https://api.github.com/users/zalando-stups/events{/privacy}","received_events_url":"https://api.github.com/users/zalando-stups/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/zalando-stups/taupage","description":"Amazon Machine Image (AMI) with Docker runtime https://docs.stups.io/en/latest/components/taupage.html","fork":false,"url":"https://api.github.com/repos/zalando-stups/taupage","forks_url":"https://api.github.com/repos/zalando-stups/taupage/forks","keys_url":"https://api.github.com/repos/zalando-stups/taupage/keys{/key_id}","collaborators_url":"https://api.github.com/repos/zalando-stups/taupage/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/zalando-stups/taupage/teams","hooks_url":"https://api.github.com/repos/zalando-stups/taupage/hooks","issue_events_url":"https://api.github.com/repos/zalando-stups/taupage/issues/events{/number}","events_url":"https://api.github.com/repos/zalando-stups/taupage/events","assignees_url":"https://api.github.com/repos/zalando-stups/taupage/assignees{/user}","branches_url":"https://api.github.com/repos/zalando-stups/taupage/branches{/branch}","tags_url":"https://api.github.com/repos/zalando-stups/taupage/tags","blobs_url":"https://api.github.com/repos/zalando-stups/taupage/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/zalando-stups/taupage/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/zalando-stups/taupage/git/refs{/sha}","trees_url":"https://api.github.com/repos/zalando-stups/taupage/git/trees{/sha}","statuses_url":"https://api.github.com/repos/zalando-stups/taupage/statuses/{sha}","languages_url":"https://api.github.com/repos/zalando-stups/taupage/languages","stargazers_url":"https://api.github.com/repos/zalando-stups/taupage/stargazers","contributors_url":"https://api.github.com/repos/zalando-stups/taupage/contributors","subscribers_url":"https://api.github.com/repos/zalando-stups/taupage/subscribers","subscription_url":"https://api.github.com/repos/zalando-stups/taupage/subscription","commits_url":"https://api.github.com/repos/zalando-stups/taupage/commits{/sha}","git_commits_url":"https://api.github.com/repos/zalando-stups/taupage/git/commits{/sha}","comments_url":"https://api.github.com/repos/zalando-stups/taupage/comments{/number}","issue_comment_url":"https://api.github.com/repos/zalando-stups/taupage/issues/comments{/number}","contents_url":"https://api.github.com/repos/zalando-stups/taupage/contents/{+path}","compare_url":"https://api.github.com/repos/zalando-stups/taupage/compare/{base}...{head}","merges_url":"https://api.github.com/repos/zalando-stups/taupage/merges","archive_url":"https://api.github.com/repos/zalando-stups/taupage/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/zalando-stups/taupage/downloads","issues_url":"https://api.github.com/repos/zalando-stups/taupage/issues{/number}","pulls_url":"https://api.github.com/repos/zalando-stups/taupage/pulls{/number}","milestones_url":"https://api.github.com/repos/zalando-stups/taupage/milestones{/number}","notifications_url":"https://api.github.com/repos/zalando-stups/taupage/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/zalando-stups/taupage/labels{/name}","releases_url":"https://api.github.com/repos/zalando-stups/taupage/releases{/id}","created_at":"2015-03-12T08:43:40Z","updated_at":"2015-08-03T13:33:49Z","pushed_at":"2015-08-11T13:29:29Z","git_url":"git://github.com/zalando-stups/taupage.git","ssh_url":"git@github.com:zalando-stups/taupage.git","clone_url":"https://github.com/zalando-stups/taupage.git","svn_url":"https://github.com/zalando-stups/taupage","homepage":"","size":55767,"stargazers_count":9,"watchers_count":9,"language":"Shell","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":11,"mirror_url":null,"open_issues_count":21,"forks":11,"open_issues":21,"watchers":9,"default_branch":"master"}},"base":{"label":"zalando-stups:master","ref":"master","sha":"9425c838b092bbd2e7146af0600dbdc3f2694cd9","user":{"login":"zalando-stups","id":11431876,"avatar_url":"https://avatars.githubusercontent.com/u/11431876?v=3","gravatar_id":"","url":"https://api.github.com/users/zalando-stups","html_url":"https://github.com/zalando-stups","followers_url":"https://api.github.com/users/zalando-stups/followers","following_url":"https://api.github.com/users/zalando-stups/following{/other_user}","gists_url":"https://api.github.com/users/zalando-stups/gists{/gist_id}","starred_url":"https://api.github.com/users/zalando-stups/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zalando-stups/subscriptions","organizations_url":"https://api.github.com/users/zalando-stups/orgs","repos_url":"https://api.github.com/users/zalando-stups/repos","events_url":"https://api.github.com/users/zalando-stups/events{/privacy}","received_events_url":"https://api.github.com/users/zalando-stups/received_events","type":"Organization","site_admin":false},"repo":{"id":32066393,"name":"taupage","full_name":"zalando-stups/taupage","owner":{"login":"zalando-stups","id":11431876,"avatar_url":"https://avatars.githubusercontent.com/u/11431876?v=3","gravatar_id":"","url":"https://api.github.com/users/zalando-stups","html_url":"https://github.com/zalando-stups","followers_url":"https://api.github.com/users/zalando-stups/followers","following_url":"https://api.github.com/users/zalando-stups/following{/other_user}","gists_url":"https://api.github.com/users/zalando-stups/gists{/gist_id}","starred_url":"https://api.github.com/users/zalando-stups/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zalando-stups/subscriptions","organizations_url":"https://api.github.com/users/zalando-stups/orgs","repos_url":"https://api.github.com/users/zalando-stups/repos","events_url":"https://api.github.com/users/zalando-stups/events{/privacy}","received_events_url":"https://api.github.com/users/zalando-stups/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/zalando-stups/taupage","description":"Amazon Machine Image (AMI) with Docker runtime https://docs.stups.io/en/latest/components/taupage.html","fork":false,"url":"https://api.github.com/repos/zalando-stups/taupage","forks_url":"https://api.github.com/repos/zalando-stups/taupage/forks","keys_url":"https://api.github.com/repos/zalando-stups/taupage/keys{/key_id}","collaborators_url":"https://api.github.com/repos/zalando-stups/taupage/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/zalando-stups/taupage/teams","hooks_url":"https://api.github.com/repos/zalando-stups/taupage/hooks","issue_events_url":"https://api.github.com/repos/zalando-stups/taupage/issues/events{/number}","events_url":"https://api.github.com/repos/zalando-stups/taupage/events","assignees_url":"https://api.github.com/repos/zalando-stups/taupage/assignees{/user}","branches_url":"https://api.github.com/repos/zalando-stups/taupage/branches{/branch}","tags_url":"https://api.github.com/repos/zalando-stups/taupage/tags","blobs_url":"https://api.github.com/repos/zalando-stups/taupage/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/zalando-stups/taupage/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/zalando-stups/taupage/git/refs{/sha}","trees_url":"https://api.github.com/repos/zalando-stups/taupage/git/trees{/sha}","statuses_url":"https://api.github.com/repos/zalando-stups/taupage/statuses/{sha}","languages_url":"https://api.github.com/repos/zalando-stups/taupage/languages","stargazers_url":"https://api.github.com/repos/zalando-stups/taupage/stargazers","contributors_url":"https://api.github.com/repos/zalando-stups/taupage/contributors","subscribers_url":"https://api.github.com/repos/zalando-stups/taupage/subscribers","subscription_url":"https://api.github.com/repos/zalando-stups/taupage/subscription","commits_url":"https://api.github.com/repos/zalando-stups/taupage/commits{/sha}","git_commits_url":"https://api.github.com/repos/zalando-stups/taupage/git/commits{/sha}","comments_url":"https://api.github.com/repos/zalando-stups/taupage/comments{/number}","issue_comment_url":"https://api.github.com/repos/zalando-stups/taupage/issues/comments{/number}","contents_url":"https://api.github.com/repos/zalando-stups/taupage/contents/{+path}","compare_url":"https://api.github.com/repos/zalando-stups/taupage/compare/{base}...{head}","merges_url":"https://api.github.com/repos/zalando-stups/taupage/merges","archive_url":"https://api.github.com/repos/zalando-stups/taupage/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/zalando-stups/taupage/downloads","issues_url":"https://api.github.com/repos/zalando-stups/taupage/issues{/number}","pulls_url":"https://api.github.com/repos/zalando-stups/taupage/pulls{/number}","milestones_url":"https://api.github.com/repos/zalando-stups/taupage/milestones{/number}","notifications_url":"https://api.github.com/repos/zalando-stups/taupage/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/zalando-stups/taupage/labels{/name}","releases_url":"https://api.github.com/repos/zalando-stups/taupage/releases{/id}","created_at":"2015-03-12T08:43:40Z","updated_at":"2015-08-03T13:33:49Z","pushed_at":"2015-08-11T13:29:29Z","git_url":"git://github.com/zalando-stups/taupage.git","ssh_url":"git@github.com:zalando-stups/taupage.git","clone_url":"https://github.com/zalando-stups/taupage.git","svn_url":"https://github.com/zalando-stups/taupage","homepage":"","size":55767,"stargazers_count":9,"watchers_count":9,"language":"Shell","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":11,"mirror_url":null,"open_issues_count":21,"forks":11,"open_issues":21,"watchers":9,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/zalando-stups/taupage/pulls/117"},"html":{"href":"https://github.com/zalando-stups/taupage/pull/117"},"issue":{"href":"https://api.github.com/repos/zalando-stups/taupage/issues/117"},"comments":{"href":"https://api.github.com/repos/zalando-stups/taupage/issues/117/comments"},"review_comments":{"href":"https://api.github.com/repos/zalando-stups/taupage/pulls/117/comments"},"review_comment":{"href":"https://api.github.com/repos/zalando-stups/taupage/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/zalando-stups/taupage/pulls/117/commits"},"statuses":{"href":"https://api.github.com/repos/zalando-stups/taupage/statuses/7f03219c700f132cc3485136f2b97c4cf99aec2f"}}}}