Skip to content

Sync with upstream 3.28.0 - #364

Merged
dkropachev merged 20 commits into
scylladb:masterfrom
dkropachev:dk/sync-with-upstream-3.28.0
Nov 18, 2024
Merged

Sync with upstream 3.28.0#364
dkropachev merged 20 commits into
scylladb:masterfrom
dkropachev:dk/sync-with-upstream-3.28.0

Conversation

@dkropachev

@dkropachevdkropachev commented Aug 9, 2024•
edited
Loading

Copy link
Copy Markdown

it is a peace of #329 that updates master to 3.28.0

@dkropachev
dkropachevforce-pushed the dk/sync-with-upstream-3.28.0 branch 4 times, most recently from 76e1a2f to 8cc41a4CompareAugust 9, 2024 22:42
@dkropachev
dkropachev marked this pull request as ready for review August 9, 2024 22:45
@dkropachev
dkropachevforce-pushed the dk/sync-with-upstream-3.28.0 branch 2 times, most recently from 81b3b33 to e344b51CompareAugust 9, 2024 23:57
@dkropachevdkropachev self-assigned this Aug 9, 2024
fruch
fruch reviewed Aug 10, 2024
View reviewed changes
Comment threaddocs/index.rst Outdated
@dkropachev
dkropachevforce-pushed the dk/sync-with-upstream-3.28.0 branch 4 times, most recently from 969c93b to 5357c34CompareAugust 13, 2024 18:24
fruch
fruch approved these changes Aug 13, 2024
View reviewed changes

@fruchfruch left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dkropachev

dkropachev commented Aug 15, 2024

Copy link
Copy Markdown
Author

@Lorak-mmk , @roydahan , is it good to go?

@Lorak-mmk

Lorak-mmk commented Aug 15, 2024

Copy link
Copy Markdown

@Lorak-mmk , @roydahan , is it good to go?

I'm reviewing right now

Lorak-mmk
Lorak-mmk requested changes Aug 15, 2024
View reviewed changes

@Lorak-mmkLorak-mmk left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commits that add column encryption policy make a lot of changes.
I think it would be better to drop those commits altogether until we decide if and how we want to implement the encryption - adding code later is much easier than removing it.

After reviewing this I remember why I dislike current process so much...

Comment threaddocs/.nav Outdated
Comment thread.travis.yml Outdated
Comment threadsetup.py
Comment threadcassandra/cqltypes.py
Comment threadcassandra/policies.py
Comment threaddocs/.nav Outdated
fruch
fruch reviewed Aug 15, 2024
View reviewed changes
Comment threadtox.ini Outdated
@dkropachev
dkropachevforce-pushed the dk/sync-with-upstream-3.28.0 branch 2 times, most recently from ad15d4d to acbf507CompareAugust 15, 2024 23:57
@dkropachev

dkropachev commented Aug 16, 2024

Copy link
Copy Markdown
Author

Commits that add column encryption policy make a lot of changes. I think it would be better to drop those commits altogether until we decide if and how we want to implement the encryption - adding code later is much easier than removing it.

After reviewing this I remember why I dislike current process so much...

CLE is highly integrated into cluster, session and even query, removing these commits will create unnecessary conflicts with any code done on top of it, also as bonus you are going to get a headache of merging them back and re-resolving same conflicts other way around when/if you decide to get this code in.

@Lorak-mmkLorak-mmk mentioned this pull request Nov 6, 2024
Merged
@dkropachev
dkropachevforce-pushed the dk/sync-with-upstream-3.28.0 branch from acbf507 to 6ea0d65CompareNovember 10, 2024 14:44
@dkropachev

dkropachev commented Nov 10, 2024•
edited
Loading

Copy link
Copy Markdown
Author

Commits that add column encryption policy make a lot of changes. I think it would be better to drop those commits altogether until we decide if and how we want to implement the encryption - adding code later is much easier than removing it.

After reviewing this I remember why I dislike current process so much...

Since we have already removed docs, I can't tell you that leaving code in creates way less conflicts and makes merging so much easier.
Also we need to consider that we are not merging code that was not reviewed, it already went though review process on the upstream, in some cases, when we changed core on our side it does not mean much, but on the side of the code we did not touch it does.

