Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions .github/workflows/cwbi-dev-build-push-pg_featureserv.yml

This file was deleted.

54 changes: 0 additions & 54 deletions .github/workflows/cwbi-prod-build-push-pg_featureserv.yml

This file was deleted.

54 changes: 0 additions & 54 deletions .github/workflows/cwbi-test-build-push-pg_featureserv.yml

This file was deleted.

1 change: 0 additions & 1 deletion api/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ type Config struct {
AWSS3ForcePathStyle bool `envconfig:"AWS_S3_FORCE_PATH_STYLE"`
AWSS3Bucket string `envconfig:"AWS_S3_BUCKET"`
AWSS3BucketPrefix string `envconfig:"AWS_S3_BUCKET_PREFIX"`
PgFeatureservUrl string `envconfig:"PG_FEATURESERV_URL"`

// Timeouts. Every value below is a ceiling on how long one request can pin a
// resource; they are env-tunable because the right number depends on how slow
Expand Down
4 changes: 0 additions & 4 deletions api/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,6 @@ func main() {
return handlers.GetIdentityProviderConfiguration(cfg.AuthEnvironment, c)
})

// Proxy to pg_featureserv
features := e.Group("/features")
features.Use(middleware.PgFeatureservProxy(cfg.PgFeatureservUrl))

// Acquirables
public.GET("/acquirables", handlers.ListAcquirables(db))
private.GET("/acquirables/:acquirable_id/files", handlers.ListAcquirablefiles(db))
Expand Down
7 changes: 3 additions & 4 deletions api/middleware/gzip.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ var GZIP = middleware.GzipWithConfig(middleware.GzipConfig{
Level: 5,
Skipper: func(c echo.Context) bool {
p := c.Request().URL.Path
// Skip GZIP compression for routes starting with /features as compression
// messes with pg_featureserv, and for COG byte-range streaming where
// compression breaks Range / Content-Length / Content-Range semantics.
return strings.Contains(p, "/features") || strings.Contains(p, "/cog/")
// Skip GZIP compression for COG byte-range streaming, where compression
// breaks Range / Content-Length / Content-Range semantics.
return strings.Contains(p, "/cog/")
},
})
23 changes: 0 additions & 23 deletions api/middleware/proxy-pgfeatureserv.go

This file was deleted.

1 change: 0 additions & 1 deletion docker-compose.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ services:
- CUMULUS_AWS_S3_ENDPOINT=http://minio:9000
- CUMULUS_AWS_S3_DISABLE_SSL=True
- CUMULUS_AWS_S3_FORCE_PATH_STYLE=True
- PG_FEATURESERV_URL=http://featureserv:8080
ports:
- "80:80"
restart: always
Expand Down
34 changes: 0 additions & 34 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ services:
# Global (S3-scoped) endpoint picked up by aws-sdk-go-v2 LoadDefaultConfig.
# Unset in prod so the SDK uses real S3. http:// disables TLS for MinIO.
- AWS_ENDPOINT_URL_S3=http://minio:9000
- PG_FEATURESERV_URL=http://featureserv:8080
volumes:
- ./api/:/go/src/app/:rw
ports:
Expand Down Expand Up @@ -205,39 +204,6 @@ 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
# --------------------------------------
# pgadmin:
# image: dpage/pgadmin4
# environment:
Expand Down
11 changes: 0 additions & 11 deletions pg_featureserv/Dockerfile

This file was deleted.

10 changes: 0 additions & 10 deletions pg_featureserv/entrypoint.sh

This file was deleted.