Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions patches/kaggle_secrets.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def get_gcloud_credential(self) -> str:

def set_gcloud_credentials(self, project=None, account=None):
"""Set user credentials attached to the current kernel and optionally the project & account name to the `gcloud` CLI.

Example usage:
client = UserSecretsClient()
client.set_gcloud_credentials(project="my-gcp-project", account="[email protected]")
Expand All @@ -92,9 +92,10 @@ def set_gcloud_credentials(self, project=None, account=None):
"""
creds = self.get_gcloud_credential()
creds_path = self._write_credentials_file(creds)
self._write_gsutil_credentials_file(creds)

subprocess.run(['gcloud', 'config', 'set', 'auth/credential_file_override', creds_path])

if project:
os.environ['GOOGLE_CLOUD_PROJECT'] = project
subprocess.run(['gcloud', 'config', 'set', 'project', project])
Expand Down Expand Up @@ -127,7 +128,7 @@ def get_bigquery_access_token(self) -> Tuple[str, Optional[datetime]]:
token, expiry = client.get_bigquery_access_token()
"""
return self._get_access_token(GcpTarget.BIGQUERY)

def _write_credentials_file(self, credentials) -> str:
adc_path = os.path.join(os.environ.get('HOME', '/'), 'gcloud_credential.json')
with open(adc_path, 'w') as f:
Expand All @@ -136,6 +137,17 @@ def _write_credentials_file(self, credentials) -> str:

return adc_path

def _write_gsutil_credentials_file(self, credentials) -> str:
import json
creds_dict = json.loads(credentials)
boto_path = os.path.join(os.environ.get('HOME', '/'), '.boto')
with open(boto_path, 'w') as f:
f.write('[Credentials]\n')
f.write(' gs_oauth2_refresh_token = ')
f.write(creds_dict['refresh_token'])

return boto_path

def _get_gcs_access_token(self) -> Tuple[str, Optional[datetime]]:
return self._get_access_token(GcpTarget.GCS)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_user_secrets.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def call_get_secret():
success=False)

def test_set_gcloud_credentials_succeeds(self):
secret = '{"client_id":"gcloud","type":"authorized_user"}'
secret = '{"client_id":"gcloud","type":"authorized_user","refresh_token":"refresh_token"}'
project = 'foo'
account = 'bar'

Expand Down