Add ruleSet and KMS setting for CLI CSFLE during init #2942
Conversation
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
|
🎉 All Contributor License Agreements have been signed. Ready to merge. |
rayokota
reviewed
Nov 18, 2024
channingdong
commented
Nov 22, 2024
channingdong
commented
Nov 25, 2024
channingdong
changed the title
channingdong
commented
Nov 26, 2024
channingdong
commented
Nov 26, 2024
Comment on lines
152
to
177
| currDir, err := os.Getwd() | ||
| if err != nil { | ||
| return nil, fmt.Errorf("Error getting current working directory: %v\n", err) | ||
| } | ||
| log.CliLogger.Debugf("Current working directory is: %s\n", currDir) | ||
|
|
||
| // Copy all the built-in proto schemas needed for CSFLE to <importPath> where the main schema is stored | ||
| // Note: folder path should be set correctly based on current working directory | ||
| // Expected working directory in CLI test is: /Users/github.com/confluentinc/cli/pkg/serdes | ||
| // Expected working directory in CLI shell execution is: /Users/github.com/confluentinc/cli | ||
| for _, folder := range builtInSchemaFoldersToCopy { | ||
| dst := importPath + "/" + folder | ||
|
|
||
| // Skip copying the built-in schema folders if they are present already in the temp folder | ||
| if _, err = os.Stat(dst); err == nil { | ||
| log.CliLogger.Debugf("Built-in schema folder already exists %s, skipping copy again:\n", dst) | ||
| continue | ||
| } | ||
|
|
||
| // Locate the source of built-in schema folders | ||
| if strings.HasSuffix(currDir, "confluentinc/cli") { | ||
| folder = "pkg/serdes/" + folder | ||
| } | ||
| if err = copy.Copy(folder, dst); err != nil { | ||
| return nil, fmt.Errorf("Error copying built-in schemas folder %s: %w\n", folder, err) | ||
| } |
There was a problem hiding this comment.
@sgagniere This part is something relatively new to CLI, your review will be appreciated!
…ate test cases accordingly
airlock-confluentinc
bot
force-pushed
the
cdong-csfle-ruleset
branch
from
27bb169 to
5cbc67b
Compare
This reverts commit 5cbc67b.
sgagniere
previously approved these changes
Dec 5, 2024
sgagniere
reviewed
Dec 5, 2024
sgagniere
requested changes
Dec 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Release Notes
This PR serves as a following up PR to finalize the CSFLE work on CLI, including the following changes:
Breaking Changes
New Features
ruleSetand Key Management Service (KMS) driver support to finalize the Client Side Field Level Encryption (CSFLE) feature forconfluent kafka topic [produce | consume]Bug Fixes
Checklist
What
ruleSetcan be extracted correctly from the native Go object.ruleSetcorrectly.confluent-kafka-golibrary to latest version.References
Test & Review
The manual verification passing result can be found here:
https://docs.google.com/document/d/1GwXz9hNOkub_Br-2nssoYWCf6elZBvwo7TMhCNYinwE/edit?tab=t.0#heading=h.1xcbdvagwov4