Merge pull request #616 from USACE/issue488/serve-media-fix

Update serve downloads.

Author: jeffsuperglide

api/handlers/media.go

@@ -22,15 +22,22 @@ func cleanFilepath(rawPath string) (string, error) {
 	return filepath.Clean("/" + p), nil
 }
 
-func ServeMedia(awsCfg *aws.Config, bucket *string) echo.HandlerFunc {
+func ServeMedia(awsCfg *aws.Config, bucket *string, endpoint string, forcePathStyle, disableSSL bool) echo.HandlerFunc {
 	return func(c echo.Context) error {
 		path, err := cleanFilepath(c.Request().RequestURI)
 		if err != nil {
 			return c.String(http.StatusBadRequest, err.Error())
 		}
 
-		// _client := s3.New(session.New(awsCfg))
-		_client := s3.NewFromConfig(*awsCfg)
+		_client := s3.NewFromConfig(*awsCfg, func(o *s3.Options) {
+			o.UsePathStyle = forcePathStyle // was a.WithS3ForcePathStyle(...)
+			if endpoint != "" {             // was: if cfg.AWSS3Endpoint != "" { a.WithEndpoint(...) }
+				o.BaseEndpoint = aws.String(endpoint)
+			}
+			if disableSSL { // was a.WithDisableSSL(...)
+				o.EndpointOptions.DisableHTTPS = true
+			}
+		})
 		output, err := _client.GetObject(context.Background(), &s3.GetObjectInput{Bucket: bucket, Key: aws.String(path)})
 		if err != nil {
 			return c.String(500, err.Error())

api/main.go

@@ -228,8 +228,12 @@ func main() {
 		middleware.IsAdmin,
 	)
 
-	// Downloads
-	public.GET("/cumulus/download/*", handlers.ServeMedia(&cfg.AwsConfig, &cfg.AWSS3Bucket)) // Serve Downloads
+	// Serve Downloads
+	public.GET("/cumulus/download/*", handlers.ServeMedia(
+		&cfg.AwsConfig, &cfg.AWSS3Bucket,
+		cfg.AWSS3Endpoint, cfg.AWSS3ForcePathStyle, cfg.AWSS3DisableSSL,
+	))
+
 	// List Downloads
 	private.GET("/downloads", handlers.ListAdminDownloads(db), middleware.IsAdmin)
 	// Create Download (Anonymous)

docker-compose.yml

@@ -169,7 +169,7 @@ services:
     volumes:
       - ./api/:/go/src/app/:rw
     ports:
-      - '80:80'
+      - '8080:80'
       - '2345:2345' # expose port to host for Go delve
     restart: always
     depends_on:
@@ -202,38 +202,38 @@ services:
       cumulusdb:
         condition: service_started
   # --------------------------------------
-  featureserv:
-    build:
-      context: pg_featureserv
-    platform: linux/amd64 # this is the supported architecture for postgis
-    container_name: featureserv
-    restart: always
-    environment:
-      # - DATABASE_URL=postgres://cumulus_user:cumulus_pass@cumulusdb:5432/postgres
-      # Individual PG env vars are easier to provide in IaC instead of the DATABASE_URL
-      - PGHOST=cumulusdb
-      - PGPORT=5432
-      - PGUSER=cumulus_user
-      - PGPASSWORD=cumulus_pass
-      - PGDATABASE=postgres
-      - PGTARGETROLE=cumulus_reader #this env var is custom
-      - PGFS_SERVER_HTTPPORT=8080
-      - PGFS_SERVER_HTTPSPORT=8443
-      - PGFS_SERVER_URLBASE=http://localhost/features
-      - PGFS_SERVER_BASEPATH=/features
-      - PGFS_SERVER_DEBUG=true
-      - PGFS_WEBSITE_BASEMAPURL=http://a.tile.openstreetmap.org/{z}/{x}/{y}.png
-    # The API provides a proxy using /features
-    # This port exposure is for direct access/troubleshooting locally
-    ports:
-      - '8080:8080'
-    depends_on:
-      cumulusdb:
-        condition: service_started
-      flyway:
-        condition: service_completed_successfully
-      api:
-        condition: service_started
+  # featureserv:
+  #   build:
+  #     context: pg_featureserv
+  #   platform: linux/amd64 # this is the supported architecture for postgis
+  #   container_name: featureserv
+  #   restart: always
+  #   environment:
+  #     # - DATABASE_URL=postgres://cumulus_user:cumulus_pass@cumulusdb:5432/postgres
+  #     # Individual PG env vars are easier to provide in IaC instead of the DATABASE_URL
+  #     - PGHOST=cumulusdb
+  #     - PGPORT=5432
+  #     - PGUSER=cumulus_user
+  #     - PGPASSWORD=cumulus_pass
+  #     - PGDATABASE=postgres
+  #     - PGTARGETROLE=cumulus_reader #this env var is custom
+  #     - PGFS_SERVER_HTTPPORT=8080
+  #     - PGFS_SERVER_HTTPSPORT=8443
+  #     - PGFS_SERVER_URLBASE=http://localhost/features
+  #     - PGFS_SERVER_BASEPATH=/features
+  #     - PGFS_SERVER_DEBUG=true
+  #     - PGFS_WEBSITE_BASEMAPURL=http://a.tile.openstreetmap.org/{z}/{x}/{y}.png
+  #   # The API provides a proxy using /features
+  #   # This port exposure is for direct access/troubleshooting locally
+  #   ports:
+  #     - '8080:8080'
+  #   depends_on:
+  #     cumulusdb:
+  #       condition: service_started
+  #     flyway:
+  #       condition: service_completed_successfully
+  #     api:
+  #       condition: service_started
   # --------------------------------------
   # pgadmin:
   #   image: dpage/pgadmin4