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.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: use project_id
property from service account credentials
#120
Merged
tswast
merged 3 commits into
googleapis:master
from
tswast:issue118-connect-with-credentials
Apr 12, 2021
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
# Copyright 2021 The PyBigQuery Authors | ||
# | ||
# Use of this source code is governed by an MIT-style | ||
# license that can be found in the LICENSE file or at | ||
# https://opensource.org/licenses/MIT. | ||
|
||
import os | ||
import json | ||
|
||
import pytest | ||
|
||
|
||
@pytest.fixture(scope="session") | ||
def module_under_test(): | ||
from pybigquery import _helpers | ||
|
||
return _helpers | ||
|
||
|
||
@pytest.fixture | ||
def credentials_path(): | ||
if "GOOGLE_APPLICATION_CREDENTIALS" not in os.environ: | ||
pytest.skip("GOOGLE_APPLICATION_CREDENTIALS must be set") | ||
return os.environ["GOOGLE_APPLICATION_CREDENTIALS"] | ||
|
||
|
||
@pytest.fixture | ||
def credentials_info(credentials_path): | ||
with open(credentials_path) as credentials_file: | ||
return json.load(credentials_file) | ||
|
||
|
||
def test_create_bigquery_client_with_credentials_path( | ||
module_under_test, credentials_path, credentials_info | ||
): | ||
bqclient = module_under_test.create_bigquery_client( | ||
credentials_path=credentials_path | ||
) | ||
assert bqclient.project == credentials_info["project_id"] | ||
|
||
|
||
def test_create_bigquery_client_with_credentials_path_respects_project( | ||
module_under_test, credentials_path | ||
): | ||
"""Test that project_id is used, even when there is a default project. | ||
|
||
https://github.com/googleapis/python-bigquery-sqlalchemy/issues/48 | ||
""" | ||
bqclient = module_under_test.create_bigquery_client( | ||
credentials_path=credentials_path, project_id="connection-url-project", | ||
) | ||
assert bqclient.project == "connection-url-project" | ||
|
||
|
||
def test_create_bigquery_client_with_credentials_info( | ||
module_under_test, credentials_info | ||
): | ||
bqclient = module_under_test.create_bigquery_client( | ||
credentials_info=credentials_info | ||
) | ||
assert bqclient.project == credentials_info["project_id"] | ||
|
||
|
||
def test_create_bigquery_client_with_credentials_info_respects_project( | ||
module_under_test, credentials_info | ||
): | ||
"""Test that project_id is used, even when there is a default project. | ||
|
||
https://github.com/googleapis/python-bigquery-sqlalchemy/issues/48 | ||
""" | ||
bqclient = module_under_test.create_bigquery_client( | ||
credentials_info=credentials_info, project_id="connection-url-project", | ||
) | ||
assert bqclient.project == "connection-url-project" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's he purpose of this?
Why not just refer to
_helpers
? Do we think the name is likely to change?