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

Jump to bottom

Sync with upstream 3.28.0 #364

Merged
merged 20 commits into from
Nov 18, 2024
Merged

Sync with upstream 3.28.0 #364

merged 20 commits into from
Nov 18, 2024

Conversation

dkropachev
Copy link
Collaborator

@dkropachev dkropachev commented Aug 9, 2024 •
edited
Loading

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

@dkropachev dkropachev force-pushed the dk/sync-with-upstream-3.28.0 branch 4 times, most recently from 76e1a2f to 8cc41a4 Compare August 9, 2024 22:42
@dkropachev dkropachev marked this pull request as ready for review August 9, 2024 22:45
@dkropachev dkropachev force-pushed the dk/sync-with-upstream-3.28.0 branch 2 times, most recently from 81b3b33 to e344b51 Compare August 9, 2024 23:57
@dkropachev dkropachev self-assigned this Aug 9, 2024
fruch
fruch reviewed Aug 10, 2024
View reviewed changes
docs/index.rst Outdated Show resolved Hide resolved
@dkropachev dkropachev force-pushed the dk/sync-with-upstream-3.28.0 branch 4 times, most recently from 969c93b to 5357c34 Compare August 13, 2024 18:24
fruch
fruch approved these changes Aug 13, 2024
View reviewed changes
Copy link

@fruch fruch left a comment

Choose a reason for hiding this comment

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

LGTM

@dkropachev
Copy link
Collaborator Author

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

@Lorak-mmk
Copy link

@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
Copy link

@Lorak-mmk Lorak-mmk left a comment

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...

docs/.nav Outdated Show resolved Hide resolved
.travis.yml Outdated Show resolved Hide resolved
setup.py Outdated Show resolved Hide resolved
cassandra/cqltypes.py Outdated Show resolved Hide resolved
cassandra/policies.py Show resolved Hide resolved
docs/.nav Outdated Show resolved Hide resolved
fruch
fruch reviewed Aug 15, 2024
View reviewed changes
tox.ini Outdated Show resolved Hide resolved
@dkropachev dkropachev force-pushed the dk/sync-with-upstream-3.28.0 branch 2 times, most recently from ad15d4d to acbf507 Compare August 15, 2024 23:57
@dkropachev
Copy link
Collaborator 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-mmk Lorak-mmk mentioned this pull request Nov 6, 2024
Merged
@dkropachev
Copy link
Collaborator Author

dkropachev commented Nov 10, 2024 •
edited
Loading

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
Copy link

@Lorak-mmk Lorak-mmk left a comment

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.

.travis.yml Outdated Show resolved Hide resolved
docs/index.rst Outdated Show resolved Hide resolved
absurdfarce and others added 18 commits November 18, 2024 10:21
@absurdfarce @dkropachev
PYTHON-1341 Impl of client-side column-level encryption/decryption (d…
b0b9527 
…atastax#1150)
@absurdfarce @dkropachev
Release 3.27: changelog & version
12f0922
@jgillenwater @dkropachev
update RH nav order (datastax#1154)
dd00b5d 
* update RH nav order

* add line break

* add api
@jgillenwater @dkropachev
remove future plans (datastax#1155)
5273707
@absurdfarce @dkropachev
Missed dependency on cryptography in setup.py
0d3b5fa
@emeliawilkinson24 @dkropachev
DOC-2813 (datastax#1145)
070d72a 
Added error handling blog reference.
@absurdfarce @dkropachev
DOC-3278 Update comment for retry policy (datastax#1158)
b9b976e
@absurdfarce @dkropachev
Fix for rendering of code blocks in CLE documentation (datastax#1159)
3c996d4
@bschoening @dkropachev
remove unnecessary import __future__ (datastax#1156)
b4f4354
@lukaselmer @dkropachev
docs: convert print statement to function in docs (datastax#1157)
0b054ee
@absurdfarce @dkropachev
Revert "remove unnecessary import __future__ (datastax#1156)"
b400697 
This reverts commit 6894b02.
@absurdfarce @dkropachev
PYTHON-1351 Convert cryptography to an optional dependency (datastax#…
7e47772 
…1164)
@absurdfarce @dkropachev
PYTHON-1350 Store IV along with encrypted text when using column-leve…
a1c6bf7 
…l encryption (datastax#1160)
@absurdfarce @dkropachev
PYTHON-1356 Create session-specific protocol handlers to contain sess…
9124492 
…ion-specific CLE policies (datastax#1165)
@absurdfarce @dkropachev
CONN-38 Notes for 3.27.0 on PYTHON-1350 (datastax#1166)
3a9ac29
@absurdfarce @dkropachev
PYTHON-1352 Add vector type, codec + support for parsing CQL type (da…
6b46906 
…tastax#1161)
@absurdfarce @dkropachev
Release 3.28.0: changelog & version
b2af730
@dkropachev
Add .eggs to .gitignore
1c5edd7
Lorak-mmk
Lorak-mmk reviewed Nov 18, 2024
View reviewed changes
docs/index.rst Outdated Show resolved Hide resolved
@fruch
Copy link

fruch commented Nov 18, 2024

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 dkropachev merged commit 416d9ae into scylladb:master Nov 18, 2024
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fruch fruch fruch approved these changes

@Lorak-mmk Lorak-mmk Lorak-mmk approved these changes

@sylwiaszunejko sylwiaszunejko Awaiting requested review from sylwiaszunejko

@roydahan roydahan Awaiting requested review from roydahan

Assignees

@dkropachev dkropachev

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@dkropachev @Lorak-mmk @fruch @roydahan @absurdfarce @jgillenwater @emeliawilkinson24 @bschoening @lukaselmer