Merge branch 'master' into tokenserver-experiments

mozilla-services · Oct 21, 2020 · 25e95aa · 25e95aa
2 parents 7310f13 + 0400863
commit 25e95aa
Show file tree

Hide file tree

Showing 45 changed files with 2,560 additions and 5,730 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -70,7 +70,7 @@ commands:
           name: quota test
           command: cargo test --all --verbose
           environment:
-              ENABLE_QUOTA: 1
+              SYNC_ENABLE_QUOTA: 1
 
   run-e2e-tests:
     steps:
@@ -113,6 +113,9 @@ jobs:
   checks:
     docker:
       - image: circleci/rust:latest
+        auth:
+          username: $DOCKER_USER
+          password: $DOCKER_PASS
     steps:
       - checkout
       - setup-rust
@@ -124,12 +127,18 @@ jobs:
   build-and-test:
     docker:
       - image: circleci/rust:latest
+        auth:
+          username: $DOCKER_USER
+          password: $DOCKER_PASS
         environment:
             SYNC_DATABASE_URL: mysql://test:[email protected]/syncstorage
             RUST_BACKTRACE: 1
             # XXX: begin_test_transaction doesn't play nice over threaded tests
             RUST_TEST_THREADS: 1
       - image: circleci/mysql:5.7-ram
+        auth:
+          username: $DOCKER_USER
+          password: $DOCKER_PASS
         environment:
             MYSQL_ROOT_PASSWORD: random
             MYSQL_USER: test
@@ -138,6 +147,14 @@ jobs:
     steps:
       - setup_remote_docker:
           docker_layer_caching: true
+          = run:
+            name: Login to Dockerhub
+            command: |
+              if [ "${DOCKER_USER}" == "" ] || [ "${DOCKER_PASS}" == "" ]; then
+                echo "Skipping Login to DockerHub, credentials unavailable"
+              else
+                echo "${DOCKER_PASS}" | docker login -u="${DOCKER_USER}" --password-stdin
+              fi
       - checkout
       - setup-rust
       - setup-gcp-grpc
@@ -169,6 +186,9 @@ jobs:
   e2e-tests:
     docker:
       - image: docker/compose:1.24.0
+        auth:
+          username: $DOCKER_USER
+          password: $DOCKER_PASS
     steps:
       - setup_remote_docker
       - restore_cache:
@@ -184,6 +204,9 @@ jobs:
   deploy:
     docker:
       - image: docker:18.02.0-ce
+        auth:
+          username: $DOCKER_USER
+          password: $DOCKER_PASS
     steps:
       - setup_remote_docker
       - restore_cache:
@@ -219,6 +242,9 @@ jobs:
   deploy-python-utils:
     docker:
       - image: docker:stable-git
+        auth:
+          username: $DOCKER_USER
+          password: $DOCKER_PASS
     steps:
       - setup_remote_docker
       - checkout

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,41 @@
+<a name="0.7.1"></a>
+## 0.7.1 (2020-10-19)
+
+
+#### Bug Fixes
+
+*   correct quota env var in config test to SYNC_ENABLE_QUOTA (#859) ([f0aa4642](https://github.com/mozilla-services/syncstorage-rs/commit/f0aa4642b13a9e4d687707940959cc181e6f750d), closes [#829](https://github.com/mozilla-services/syncstorage-rs/issues/829))
+* rework error logging/metric reporting; fix BSO batch updates for spanner (#174, #619, #618) ([cef8fb521](https://github.com/mozilla-services/syncstorage-rs/commit/cef8fb521ad3239f5ecf356468715ca8341e7f73), closes [#174](https://github.com/mozilla-services/syncstorage-rs/issues/174), [#619](https://github.com/mozilla-services/syncstorage-rs/issues/619), [#618](https://github.com/mozilla-services/syncstorage-rs/issues/618))
+
+
+
+<a name="0.7.0"></a>
+## 0.7.0 (2020-10-12)
+
+
+#### Bug Fixes
+
+*   Return FORBIDDEN if a user's batch is Over Quota (#848) ([d24dcdb6](https://github.com/mozilla-services/syncstorage-rs/commit/d24dcdb6c1a23ea725322830b82a3f31a11c7a8b), closes [#852](https://github.com/mozilla-services/syncstorage-rs/issues/852))
+*   clippy error related to matches! closes #850 ([06aed80f](https://github.com/mozilla-services/syncstorage-rs/commit/06aed80f004c355f280d25c9d508b28038adf0f2))
+*   downgrade sentry to 0.19 (#849) ([0a175dde](https://github.com/mozilla-services/syncstorage-rs/commit/0a175dde049b4661d681be5398941f6a3136a142))
+
+#### Chore
+
+*   Update circleci to use docker auth (#855) ([dcb0a0b2](https://github.com/mozilla-services/syncstorage-rs/commit/dcb0a0b23c78b5f07c0a8f4c2d91f4f5895a7515), closes [#854](https://github.com/mozilla-services/syncstorage-rs/issues/854))
+*   update to protobuf 2.18.0 ([c6f9cf9b](https://github.com/mozilla-services/syncstorage-rs/commit/c6f9cf9bd4ef7bff13ddc33a71f5771dd9bf6ea3), closes [#852](https://github.com/mozilla-services/syncstorage-rs/issues/852))
+
+
+
+<a name="0.6.1"></a>
+## 0.6.1 (2020-09-30)
+
+#### Features
+* update to actix-web 3 (#834)
+
+#### Bug Fixes
+* return correct error code and value for OverQuota users (#837)
+
+
 <a name="0.6.0"></a>
 ## 0.6.0 (2020-09-23)