asd

nhost · Aug 21, 2023 · f821966 · f821966
1 parent 3e16cc5
commit f821966
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/build/clamav/entrypoint.sh b/build/clamav/entrypoint.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+set -euo pipefail
 
 mkdir -p /clamav
 

diff --git a/build/dev/docker/docker-compose.yaml b/build/dev/docker/docker-compose.yaml
@@ -62,7 +62,7 @@ services:
       S3_ROOT_FOLDER: "f215cf48-7458-4596-9aa5-2159fc6a3caf"
       POSTGRES_MIGRATIONS: 1
       POSTGRES_MIGRATIONS_SOURCE: ${HASURA_GRAPHQL_DATABASE_URL:-postgres://postgres:hejsan@postgres:5432/postgres?sslmode=disable}
-      USE_CLAMAV: tcp://clamd:3310
+      USE_CLAMAV_SERVER: tcp://clamd:3310
     command: serve
 
   clamd:

diff --git a/cmd/serve.go b/cmd/serve.go
@@ -41,7 +41,7 @@ const (
 	fastlyKeyFlag                = "fastly-key"
 	corsAllowOriginsFlag         = "cors-allow-origins"
 	corsAllowCredentialsFlag     = "cors-allow-credentials" //nolint: gosec
-	useClamavFlag                = "use-clamav"
+	useClamavServerFlag          = "use-clamav-server"
 )
 
 func ginLogger(logger *logrus.Logger) gin.HandlerFunc {
@@ -92,7 +92,7 @@ func getGin(
 		gin.SetMode(gin.ReleaseMode)
 	}
 
-	av, err := getAv(viper.GetString(useClamavFlag))
+	av, err := getAv(viper.GetString(useClamavServerFlag))
 	if err != nil {
 		return nil, fmt.Errorf("problem trying to get av: %w", err)
 	}
@@ -238,7 +238,7 @@ func init() {
 		addStringArrayFlag(serveCmd.Flags(), corsAllowOriginsFlag, []string{"*"}, "CORS allow origins")
 		addBoolFlag(serveCmd.Flags(), corsAllowCredentialsFlag, false, "CORS allow credentials")
 		addStringFlag(
-			serveCmd.Flags(), useClamavFlag, "", "Use ClamAV to scan files. Example: tcp://clamavd:3310",
+			serveCmd.Flags(), useClamavServerFlag, "", "Use ClamAV to scan files. Example: tcp://clamavd:3310",
 		)
 	}
 }
@@ -274,7 +274,7 @@ var serveCmd = &cobra.Command{
 				s3RegionFlag:           viper.GetString(s3RegionFlag),
 				s3BucketFlag:           viper.GetString(s3BucketFlag),
 				s3RootFolderFlag:       viper.GetString(s3RootFolderFlag),
-				useClamavFlag:          viper.GetString(useClamavFlag),
+				useClamavServerFlag:    viper.GetString(useClamavServerFlag),
 			},
 		).Debug("parameters")