Skip to content

Commit

Permalink
fix linting errors
Browse files Browse the repository at this point in the history
  • Loading branch information
thecodeassassin committed Apr 22, 2024
1 parent 95e06a0 commit 8b4dc1a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
3 changes: 1 addition & 2 deletions internal/datastore/nats.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ import (
"fmt"
"strings"

"github.com/pkg/errors"

"github.com/nats-io/nats.go"
"github.com/pkg/errors"

kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1"
)
Expand Down
3 changes: 0 additions & 3 deletions internal/resources/datastore/datastore_storage_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,20 +140,17 @@ func (r *Config) mutate(ctx context.Context, tenantControlPlane *kamajiv1alpha1.
if r.DataStore.Spec.Driver == kamajiv1alpha1.KineNatsDriver {
// set username and password to the basicAuth values of the NATS datastore
u, err := r.DataStore.Spec.BasicAuth.Username.GetContent(ctx, r.Client)

if err != nil {
return errors.Wrap(err, "failed to retrieve the username for the NATS datastore")
}

p, err := r.DataStore.Spec.BasicAuth.Password.GetContent(ctx, r.Client)

if err != nil {
return errors.Wrap(err, "failed to retrieve the password for the NATS datastore")
}

username = u
password = p

} else {
username = coalesceFn(tenantControlPlane.Status.Storage.Setup.User)
}
Expand Down

0 comments on commit 8b4dc1a

Please sign in to comment.