go mod tidy

Author: eriktate

integrations/terraform-mwi/go.mod

@@ -37,6 +37,7 @@ require (
 	code.dny.dev/ssrf v0.2.0 // indirect
 	connectrpc.com/connect v1.18.1 // indirect
 	dario.cat/mergo v1.0.1 // indirect
+	filippo.io/age v1.2.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect

integrations/terraform-mwi/go.sum

@@ -1,3 +1,5 @@
+c2sp.org/CCTV/age v0.0.0-20240306222714-3ec4d716e805 h1:u2qwJeEvnypw+OCPUHmoZE3IqwfuN5kgDfo5MLzpNM0=
+c2sp.org/CCTV/age v0.0.0-20240306222714-3ec4d716e805/go.mod h1:FomMrUJ2Lxt5jCLmZkG3FHa72zUprnhd3v/Z18Snm4w=
 cel.dev/expr v0.23.1 h1:K4KOtPCJQjVggkARsjG9RWXP6O4R73aHeJMa/dmCQQg=
 cel.dev/expr v0.23.1/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
@@ -43,6 +45,8 @@ connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw=
 connectrpc.com/connect v1.18.1/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8=
 dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
 dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+filippo.io/age v1.2.1 h1:X0TZjehAZylOIj4DubWYU1vWQxv9bJpo+Uu2/LGhi1o=
+filippo.io/age v1.2.1/go.mod h1:JL9ew2lTN+Pyft4RiNGguFfOpewKwSHm5ayKD/A4004=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs=

lib/auth/recordingencryption/encryptedio_test.go

@@ -31,18 +31,18 @@ import (
 
 func TestEncryptedIO(t *testing.T) {
 	ctx := context.Background()
-	keyStore := newFakeKeyStore()
-	ident, err := keyStore.generateIdentity()
+	keyFinder := newFakeKeyFinder()
+	ident, err := keyFinder.generateIdentity()
 	require.NoError(t, err)
 
 	srcGetter, err := newFakeSRCGetter(true, []*types.AgeEncryptionKey{
-		&types.AgeEncryptionKey{
+		{
 			PublicKey: []byte(ident.Recipient().String()),
 		},
 	})
 	require.NoError(t, err)
 
-	encryptedIO := recordingencryption.NewEncryptedIO(srcGetter, keyStore)
+	encryptedIO := recordingencryption.NewEncryptedIO(srcGetter, keyFinder)
 
 	out := bytes.NewBuffer(nil)
 	writer, err := encryptedIO.WithEncryption(ctx, &writeCloser{Writer: out})

lib/events/stream.go

@@ -94,9 +94,6 @@ const (
 	// of the record header, it consists of the record length
 	ProtoStreamV1RecordHeaderSize = Int32Size
 
-	// AgeHeader prefixes all encrypted recording parts
-	AgeHeader = "age-encryption.org/"
-
 	// uploaderReservePartErrorMessage error message present when
 	// `ReserveUploadPart` fails.
 	uploaderReservePartErrorMessage = "uploader failed to reserve upload part"

lib/events/stream_test.go

@@ -23,7 +23,6 @@ import (
 	"context"
 	"encoding/hex"
 	"errors"
-	"fmt"
 	"io"
 	"os"
 	"strings"
@@ -335,22 +334,10 @@ func (f *fakeEncryptedIO) WithEncryption(ctx context.Context, writer io.WriteClo
 		writer: hexWriter,
 	}
 
-	_, err := writer.Write([]byte(events.AgeHeader))
-	if err != nil {
-		return nil, fmt.Errorf("writing age header: %w", err)
-	}
 	return encrypter, f.err
 }
 
 func (f *fakeEncryptedIO) WithDecryption(ctx context.Context, reader io.Reader) (io.Reader, error) {
-	header := make([]byte, len(events.AgeHeader))
-	if _, err := reader.Read(header); err != nil {
-		return nil, fmt.Errorf("reading age header: %w", err)
-	}
-
-	if string(header) != events.AgeHeader {
-		return nil, errors.New("missing age header")
-	}
 	return hex.NewDecoder(reader), f.err
 }