Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
144190e
feat: Support CMEK for BQ tables
shobsi Feb 29, 2024
eda994e
Merge remote-tracking branch 'refs/remotes/github/main' into shobs-cmek
shobsi Feb 29, 2024
6b41ec0
add more tests
shobsi Mar 1, 2024
d2f3f3d
add unit tests
shobsi Mar 1, 2024
425cf12
add more tests, fix broken tests
shobsi Mar 1, 2024
2443d40
separate bqml client to send kms_key_name via OPTIONS instead of job
shobsi Mar 4, 2024
ca50e6c
Merge remote-tracking branch 'refs/remotes/github/main' into shobs-cmek
shobsi Mar 4, 2024
07d97f4
fix unit tests
shobsi Mar 4, 2024
950dd27
fix mypy
shobsi Mar 4, 2024
ee717fe
Merge remote-tracking branch 'refs/remotes/github/main' into shobs-cmek
shobsi Mar 4, 2024
927d8a2
skip cmek test for empty cmek
shobsi Mar 4, 2024
827bef2
move staticmethods to helper module
shobsi Mar 5, 2024
e1b3258
Merge remote-tracking branch 'refs/remotes/github/main' into shobs-cmek
shobsi Mar 6, 2024
f1c8b00
revert bqmlclient, pass cmek through call time job config
shobsi Mar 7, 2024
28064f8
Merge remote-tracking branch 'refs/remotes/github/main' into shobs-cmek
shobsi Mar 7, 2024
073f989
revert bqmlclient unit test
shobsi Mar 7, 2024
79a4b73
fix mypy failure
shobsi Mar 7, 2024
313bb12
use better named key, disable use_query_cache in test
shobsi Mar 7, 2024
9c8d064
Merge remote-tracking branch 'refs/remotes/github/main' into shobs-cmek
shobsi Mar 7, 2024
4d4bb10
rename bqml create model internal method
shobsi Mar 8, 2024
0eff3a6
fix renamed methods's reference in unit tests
shobsi Mar 8, 2024
185edd9
remove stray bqmlclient variable
shobsi Mar 8, 2024
07dca56
Merge remote-tracking branch 'refs/remotes/github/main' into shobs-cmek
shobsi Mar 8, 2024
86ebba7
Merge remote-tracking branch 'refs/remotes/github/main' into shobs-cmek
shobsi Mar 8, 2024
2ae5361
Merge remote-tracking branch 'refs/remotes/github/main' into shobs-cmek
shobsi Mar 8, 2024
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
Prev Previous commit
Next Next commit
skip cmek test for empty cmek
  • Loading branch information
shobsi committed Mar 4, 2024
commit 927d8a220baf2fa31eacf100e500fcabff8c3f19
4 changes: 3 additions & 1 deletion tests/system/small/test_encryption.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,10 @@ def test_read_pandas_large(bq_cmek, session_with_bq_cmek):


def test_bqml(bq_cmek, session_with_bq_cmek, penguins_table_id):
model = bigframes.ml.linear_model.LinearRegression()
if not bq_cmek:
pytest.skip("no cmek set for testing")

model = bigframes.ml.linear_model.LinearRegression()
df = session_with_bq_cmek.read_gbq(penguins_table_id).dropna()
X_train = df[
[
Expand Down