Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat]: Adapt GCPCluster to be able to initialize the cluster by passing credentials without obtaining from the environment #432

Merged
merged 1 commit into from
Aug 29, 2024
Merged

[feat]: Adapt GCPCluster to be able to initialize the cluster by passing credentials without obtaining from the environment #432

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 22 additions & 4 deletions dask_cloudprovider/gcp/instances.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import json

import sqlite3
from typing import Optional, Any, Dict

import dask
from dask.utils import tmpfile
Expand Down Expand Up @@ -106,7 +107,6 @@ def __init__(
self.instance_labels = _instance_labels

self.general_zone = "-".join(self.zone.split("-")[:2]) # us-east1-c -> us-east1

self.service_account = service_account or self.config.get("service_account")

def create_gcp_config(self):
Expand Down Expand Up @@ -494,6 +494,8 @@ class GCPCluster(VMCluster):
service_account: str
Service account that all VMs will run under.
Defaults to the default Compute Engine service account for your GCP project.
service_account_credentials: Optional[Dict[str, Any]]
Service account credentials to create the compute engine Vms

Examples
--------
Expand Down Expand Up @@ -587,9 +589,10 @@ def __init__(
debug=False,
instance_labels=None,
service_account=None,
service_account_credentials: Optional[Dict[str, Any]] = None,
**kwargs,
):
self.compute = GCPCompute()
self.compute = GCPCompute(service_account_credentials)

self.config = dask.config.get("cloudprovider.gcp", {})
self.auto_shutdown = (
Expand Down Expand Up @@ -641,9 +644,17 @@ def __init__(


class GCPCompute:
"""Wrapper for the ``googleapiclient`` compute object."""
"""
Wrapper for the ``googleapiclient`` compute object.

Attributes
----------
service_account_credentials: Optional[dict]
Service account credentials to create the compute engine Vms
"""

def __init__(self):
def __init__(self, service_account_credentials: Optional[dict[str, Any]] = None):
self.service_account_credentials = service_account_credentials or {}
self._compute = self.refresh_client()

def refresh_client(self):
Expand All @@ -654,6 +665,13 @@ def refresh_client(self):
os.environ["GOOGLE_APPLICATION_CREDENTIALS"],
scopes=["https://www.googleapis.com/auth/cloud-platform"],
)
elif self.service_account_credentials:
import google.oauth2.service_account # google-auth

creds = google.oauth2.service_account.Credentials.from_service_account_info(
self.service_account_credentials,
scopes=["https://www.googleapis.com/auth/cloud-platform"],
)
else:
import google.auth.credentials # google-auth

Expand Down
Loading