Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add fix for IP address showing in url #88

Merged
merged 2 commits into from
Feb 17, 2023
Merged

add fix for IP address showing in url #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57cf206
add fix for IP address showing in url
andre-urbani Feb 15, 2023
45f0313
upgrade dependencies
andre-urbani Feb 15, 2023
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
2 changes: 2 additions & 0 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ type Config struct {
DatasetAPIURL string `envconfig:"DATASET_API_URL"`
FilterAPIURL string `envconfig:"FILTER_API_URL"`
PopulationTypesAPIURL string `envconfig:"POPULATION_TYPES_API_URL"`
ExternalPrefixURL string `envconfig:"EXTERNAL_PREFIX_URL"`
FiltersCollection string `envconfig:"FILTERS_COLLECTION"`
FilterOutputsCollection string `envconfig:"FILTER_OUTPUTS_COLLECTION"`
DownloadServiceURL string `envconfig:"DOWNLOAD_SERVICE_URL"` // needed to create url for file downloads
Expand Down Expand Up @@ -76,6 +77,7 @@ func Get() (*Config, error) {
DatasetAPIURL: "http://localhost:22000",
FilterAPIURL: "http://localhost:22100",
PopulationTypesAPIURL: "http://localhost:27300",
ExternalPrefixURL: "http://localhost:22000",
FiltersCollection: "filters",
FilterOutputsCollection: "filterOutputs",
DownloadServiceURL: "http://localhost:23600",
Expand Down
1 change: 1 addition & 0 deletions config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func TestConfig(t *testing.T) {
So(cfg.ServiceAuthToken, ShouldEqual, "")
So(cfg.DatasetAPIURL, ShouldEqual, "http://localhost:22000")
So(cfg.DownloadServiceURL, ShouldEqual, "http://localhost:23600")
So(cfg.ExternalPrefixURL, ShouldEqual, "http://localhost:22000")
So(cfg.AWSRegion, ShouldEqual, "eu-west-1")
So(cfg.PublicBucketName, ShouldEqual, "public-bucket")
So(cfg.PrivateBucketName, ShouldEqual, "private-bucket")
Expand Down
34 changes: 17 additions & 17 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,32 @@ replace github.com/prometheus/client_golang => github.com/prometheus/client_gola

require (
github.com/ONSdigital/dp-api-clients-go v1.43.0
github.com/ONSdigital/dp-api-clients-go/v2 v2.207.1
github.com/ONSdigital/dp-api-clients-go/v2 v2.225.0
github.com/ONSdigital/dp-cantabular-filter-flex-api v1.15.0
github.com/ONSdigital/dp-component-test v0.9.0
github.com/ONSdigital/dp-healthcheck v1.5.0
github.com/ONSdigital/dp-kafka/v3 v3.8.0
github.com/ONSdigital/dp-mongodb/v3 v3.4.0
github.com/ONSdigital/dp-mongodb/v3 v3.5.0
github.com/ONSdigital/dp-net v1.5.0
github.com/ONSdigital/dp-s3/v2 v2.1.0-beta.1
github.com/ONSdigital/dp-vault v1.3.0
github.com/ONSdigital/log.go/v2 v2.3.0
github.com/aws/aws-sdk-go v1.44.154
github.com/cucumber/godog v0.12.5
github.com/aws/aws-sdk-go v1.44.190
github.com/cucumber/godog v0.12.6
github.com/google/go-cmp v0.5.9
github.com/gorilla/mux v1.8.0
github.com/kelseyhightower/envconfig v1.4.0
github.com/maxcnunes/httpfake v1.2.4
github.com/pkg/errors v0.9.1
github.com/smartystreets/goconvey v1.7.2
github.com/xuri/excelize/v2 v2.6.1
go.mongodb.org/mongo-driver v1.11.0
go.mongodb.org/mongo-driver v1.11.1
)

require (
github.com/ONSdigital/dp-authorisation v0.2.0 // indirect
github.com/ONSdigital/dp-mongodb-in-memory v1.5.0 // indirect
github.com/ONSdigital/dp-net/v2 v2.6.0 // indirect
github.com/ONSdigital/dp-net/v2 v2.7.0 // indirect
github.com/ONSdigital/dp-rchttp v1.0.0 // indirect
github.com/ONSdigital/go-ns v0.0.0-20210916104633-ac1c1c52327e // indirect
github.com/Shopify/sarama v1.37.2 // indirect
Expand All @@ -60,9 +60,9 @@ require (
github.com/eapache/go-resiliency v1.3.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fatih/color v1.14.1 // indirect
github.com/go-avro/avro v0.0.0-20171219232920-444163702c11 // indirect
github.com/go-chi/chi/v5 v5.0.7 // indirect
github.com/go-chi/chi/v5 v5.0.8 // indirect
github.com/gobwas/httphead v0.1.0 // indirect
github.com/gobwas/pool v0.2.1 // indirect
github.com/gobwas/ws v1.1.0 // indirect
Expand Down Expand Up @@ -101,10 +101,10 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/jtolds/gls v4.20.0+incompatible // indirect
github.com/justinas/alice v1.2.0 // indirect
github.com/klauspost/compress v1.15.12 // indirect
github.com/klauspost/compress v1.15.13 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
Expand All @@ -127,17 +127,17 @@ require (
github.com/square/mongo-lock v0.0.0-20220601164918-701ecf357cd7 // indirect
github.com/stretchr/testify v1.8.1 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.1 // indirect
github.com/xdg-go/stringprep v1.0.3 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 // indirect
github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/crypto v0.4.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f // indirect
google.golang.org/grpc v1.47.0 // indirect
Expand Down
Loading