Page MenuHomePhabricator
Files F3390329

D8361.diff
No OneTemporary
Actions

D8361.diff
View Options

diff --git a/services/.env b/services/.env
--- a/services/.env
+++ b/services/.env
@@ -3,4 +3,3 @@
COMM_SERVICES_PORT_BLOB=50053
COMM_SERVICES_PORT_IDENTITY=50054
COMM_SERVICES_PORT_FEATURE_FLAGS=50055
-COMM_TEST_SERVICES=0
diff --git a/services/docker-compose.yml b/services/docker-compose.yml
--- a/services/docker-compose.yml
+++ b/services/docker-compose.yml
@@ -25,7 +25,6 @@
dockerfile: services/backup/Dockerfile
context: ../
args:
- - COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
- COMM_SERVICES_SANDBOX=${COMM_SERVICES_SANDBOX}
- LOCALSTACK_URL=http://localstack:4566
- BLOB_SERVICE_URL=http://blob-server:50051
@@ -42,7 +41,6 @@
dockerfile: services/blob/Dockerfile
context: ../
args:
- - COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
- COMM_SERVICES_SANDBOX=${COMM_SERVICES_SANDBOX}
image: commapp/blob-server:0.1
ports:
@@ -60,6 +58,7 @@
image: commapp/identity-server:0.1
ports:
- '${COMM_SERVICES_PORT_IDENTITY}:50054'
+ # feature-flags
feature-flags-server:
depends_on:
- localstack
diff --git a/services/package.json b/services/package.json
--- a/services/package.json
+++ b/services/package.json
@@ -14,7 +14,6 @@
"run-feature-flags-service": "./scripts/run_server_image.sh feature-flags",
"run-feature-flags-service-in-sandbox": "COMM_SERVICES_SANDBOX=1 ./scripts/run_server_image.sh feature-flags",
"run-all-services": "./scripts/run_all_services.sh",
- "run-unit-tests": "./scripts/run_unit_tests.sh",
"run-integration-tests": "./scripts/run_integration_tests.sh",
"run-performance-tests": "./scripts/run_performance_tests.sh",
"run-all-services-in-sandbox": "COMM_SERVICES_SANDBOX=1 ./scripts/run_all_services.sh",
diff --git a/services/scripts/run_integration_tests.sh b/services/scripts/run_integration_tests.sh
--- a/services/scripts/run_integration_tests.sh
+++ b/services/scripts/run_integration_tests.sh
@@ -2,7 +2,6 @@
set -e
-export COMM_TEST_SERVICES=1
export COMM_SERVICES_SANDBOX=1
SERVICES=$(./scripts/list_services.sh)
diff --git a/services/scripts/run_unit_tests.sh b/services/scripts/run_unit_tests.sh
deleted file mode 100755
--- a/services/scripts/run_unit_tests.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-export COMM_TEST_SERVICES=1
-export COMM_SERVICES_SANDBOX=1
-
-SERVICES=$(./scripts/list_services.sh)
-
-run_unit_test () {
- echo "unit tests will be run for the $1 service"
-
- docker-compose build "$1"-server
- docker-compose run "$1"-server
-}
-
-list_expected () {
- echo "Expected one of these:";
- echo "$SERVICES";
-}
-
-if [[ -z "$1" ]]; then
- echo "No service specified";
- list_expected;
- exit 1;
-fi
-
-if [[ "$1" == "all" ]]; then
- for SERVICE in $SERVICES; do
- run_unit_test "$SERVICE"
- done
- exit 0;
-fi;
-
-SERVICE=$(grep "$1" <<< "$SERVICES")
-
-if [[ "$SERVICE" != "$1" ]]; then
- echo "No such service: $1";
- list_expected;
- exit 1;
-fi;
-
-run_unit_test "$SERVICE"
diff --git a/services/terraform/dynamodb-test.tf b/services/terraform/dynamodb-test.tf
deleted file mode 100644
--- a/services/terraform/dynamodb-test.tf
+++ /dev/null
@@ -1,104 +0,0 @@
-resource "aws_dynamodb_table" "backup-service-backup-test" {
- name = "backup-service-backup-test"
- hash_key = "userID"
- range_key = "backupID"
- write_capacity = 10
- read_capacity = 10
-
- attribute {
- name = "userID"
- type = "S"
- }
-
- attribute {
- name = "backupID"
- type = "S"
- }
-
- attribute {
- name = "created"
- type = "S"
- }
-
- global_secondary_index {
- name = "userID-created-index"
- hash_key = "userID"
- range_key = "created"
- write_capacity = 10
- read_capacity = 10
- projection_type = "INCLUDE"
- non_key_attributes = ["recoveryData"]
- }
-}
-
-resource "aws_dynamodb_table" "backup-service-log-test" {
- name = "backup-service-log-test"
- hash_key = "backupID"
- range_key = "logID"
- write_capacity = 10
- read_capacity = 10
-
- attribute {
- name = "backupID"
- type = "S"
- }
-
- attribute {
- name = "logID"
- type = "S"
- }
-}
-
-resource "aws_dynamodb_table" "blob-service-blob-test" {
- name = "blob-service-blob-test"
- hash_key = "blobHash"
- write_capacity = 10
- read_capacity = 10
-
- attribute {
- name = "blobHash"
- type = "S"
- }
-}
-
-resource "aws_dynamodb_table" "blob-service-reverse-index-test" {
- name = "blob-service-reverse-index-test"
- hash_key = "holder"
- write_capacity = 10
- read_capacity = 10
-
- attribute {
- name = "holder"
- type = "S"
- }
-
- attribute {
- name = "blobHash"
- type = "S"
- }
-
- global_secondary_index {
- name = "blobHash-index"
- hash_key = "blobHash"
- write_capacity = 10
- read_capacity = 10
- projection_type = "ALL"
- }
-}
-
-resource "aws_dynamodb_table" "feature-flags-test" {
- name = "feature-flags-test"
- hash_key = "platform"
- range_key = "feature"
- billing_mode = "PAY_PER_REQUEST"
-
- attribute {
- name = "platform"
- type = "S"
- }
-
- attribute {
- name = "feature"
- type = "S"
- }
-}

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 30, 11:20 PM (19 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2602751
Default Alt Text
D8361.diff (5 KB)

Event Timeline