version bump Cog (#617)

Co-authored-by: Oskar Hurst <oskar.a.hurst@usace.army.mil>

Author: oskarhurst

api/handlers/productfile_cog.go

@@ -5,17 +5,16 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/s3"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"
 
 	"github.com/USACE/cumulus-api/api/middleware"
 	"github.com/USACE/cumulus-api/api/models"
 
-	_ "github.com/jackc/pgx/v4"
-	"github.com/jackc/pgx/v4/pgxpool"
+	_ "github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgxpool"
 )
 
 // ListProductfilesCOG returns the productfiles for a product over a time range as
@@ -60,7 +59,7 @@ func ListProductfilesCOG(db *pgxpool.Pool) echo.HandlerFunc {
 // Content-Range/Accept-Ranges so a GDAL /vsicurl/ client can read tiles directly
 // (no full download). HEAD returns size + range support for /vsicurl/ probing.
 // Every request is authenticated (private route) and logged for metering.
-func StreamProductfileCOG(db *pgxpool.Pool, awsCfg *aws.Config) echo.HandlerFunc {
+func StreamProductfileCOG(db *pgxpool.Pool, awsCfg *aws.Config, endpoint string, forcePathStyle, disableSSL bool) echo.HandlerFunc {
 	return func(c echo.Context) error {
 		pfID, err := uuid.Parse(c.Param("productfile_id"))
 		if err != nil {
@@ -72,11 +71,20 @@ func StreamProductfileCOG(db *pgxpool.Pool, awsCfg *aws.Config) echo.HandlerFunc
 			return c.String(http.StatusNotFound, "Productfile not found")
 		}
 
-		client := s3.New(session.New(awsCfg))
+		ctx := c.Request().Context()
+		client := s3.NewFromConfig(*awsCfg, func(o *s3.Options) {
+			o.UsePathStyle = forcePathStyle
+			if endpoint != "" {
+				o.BaseEndpoint = aws.String(endpoint)
+			}
+			if disableSSL {
+				o.EndpointOptions.DisableHTTPS = true
+			}
+		})
 
 		// HEAD: metadata only (size + range support) for /vsicurl/ probing.
 		if c.Request().Method == http.MethodHead {
-			head, err := client.HeadObject(&s3.HeadObjectInput{Bucket: &obj.Bucket, Key: &obj.Key})
+			head, err := client.HeadObject(ctx, &s3.HeadObjectInput{Bucket: &obj.Bucket, Key: &obj.Key})
 			if err != nil {
 				return c.String(http.StatusInternalServerError, err.Error())
 			}
@@ -94,7 +102,7 @@ func StreamProductfileCOG(db *pgxpool.Pool, awsCfg *aws.Config) echo.HandlerFunc
 			in.Range = aws.String(rangeHeader)
 		}
 
-		out, err := client.GetObject(in)
+		out, err := client.GetObject(ctx, in)
 		if err != nil {
 			return c.String(http.StatusInternalServerError, err.Error())
 		}

api/main.go

@@ -162,8 +162,8 @@ func main() {
 	public.GET("/products/:product_id/files", handlers.ListProductfiles(db))
 	// Direct, Range-capable COG access (authenticated + metered) for desktop clients
 	private.GET("/products/:product_id/cog-files", handlers.ListProductfilesCOG(db))
-	private.GET("/products/:product_id/cog/:productfile_id", handlers.StreamProductfileCOG(db, &awsCfg))
-	private.HEAD("/products/:product_id/cog/:productfile_id", handlers.StreamProductfileCOG(db, &awsCfg))
+	private.GET("/products/:product_id/cog/:productfile_id", handlers.StreamProductfileCOG(db, &cfg.AwsConfig, cfg.AWSS3Endpoint, cfg.AWSS3ForcePathStyle, cfg.AWSS3DisableSSL))
+	private.HEAD("/products/:product_id/cog/:productfile_id", handlers.StreamProductfileCOG(db, &cfg.AwsConfig, cfg.AWSS3Endpoint, cfg.AWSS3ForcePathStyle, cfg.AWSS3DisableSSL))
 
 	// Productfiles
 	private.POST("/productfiles", handlers.CreateProductfiles(db),

docker-compose.yml

@@ -158,7 +158,7 @@ services:
       - CUMULUS_ASYNC_ENGINE_PACKAGER_TARGET=local/http://localhost:9324/queue/cumulus-packager
       - CUMULUS_ASYNC_ENGINE_STATISTICS=AWSSQS
       - CUMULUS_ASYNC_ENGINE_STATISTICS_TARGET=local/http://localhost:9324/queue/cumulus-statistics
-      - CUMULUS_STATIC_HOST=http://localhost
+      - CUMULUS_STATIC_HOST=http://localhost/api
       - CUMULUS_AWS_S3_REGION=us-east-1
       - CUMULUS_AWS_S3_BUCKET=castle-data-develop
       - CUMULUS_AWS_S3_BUCKET_PREFIX=cumulus/ui
@@ -169,7 +169,7 @@ services:
     volumes:
       - ./api/:/go/src/app/:rw
     ports:
-      - '8080:80'
+      - '80: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