Skip to content

Encrypt in a package and export method encrypt to be used in import "go.mozilla.org/sops/v3/encrypt" #1174

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

Open
skrese wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Encrypt in a package and export method encrypt to be used in import "go.mozilla.org/sops/v3/encrypt" #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd63b4f
Encrypt in a package and export method encrypt to be used in import "…
Feb 4, 2023
59a0398
Decrypt in a package and export method decrypt to be used in import "…
Mar 15, 2023
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
4 changes: 2 additions & 2 deletions cmd/sops/decrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"go.mozilla.org/sops/v3/keyservice"
)

type decryptOpts struct {
type DecryptOpts struct {
Cipher sops.Cipher
InputStore sops.Store
OutputStore sops.Store
Expand All @@ -19,7 +19,7 @@ type decryptOpts struct {
KeyServices []keyservice.KeyServiceClient
}

func decrypt(opts decryptOpts) (decryptedFile []byte, err error) {
func Decrypt(opts DecryptOpts) (decryptedFile []byte, err error) {
tree, err := common.LoadEncryptedFileWithBugFixes(common.GenericDecryptOpts{
Cipher: opts.Cipher,
InputStore: opts.InputStore,
Expand Down
13 changes: 7 additions & 6 deletions cmd/sops/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
publishcmd "go.mozilla.org/sops/v3/cmd/sops/subcommand/publish"
"go.mozilla.org/sops/v3/cmd/sops/subcommand/updatekeys"
"go.mozilla.org/sops/v3/config"
"go.mozilla.org/sops/v3/encrypt"
"go.mozilla.org/sops/v3/gcpkms"
"go.mozilla.org/sops/v3/hcvault"
"go.mozilla.org/sops/v3/keys"
Expand Down Expand Up @@ -144,7 +145,7 @@ func main() {
inputStore := inputStore(c, fileName)

svcs := keyservices(c)
opts := decryptOpts{
opts := DecryptOpts{
OutputStore: &dotenv.Store{},
InputStore: inputStore,
InputPath: fileName,
Expand All @@ -153,7 +154,7 @@ func main() {
IgnoreMAC: c.Bool("ignore-mac"),
}

output, err := decrypt(opts)
output, err := Decrypt(opts)
if err != nil {
return toExitError(err)
}
Expand Down Expand Up @@ -212,7 +213,7 @@ func main() {
outputStore := outputStore(c, fileName)

svcs := keyservices(c)
opts := decryptOpts{
opts := DecryptOpts{
OutputStore: outputStore,
InputStore: inputStore,
InputPath: fileName,
Expand All @@ -221,7 +222,7 @@ func main() {
IgnoreMAC: c.Bool("ignore-mac"),
}

output, err := decrypt(opts)
output, err := Decrypt(opts)
if err != nil {
return toExitError(err)
}
Expand Down Expand Up @@ -796,7 +797,7 @@ func main() {
if err != nil {
return toExitError(err)
}
output, err = encrypt(encryptOpts{
output, err = encrypt.Encrypt(encrypt.EncryptOpts{
OutputStore: outputStore,
InputStore: inputStore,
InputPath: fileName,
Expand All @@ -817,7 +818,7 @@ func main() {
if err != nil {
return common.NewExitError(fmt.Errorf("error parsing --extract path: %s", err), codes.InvalidTreePathFormat)
}
output, err = decrypt(decryptOpts{
output, err = Decrypt(DecryptOpts{
OutputStore: outputStore,
InputStore: inputStore,
InputPath: fileName,
Expand Down
8 changes: 4 additions & 4 deletions cmd/sops/encrypt.go → encrypt/encrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package encrypt

import (
"io/ioutil"
Expand All @@ -14,7 +14,7 @@ import (
"go.mozilla.org/sops/v3/version"
)

type encryptOpts struct {
type EncryptOpts struct {
Cipher sops.Cipher
InputStore sops.Store
OutputStore sops.Store
Expand Down Expand Up @@ -46,7 +46,7 @@ func (err *fileAlreadyEncryptedError) UserError() string {
return wordwrap.WrapString(message, 75)
}

func ensureNoMetadata(opts encryptOpts, branch sops.TreeBranch) error {
func ensureNoMetadata(opts EncryptOpts, branch sops.TreeBranch) error {
for _, b := range branch {
if b.Key == "sops" {
return &fileAlreadyEncryptedError{}
Expand All @@ -55,7 +55,7 @@ func ensureNoMetadata(opts encryptOpts, branch sops.TreeBranch) error {
return nil
}

func encrypt(opts encryptOpts) (encryptedFile []byte, err error) {
func Encrypt(opts EncryptOpts) (encryptedFile []byte, err error) {
// Load the file
fileBytes, err := ioutil.ReadFile(opts.InputPath)
if err != nil {
Expand Down