Lorak-mmk
Lorak-mmk requested changes Nov 18, 2024
View reviewed changes

@Lorak-mmkLorak-mmk left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some minor comments, apart from that looks good.

Comment thread.travis.yml Outdated
Comment threaddocs/index.rst Outdated
absurdfarceand others added 18 commits November 18, 2024 10:21
@absurdfarce@dkropachev
PYTHON-1341 Impl of client-side column-level encryption/decryption (a…
b0b9527
…pache#1150)
Bret McGuire@dkropachev
Release 3.27: changelog & version
12f0922
Jamie Gillenwater@dkropachev
update RH nav order (apache#1154)
dd00b5d
* update RH nav order
* add line break
* add api
Jamie Gillenwater@dkropachev
remove future plans (apache#1155)
5273707
Bret McGuire@dkropachev
Missed dependency on cryptography in setup.py
0d3b5fa
@emeliawilkinson24@dkropachev
DOC-2813 (apache#1145)
070d72a
Added error handling blog reference.
@absurdfarce@dkropachev
DOC-3278 Update comment for retry policy (apache#1158)
b9b976e
@absurdfarce@dkropachev
Fix for rendering of code blocks in CLE documentation (apache#1159)
3c996d4
@bschoening@dkropachev
remove unnecessary import __future__ (apache#1156)
b4f4354
@lukaselmer@dkropachev
docs: convert print statement to function in docs (apache#1157)
0b054ee
Bret McGuire@dkropachev
Revert "remove unnecessary import __future__ (apache#1156)"
b400697
This reverts commit 6894b02.
@absurdfarce@dkropachev
PYTHON-1351 Convert cryptography to an optional dependency (apache#1164)
7e47772
@absurdfarce@dkropachev
PYTHON-1350 Store IV along with encrypted text when using column-leve…
a1c6bf7
…l encryption (apache#1160)
@absurdfarce@dkropachev
PYTHON-1356 Create session-specific protocol handlers to contain sess…
9124492
…ion-specific CLE policies (apache#1165)
@absurdfarce@dkropachev
CONN-38 Notes for 3.27.0 on PYTHON-1350 (apache#1166)
3a9ac29
@absurdfarce@dkropachev
PYTHON-1352 Add vector type, codec + support for parsing CQL type (ap…
6b46906
…ache#1161)
Bret McGuire@dkropachev
Release 3.28.0: changelog & version
b2af730
@dkropachev
Add .eggs to .gitignore
1c5edd7
@dkropachev
dkropachevforce-pushed the dk/sync-with-upstream-3.28.0 branch from 6ea0d65 to c074bf8CompareNovember 18, 2024 14:22
Lorak-mmk
Lorak-mmk reviewed Nov 18, 2024
View reviewed changes
Comment threaddocs/index.rst
@dkropachev
dkropachevforce-pushed the dk/sync-with-upstream-3.28.0 branch from c074bf8 to ffcfde0CompareNovember 18, 2024 14:37
@fruch

fruch commented Nov 18, 2024

Copy link
Copy Markdown

Docs are failing to build

https://github.com/scylladb/python-driver/actions/runs/11894706235/job/33142543012#step:6:1

@dkropachev
Temporary disable AES256ColumnEncryptionPolicy
569271f
There was some seriouse issues in policy implementation in `3.27.0`.
We want to inspect the feature before making it available.
@dkropachev
dkropachevforce-pushed the dk/sync-with-upstream-3.28.0 branch from ffcfde0 to 569271fCompareNovember 18, 2024 19:23
@dkropachev
dkropachev merged commit 416d9ae into scylladb:masterNov 18, 2024
@dkropachevdkropachev mentioned this pull request Feb 20, 2025
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Lorak-mmkLorak-mmkLorak-mmk approved these changes
@sylwiaszunejkosylwiaszunejkoAwaiting requested review from sylwiaszunejko
@roydahanroydahanAwaiting requested review from roydahan
+1 more reviewer
@fruchfruchfruch approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@dkropachevdkropachev

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@dkropachev@Lorak-mmk@fruch@roydahan@absurdfarce@emeliawilkinson24@bschoening@lukaselmer