Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ linters-settings:
- golang.org/x/term
- google.golang.org/genproto
- google.golang.org/protobuf
- gopkg.in/square/go-jose.v2
- github.com/go-jose/go-jose/v3
- gopkg.in/yaml.v3
- oras.land/oras-go
- sigs.k8s.io/yaml
Expand Down
2 changes: 1 addition & 1 deletion cmd/harp/internal/cmd/keygen_jwk.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
package cmd

import (
"github.com/go-jose/go-jose/v3"
"github.com/spf13/cobra"
"go.uber.org/zap"
"gopkg.in/square/go-jose.v2"

"github.com/elastic/harp/pkg/sdk/cmdutil"
"github.com/elastic/harp/pkg/sdk/log"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ require (
github.com/fatih/structs v1.1.0
github.com/fernet/fernet-go v0.0.0-20240119011108-303da6aec611
github.com/go-akka/configuration v0.0.0-20200606091224-a002c0330665
github.com/go-jose/go-jose/v3 v3.0.4
github.com/go-ozzo/ozzo-validation/v4 v4.3.0
github.com/go-zookeeper/zk v1.0.4
github.com/gobwas/glob v0.2.3
Expand Down Expand Up @@ -83,7 +84,6 @@ require (
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822
google.golang.org/grpc v1.74.2
google.golang.org/protobuf v1.36.7
gopkg.in/square/go-jose.v2 v2.6.0
gopkg.in/yaml.v3 v3.0.1
oras.land/oras-go v1.2.6
sigs.k8s.io/yaml v1.4.0
Expand Down
59 changes: 57 additions & 2 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pkg/sdk/security/crypto/encoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import (
"encoding/pem"
"fmt"

jose "github.com/go-jose/go-jose/v3"
"github.com/go-jose/go-jose/v3/jwt"
"github.com/pkg/errors"
"go.step.sm/crypto/pemutil"
jose "gopkg.in/square/go-jose.v2"
"gopkg.in/square/go-jose.v2/jwt"

"github.com/elastic/harp/build/fips"
"github.com/elastic/harp/pkg/sdk/security/crypto/bech32"
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/value/encryption/jwe/builders.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"fmt"
"strings"

"gopkg.in/square/go-jose.v2"
"github.com/go-jose/go-jose/v3"

"github.com/elastic/harp/pkg/sdk/value"
"github.com/elastic/harp/pkg/sdk/value/encryption"
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/value/encryption/jwe/transformer.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"context"
"fmt"

"gopkg.in/square/go-jose.v2"
"github.com/go-jose/go-jose/v3"

"github.com/elastic/harp/pkg/sdk/types"
"github.com/elastic/harp/pkg/sdk/value"
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/value/encryption/jwe/transformer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"reflect"
"testing"

"gopkg.in/square/go-jose.v2"
"github.com/go-jose/go-jose/v3"
)

func mustDecodeBase64(in string) []byte {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/value/signature/jws/builders.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"

"github.com/dchest/uniuri"
"gopkg.in/square/go-jose.v2"
"github.com/go-jose/go-jose/v3"

"github.com/elastic/harp/pkg/sdk/value"
"github.com/elastic/harp/pkg/sdk/value/signature"
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/value/signature/jws/transformer.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"context"
"fmt"

"gopkg.in/square/go-jose.v2"
"github.com/go-jose/go-jose/v3"

"github.com/elastic/harp/pkg/sdk/types"
"github.com/elastic/harp/pkg/sdk/value/signature"
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/value/signature/jws/transformer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"reflect"
"testing"

"github.com/go-jose/go-jose/v3"
"github.com/stretchr/testify/assert"
"gopkg.in/square/go-jose.v2"

"github.com/elastic/harp/pkg/sdk/value/signature"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/value/signature/paseto/builders.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"fmt"
"strings"

"gopkg.in/square/go-jose.v2"
"github.com/go-jose/go-jose/v3"

"github.com/elastic/harp/pkg/sdk/value"
"github.com/elastic/harp/pkg/sdk/value/signature"
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/value/signature/paseto/transformer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"reflect"
"testing"

"github.com/go-jose/go-jose/v3"
"github.com/stretchr/testify/assert"
"gopkg.in/square/go-jose.v2"
)

func mustDecodeJWK(input []byte) *jose.JSONWebKey {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/value/signature/raw/builders.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"fmt"
"strings"

"gopkg.in/square/go-jose.v2"
"github.com/go-jose/go-jose/v3"

"github.com/elastic/harp/pkg/sdk/value"
"github.com/elastic/harp/pkg/sdk/value/signature"
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/value/signature/raw/transformer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"encoding/json"
"testing"

"github.com/go-jose/go-jose/v3"
"github.com/stretchr/testify/assert"
"gopkg.in/square/go-jose.v2"

"github.com/elastic/harp/pkg/sdk/value/signature"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/tasks/keygen/jwk.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"fmt"
"io"

"gopkg.in/square/go-jose.v2"
"github.com/go-jose/go-jose/v3"

"github.com/elastic/harp/pkg/tasks"
)
Expand Down
Loading