Merge pull request #2138 from traPtitech/dependabot/go_modules/github…

….com/spf13/viper-1.18.0 Bump github.com/spf13/viper from 1.17.0 to 1.18.0
traPtitech · Dec 7, 2023 · 9fc76ae · 9fc76ae
2 parents c0eef75 + 1d52ab5
commit 9fc76ae
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 330 deletions.
diff --git a/cmd/file.go b/cmd/file.go
@@ -75,7 +75,7 @@ func filePruneCommand() *cobra.Command {
 			}
 
 			// FileManager
-			fm, err := file.InitFileManager(repo, fs, imaging.NewProcessor(provideImageProcessorConfig(c)), logger)
+			fm, err := file.InitFileManager(repo, fs, imaging.NewProcessor(provideImageProcessorConfig(&c)), logger)
 			if err != nil {
 				logger.Fatal("failed to initialize file manager", zap.Error(err))
 			}
@@ -176,7 +176,7 @@ func genMissingThumbnails() *cobra.Command {
 			}
 
 			// ImageProcessor
-			ip := imaging.NewProcessor(provideImageProcessorConfig(c))
+			ip := imaging.NewProcessor(provideImageProcessorConfig(&c))
 
 			generateImageThumb := func(file *model.FileMeta) error {
 				fid := file.ID
@@ -374,7 +374,7 @@ func genGroupImages() *cobra.Command {
 			}
 
 			// ImageProcessor
-			ip := imaging.NewProcessor(provideImageProcessorConfig(c))
+			ip := imaging.NewProcessor(provideImageProcessorConfig(&c))
 
 			// FileManager
 			fm, err := file.InitFileManager(repo, fs, ip, logger)

diff --git a/cmd/root.go b/cmd/root.go
@@ -29,7 +29,7 @@ var (
 	// configFile 設定ファイルyamlのパス
 	configFile string
 	// c 設定
-	c *Config
+	c Config
 )
 
 // rootコマンドはダミー。コマンドとしては使用しない

diff --git a/cmd/serve.go b/cmd/serve.go
@@ -42,7 +42,7 @@ func serveCommand() *cobra.Command {
 
 			// Stackdriver Profiler
 			if c.GCP.Stackdriver.Profiler.Enabled {
-				if err := initStackdriverProfiler(c); err != nil {
+				if err := initStackdriverProfiler(&c); err != nil {
 					logger.Fatal("failed to setup Stackdriver Profiler", zap.Error(err))
 				}
 				logger.Info("stackdriver profiler started")
@@ -98,7 +98,7 @@ func serveCommand() *cobra.Command {
 			}
 
 			// サーバー作成
-			server, err := newServer(hub, engine, repo, fs, logger, c)
+			server, err := newServer(hub, engine, repo, fs, logger, &c)
 			if err != nil {
 				logger.Fatal("failed to create server", zap.Error(err))
 			}

diff --git a/cmd/stamp.go b/cmd/stamp.go
@@ -62,7 +62,7 @@ func stampInstallEmojisCommand() *cobra.Command {
 			if err != nil {
 				logger.Fatal("failed to initialize repository", zap.Error(err))
 			}
-			fm, err := file.InitFileManager(repo, fs, imaging.NewProcessor(provideImageProcessorConfig(c)), logger)
+			fm, err := file.InitFileManager(repo, fs, imaging.NewProcessor(provideImageProcessorConfig(&c)), logger)
 			if err != nil {
 				logger.Fatal("failed to initialize file manager", zap.Error(err))
 			}

diff --git a/go.mod b/go.mod
@@ -48,7 +48,7 @@ require (
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.17.0
+	github.com/spf13/viper v1.18.0
 	github.com/stretchr/testify v1.8.4
 	go.uber.org/zap v1.26.0
 	golang.org/x/crypto v0.16.0
@@ -70,7 +70,7 @@ require (
 	cloud.google.com/go/firestore v1.14.0 // indirect
 	cloud.google.com/go/iam v1.1.5 // indirect
 	cloud.google.com/go/longrunning v0.5.4 // indirect
-	cloud.google.com/go/storage v1.30.1 // indirect
+	cloud.google.com/go/storage v1.35.1 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
 	github.com/Microsoft/go-winio v0.6.0 // indirect
 	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
@@ -106,7 +106,7 @@ require (
 	github.com/fatih/color v1.15.0 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/fogleman/gg v1.3.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-audio/riff v1.0.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
@@ -150,14 +150,14 @@ require (
 	github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.11.1 // indirect
-	github.com/sagikazarmark/locafero v0.3.0 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sanity-io/litter v1.5.5 // indirect
 	github.com/sergi/go-diff v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.10.0 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.34.0 // indirect