From 23435b51b1bc9a8325b4e221a4a71cc8ade03028 Mon Sep 17 00:00:00 2001
From: Abdelhak Marouane <am0089@uah.edu>
Date: Tue, 27 Aug 2024 15:33:05 -0500
Subject: [PATCH] Making @echo consistent

---
 sm2a/Makefile           | 15 +++++++--------
 sm2a/docker-compose.yml |  4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/sm2a/Makefile b/sm2a/Makefile
index 62a04bd3..287f8812 100644
--- a/sm2a/Makefile
+++ b/sm2a/Makefile
@@ -28,16 +28,16 @@ count_down = \
 all: sm2a-local-init sm2a-local-run
 
 
-sm2a-local-run: sm2a-local-stop sm2a-cp-dags
+sm2a-local-run: sm2a-local-stop
 	@echo "Running SM2A"
 	docker compose up -d
 	$(call important_message, "Give the resources a minute to be healthy 💪")
 	$(count_down)
 	$(call info_message, "Please visit http://localhost:8080")
-	echo "username:airflow | password:airflow"
-	echo "To use local SM2A with AWS update ${SM2A_FOLDER}/sm2a-local-config/.env AWS credentials"
+	@echo "username:airflow | password:airflow"
+	@echo "To use local SM2A with AWS update ${SM2A_FOLDER}/sm2a-local-config/.env AWS credentials"
 
-sm2a-local-init: sm2a-cp-dags
+sm2a-local-init:
 	cp sm2a-local-config/env_example sm2a-local-config/.env
 	docker compose run --rm airflow-cli db init
 	docker compose run --rm airflow-cli users create --email airflow@example.com --firstname airflow --lastname airflow --password airflow --username airflow --role Admin
@@ -45,13 +45,12 @@ sm2a-local-init: sm2a-cp-dags
 sm2a-local-stop:
 	docker compose down
 
-sm2a-cp-dags:
-	cp -r ../dags .
 
-sm2a-deploy: sm2a-cp-dags
+sm2a-deploy:
 	@echo "Installing the deployment dependency"
 	pip install -r deploy_requirements.txt
-	echo "Deploying SM2A"
+	@echo "Deploying SM2A"
+	cp -r ../dags .
 	python scripts/generate_env_file.py --secret-id ${SECRET_NAME} --env-file ${ENV_FILE}
 	./scripts/deploy.sh ${ENV_FILE} <<< init
 	./scripts/deploy.sh ${ENV_FILE} <<< deploy
diff --git a/sm2a/docker-compose.yml b/sm2a/docker-compose.yml
index c441b6c7..b84a99c0 100644
--- a/sm2a/docker-compose.yml
+++ b/sm2a/docker-compose.yml
@@ -22,7 +22,7 @@ x-airflow-common:
     # Gotcha: Even though we set this to "True" in airflow.cfg, an environment variable overrides it
     AIRFLOW__CORE__LOAD_EXAMPLES: false
   volumes:
-    - ./dags:/opt/airflow/dags
+    - ../dags:/opt/airflow/dags
     - ./plugins:/opt/airflow/plugins
     - ./sm2a-local-config/local_airflow.cfg:/opt/airflow/airflow.cfg
     - ./sm2a-local-config/local_webserver_config.py:/opt/airflow/webserver_config.py
@@ -47,7 +47,7 @@ x-airflow-worker:
   environment:
     <<: *airflow-common-env
   volumes:
-    - ./dags:/opt/airflow/dags
+    - ../dags:/opt/airflow/dags
     - ./plugins:/opt/airflow/plugins
     - ./sm2a-local-config/local_airflow.cfg:/opt/airflow/airflow.cfg
     - ./infrastructure/configuration:/opt/airflow/configuration