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

release-22.2: cli: fix debug pebble commands on encrypted stores #110509

Merged
merged 1 commit into from
Sep 15, 2023
Merged

release-22.2: cli: fix debug pebble commands on encrypted stores #110509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions pkg/ccl/cliccl/debug.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,13 @@ with their env type and encryption settings (if applicable).
&storeEncryptionSpecs, cliflagsccl.EnterpriseEncryption)

cli.PopulateStorageConfigHook = fillEncryptionOptionsForStore
cli.EncryptedStorePathsHook = func() []string {
var res []string
for _, spec := range storeEncryptionSpecs.Specs {
res = append(res, spec.Path)
}
return res
}
}

// fillEncryptionOptionsForStore fills the StorageConfig fields
Expand Down
5 changes: 3 additions & 2 deletions pkg/cli/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ load("//pkg/testutils/buildutil:buildutil.bzl", "disallowed_imports_test")
go_library(
name = "cli",
srcs = [
"absolute_fs.go",
"auth.go",
"auto_decrypt_fs.go",
"cert.go",
"cli.go",
"client_url.go",
Expand Down Expand Up @@ -59,7 +59,6 @@ go_library(
"start_windows.go",
"statement_bundle.go",
"statement_diag.go",
"swappable_fs.go",
"testutils.go",
"tsdump.go",
"userfile.go",
Expand Down Expand Up @@ -234,6 +233,7 @@ go_library(
"@com_github_cockroachdb_errors//hintdetail",
"@com_github_cockroachdb_errors//oserror",
"@com_github_cockroachdb_logtags//:logtags",
"@com_github_cockroachdb_pebble//:pebble",
"@com_github_cockroachdb_pebble//tool",
"@com_github_cockroachdb_pebble//vfs",
"@com_github_cockroachdb_redact//:redact",
Expand Down Expand Up @@ -303,6 +303,7 @@ go_test(
name = "cli_test",
size = "large",
srcs = [
"auto_decrypt_fs_test.go",
"cert_test.go",
"cli_debug_test.go",
"cli_test.go",
Expand Down
139 changes: 0 additions & 139 deletions pkg/cli/absolute_fs.go
View file
Open in desktop

This file was deleted.

Loading