From b3cc4d4cc359d9b457ab2c211b2a08a03db395e1 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Mon, 4 Dec 2023 22:31:32 -0300 Subject: [PATCH] Remove unused code --- .../user-manager/src/tests/conftest.py | 25 +----- .../src/tests/functional/test_auth.py | 4 - .../src/tests/unit/test_config.py | 1 - browser-domain/src/Api.ts | 2 - .../src/components/Home/Card/Card.tsx | 11 +-- browser-domain/src/components/LogIn/LogIn.tsx | 1 - .../src/api/cruds/flight.py | 2 - gateway/src/api/routes/flights.py | 17 ---- observability/elk/CAMBIOS.md | 7 -- .../elasticsearch/config/elasticsearch.yml | 7 -- .../elk/extensions/curator/README.md | 20 ----- .../elk/extensions/heartbeat/README.md | 41 ---------- .../extensions/heartbeat/config/heartbeat.yml | 15 ---- observability/elk/kibana/config/kibana.yml | 23 ------ observability/elk/logstash/Dockerfile | 1 - .../elk/logstash/config/logstash.yml | 4 - testing/newman/.env.dev.example | 1 - testing/newman/Auth.postman_collection.json | 82 ------------------- testing/newman/Dockerfile | 12 --- testing/newman/docker-compose.dev.yml | 9 -- testing/newman/test.sh | 3 - 21 files changed, 4 insertions(+), 284 deletions(-) delete mode 100644 observability/elk/CAMBIOS.md delete mode 100644 observability/elk/extensions/curator/README.md delete mode 100644 observability/elk/extensions/heartbeat/README.md delete mode 100644 testing/newman/.env.dev.example delete mode 100644 testing/newman/Auth.postman_collection.json delete mode 100644 testing/newman/Dockerfile delete mode 100644 testing/newman/docker-compose.dev.yml delete mode 100644 testing/newman/test.sh diff --git a/auth-domain/user-manager/src/tests/conftest.py b/auth-domain/user-manager/src/tests/conftest.py index 532eea4..3a29491 100644 --- a/auth-domain/user-manager/src/tests/conftest.py +++ b/auth-domain/user-manager/src/tests/conftest.py @@ -5,11 +5,6 @@ from src import create_app, db from src.api.models.users import User from src.config import ProductionConfig -# from pactman import Consumer, Provider - - -# from src.tests.client.client import UsersClient - PACT_DIR = "src/tests/pacts" @@ -18,7 +13,7 @@ def test_app(): app = create_app() app.config.from_object("src.config.TestingConfig") with app.app_context(): - yield app # testing happens here + yield app @pytest.fixture(scope="module") @@ -31,27 +26,11 @@ def test_namespace(): def test_database(): db.drop_all() db.create_all() - yield db # testing happens here + yield db db.session.remove() db.drop_all() -# @pytest.fixture(scope="function") -# def pact(): -# pact = Consumer("UsersConsumer").has_pact_with( -# Provider("UsersProvider"), pact_dir=PACT_DIR -# ) -# pact.start_service() -# yield pact -# pact.stop_service() - - -# @pytest.fixture(scope="function") -# def user_client(pact): -# cli = UsersClient(uri=pact.uri) -# yield cli - - @pytest.fixture(scope="function") def prod_config(): yield ProductionConfig() diff --git a/auth-domain/user-manager/src/tests/functional/test_auth.py b/auth-domain/user-manager/src/tests/functional/test_auth.py index 096506a..2a0f76b 100644 --- a/auth-domain/user-manager/src/tests/functional/test_auth.py +++ b/auth-domain/user-manager/src/tests/functional/test_auth.py @@ -37,13 +37,11 @@ def test_not_registered_user_login(test_app, test_database): def test_valid_refresh(test_app, test_database, add_user): add_user(TEST_USERNAME, TEST_EMAIL, TEST_PASSWD) client = test_app.test_client() - # user login resp_login = client.post( "/auth/login", data=json.dumps({"email": TEST_EMAIL, "password": TEST_PASSWD}), content_type="application/json", ) - # valid refresh refresh_token = json.loads(resp_login.data.decode())["refresh_token"] resp = client.post( "/auth/refresh", @@ -60,13 +58,11 @@ def test_valid_refresh(test_app, test_database, add_user): def test_invalid_refresh_expired_token(test_app, test_database, add_user): add_user("test5", "test5@test.com", "test") client = test_app.test_client() - # user login resp_login = client.post( "/auth/login", data=json.dumps({"email": "test5@test.com", "password": "test"}), content_type="application/json", ) - # invalid token refresh time.sleep(10) refresh_token = json.loads(resp_login.data.decode())["refresh_token"] resp = client.post( diff --git a/auth-domain/user-manager/src/tests/unit/test_config.py b/auth-domain/user-manager/src/tests/unit/test_config.py index 7504716..4b80436 100644 --- a/auth-domain/user-manager/src/tests/unit/test_config.py +++ b/auth-domain/user-manager/src/tests/unit/test_config.py @@ -30,7 +30,6 @@ def test_production_config(test_app, monkeypatch): "DATABASE_URL", "postgresql://postgres:postgres@api-db:5432/api_users" ) test_app.config.from_object(ProductionConfig()) - # assert test_app.config["SECRET_KEY"] == "my_precious" assert not test_app.config["TESTING"] assert test_app.config["SQLALCHEMY_DATABASE_URI"] == os.environ.get("DATABASE_URL") assert test_app.config["BCRYPT_LOG_ROUNDS"] == 13 diff --git a/browser-domain/src/Api.ts b/browser-domain/src/Api.ts index 1f31e7b..c70ac89 100644 --- a/browser-domain/src/Api.ts +++ b/browser-domain/src/Api.ts @@ -17,12 +17,10 @@ instance.interceptors.request.use((request) => { instance.interceptors.response.use( (response) => { - console.log(response.headers) if (response.headers["x-count"]) { let json: any = {} json["flights"] = JSON.parse(response.data); json["count"] = response.headers["x-count"] - console.log(json) return json } else if (response.status === 204) { return response; diff --git a/browser-domain/src/components/Home/Card/Card.tsx b/browser-domain/src/components/Home/Card/Card.tsx index 051ed9b..9281732 100644 --- a/browser-domain/src/components/Home/Card/Card.tsx +++ b/browser-domain/src/components/Home/Card/Card.tsx @@ -48,8 +48,6 @@ export const Card: React.FC = ({ flight, user, subscribed, refresh, r flight_id: flight.id } - console.log(data) - subscribeToFlight(data, token) .then(() => { refresh() @@ -85,7 +83,7 @@ export const Card: React.FC = ({ flight, user, subscribed, refresh, r refreshFlights() }) .catch((error) => { - console.log(error) + // console.log(error) }); }; @@ -106,20 +104,15 @@ export const Card: React.FC = ({ flight, user, subscribed, refresh, r flight_id: flight.id } - console.log(data) - unsubscribeFromFlight(data, token) .then(() => { refresh() }) .catch((error) => { - console.log(error) + // console.log(error) }); }; - console.log(flight.user_id) - console.log(user?.id) - return (
diff --git a/browser-domain/src/components/LogIn/LogIn.tsx b/browser-domain/src/components/LogIn/LogIn.tsx index 4c6bb8c..14832a0 100644 --- a/browser-domain/src/components/LogIn/LogIn.tsx +++ b/browser-domain/src/components/LogIn/LogIn.tsx @@ -8,7 +8,6 @@ export const LogIn = () => { const [email, setEmail] = useState(""); const [password, setPassword] = useState(""); const navigate = useNavigate(); - console.log(error) return (
diff --git a/flights-domain/flights-information/src/api/cruds/flight.py b/flights-domain/flights-information/src/api/cruds/flight.py index dc9f483..1eb8121 100644 --- a/flights-domain/flights-information/src/api/cruds/flight.py +++ b/flights-domain/flights-information/src/api/cruds/flight.py @@ -106,8 +106,6 @@ def update_flight(db: Session, update_data, id): db_flight = db.query(Flight).filter(Flight.id == id).first() if db_flight is None: raise KeyError - # if db_flight.user_id != update_data["user_id"] and role != "admin": - # raise PermissionError new_flight = Flight( **{ diff --git a/gateway/src/api/routes/flights.py b/gateway/src/api/routes/flights.py index 782645b..81d72d3 100644 --- a/gateway/src/api/routes/flights.py +++ b/gateway/src/api/routes/flights.py @@ -42,23 +42,6 @@ async def create_flight( return response -# @router.delete("/{id}") -# async def delete_flight( -# id: int, -# req: Request, -# authorization: Annotated[str | None, Header()] = None, -# ): -# id = await checkAuth(req, authorization, isAirline=True) -# request_id = req.state.request_id -# header = {"x-api-request-id": request_id} -# (response, status, _) = await request( -# f"{API_FLIGHTS}/{id}", "DELETE", headers=header -# ) -# if status < 200 or status > 204: -# raise HTTPException(status_code=status, detail=response) -# return response - - @router.patch("/{id}", response_model=Flight) async def update_flight( id: int, diff --git a/observability/elk/CAMBIOS.md b/observability/elk/CAMBIOS.md deleted file mode 100644 index aa0b98b..0000000 --- a/observability/elk/CAMBIOS.md +++ /dev/null @@ -1,7 +0,0 @@ -# Cambio - -Dentro de kibana: - -Stack Managment > Roles > logstash_writer - -Agregar los permisos que se deseen a los indices que se van a usar, en el caso del codigo de ejemplo, los logs tienen el formato `trips_*`. \ No newline at end of file diff --git a/observability/elk/elasticsearch/config/elasticsearch.yml b/observability/elk/elasticsearch/config/elasticsearch.yml index 2920fe5..64bbe9f 100644 --- a/observability/elk/elasticsearch/config/elasticsearch.yml +++ b/observability/elk/elasticsearch/config/elasticsearch.yml @@ -1,13 +1,6 @@ --- -## Default Elasticsearch configuration from Elasticsearch base image. -## https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/config/elasticsearch.yml -# cluster.name: docker-cluster network.host: 0.0.0.0 - -## X-Pack settings -## see https://www.elastic.co/guide/en/elasticsearch/reference/current/security-settings.html -# xpack.license.self_generated.type: trial xpack.security.enabled: true cluster.routing.allocation.disk.threshold_enabled: false diff --git a/observability/elk/extensions/curator/README.md b/observability/elk/extensions/curator/README.md deleted file mode 100644 index 5c38786..0000000 --- a/observability/elk/extensions/curator/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# Curator - -Elasticsearch Curator helps you curate or manage your indices. - -## Usage - -If you want to include the Curator extension, run Docker Compose from the root of the repository with an additional -command line argument referencing the `curator-compose.yml` file: - -```bash -$ docker-compose -f docker-compose.yml -f extensions/curator/curator-compose.yml up -``` - -This sample setup demonstrates how to run `curator` every minute using `cron`. - -All configuration files are available in the `config/` directory. - -## Documentation - -[Curator Reference](https://www.elastic.co/guide/en/elasticsearch/client/curator/current/index.html) diff --git a/observability/elk/extensions/heartbeat/README.md b/observability/elk/extensions/heartbeat/README.md deleted file mode 100644 index 82c938f..0000000 --- a/observability/elk/extensions/heartbeat/README.md +++ /dev/null @@ -1,41 +0,0 @@ -# Heartbeat - -Heartbeat is a lightweight daemon that periodically checks the status of your services and determines whether they are -available. - -## Usage - -**This extension requires the `heartbeat_internal` and `beats_system` users to be created and initialized with a -password.** In case you haven't done that during the initial startup of the stack, please refer to [How to re-execute -the setup][setup] to run the setup container again and initialize these users. - -To include Heartbeat in the stack, run Docker Compose from the root of the repository with an additional command line -argument referencing the `heartbeat-compose.yml` file: - -```console -$ docker-compose -f docker-compose.yml -f extensions/heartbeat/heartbeat-compose.yml up -``` - -## Configuring Heartbeat - -The Heartbeat configuration is stored in [`config/heartbeat.yml`](./config/heartbeat.yml). You can modify this file -with the help of the [Configuration reference][heartbeat-config]. - -Any change to the Heartbeat configuration requires a restart of the Heartbeat container: - -```console -$ docker-compose -f docker-compose.yml -f extensions/heartbeat/heartbeat-compose.yml restart heartbeat -``` - -Please refer to the following documentation page for more details about how to configure Heartbeat inside a -Docker container: [Run Heartbeat on Docker][heartbeat-docker]. - -## See also - -[Heartbeat documentation][heartbeat-doc] - -[heartbeat-config]: https://www.elastic.co/guide/en/beats/heartbeat/current/heartbeat-reference-yml.html -[heartbeat-docker]: https://www.elastic.co/guide/en/beats/heartbeat/current/running-on-docker.html -[heartbeat-doc]: https://www.elastic.co/guide/en/beats/heartbeat/current/index.html - -[setup]: ../../README.md#how-to-re-execute-the-setup diff --git a/observability/elk/extensions/heartbeat/config/heartbeat.yml b/observability/elk/extensions/heartbeat/config/heartbeat.yml index cb26464..2925142 100644 --- a/observability/elk/extensions/heartbeat/config/heartbeat.yml +++ b/observability/elk/extensions/heartbeat/config/heartbeat.yml @@ -1,7 +1,3 @@ -## Heartbeat configuration -## https://github.com/elastic/beats/blob/main/deploy/docker/heartbeat.docker.yml -# - name: heartbeat heartbeat.monitors: @@ -19,13 +15,6 @@ heartbeat.monitors: hosts: - elasticsearch -# - type: http -# name: dummy -# schedule: '@every 5s' -# check.response.status: [200] -# urls: -# - http://localhost:5000 - processors: - add_cloud_metadata: ~ @@ -40,10 +29,6 @@ output.elasticsearch: username: heartbeat_internal password: ${HEARTBEAT_INTERNAL_PASSWORD} -## HTTP endpoint for health checking -## https://www.elastic.co/guide/en/beats/heartbeat/current/http-endpoint.html -# - http: enabled: true host: 0.0.0.0 diff --git a/observability/elk/kibana/config/kibana.yml b/observability/elk/kibana/config/kibana.yml index fcbdff4..6ecf95f 100644 --- a/observability/elk/kibana/config/kibana.yml +++ b/observability/elk/kibana/config/kibana.yml @@ -1,7 +1,4 @@ --- -## Default Kibana configuration from Kibana base image. -## https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/templates/kibana_yml.template.ts -# server.name: marte server.host: 0.0.0.0 elasticsearch.hosts: [ http://elasticsearch:9200 ] @@ -9,27 +6,9 @@ elasticsearch.hosts: [ http://elasticsearch:9200 ] monitoring.ui.container.elasticsearch.enabled: true monitoring.ui.container.logstash.enabled: true -## X-Pack security credentials -# elasticsearch.username: kibana_system elasticsearch.password: ${KIBANA_SYSTEM_PASSWORD} -## Encryption keys (optional but highly recommended) -## -## Generate with either -## $ docker container run --rm docker.elastic.co/kibana/kibana:8.6.2 bin/kibana-encryption-keys generate -## $ openssl rand -hex 32 -## -## https://www.elastic.co/guide/en/kibana/current/using-kibana-with-security.html -## https://www.elastic.co/guide/en/kibana/current/kibana-encryption-keys.html -# -#xpack.security.encryptionKey: -#xpack.encryptedSavedObjects.encryptionKey: -#xpack.reporting.encryptionKey: - -## Fleet -## https://www.elastic.co/guide/en/kibana/current/fleet-settings-kb.html -# xpack.fleet.agents.fleet_server.hosts: [ http://fleet-server:8220 ] xpack.fleet.outputs: @@ -83,8 +62,6 @@ xpack.fleet.agentPolicies: - name: apm-1 package: name: apm - # See the APM package manifest for a list of possible inputs. - # https://github.com/elastic/apm-server/blob/v8.5.0/apmpackage/apm/manifest.yml#L41-L168 inputs: - type: apm vars: diff --git a/observability/elk/logstash/Dockerfile b/observability/elk/logstash/Dockerfile index ba721dc..fae2944 100644 --- a/observability/elk/logstash/Dockerfile +++ b/observability/elk/logstash/Dockerfile @@ -1,6 +1,5 @@ ARG ELASTIC_VERSION -# https://www.docker.elastic.co/ FROM docker.elastic.co/logstash/logstash:${ELASTIC_VERSION} COPY config/logstash.yml /usr/share/logstash/config/logstash.yml diff --git a/observability/elk/logstash/config/logstash.yml b/observability/elk/logstash/config/logstash.yml index a81b89b..8adc753 100644 --- a/observability/elk/logstash/config/logstash.yml +++ b/observability/elk/logstash/config/logstash.yml @@ -1,7 +1,3 @@ --- -## Default Logstash configuration from Logstash base image. -## https://github.com/elastic/logstash/blob/main/docker/data/logstash/config/logstash-full.yml -# http.host: 0.0.0.0 - node.name: logstash diff --git a/testing/newman/.env.dev.example b/testing/newman/.env.dev.example deleted file mode 100644 index e1fcb05..0000000 --- a/testing/newman/.env.dev.example +++ /dev/null @@ -1 +0,0 @@ -API_URL=http://localhost:5000 \ No newline at end of file diff --git a/testing/newman/Auth.postman_collection.json b/testing/newman/Auth.postman_collection.json deleted file mode 100644 index 5003fe6..0000000 --- a/testing/newman/Auth.postman_collection.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "info": { - "_postman_id": "5a442e31-1ca6-4662-bb2a-4a4fdcf89cb2", - "name": "Auth", - "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json", - "_exporter_id": "31564770" - }, - "item": [ - { - "name": "Login", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.have.status(200);", - "});", - "", - "pm.test(\"Content-Type is present\", function () {", - " pm.response.to.have.header(\"Content-Type\");", - "});", - "" - ], - "type": "text/javascript" - } - } - ], - "request": { - "method": "POST", - "header": [], - "body": { - "mode": "raw", - "raw": "{\n \"email\": \"info@lufthansa.com\",\n \"password\": \"password1234\"\n}", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "{{API_URL}}/auth/login", - "host": [ - "{{API_URL}}" - ], - "path": [ - "auth", - "login" - ] - } - }, - "response": [] - } - ], - "event": [ - { - "listen": "prerequest", - "script": { - "type": "text/javascript", - "exec": [ - "" - ] - } - }, - { - "listen": "test", - "script": { - "type": "text/javascript", - "exec": [ - "" - ] - } - } - ], - "variable": [ - { - "key": "API_URL", - "value": "http://localhost:5001", - "type": "string" - } - ] -} \ No newline at end of file diff --git a/testing/newman/Dockerfile b/testing/newman/Dockerfile deleted file mode 100644 index 4ba2c31..0000000 --- a/testing/newman/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM node:16-alpine - -ENV LC_ALL="en_US.UTF-8" LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8" ALPINE_NODE_REPO="oznu/alpine-node" - -RUN npm install --global newman - -WORKDIR /usr/src/app - -COPY . . -RUN chmod +x /usr/src/app/test.sh - -ENTRYPOINT ["/usr/src/app/test.sh"] \ No newline at end of file diff --git a/testing/newman/docker-compose.dev.yml b/testing/newman/docker-compose.dev.yml deleted file mode 100644 index d634a59..0000000 --- a/testing/newman/docker-compose.dev.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: '3.8' - -services: - newman: - container_name: fids-testing_newman - image: ${API_IMAGE} - environment: - - API_URL=${API_URL} - network_mode: host diff --git a/testing/newman/test.sh b/testing/newman/test.sh deleted file mode 100644 index 2d3fea9..0000000 --- a/testing/newman/test.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -newman run Auth.postman_collection.json