{"action":"created","comment":{"url":"https://api.github.com/repos/alphagov/paas-cf/pulls/comments/83612365","pull_request_review_id":4443732,"id":83612365,"diff_hunk":"@@ -467,6 +467,10 @@ jobs:\n                               ./paas-cf/manifests/concourse-manifest/extensions/datadog-agent.yml\n                               ./paas-cf/manifests/shared/deployments/datadog-agent.yml\"\n             fi\n+            # shellcheck disable=SC2050","path":"concourse/pipelines/create-deployer.yml","position":4,"original_position":4,"commit_id":"6e80e34acc555b151ec3ed836dfd07527a5bc286","original_commit_id":"6e80e34acc555b151ec3ed836dfd07527a5bc286","user":{"login":"keymon","id":280032,"avatar_url":"https://avatars.githubusercontent.com/u/280032?v=3","gravatar_id":"","url":"https://api.github.com/users/keymon","html_url":"https://github.com/keymon","followers_url":"https://api.github.com/users/keymon/followers","following_url":"https://api.github.com/users/keymon/following{/other_user}","gists_url":"https://api.github.com/users/keymon/gists{/gist_id}","starred_url":"https://api.github.com/users/keymon/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/keymon/subscriptions","organizations_url":"https://api.github.com/users/keymon/orgs","repos_url":"https://api.github.com/users/keymon/repos","events_url":"https://api.github.com/users/keymon/events{/privacy}","received_events_url":"https://api.github.com/users/keymon/received_events","type":"User","site_admin":false},"body":"In case of doubt these are the changes I propose:\r\n```diff\r\ndiff --git a/Makefile b/Makefile\r\nindex 8b4734d..0f422ce 100644\r\n--- a/Makefile\r\n+++ b/Makefile\r\n@@ -146,6 +146,7 @@ prod: globals check-env-vars ## Set Environment to Production\r\n \t$(eval export ENABLE_CF_ACCEPTANCE_TESTS=false)\r\n \t$(eval export ENABLE_DATADOG=true)\r\n \t$(eval export DECRYPT_CONCOURSE_ATC_PASSWORD=prod_deployment)\r\n+\t$(eval export CONCOURSE_AUTH_DURATION=5m)\r\n \t@true\r\n \r\n .PHONY: bootstrap\r\ndiff --git a/concourse/pipelines/create-deployer.yml b/concourse/pipelines/create-deployer.yml\r\nindex c4ff5eb..7ea357c 100644\r\n--- a/concourse/pipelines/create-deployer.yml\r\n+++ b/concourse/pipelines/create-deployer.yml\r\n@@ -442,6 +442,7 @@ jobs:\r\n           AWS_ACCOUNT: {{aws_account}}\r\n           DATADOG_API_KEY: {{datadog_api_key}}\r\n           ENABLE_DATADOG: {{enable_datadog}}\r\n+          CONCOURSE_AUTH_DURATION: {{concourse_auth_duration}}\r\n           CONCOURSE_MANIFEST_STUBS: |\r\n             ./paas-cf/manifests/concourse-manifest/concourse-base.yml\r\n             predefined-concourse-secrets/predefined-concourse-secrets.yml\r\n@@ -467,10 +468,6 @@ jobs:\r\n                               ./paas-cf/manifests/concourse-manifest/extensions/datadog-agent.yml\r\n                               ./paas-cf/manifests/shared/deployments/datadog-agent.yml\"\r\n             fi\r\n-            # shellcheck disable=SC2050\r\n-            if [ {{aws_account}} = \"prod\" ] ; then\r\n-              export AUTH_DURATION=5m\r\n-            fi\r\n             ./paas-cf/manifests/shared/build_manifest.sh $CONCOURSE_MANIFEST_STUBS \\\r\n               > concourse-manifest/concourse-manifest.yml\r\n             ls -l concourse-manifest/concourse-manifest.yml\r\ndiff --git a/concourse/scripts/pipelines-deployer.sh b/concourse/scripts/pipelines-deployer.sh\r\nindex 83c8de9..f22f788 100755\r\n--- a/concourse/scripts/pipelines-deployer.sh\r\n+++ b/concourse/scripts/pipelines-deployer.sh\r\n@@ -32,6 +32,7 @@ system_dns_zone_name: ${SYSTEM_DNS_ZONE_NAME}\r\n aws_account: ${AWS_ACCOUNT:-dev}\r\n datadog_api_key: ${datadog_api_key:-}\r\n enable_datadog: ${ENABLE_DATADOG}\r\n+concourse_auth_duration: ${CONCOURSE_AUTH_DURATION:-24h}\r\n EOF\r\n }\r\n \r\ndiff --git a/manifests/concourse-manifest/concourse-base.yml b/manifests/concourse-manifest/concourse-base.yml\r\nindex fa07316..9bbc001 100644\r\n--- a/manifests/concourse-manifest/concourse-base.yml\r\n+++ b/manifests/concourse-manifest/concourse-base.yml\r\n@@ -81,7 +81,7 @@ jobs:\r\n           external_url: (( concat \"https://\" terraform_outputs.concourse_dns_name ))\r\n           basic_auth_username: admin\r\n           basic_auth_password: (( grab secrets.concourse_atc_password ))\r\n-          auth_duration: (( grab $AUTH_DURATION || \"24h\" ))\r\n+          auth_duration: (( grab $CONCOURSE_AUTH_DURATION || null ))\r\n \r\n           postgresql:\r\n             address: 127.0.0.1:5432\r\n``` ","created_at":"2016-10-17T10:02:31Z","updated_at":"2016-10-17T10:02:31Z","html_url":"https://github.com/alphagov/paas-cf/pull/546#discussion_r83612365","pull_request_url":"https://api.github.com/repos/alphagov/paas-cf/pulls/546","_links":{"self":{"href":"https://api.github.com/repos/alphagov/paas-cf/pulls/comments/83612365"},"html":{"href":"https://github.com/alphagov/paas-cf/pull/546#discussion_r83612365"},"pull_request":{"href":"https://api.github.com/repos/alphagov/paas-cf/pulls/546"}}},"pull_request":{"url":"https://api.github.com/repos/alphagov/paas-cf/pulls/546","id":89368349,"html_url":"https://github.com/alphagov/paas-cf/pull/546","diff_url":"https://github.com/alphagov/paas-cf/pull/546.diff","patch_url":"https://github.com/alphagov/paas-cf/pull/546.patch","issue_url":"https://api.github.com/repos/alphagov/paas-cf/issues/546","number":546,"state":"open","locked":false,"title":"[#130844201] More distinctive concourses","user":{"login":"mtekel","id":483891,"avatar_url":"https://avatars.githubusercontent.com/u/483891?v=3","gravatar_id":"","url":"https://api.github.com/users/mtekel","html_url":"https://github.com/mtekel","followers_url":"https://api.github.com/users/mtekel/followers","following_url":"https://api.github.com/users/mtekel/following{/other_user}","gists_url":"https://api.github.com/users/mtekel/gists{/gist_id}","starred_url":"https://api.github.com/users/mtekel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mtekel/subscriptions","organizations_url":"https://api.github.com/users/mtekel/orgs","repos_url":"https://api.github.com/users/mtekel/repos","events_url":"https://api.github.com/users/mtekel/events{/privacy}","received_events_url":"https://api.github.com/users/mtekel/received_events","type":"User","site_admin":false},"body":"## What\r\n\r\n[Make it more difficult to run actions manually on Production Concourse](https://www.pivotaltracker.com/n/projects/1275640/stories/130844201)\r\n\r\nTo make our concourses more distinctive in order to avoid operator accidentally operating on different environments:\r\n* add team with aws account specific name\r\n* set login timeout to 5 minutes on prod\r\n\r\nNote that this PR does not migrate the pipelines to the new team yet. We'll implement that later if we see the need.\r\n\r\n## How to review\r\n\r\n`make dev bootstrap`. Deploy. See team being created. Go to your concourse and try logging in using the new team. Password and user are the same (admin/usual PW). To test 5m timeout, edit pipeline & change the condition to check against 'dev' instead of 'prod' [here](https://github.com/alphagov/paas-cf/commit/6e80e34acc555b151ec3ed836dfd07527a5bc286#diff-5eac5d6fc041d1da10144e10c0fa2ed0R471), upload (`make dev bootstrap`), deploy, log in, wait 5 mins, click somewhere in pipeline (e.g. try to start a job) & be prompted to log in.\r\n\r\n## Who can review\r\n\r\nyou!","created_at":"2016-10-14T11:27:08Z","updated_at":"2016-10-17T10:02:31Z","closed_at":null,"merged_at":null,"merge_commit_sha":"73673474b151d9a1b9d1d7bae5f39987b9384797","assignee":{"login":"keymon","id":280032,"avatar_url":"https://avatars.githubusercontent.com/u/280032?v=3","gravatar_id":"","url":"https://api.github.com/users/keymon","html_url":"https://github.com/keymon","followers_url":"https://api.github.com/users/keymon/followers","following_url":"https://api.github.com/users/keymon/following{/other_user}","gists_url":"https://api.github.com/users/keymon/gists{/gist_id}","starred_url":"https://api.github.com/users/keymon/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/keymon/subscriptions","organizations_url":"https://api.github.com/users/keymon/orgs","repos_url":"https://api.github.com/users/keymon/repos","events_url":"https://api.github.com/users/keymon/events{/privacy}","received_events_url":"https://api.github.com/users/keymon/received_events","type":"User","site_admin":false},"assignees":[{"login":"keymon","id":280032,"avatar_url":"https://avatars.githubusercontent.com/u/280032?v=3","gravatar_id":"","url":"https://api.github.com/users/keymon","html_url":"https://github.com/keymon","followers_url":"https://api.github.com/users/keymon/followers","following_url":"https://api.github.com/users/keymon/following{/other_user}","gists_url":"https://api.github.com/users/keymon/gists{/gist_id}","starred_url":"https://api.github.com/users/keymon/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/keymon/subscriptions","organizations_url":"https://api.github.com/users/keymon/orgs","repos_url":"https://api.github.com/users/keymon/repos","events_url":"https://api.github.com/users/keymon/events{/privacy}","received_events_url":"https://api.github.com/users/keymon/received_events","type":"User","site_admin":false}],"milestone":null,"commits_url":"https://api.github.com/repos/alphagov/paas-cf/pulls/546/commits","review_comments_url":"https://api.github.com/repos/alphagov/paas-cf/pulls/546/comments","review_comment_url":"https://api.github.com/repos/alphagov/paas-cf/pulls/comments{/number}","comments_url":"https://api.github.com/repos/alphagov/paas-cf/issues/546/comments","statuses_url":"https://api.github.com/repos/alphagov/paas-cf/statuses/6e80e34acc555b151ec3ed836dfd07527a5bc286","head":{"label":"alphagov:more-distinctive-concourses-130844201","ref":"more-distinctive-concourses-130844201","sha":"6e80e34acc555b151ec3ed836dfd07527a5bc286","user":{"login":"alphagov","id":596977,"avatar_url":"https://avatars.githubusercontent.com/u/596977?v=3","gravatar_id":"","url":"https://api.github.com/users/alphagov","html_url":"https://github.com/alphagov","followers_url":"https://api.github.com/users/alphagov/followers","following_url":"https://api.github.com/users/alphagov/following{/other_user}","gists_url":"https://api.github.com/users/alphagov/gists{/gist_id}","starred_url":"https://api.github.com/users/alphagov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alphagov/subscriptions","organizations_url":"https://api.github.com/users/alphagov/orgs","repos_url":"https://api.github.com/users/alphagov/repos","events_url":"https://api.github.com/users/alphagov/events{/privacy}","received_events_url":"https://api.github.com/users/alphagov/received_events","type":"Organization","site_admin":false},"repo":{"id":46716359,"name":"paas-cf","full_name":"alphagov/paas-cf","owner":{"login":"alphagov","id":596977,"avatar_url":"https://avatars.githubusercontent.com/u/596977?v=3","gravatar_id":"","url":"https://api.github.com/users/alphagov","html_url":"https://github.com/alphagov","followers_url":"https://api.github.com/users/alphagov/followers","following_url":"https://api.github.com/users/alphagov/following{/other_user}","gists_url":"https://api.github.com/users/alphagov/gists{/gist_id}","starred_url":"https://api.github.com/users/alphagov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alphagov/subscriptions","organizations_url":"https://api.github.com/users/alphagov/orgs","repos_url":"https://api.github.com/users/alphagov/repos","events_url":"https://api.github.com/users/alphagov/events{/privacy}","received_events_url":"https://api.github.com/users/alphagov/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/alphagov/paas-cf","description":"Government PaaS - Cloud Foundry","fork":false,"url":"https://api.github.com/repos/alphagov/paas-cf","forks_url":"https://api.github.com/repos/alphagov/paas-cf/forks","keys_url":"https://api.github.com/repos/alphagov/paas-cf/keys{/key_id}","collaborators_url":"https://api.github.com/repos/alphagov/paas-cf/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/alphagov/paas-cf/teams","hooks_url":"https://api.github.com/repos/alphagov/paas-cf/hooks","issue_events_url":"https://api.github.com/repos/alphagov/paas-cf/issues/events{/number}","events_url":"https://api.github.com/repos/alphagov/paas-cf/events","assignees_url":"https://api.github.com/repos/alphagov/paas-cf/assignees{/user}","branches_url":"https://api.github.com/repos/alphagov/paas-cf/branches{/branch}","tags_url":"https://api.github.com/repos/alphagov/paas-cf/tags","blobs_url":"https://api.github.com/repos/alphagov/paas-cf/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/alphagov/paas-cf/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/alphagov/paas-cf/git/refs{/sha}","trees_url":"https://api.github.com/repos/alphagov/paas-cf/git/trees{/sha}","statuses_url":"https://api.github.com/repos/alphagov/paas-cf/statuses/{sha}","languages_url":"https://api.github.com/repos/alphagov/paas-cf/languages","stargazers_url":"https://api.github.com/repos/alphagov/paas-cf/stargazers","contributors_url":"https://api.github.com/repos/alphagov/paas-cf/contributors","subscribers_url":"https://api.github.com/repos/alphagov/paas-cf/subscribers","subscription_url":"https://api.github.com/repos/alphagov/paas-cf/subscription","commits_url":"https://api.github.com/repos/alphagov/paas-cf/commits{/sha}","git_commits_url":"https://api.github.com/repos/alphagov/paas-cf/git/commits{/sha}","comments_url":"https://api.github.com/repos/alphagov/paas-cf/comments{/number}","issue_comment_url":"https://api.github.com/repos/alphagov/paas-cf/issues/comments{/number}","contents_url":"https://api.github.com/repos/alphagov/paas-cf/contents/{+path}","compare_url":"https://api.github.com/repos/alphagov/paas-cf/compare/{base}...{head}","merges_url":"https://api.github.com/repos/alphagov/paas-cf/merges","archive_url":"https://api.github.com/repos/alphagov/paas-cf/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/alphagov/paas-cf/downloads","issues_url":"https://api.github.com/repos/alphagov/paas-cf/issues{/number}","pulls_url":"https://api.github.com/repos/alphagov/paas-cf/pulls{/number}","milestones_url":"https://api.github.com/repos/alphagov/paas-cf/milestones{/number}","notifications_url":"https://api.github.com/repos/alphagov/paas-cf/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/alphagov/paas-cf/labels{/name}","releases_url":"https://api.github.com/repos/alphagov/paas-cf/releases{/id}","deployments_url":"https://api.github.com/repos/alphagov/paas-cf/deployments","created_at":"2015-11-23T11:36:57Z","updated_at":"2016-09-28T05:30:58Z","pushed_at":"2016-10-17T09:54:45Z","git_url":"git://github.com/alphagov/paas-cf.git","ssh_url":"git@github.com:alphagov/paas-cf.git","clone_url":"https://github.com/alphagov/paas-cf.git","svn_url":"https://github.com/alphagov/paas-cf","homepage":null,"size":16509,"stargazers_count":25,"watchers_count":25,"language":"Ruby","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":9,"mirror_url":null,"open_issues_count":9,"forks":9,"open_issues":9,"watchers":25,"default_branch":"master"}},"base":{"label":"alphagov:master","ref":"master","sha":"e013c461d6203c17d50539a5f766babcef66cf28","user":{"login":"alphagov","id":596977,"avatar_url":"https://avatars.githubusercontent.com/u/596977?v=3","gravatar_id":"","url":"https://api.github.com/users/alphagov","html_url":"https://github.com/alphagov","followers_url":"https://api.github.com/users/alphagov/followers","following_url":"https://api.github.com/users/alphagov/following{/other_user}","gists_url":"https://api.github.com/users/alphagov/gists{/gist_id}","starred_url":"https://api.github.com/users/alphagov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alphagov/subscriptions","organizations_url":"https://api.github.com/users/alphagov/orgs","repos_url":"https://api.github.com/users/alphagov/repos","events_url":"https://api.github.com/users/alphagov/events{/privacy}","received_events_url":"https://api.github.com/users/alphagov/received_events","type":"Organization","site_admin":false},"repo":{"id":46716359,"name":"paas-cf","full_name":"alphagov/paas-cf","owner":{"login":"alphagov","id":596977,"avatar_url":"https://avatars.githubusercontent.com/u/596977?v=3","gravatar_id":"","url":"https://api.github.com/users/alphagov","html_url":"https://github.com/alphagov","followers_url":"https://api.github.com/users/alphagov/followers","following_url":"https://api.github.com/users/alphagov/following{/other_user}","gists_url":"https://api.github.com/users/alphagov/gists{/gist_id}","starred_url":"https://api.github.com/users/alphagov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alphagov/subscriptions","organizations_url":"https://api.github.com/users/alphagov/orgs","repos_url":"https://api.github.com/users/alphagov/repos","events_url":"https://api.github.com/users/alphagov/events{/privacy}","received_events_url":"https://api.github.com/users/alphagov/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/alphagov/paas-cf","description":"Government PaaS - Cloud Foundry","fork":false,"url":"https://api.github.com/repos/alphagov/paas-cf","forks_url":"https://api.github.com/repos/alphagov/paas-cf/forks","keys_url":"https://api.github.com/repos/alphagov/paas-cf/keys{/key_id}","collaborators_url":"https://api.github.com/repos/alphagov/paas-cf/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/alphagov/paas-cf/teams","hooks_url":"https://api.github.com/repos/alphagov/paas-cf/hooks","issue_events_url":"https://api.github.com/repos/alphagov/paas-cf/issues/events{/number}","events_url":"https://api.github.com/repos/alphagov/paas-cf/events","assignees_url":"https://api.github.com/repos/alphagov/paas-cf/assignees{/user}","branches_url":"https://api.github.com/repos/alphagov/paas-cf/branches{/branch}","tags_url":"https://api.github.com/repos/alphagov/paas-cf/tags","blobs_url":"https://api.github.com/repos/alphagov/paas-cf/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/alphagov/paas-cf/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/alphagov/paas-cf/git/refs{/sha}","trees_url":"https://api.github.com/repos/alphagov/paas-cf/git/trees{/sha}","statuses_url":"https://api.github.com/repos/alphagov/paas-cf/statuses/{sha}","languages_url":"https://api.github.com/repos/alphagov/paas-cf/languages","stargazers_url":"https://api.github.com/repos/alphagov/paas-cf/stargazers","contributors_url":"https://api.github.com/repos/alphagov/paas-cf/contributors","subscribers_url":"https://api.github.com/repos/alphagov/paas-cf/subscribers","subscription_url":"https://api.github.com/repos/alphagov/paas-cf/subscription","commits_url":"https://api.github.com/repos/alphagov/paas-cf/commits{/sha}","git_commits_url":"https://api.github.com/repos/alphagov/paas-cf/git/commits{/sha}","comments_url":"https://api.github.com/repos/alphagov/paas-cf/comments{/number}","issue_comment_url":"https://api.github.com/repos/alphagov/paas-cf/issues/comments{/number}","contents_url":"https://api.github.com/repos/alphagov/paas-cf/contents/{+path}","compare_url":"https://api.github.com/repos/alphagov/paas-cf/compare/{base}...{head}","merges_url":"https://api.github.com/repos/alphagov/paas-cf/merges","archive_url":"https://api.github.com/repos/alphagov/paas-cf/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/alphagov/paas-cf/downloads","issues_url":"https://api.github.com/repos/alphagov/paas-cf/issues{/number}","pulls_url":"https://api.github.com/repos/alphagov/paas-cf/pulls{/number}","milestones_url":"https://api.github.com/repos/alphagov/paas-cf/milestones{/number}","notifications_url":"https://api.github.com/repos/alphagov/paas-cf/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/alphagov/paas-cf/labels{/name}","releases_url":"https://api.github.com/repos/alphagov/paas-cf/releases{/id}","deployments_url":"https://api.github.com/repos/alphagov/paas-cf/deployments","created_at":"2015-11-23T11:36:57Z","updated_at":"2016-09-28T05:30:58Z","pushed_at":"2016-10-17T09:54:45Z","git_url":"git://github.com/alphagov/paas-cf.git","ssh_url":"git@github.com:alphagov/paas-cf.git","clone_url":"https://github.com/alphagov/paas-cf.git","svn_url":"https://github.com/alphagov/paas-cf","homepage":null,"size":16509,"stargazers_count":25,"watchers_count":25,"language":"Ruby","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":9,"mirror_url":null,"open_issues_count":9,"forks":9,"open_issues":9,"watchers":25,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/alphagov/paas-cf/pulls/546"},"html":{"href":"https://github.com/alphagov/paas-cf/pull/546"},"issue":{"href":"https://api.github.com/repos/alphagov/paas-cf/issues/546"},"comments":{"href":"https://api.github.com/repos/alphagov/paas-cf/issues/546/comments"},"review_comments":{"href":"https://api.github.com/repos/alphagov/paas-cf/pulls/546/comments"},"review_comment":{"href":"https://api.github.com/repos/alphagov/paas-cf/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/alphagov/paas-cf/pulls/546/commits"},"statuses":{"href":"https://api.github.com/repos/alphagov/paas-cf/statuses/6e80e34acc555b151ec3ed836dfd07527a5bc286"}}}}
{"actor":{"display_login":"keymon"}}