Skip to content

Commit

Permalink
Merge pull request #548 from LerianStudio/Refactor/MIDAZ-547
Browse files Browse the repository at this point in the history
Refactor/MIDAZ-547
  • Loading branch information
MartinezAvellan authored Feb 25, 2025
2 parents 0142cec + 36bb7b1 commit 73c9c3e
Show file tree
Hide file tree
Showing 29 changed files with 173 additions and 3,346 deletions.
1 change: 0 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
## Pull Request Type
[//]: # (Check the appropriate box for the type of pull request.)

- [ ] Auth
- [ ] Infra
- [ ] Onboarding
- [ ] Mdz
Expand Down
54 changes: 27 additions & 27 deletions .github/workflows/go-combined-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,30 +138,30 @@ jobs:
shell: bash
run: make test

integration-tests:
name: Run Integrations Tests to MDZ
runs-on: ubuntu-24.04
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Install Docker Compose
run: |
sudo apt-get update
sudo apt-get install -y docker-compose
- name: Setup .env files
run: make set-env

- name: Start Docker Compose Services
run: make up

- name: Install CLI
run: cd components/mdz && make install-local && cd -

- name: Wait for services to be ready
run: sleep 10
timeout-minutes: 2

- name: Run Integration Tests
run: make test_integration_cli
# integration-tests:
# name: Run Integrations Tests to MDZ
# runs-on: ubuntu-24.04
# steps:
# - name: Checkout repository
# uses: actions/checkout@v3
#
# - name: Install Docker Compose
# run: |
# sudo apt-get update
# sudo apt-get install -y docker-compose
#
# - name: Setup .env files
# run: make set-env
#
# - name: Start Docker Compose Services
# run: make up
#
# - name: Install CLI
# run: cd components/mdz && make install-local && cd -
#
# - name: Wait for services to be ready
# run: sleep 10
# timeout-minutes: 2
#
# - name: Run Integration Tests
# run: make test_integration_cli
10 changes: 1 addition & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
AUTH_DIR := ./components/auth
INFRA_DIR := ./components/infra
MDZ_DIR := ./components/mdz
ONBOARDING_DIR := ./components/onboarding
Expand Down Expand Up @@ -149,7 +148,6 @@ set-env:
@echo "$(YELLOW)WARNING:$(NC)"
@echo "$(YELLOW)Customize .env variables to fit your environment. Default values are for initial setup and may not be secure for production. Protect sensitive info and avoid exposing .env files in public repositories.$(NC)"
@echo "$(BLUE)Setting up environment files...$(NC)"
cp -r $(AUTH_DIR)/.env.example $(AUTH_DIR)/.env
cp -r $(INFRA_DIR)/.env.example $(INFRA_DIR)/.env
cp -r $(ONBOARDING_DIR)/.env.example $(ONBOARDING_DIR)/.env
cp -r $(TRANSACTION_DIR)/.env.example $(TRANSACTION_DIR)/.env
Expand All @@ -159,17 +157,12 @@ set-env:
.PHONY: up
up:
@echo "$(BLUE)Starting all services...$(NC)"
@$(DOCKER_CMD) -f $(AUTH_DIR)/docker-compose.yml up --build -d

@$(DOCKER_CMD) -f $(INFRA_DIR)/docker-compose.yml up --build -d
@$(DOCKER_CMD) -f $(ONBOARDING_DIR)/docker-compose.yml up --build -d
@$(DOCKER_CMD) -f $(TRANSACTION_DIR)/docker-compose.yml up --build -d
@echo "$(BLUE)All services started successfully$(NC)"

.PHONY: auth
auth:
@echo "$(BLUE)Executing command in auth service...$(NC)"
$(MAKE) -C $(AUTH_DIR) $(COMMAND)

.PHONY: infra
infra:
@echo "$(BLUE)Executing command in infra service...$(NC)"
Expand All @@ -188,7 +181,6 @@ transaction:
.PHONY: all-services
all-services:
@echo "$(BLUE)Executing command across all services...$(NC)"
$(MAKE) -C $(AUTH_DIR) $(COMMAND) && \
$(MAKE) -C $(INFRA_DIR) $(COMMAND) && \
$(MAKE) -C $(ONBOARDING_DIR) $(COMMAND) && \
$(MAKE) -C $(TRANSACTION_DIR) $(COMMAND)
Expand Down
2 changes: 1 addition & 1 deletion chocolatey/tools/chocolateyinstall.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$version = 'v1.48.0'
$version = 'v1.49.0'

$ErrorActionPreference = 'Stop';

Expand Down
37 changes: 0 additions & 37 deletions components/auth/.env.example

This file was deleted.

84 changes: 0 additions & 84 deletions components/auth/Makefile

This file was deleted.

45 changes: 0 additions & 45 deletions components/auth/docker-compose.yml

This file was deleted.

84 changes: 0 additions & 84 deletions components/auth/setup/00_init.sql

This file was deleted.

Loading

0 comments on commit 73c9c3e

Please sign in to comment.