Commit Graph

83 Commits

Author SHA1 Message Date
Yuri Astrakhan
92f768bb3e
Configuration cleanup: step 2 (#425)
A few minor simplifications in the config and appstate:

* default srid seems to be unused.
* simplify Config struct to have non-optional table and function sources. Ok to be empty.
* add a parsing unit test
* rename configs to distinct names for simplicity

I am making this as a separate PR to keep things easier -- the big upcoming PR will use a dynamic dispatch system for all types of sources
2022-10-05 22:12:44 +03:00
Yuri Astrakhan
aed3274162
Breakup config for pg and srv (#420)
Getting ready for multi-backend system, where each backend would have its own configuration.

All 3 config structs (clap args, config, and configbuilder) are now separated into 3 files - the main one, one for service  (actix stuff), and one for PostgreSQL.

The files have been moved to `/pg` and `/srv`, but otherwise the logic should be mostly intact.
2022-10-01 07:48:11 +00:00
dependabot[bot]
9e8e6726c6
chore(deps): bump clap from 4.0.2 to 4.0.4 (#422)
Bumps [clap](https://github.com/clap-rs/clap) from 4.0.2 to 4.0.4.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.0.2...v4.0.4)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-30 02:46:26 +00:00
dependabot[bot]
c7efe236fa
chore(deps): bump clap from 4.0.0-rc.3 to 4.0.2 (#421)
Bumps [clap](https://github.com/clap-rs/clap) from 4.0.0-rc.3 to 4.0.2.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/v4.0.0-rc.3...v4.0.2)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-29 02:38:54 +00:00
Yuri Astrakhan
47ed143d8f
Clean up configuration system to use Clap (#415)
* Use latest Clap-derive (currently v4rc, but should be public within a few days)
* reorganize configuration to streamline different config sources into one Config (using multiple ConfigBuilders)
2022-09-28 04:19:23 -04:00
Yuri Astrakhan
8b9ad07902
cargo update (#395)
* bump postgres features
* update to latest
2022-09-13 02:18:01 -04:00
dependabot[bot]
db8c09228d
chore(deps): bump criterion from 0.3.6 to 0.4.0 (#393)
Bumps [criterion](https://github.com/bheisler/criterion.rs) from 0.3.6 to 0.4.0.
- [Release notes](https://github.com/bheisler/criterion.rs/releases)
- [Changelog](https://github.com/bheisler/criterion.rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bheisler/criterion.rs/compare/0.3.6...0.4.0)

---
updated-dependencies:
- dependency-name: criterion
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-12 18:42:06 -04:00
Yuri Astrakhan
1e8e676e44
feat: use latest actix, switch to bb8 (async everywhere), remove actions (#377)
* remove all actions and other low-level magic code, making it more straightforward for the most common usage
* replace r2d2 with bb8 to make it all async
* use first significant version in cargo.toml - this makes it easier to maintain

This fixes #349
2022-08-15 09:54:48 -04:00
dependabot[bot]
7902b7acbd
chore(deps): bump serde_yaml from 0.8.26 to 0.9.0 (#369)
Bumps [serde_yaml](https://github.com/dtolnay/serde-yaml) from 0.8.26 to 0.9.0.
- [Release notes](https://github.com/dtolnay/serde-yaml/releases)
- [Commits](https://github.com/dtolnay/serde-yaml/compare/0.8.26...0.9.0)

---
updated-dependencies:
- dependency-name: serde_yaml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-29 12:20:49 +03:00
dependabot[bot]
dd735f9f6b
chore(deps): bump openssl from 0.10.40 to 0.10.41 (#366)
Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.40 to 0.10.41.
- [Release notes](https://github.com/sfackler/rust-openssl/releases)
- [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.40...openssl-v0.10.41)

---
updated-dependencies:
- dependency-name: openssl
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-26 16:43:58 -04:00
Yuri Astrakhan
0ede9a5aac
Clean up licensing per on-boarding (#364)
* Use standard `MIT OR Apache-2.0` license
* Add `MapLibre contributors`
* Add Apache and MIT license files
  * The original LICENSE (MIT) file is near-identical but had different line breaks.
  * MIT license now also includes copyright maplibre contributors
2022-07-06 08:25:45 -04:00
Yuri Astrakhan
0126c5f595
Migrate some urbica/martin -> maplibre/martin (#347)
* Migrate some urbica/martin -> maplibre/martin
2022-06-11 10:51:41 +03:00
Yuri Astrakhan
4a26366a60
chore: use tilejson 0.3.1 and simplify (#341) (h/t @nyurik)
* bounds merging is now built-in into Bounds as Add/AddAssign
* use Bounds::MAX instead of hard-coding it everywhere
2022-05-30 14:06:44 +03:00
Yuri Astrakhan
66876d5254
chore: migrate to TileJSON v0.3 (#330) (h/t @nyurik)
* use `tilejson!` to generate json object
* use `Bounds` everywhere when appropriate
2022-05-27 14:04:27 +03:00
Yuri Astrakhan
d0655fd2b3
Use 2021 edition, modern format (#331) (h/t @nyurik)
* switch to 2021 rust edition
* use `format!("{var}")` instead of `"{}", var`
2022-05-27 14:03:48 +03:00
dependabot[bot]
ebb00ae9e8
chore(deps): bump openssl from 0.10.39 to 0.10.40 (#326)
Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.39 to 0.10.40.
- [Release notes](https://github.com/sfackler/rust-openssl/releases)
- [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.39...openssl-v0.10.40)

---
updated-dependencies:
- dependency-name: openssl
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-05 13:59:24 +03:00
dependabot[bot]
ec75098f3d
chore(deps): bump openssl from 0.10.37 to 0.10.38 (#273)
Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.37 to 0.10.38.
- [Release notes](https://github.com/sfackler/rust-openssl/releases)
- [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.37...openssl-v0.10.38)

---
updated-dependencies:
- dependency-name: openssl
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-01 10:53:41 +03:00
dependabot[bot]
bd8db377fa
chore(deps): bump openssl from 0.10.36 to 0.10.37 (#272)
Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.36 to 0.10.37.
- [Release notes](https://github.com/sfackler/rust-openssl/releases)
- [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.36...openssl-v0.10.37)

---
updated-dependencies:
- dependency-name: openssl
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-28 11:25:59 +03:00
Stepan Kuzmin
235f94e112
(cargo-release) version 1.0.0-alpha.0 2021-10-18 16:29:51 +03:00
Stepan Kuzmin
7ad7f1ab8b
feat: use openssl for tls connections, add CA_ROOT_FILE support (#268) (h/t @kapcsandi) 2021-10-18 14:35:08 +03:00
Stepan Kuzmin
40b0a0c26a
feat: add bounds to tilejson endpoints (#260) (h/t @jaspervercnocke) 2021-10-10 12:09:56 +03:00
Stepan Kuzmin
d22cc7772b
chore: update dependencies (#259) 2021-10-09 15:33:26 +03:00
Stepan Kuzmin
0071e94b9e
chore: improve logging (#258) 2021-10-08 17:24:16 +03:00
dependabot[bot]
441b63cb06
chore(deps): bump postgres-protocol from 0.6.1 to 0.6.2 (#254)
Bumps [postgres-protocol](https://github.com/sfackler/rust-postgres) from 0.6.1 to 0.6.2.
- [Release notes](https://github.com/sfackler/rust-postgres/releases)
- [Commits](https://github.com/sfackler/rust-postgres/compare/postgres-protocol-v0.6.1...postgres-protocol-v0.6.2)

---
updated-dependencies:
- dependency-name: postgres-protocol
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-30 14:27:03 +03:00
Stepan Kuzmin
f935db9f1f
chore: add benchmarks (#230) 2021-07-23 11:04:34 +03:00
Stepan Kuzmin
2e2599ad78
chore: update dependencies (#226) 2021-07-16 16:08:46 +03:00
Paul FLORENCE
aaae520933
Merge pull request #216 from gbip/fix_prepared_query
fix: escape table and schema in function source tiles URL
2021-07-02 16:08:48 +03:00
dependabot[bot]
c334931b21 chore(deps): bump semver from 0.11.0 to 1.0.0
Bumps [semver](https://github.com/dtolnay/semver) from 0.11.0 to 1.0.0.
- [Release notes](https://github.com/dtolnay/semver/releases)
- [Commits](https://github.com/dtolnay/semver/compare/0.11.0...1.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-27 10:27:09 +03:00
dependabot[bot]
3697a695b0 chore(deps): bump actix from 0.9.0 to 0.10.0
Bumps [actix](https://github.com/actix/actix) from 0.9.0 to 0.10.0.
- [Release notes](https://github.com/actix/actix/releases)
- [Changelog](https://github.com/actix/actix/blob/v0.10.0/CHANGES.md)
- [Commits](https://github.com/actix/actix/compare/v0.9.0...v0.10.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-09 16:05:10 +03:00
Stepan Kuzmin
810a2db34f
update dependencies (#204)
* chore: update postgres

* chore: update dependencies
2021-04-25 14:46:44 +03:00
Stepan Kuzmin
3c01125fc5
feat: add composite sources support (#184)
* feat: add composite sources support WIP

* feat: handle empty composite sources

* fix: decompose queries

* docs: add docs on composite sources

* ci: push docker image

* test: add composite source tests
2021-04-24 20:19:37 +03:00
Miguel de Dios Matias
a0442571ea
chore: updates some deps (#183) (h/t @mdtrooper)
* Update some deps (the most important is actix-web to 3.x) and some changes in the code run with new versions.

* Some fixes for cargo fmt.

* Fixed "error: this functions return value is unnecessarily wrapped by Result" from github actions (clippy).
2021-02-21 21:44:28 +03:00
dependabot-preview[bot]
4e8190bfef
chore(deps): bump env_logger from 0.7.1 to 0.8.1 (#132)
Bumps [env_logger](https://github.com/env-logger-rs/env_logger) from 0.7.1 to 0.8.1.
- [Release notes](https://github.com/env-logger-rs/env_logger/releases)
- [Changelog](https://github.com/env-logger-rs/env_logger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/env-logger-rs/env_logger/compare/v0.7.1...v0.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-10-21 09:42:51 +03:00
dependabot-preview[bot]
fbee05bc8d
chore(deps): bump semver from 0.10.0 to 0.11.0 (#119)
Bumps [semver](https://github.com/steveklabnik/semver) from 0.10.0 to 0.11.0.
- [Release notes](https://github.com/steveklabnik/semver/releases)
- [Commits](https://github.com/steveklabnik/semver/compare/v0.10.0...v0.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-25 14:15:35 +03:00
dependabot-preview[bot]
99204cb609
chore(deps): bump postgres from 0.17.4 to 0.17.5 (#110)
Bumps [postgres](https://github.com/sfackler/rust-postgres) from 0.17.4 to 0.17.5.
- [Release notes](https://github.com/sfackler/rust-postgres/releases)
- [Commits](https://github.com/sfackler/rust-postgres/compare/postgres-v0.17.4...postgres-v0.17.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-20 11:22:58 +03:00
Stepan Kuzmin
c1c59e158d
feat: add ssl/tls support #63 (#90)
* feat: add ssl/tls support #63

* feat: add danger-accept-invalid-certs option

* ci: switch to ekidd/rust-musl-builder:stable

* ci: enable docker/build-push-action
2020-06-02 09:49:21 +03:00
dependabot-preview[bot]
8835fd4b88
chore(deps): bump semver from 0.9.0 to 0.10.0 (#92)
Bumps [semver](https://github.com/steveklabnik/semver) from 0.9.0 to 0.10.0.
- [Release notes](https://github.com/steveklabnik/semver/releases)
- [Commits](https://github.com/steveklabnik/semver/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-01 16:59:19 +03:00
Stepan Kuzmin
9887d2bb99
feat: upgrade postgres crates (#85)
* feat: upgrade postgres crates

* style: rename db types

* ci: switch to x86_64-unknown-linux-gnu
2020-05-04 21:21:11 +03:00
dependabot-preview[bot]
4e4646c04a
chore(deps): bump actix-rt from 1.1.0 to 1.1.1 (#84)
Bumps [actix-rt](https://github.com/actix/actix-net) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/actix/actix-net/releases)
- [Commits](https://github.com/actix/actix-net/compare/rt-1.1.0...rt-1.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-01 18:53:02 +03:00
Stepan Kuzmin
ad3076812d
feat: upgrade to actix-web 2.0 (#80)
* chore: update actix-web to 2.0

* fix: use default CORS middleware
2020-04-26 17:57:13 +03:00
dependabot-preview[bot]
47b4c1cb8b
chore(deps): bump num_cpus from 1.12.0 to 1.13.0 (#77)
Bumps [num_cpus](https://github.com/seanmonstar/num_cpus) from 1.12.0 to 1.13.0.
- [Release notes](https://github.com/seanmonstar/num_cpus/releases)
- [Changelog](https://github.com/seanmonstar/num_cpus/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/num_cpus/compare/v1.12.0...v1.13.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-16 14:56:03 +03:00
dependabot-preview[bot]
9ee188c6d2 chore(deps): bump num_cpus from 1.11.1 to 1.12.0 (#53)
Bumps [num_cpus](https://github.com/seanmonstar/num_cpus) from 1.11.1 to 1.12.0.
- [Release notes](https://github.com/seanmonstar/num_cpus/releases)
- [Changelog](https://github.com/seanmonstar/num_cpus/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/num_cpus/compare/v1.11.1...v1.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-17 11:00:55 +03:00
dependabot-preview[bot]
ff421e99f1 chore(deps): bump num_cpus from 1.10.1 to 1.11.0 (#37)
Bumps [num_cpus](https://github.com/seanmonstar/num_cpus) from 1.10.1 to 1.11.0.
- [Release notes](https://github.com/seanmonstar/num_cpus/releases)
- [Changelog](https://github.com/seanmonstar/num_cpus/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/num_cpus/compare/v1.10.1...v1.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 13:58:49 +03:00
Stepan Kuzmin
313fc1cc2d
chore: 🤖 release 0.5.0 2019-10-26 21:25:41 +03:00
Stepan Kuzmin
5a807e40e2
feat: upgrade actix-web to 1.0 (#33)
* test: 💍 add function sources tests

* test: 💍 limit postgres pool size in tests

* feat: 🎸 upgrade actix-web to 1.0
2019-10-26 20:37:49 +03:00
dependabot-preview[bot]
980dd70d14 chore(deps): bump tilejson from 0.1.0 to 0.2.0 (#27)
Bumps [tilejson](https://github.com/stepankuzmin/rust-tilejson) from 0.1.0 to 0.2.0.
- [Release notes](https://github.com/stepankuzmin/rust-tilejson/releases)
- [Commits](https://github.com/stepankuzmin/rust-tilejson/compare/v0.1.0...v0.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-10 12:03:36 +03:00
dependabot-preview[bot]
1ecb8a48d6 chore(deps): bump env_logger from 0.6.2 to 0.7.0 (#25)
Bumps [env_logger](https://github.com/sebasmagri/env_logger) from 0.6.2 to 0.7.0.
- [Release notes](https://github.com/sebasmagri/env_logger/releases)
- [Changelog](https://github.com/sebasmagri/env_logger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sebasmagri/env_logger/compare/v0.6.2...v0.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-08 21:52:03 +03:00
Stepan Kuzmin
9c2dea40b6 chore: 🤖 release 0.4.1 2019-10-07 12:19:07 +03:00
Stepan Kuzmin
d071bde8ce chore: 🤖 prepare v0.4.0 release 2019-09-30 15:55:54 +03:00
Stepan Kuzmin
ca4bf11da9 chore: 🤖 release 0.3.0 2019-03-16 19:12:11 +03:00