Skip to content

Commit

Permalink
chore: update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@dbarrosop
dbarrosop committed Jan 11, 2024
1 parent 19d678c commit 2d510f4
Show file tree
Hide file tree
Showing 833 changed files with 22,874 additions and 40,388 deletions.
14 changes: 7 additions & 7 deletions cmd/serve.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const (
corsAllowOriginsFlag = "cors-allow-origins"
corsAllowCredentialsFlag = "cors-allow-credentials" //nolint: gosec
clamavServerFlag = "clamav-server"
hasuraDbNameFlag = "hasura-db-name"
hasuraDBNameFlag = "hasura-db-name"
)

func ginLogger(logger *logrus.Logger) gin.HandlerFunc {
Expand Down Expand Up @@ -165,7 +165,7 @@ func getContentStorage(
o.EndpointOptions.DisableHTTPS = disableHTTPS
},
)
st := storage.NewS3(client, bucket, rootFolder, s3Endpoint, disableHTTPS, logger)
st := storage.NewS3(client, bucket, rootFolder, s3Endpoint, logger)

return st
}
Expand All @@ -176,7 +176,7 @@ func applymigrations(
hasuraMetadata bool,
hasuraEndpoint string,
hasuraSecret string,
hasuraDbName string,
hasuraDBName string,
logger *logrus.Logger,
) {
if postgresMigrations {
Expand All @@ -193,7 +193,7 @@ func applymigrations(

if hasuraMetadata {
logger.Info("applying hasura metadata")
if err := migrations.ApplyHasuraMetadata(hasuraEndpoint, hasuraSecret, hasuraDbName); err != nil {
if err := migrations.ApplyHasuraMetadata(hasuraEndpoint, hasuraSecret, hasuraDBName); err != nil {
logger.Errorf("problem applying hasura metadata: %s", err.Error())
os.Exit(1)
}
Expand Down Expand Up @@ -241,7 +241,7 @@ func init() {
"",
"postgres connection, i.e. postgres://user@pass:localhost:5432/mydb",
)
addStringFlag(serveCmd.Flags(), hasuraDbNameFlag, "default", "Hasura database name")
addStringFlag(serveCmd.Flags(), hasuraDBNameFlag, "default", "Hasura database name")
}

{
Expand Down Expand Up @@ -295,7 +295,7 @@ var serveCmd = &cobra.Command{
s3BucketFlag: viper.GetString(s3BucketFlag),
s3RootFolderFlag: viper.GetString(s3RootFolderFlag),
clamavServerFlag: viper.GetString(clamavServerFlag),
hasuraDbNameFlag: viper.GetString(hasuraDbNameFlag),
hasuraDBNameFlag: viper.GetString(hasuraDBNameFlag),
},
).Debug("parameters")

Expand All @@ -317,7 +317,7 @@ var serveCmd = &cobra.Command{
viper.GetBool(hasuraMetadataFlag),
viper.GetString(hasuraEndpointFlag),
viper.GetString(hasuraAdminSecretFlag),
viper.GetString(hasuraDbNameFlag),
viper.GetString(hasuraDBNameFlag),
logger,
)

Expand Down
2 changes: 1 addition & 1 deletion controller/delete_broken_metadata_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"net/http/httptest"
"testing"

"github.com/golang/mock/gomock"
"github.com/nhost/hasura-storage/controller"
"github.com/nhost/hasura-storage/controller/mock"
"github.com/sirupsen/logrus"
gomock "go.uber.org/mock/gomock"
)

func TestDeleteBrokenMetadata(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion controller/delete_file_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"net/http/httptest"
"testing"

"github.com/golang/mock/gomock"
"github.com/nhost/hasura-storage/controller"
"github.com/nhost/hasura-storage/controller/mock"
"github.com/sirupsen/logrus"
gomock "go.uber.org/mock/gomock"
)

func TestDeleteFile(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion controller/delete_orphans_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"net/http/httptest"
"testing"

"github.com/golang/mock/gomock"
"github.com/nhost/hasura-storage/controller"
"github.com/nhost/hasura-storage/controller/mock"
"github.com/sirupsen/logrus"
gomock "go.uber.org/mock/gomock"
)

func TestDeleteOrphans(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion controller/get_file_information_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"net/http/httptest"
"testing"

"github.com/golang/mock/gomock"
"github.com/nhost/hasura-storage/controller"
"github.com/nhost/hasura-storage/controller/mock"
"github.com/nhost/hasura-storage/image"
"github.com/sirupsen/logrus"
gomock "go.uber.org/mock/gomock"
)

func getFileTestCases() []struct {
Expand Down
2 changes: 1 addition & 1 deletion controller/get_file_presigned_url_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"testing"
"time"

"github.com/golang/mock/gomock"
"github.com/nhost/hasura-storage/controller"
"github.com/nhost/hasura-storage/controller/mock"
"github.com/sirupsen/logrus"
gomock "go.uber.org/mock/gomock"
)

func TestGetFilePresignedURL(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion controller/get_file_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"strings"
"testing"

"github.com/golang/mock/gomock"
"github.com/nhost/hasura-storage/controller"
"github.com/nhost/hasura-storage/controller/mock"
"github.com/sirupsen/logrus"
gomock "go.uber.org/mock/gomock"
)

func TestGetFile(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion controller/list_broken_metadata_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"net/http/httptest"
"testing"

"github.com/golang/mock/gomock"
"github.com/nhost/hasura-storage/controller"
"github.com/nhost/hasura-storage/controller/mock"
"github.com/sirupsen/logrus"
gomock "go.uber.org/mock/gomock"
)

func TestListBrokenMetadata(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion controller/list_not_uploaded_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"net/http/httptest"
"testing"

"github.com/golang/mock/gomock"
"github.com/nhost/hasura-storage/controller"
"github.com/nhost/hasura-storage/controller/mock"
"github.com/sirupsen/logrus"
gomock "go.uber.org/mock/gomock"
)

func TestListNotUploaded(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion controller/list_orphans_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"net/http/httptest"
"testing"

"github.com/golang/mock/gomock"
"github.com/nhost/hasura-storage/controller"
"github.com/nhost/hasura-storage/controller/mock"
"github.com/sirupsen/logrus"
gomock "go.uber.org/mock/gomock"
)

func TestListOrphans(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion controller/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"time"

"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/nhost/hasura-storage/controller"
"github.com/sirupsen/logrus"
gomock "go.uber.org/mock/gomock"
)

type readerMatcher struct {
Expand Down
10 changes: 7 additions & 3 deletions controller/mock/antivirus.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 12 additions & 8 deletions controller/mock/content_storage.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 16 additions & 12 deletions controller/mock/metadata_storage.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2d510f4

Please sign in to comment.