refactor: add database crates

.circleci/config.yml

@@ -10,7 +10,7 @@ commands:
     steps:
       - run:
           name: Display Rust Version
-          command: 
+          command:
             rustc --version
   setup-rust-check:
     steps:
@@ -43,12 +43,18 @@ commands:
             flake8 syncserver/src/tokenserver
             flake8 tools/integration_tests
             flake8 tools/tokenserver
-  rust-clippy:
+  rust-clippy-mysql:
     steps:
       - run:
-          name: Rust Clippy
+          name: Rust Clippy MySQL
           command: |
-            cargo clippy --workspace --all-targets --all-features -- -D warnings
+            cargo clippy --workspace --all-targets --no-default-features --features=syncstorage-db/mysql -- -D warnings
+  rust-clippy-spanner:
+    steps:
+      - run:
+          name: Rust Clippy Spanner
+          command: |
+            cargo clippy --workspace --all-targets --no-default-features --features=syncstorage-db/spanner -- -D warnings
   cargo-build:
     steps:
       - run:
@@ -69,7 +75,7 @@ commands:
       - run:
           name: Create Tokenserver database
           command: |
-            mysql -u root -ppassword -h 127.0.0.1 -e 'CREATE DATABASE tokenserver;'   
+            mysql -u root -ppassword -h 127.0.0.1 -e 'CREATE DATABASE tokenserver;'
             mysql -u root -ppassword -h 127.0.0.1 -e "GRANT ALL ON tokenserver.* to 'test'@'%';"
 
   write-version:
@@ -105,7 +111,7 @@ commands:
                -f docker-compose.mysql.yaml
                -f docker-compose.e2e.mysql.yaml
                up
-               --exit-code-from e2e-tests
+               --exit-code-from mysql-e2e-tests
                --abort-on-container-exit
           environment:
               SYNCSTORAGE_RS_IMAGE: app:build
@@ -129,7 +135,7 @@ commands:
                -f docker-compose.spanner.yaml
                -f docker-compose.e2e.spanner.yaml
                up
-               --exit-code-from e2e-tests
+               --exit-code-from spanner-e2e-tests
                --abort-on-container-exit
           environment:
               SYNCSTORAGE_RS_IMAGE: app:build
@@ -164,13 +170,15 @@ jobs:
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PASS
+    resource_class: large
     steps:
       - checkout
       - display-rust
       - setup-rust-check
       - setup-gcp-grpc
       - rust-check
-      - rust-clippy
+      - rust-clippy-spanner
+      - rust-clippy-mysql
       - setup-python
       - python-check
 
@@ -197,16 +205,6 @@ jobs:
             MYSQL_DATABASE: syncstorage
     resource_class: large
     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
       - display-rust
       - setup-python
@@ -221,9 +219,20 @@ jobs:
       - run-tests
       - run-tokenserver-scripts-tests
       #- save-sccache-cache
+  build-mysql-image:
+    docker:
+      - image: cimg/rust:1.60.0
+        auth:
+          username: $DOCKER_USER
+          password: $DOCKER_PASS
+    resource_class: large
+    steps:
+      - setup_remote_docker:
+          docker_layer_caching: true
+      - checkout
       - run:
-          name: Build Docker image
-          command: docker build -t app:build .
+          name: Build MySQL Docker image
+          command: docker build -t app:build --build-arg DATABASE_BACKEND=mysql .
           no_output_timeout: 30m
       # save the built docker container into CircleCI's cache. This is
       # required since Workflows do not have the same remote docker instance.
@@ -234,13 +243,43 @@ jobs:
             docker save -o /home/circleci/cache/docker.tar "app:build"
       - run:
           name: Save docker-compose config
-          command: cp docker-compose*.yaml /home/circleci/cache
+          command: cp docker-compose*mysql.yaml /home/circleci/cache
       - save_cache:
-          key: v1-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}-{{ epoch }}
+          key: mysql-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}-{{ epoch }}
           paths:
             - /home/circleci/cache
 
-  e2e-tests:
+  build-spanner-image:
+    docker:
+      - image: cimg/rust:1.60.0
+        auth:
+          username: $DOCKER_USER
+          password: $DOCKER_PASS
+    resource_class: large
+    steps:
+      - setup_remote_docker:
+          docker_layer_caching: true
+      - checkout
+      - run:
+          name: Build Spanner Docker image
+          command: docker build -t app:build --build-arg DATABASE_BACKEND=spanner .
+          no_output_timeout: 30m
+      # save the built docker container into CircleCI's cache. This is
+      # required since Workflows do not have the same remote docker instance.
+      - run:
+          name: docker save app:build
+          command: |
+            mkdir -p /home/circleci/cache
+            docker save -o /home/circleci/cache/docker.tar "app:build"
+      - run:
+          name: Save docker-compose config
+          command: cp docker-compose*spanner.yaml /home/circleci/cache
+      - save_cache:
+          key: spanner-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}-{{ epoch }}
+          paths:
+            - /home/circleci/cache
+
+  mysql-e2e-tests:
     docker:
       - image: docker/compose:1.24.0
         auth:
@@ -249,14 +288,31 @@ jobs:
     steps:
       - setup_remote_docker
       - restore_cache:
-          key: v1-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
+          key: mysql-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: Restore Docker image cache
           command: docker load -i /home/circleci/cache/docker.tar
       - run:
           name: Restore docker-compose config
           command: cp /home/circleci/cache/docker-compose*.yaml .
       - run-e2e-mysql-tests
+
+  spanner-e2e-tests:
+    docker:
+      - image: docker/compose:1.24.0
+        auth:
+          username: $DOCKER_USER
+          password: $DOCKER_PASS
+    steps:
+      - setup_remote_docker
+      - restore_cache:
+          key: spanner-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
+      - run:
+          name: Restore Docker image cache
+          command: docker load -i /home/circleci/cache/docker.tar
+      - run:
+          name: Restore docker-compose config
+          command: cp /home/circleci/cache/docker-compose*.yaml .
       - run-e2e-spanner-tests
 
   deploy:
@@ -268,7 +324,7 @@ jobs:
     steps:
       - setup_remote_docker
       - restore_cache:
-          key: v1-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
+          key: spanner-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: Restore Docker image cache
           command: docker load -i /home/circleci/cache/docker.tar
@@ -346,21 +402,41 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - e2e-tests:
+      - build-mysql-image:
+          requires:
+            - build-and-test
+          filters:
+            tags:
+              only: /.*/
+      - build-spanner-image:
           requires:
             - build-and-test
           filters:
             tags:
               only: /.*/
+      - mysql-e2e-tests:
+          requires:
+            - build-mysql-image
+          filters:
+            tags:
+              only: /.*/
+      - spanner-e2e-tests:
+          requires:
+            - build-spanner-image
+          filters:
+            tags:
+              only: /.*/
       - deploy:
           requires:
-            - e2e-tests
+            - mysql-e2e-tests
+            - spanner-e2e-tests
           filters:
             tags:
               only: /.*/
       - deploy-python-utils:
           requires:
-            - e2e-tests
+            - mysql-e2e-tests
+            - spanner-e2e-tests
           filters:
             tags:
               only: /.*/