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

fix(mnq): fix nats credentials parsing #1990

Merged
merged 3 commits into from
Jun 15, 2023
Merged

fix(mnq): fix nats credentials parsing #1990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a007f7
fix(mnq): fix nats credentials parsing
quantumsheep Jun 14, 2023
c5a4228
fix: add an exception for NonExistentQueue response code
quantumsheep Jun 15, 2023
fdd7343
revert
quantumsheep Jun 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
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ require (
github.com/hashicorp/go-retryablehttp v0.7.2
github.com/hashicorp/terraform-plugin-log v0.9.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.26.1
github.com/nats-io/jwt/v2 v2.4.1
github.com/nats-io/nats.go v1.26.0
github.com/robfig/cron/v3 v3.0.1
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230526161530-cf508019231d
Expand Down
1 change: 1 addition & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3P
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
github.com/nats-io/jwt/v2 v2.4.1 h1:Y35W1dgbbz2SQUYDPCaclXcuqleVmpbRa7646Jf2EX4=
github.com/nats-io/jwt/v2 v2.4.1/go.mod h1:24BeQtRwxRV8ruvC4CojXlx/WQ/VjuwlYiH+vu/+ibI=
github.com/nats-io/nats-server/v2 v2.9.16 h1:SuNe6AyCcVy0g5326wtyU8TdqYmcPqzTjhkHojAjprc=
github.com/nats-io/nats-server/v2 v2.9.16/go.mod h1:z1cc5Q+kqJkz9mLUdlcSsdYnId4pyImHjNgoh6zxSC0=
github.com/nats-io/nats.go v1.26.0 h1:fWJTYPnZ8DzxIaqIHOAMfColuznchnd5Ab5dbJpgPIE=
Expand Down
21 changes: 15 additions & 6 deletions scaleway/helpers_mnq_queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
natsjwt "github.com/nats-io/jwt/v2"
"github.com/nats-io/nats.go"
mnq "github.com/scaleway/scaleway-sdk-go/api/mnq/v1alpha1"
"github.com/scaleway/scaleway-sdk-go/scw"
Expand Down Expand Up @@ -101,14 +102,22 @@ func newNATSJetStreamClient(region string, endpoint string, credentials string)
}

func splitNATSJWTAndSeed(credentials string) (string, string, error) {
lines := strings.Split(credentials, "\n")
if len(lines) < 6 {
return "", "", fmt.Errorf("invalid credentials format")
jwt, err := natsjwt.ParseDecoratedJWT([]byte(credentials))
if err != nil {
return "", "", err
}

nkey, err := natsjwt.ParseDecoratedUserNKey([]byte(credentials))
if err != nil {
return "", "", err
}

seed, err := nkey.Seed()
if err != nil {
return "", "", err
}

jwt := lines[1]
seed := lines[4]
return jwt, seed, nil
return jwt, string(seed), nil
}

const SQSFIFOQueueNameSuffix = ".fifo"
Expand Down
Loading