{"action":"created","comment":{"url":"https://api.github.com/repos/broadinstitute/rawls/pulls/comments/37235045","id":37235045,"diff_hunk":"@@ -1,56 +1,90 @@\n package org.broadinstitute.dsde.rawls.dataaccess\n \n-import java.io.StringReader\n-import java.util.UUID\n+import java.io.{File, StringReader}\n \n import akka.actor.ActorSystem\n import com.google.api.client.auth.oauth2.Credential\n-import com.google.api.client.googleapis.auth.oauth2.{GoogleAuthorizationCodeFlow, GoogleClientSecrets}\n+import com.google.api.client.googleapis.auth.oauth2.{GoogleCredential, GoogleAuthorizationCodeFlow, GoogleClientSecrets}\n import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport\n+import com.google.api.client.googleapis.json.GoogleJsonResponseException\n import com.google.api.client.json.jackson2.JacksonFactory\n-import com.google.api.client.util.store.DataStoreFactory\n-import com.google.api.services.storage.Storage\n-import com.google.api.services.storage.model.Bucket\n+import com.google.api.client.util.store.{FileDataStoreFactory, DataStoreFactory}\n+import com.google.api.services.admin.directory._\n+import com.google.api.services.admin.directory.model._\n+import com.google.api.services.compute.ComputeScopes\n+import com.google.api.services.storage.{StorageScopes, Storage}\n+import com.google.api.services.storage.model.{Bucket, BucketAccessControl}\n import org.broadinstitute.dsde.rawls.RawlsException\n+import org.broadinstitute.dsde.rawls.model.GCSAccessLevel.GCSAccessLevel\n+import org.broadinstitute.dsde.rawls.model.{GCSAccessLevel, WorkspaceName}\n import scala.collection.JavaConversions._   // Seq[String] -> Collection<String>\n-import scala.concurrent.Await\n-import scala.concurrent.duration.Duration\n-import spray.client.pipelining._\n \n-class HttpGoogleCloudStorageDAO(clientSecretsJson: String, dataStoreFactory: DataStoreFactory, ourBaseURL: String)(implicit system: ActorSystem) extends GoogleCloudStorageDAO {\n+class HttpGoogleCloudStorageDAO(\n+  clientSecretsJson: String,\n+  dataStoreRoot: String,\n+  rawlsRedirectBaseUrl: String,\n+  p12File: String,\n+  appsDomain: String,\n+  groupsPrefix: String)(implicit system: ActorSystem) extends GoogleCloudStorageDAO {\n+\n+  val appName = \"firecloud:rawls\" // TODO add to config?","path":"src/main/scala/org/broadinstitute/dsde/rawls/dataaccess/HttpGoogleCloudStorageDAO.scala","position":40,"original_position":40,"commit_id":"efe5189b3587f18607e6bc5087c0c42ff89d4072","original_commit_id":"efe5189b3587f18607e6bc5087c0c42ff89d4072","user":{"login":"abaumann","id":755311,"avatar_url":"https://avatars.githubusercontent.com/u/755311?v=3","gravatar_id":"","url":"https://api.github.com/users/abaumann","html_url":"https://github.com/abaumann","followers_url":"https://api.github.com/users/abaumann/followers","following_url":"https://api.github.com/users/abaumann/following{/other_user}","gists_url":"https://api.github.com/users/abaumann/gists{/gist_id}","starred_url":"https://api.github.com/users/abaumann/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/abaumann/subscriptions","organizations_url":"https://api.github.com/users/abaumann/orgs","repos_url":"https://api.github.com/users/abaumann/repos","events_url":"https://api.github.com/users/abaumann/events{/privacy}","received_events_url":"https://api.github.com/users/abaumann/received_events","type":"User","site_admin":false},"body":"yes id say so","created_at":"2015-08-17T20:49:09Z","updated_at":"2015-08-17T20:49:09Z","html_url":"https://github.com/broadinstitute/rawls/pull/82#discussion_r37235045","pull_request_url":"https://api.github.com/repos/broadinstitute/rawls/pulls/82","_links":{"self":{"href":"https://api.github.com/repos/broadinstitute/rawls/pulls/comments/37235045"},"html":{"href":"https://github.com/broadinstitute/rawls/pull/82#discussion_r37235045"},"pull_request":{"href":"https://api.github.com/repos/broadinstitute/rawls/pulls/82"}}},"pull_request":{"url":"https://api.github.com/repos/broadinstitute/rawls/pulls/82","id":42351424,"html_url":"https://github.com/broadinstitute/rawls/pull/82","diff_url":"https://github.com/broadinstitute/rawls/pull/82.diff","patch_url":"https://github.com/broadinstitute/rawls/pull/82.patch","issue_url":"https://api.github.com/repos/broadinstitute/rawls/issues/82","number":82,"state":"open","locked":false,"title":"google groupification of workspaces","user":{"login":"MatthewBemis","id":7257391,"avatar_url":"https://avatars.githubusercontent.com/u/7257391?v=3","gravatar_id":"","url":"https://api.github.com/users/MatthewBemis","html_url":"https://github.com/MatthewBemis","followers_url":"https://api.github.com/users/MatthewBemis/followers","following_url":"https://api.github.com/users/MatthewBemis/following{/other_user}","gists_url":"https://api.github.com/users/MatthewBemis/gists{/gist_id}","starred_url":"https://api.github.com/users/MatthewBemis/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MatthewBemis/subscriptions","organizations_url":"https://api.github.com/users/MatthewBemis/orgs","repos_url":"https://api.github.com/users/MatthewBemis/repos","events_url":"https://api.github.com/users/MatthewBemis/events{/privacy}","received_events_url":"https://api.github.com/users/MatthewBemis/received_events","type":"User","site_admin":false},"body":"Not ready to be merged yet because we're waiting for DevOps to configure some stuff with the new Vault system for holding secret files, but feel free to review.\r\n\r\n* Still needs tests, which will be done once the super-task is completed\r\n* Requires some changes to rawls.conf (new service account, etc.) (tests will fail because of this)\r\n* All feedback from #80 has been addressed in this PR\r\n* [DSDEEPB-919](https://broadinstitute.atlassian.net/browse/DSDEEPB-919) is still in progress (get/set ACLs on workspaces by adding users to certain groups)","created_at":"2015-08-13T13:42:13Z","updated_at":"2015-08-17T20:49:09Z","closed_at":null,"merged_at":null,"merge_commit_sha":"177ad3c24bcc44c177a514f64048e0a6ddd0843b","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/broadinstitute/rawls/pulls/82/commits","review_comments_url":"https://api.github.com/repos/broadinstitute/rawls/pulls/82/comments","review_comment_url":"https://api.github.com/repos/broadinstitute/rawls/pulls/comments{/number}","comments_url":"https://api.github.com/repos/broadinstitute/rawls/issues/82/comments","statuses_url":"https://api.github.com/repos/broadinstitute/rawls/statuses/efe5189b3587f18607e6bc5087c0c42ff89d4072","head":{"label":"broadinstitute:mb_group_acls","ref":"mb_group_acls","sha":"efe5189b3587f18607e6bc5087c0c42ff89d4072","user":{"login":"broadinstitute","id":393552,"avatar_url":"https://avatars.githubusercontent.com/u/393552?v=3","gravatar_id":"","url":"https://api.github.com/users/broadinstitute","html_url":"https://github.com/broadinstitute","followers_url":"https://api.github.com/users/broadinstitute/followers","following_url":"https://api.github.com/users/broadinstitute/following{/other_user}","gists_url":"https://api.github.com/users/broadinstitute/gists{/gist_id}","starred_url":"https://api.github.com/users/broadinstitute/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/broadinstitute/subscriptions","organizations_url":"https://api.github.com/users/broadinstitute/orgs","repos_url":"https://api.github.com/users/broadinstitute/repos","events_url":"https://api.github.com/users/broadinstitute/events{/privacy}","received_events_url":"https://api.github.com/users/broadinstitute/received_events","type":"Organization","site_admin":false},"repo":{"id":34129770,"name":"rawls","full_name":"broadinstitute/rawls","owner":{"login":"broadinstitute","id":393552,"avatar_url":"https://avatars.githubusercontent.com/u/393552?v=3","gravatar_id":"","url":"https://api.github.com/users/broadinstitute","html_url":"https://github.com/broadinstitute","followers_url":"https://api.github.com/users/broadinstitute/followers","following_url":"https://api.github.com/users/broadinstitute/following{/other_user}","gists_url":"https://api.github.com/users/broadinstitute/gists{/gist_id}","starred_url":"https://api.github.com/users/broadinstitute/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/broadinstitute/subscriptions","organizations_url":"https://api.github.com/users/broadinstitute/orgs","repos_url":"https://api.github.com/users/broadinstitute/repos","events_url":"https://api.github.com/users/broadinstitute/events{/privacy}","received_events_url":"https://api.github.com/users/broadinstitute/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/broadinstitute/rawls","description":"Rawls service for DSDE","fork":false,"url":"https://api.github.com/repos/broadinstitute/rawls","forks_url":"https://api.github.com/repos/broadinstitute/rawls/forks","keys_url":"https://api.github.com/repos/broadinstitute/rawls/keys{/key_id}","collaborators_url":"https://api.github.com/repos/broadinstitute/rawls/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/broadinstitute/rawls/teams","hooks_url":"https://api.github.com/repos/broadinstitute/rawls/hooks","issue_events_url":"https://api.github.com/repos/broadinstitute/rawls/issues/events{/number}","events_url":"https://api.github.com/repos/broadinstitute/rawls/events","assignees_url":"https://api.github.com/repos/broadinstitute/rawls/assignees{/user}","branches_url":"https://api.github.com/repos/broadinstitute/rawls/branches{/branch}","tags_url":"https://api.github.com/repos/broadinstitute/rawls/tags","blobs_url":"https://api.github.com/repos/broadinstitute/rawls/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/broadinstitute/rawls/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/broadinstitute/rawls/git/refs{/sha}","trees_url":"https://api.github.com/repos/broadinstitute/rawls/git/trees{/sha}","statuses_url":"https://api.github.com/repos/broadinstitute/rawls/statuses/{sha}","languages_url":"https://api.github.com/repos/broadinstitute/rawls/languages","stargazers_url":"https://api.github.com/repos/broadinstitute/rawls/stargazers","contributors_url":"https://api.github.com/repos/broadinstitute/rawls/contributors","subscribers_url":"https://api.github.com/repos/broadinstitute/rawls/subscribers","subscription_url":"https://api.github.com/repos/broadinstitute/rawls/subscription","commits_url":"https://api.github.com/repos/broadinstitute/rawls/commits{/sha}","git_commits_url":"https://api.github.com/repos/broadinstitute/rawls/git/commits{/sha}","comments_url":"https://api.github.com/repos/broadinstitute/rawls/comments{/number}","issue_comment_url":"https://api.github.com/repos/broadinstitute/rawls/issues/comments{/number}","contents_url":"https://api.github.com/repos/broadinstitute/rawls/contents/{+path}","compare_url":"https://api.github.com/repos/broadinstitute/rawls/compare/{base}...{head}","merges_url":"https://api.github.com/repos/broadinstitute/rawls/merges","archive_url":"https://api.github.com/repos/broadinstitute/rawls/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/broadinstitute/rawls/downloads","issues_url":"https://api.github.com/repos/broadinstitute/rawls/issues{/number}","pulls_url":"https://api.github.com/repos/broadinstitute/rawls/pulls{/number}","milestones_url":"https://api.github.com/repos/broadinstitute/rawls/milestones{/number}","notifications_url":"https://api.github.com/repos/broadinstitute/rawls/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/broadinstitute/rawls/labels{/name}","releases_url":"https://api.github.com/repos/broadinstitute/rawls/releases{/id}","created_at":"2015-04-17T17:16:07Z","updated_at":"2015-06-12T15:10:03Z","pushed_at":"2015-08-17T20:33:20Z","git_url":"git://github.com/broadinstitute/rawls.git","ssh_url":"git@github.com:broadinstitute/rawls.git","clone_url":"https://github.com/broadinstitute/rawls.git","svn_url":"https://github.com/broadinstitute/rawls","homepage":null,"size":2141,"stargazers_count":3,"watchers_count":3,"language":"Scala","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":3,"default_branch":"master"}},"base":{"label":"broadinstitute:master","ref":"master","sha":"5cbd192831f64dae74525d675427b1d87a9c8230","user":{"login":"broadinstitute","id":393552,"avatar_url":"https://avatars.githubusercontent.com/u/393552?v=3","gravatar_id":"","url":"https://api.github.com/users/broadinstitute","html_url":"https://github.com/broadinstitute","followers_url":"https://api.github.com/users/broadinstitute/followers","following_url":"https://api.github.com/users/broadinstitute/following{/other_user}","gists_url":"https://api.github.com/users/broadinstitute/gists{/gist_id}","starred_url":"https://api.github.com/users/broadinstitute/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/broadinstitute/subscriptions","organizations_url":"https://api.github.com/users/broadinstitute/orgs","repos_url":"https://api.github.com/users/broadinstitute/repos","events_url":"https://api.github.com/users/broadinstitute/events{/privacy}","received_events_url":"https://api.github.com/users/broadinstitute/received_events","type":"Organization","site_admin":false},"repo":{"id":34129770,"name":"rawls","full_name":"broadinstitute/rawls","owner":{"login":"broadinstitute","id":393552,"avatar_url":"https://avatars.githubusercontent.com/u/393552?v=3","gravatar_id":"","url":"https://api.github.com/users/broadinstitute","html_url":"https://github.com/broadinstitute","followers_url":"https://api.github.com/users/broadinstitute/followers","following_url":"https://api.github.com/users/broadinstitute/following{/other_user}","gists_url":"https://api.github.com/users/broadinstitute/gists{/gist_id}","starred_url":"https://api.github.com/users/broadinstitute/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/broadinstitute/subscriptions","organizations_url":"https://api.github.com/users/broadinstitute/orgs","repos_url":"https://api.github.com/users/broadinstitute/repos","events_url":"https://api.github.com/users/broadinstitute/events{/privacy}","received_events_url":"https://api.github.com/users/broadinstitute/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/broadinstitute/rawls","description":"Rawls service for DSDE","fork":false,"url":"https://api.github.com/repos/broadinstitute/rawls","forks_url":"https://api.github.com/repos/broadinstitute/rawls/forks","keys_url":"https://api.github.com/repos/broadinstitute/rawls/keys{/key_id}","collaborators_url":"https://api.github.com/repos/broadinstitute/rawls/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/broadinstitute/rawls/teams","hooks_url":"https://api.github.com/repos/broadinstitute/rawls/hooks","issue_events_url":"https://api.github.com/repos/broadinstitute/rawls/issues/events{/number}","events_url":"https://api.github.com/repos/broadinstitute/rawls/events","assignees_url":"https://api.github.com/repos/broadinstitute/rawls/assignees{/user}","branches_url":"https://api.github.com/repos/broadinstitute/rawls/branches{/branch}","tags_url":"https://api.github.com/repos/broadinstitute/rawls/tags","blobs_url":"https://api.github.com/repos/broadinstitute/rawls/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/broadinstitute/rawls/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/broadinstitute/rawls/git/refs{/sha}","trees_url":"https://api.github.com/repos/broadinstitute/rawls/git/trees{/sha}","statuses_url":"https://api.github.com/repos/broadinstitute/rawls/statuses/{sha}","languages_url":"https://api.github.com/repos/broadinstitute/rawls/languages","stargazers_url":"https://api.github.com/repos/broadinstitute/rawls/stargazers","contributors_url":"https://api.github.com/repos/broadinstitute/rawls/contributors","subscribers_url":"https://api.github.com/repos/broadinstitute/rawls/subscribers","subscription_url":"https://api.github.com/repos/broadinstitute/rawls/subscription","commits_url":"https://api.github.com/repos/broadinstitute/rawls/commits{/sha}","git_commits_url":"https://api.github.com/repos/broadinstitute/rawls/git/commits{/sha}","comments_url":"https://api.github.com/repos/broadinstitute/rawls/comments{/number}","issue_comment_url":"https://api.github.com/repos/broadinstitute/rawls/issues/comments{/number}","contents_url":"https://api.github.com/repos/broadinstitute/rawls/contents/{+path}","compare_url":"https://api.github.com/repos/broadinstitute/rawls/compare/{base}...{head}","merges_url":"https://api.github.com/repos/broadinstitute/rawls/merges","archive_url":"https://api.github.com/repos/broadinstitute/rawls/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/broadinstitute/rawls/downloads","issues_url":"https://api.github.com/repos/broadinstitute/rawls/issues{/number}","pulls_url":"https://api.github.com/repos/broadinstitute/rawls/pulls{/number}","milestones_url":"https://api.github.com/repos/broadinstitute/rawls/milestones{/number}","notifications_url":"https://api.github.com/repos/broadinstitute/rawls/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/broadinstitute/rawls/labels{/name}","releases_url":"https://api.github.com/repos/broadinstitute/rawls/releases{/id}","created_at":"2015-04-17T17:16:07Z","updated_at":"2015-06-12T15:10:03Z","pushed_at":"2015-08-17T20:33:20Z","git_url":"git://github.com/broadinstitute/rawls.git","ssh_url":"git@github.com:broadinstitute/rawls.git","clone_url":"https://github.com/broadinstitute/rawls.git","svn_url":"https://github.com/broadinstitute/rawls","homepage":null,"size":2141,"stargazers_count":3,"watchers_count":3,"language":"Scala","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":3,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/broadinstitute/rawls/pulls/82"},"html":{"href":"https://github.com/broadinstitute/rawls/pull/82"},"issue":{"href":"https://api.github.com/repos/broadinstitute/rawls/issues/82"},"comments":{"href":"https://api.github.com/repos/broadinstitute/rawls/issues/82/comments"},"review_comments":{"href":"https://api.github.com/repos/broadinstitute/rawls/pulls/82/comments"},"review_comment":{"href":"https://api.github.com/repos/broadinstitute/rawls/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/broadinstitute/rawls/pulls/82/commits"},"statuses":{"href":"https://api.github.com/repos/broadinstitute/rawls/statuses/efe5189b3587f18607e6bc5087c0c42ff89d4072"}}}}