Patrones de diseño y observabilidad

.gitignore

@@ -4,6 +4,25 @@ target/
 !**/src/main/**/target/
 !**/src/test/**/target/
 
+# Environment variables and secrets
+.env
+*.tfvars
+!*.tfvars.example
+
+# Terraform files
+**/.terraform/
+**/.terraform.lock.hcl
+**/terraform.tfstate
+**/terraform.tfstate.backup
+**/*.tfplan
+
+# Keys and credentials
+infra/keys/
+*.json
+!package.json
+!package-lock.json
+!tsconfig.json
+
 ### STS ###
 .apt_generated
 .classpath
@@ -31,3 +50,6 @@ build/
 
 ### VS Code ###
 .vscode/
+
+## Keys ##
+infra/keys/

README.md

@@ -5,7 +5,7 @@
 <!--## Better Code Hub
 I analysed this repository according to the clean code standards on [Better Code Hub](https://bettercodehub.com/) just to get an independent opinion of how bad the code is. Surprisingly, the compliance score is high!
 -->
-## Introduction
+## Introduction 
 - This project is a development of a small set of **Spring Boot** and **Cloud** based Microservices projects that implement cloud-native intuitive, Reactive Programming, Event-driven, Microservices design patterns, and coding best practices.
 - The project follows **CloudNative**<!--(https://www.cncf.io/)--> recommendations and The [**twelve-factor app**](https://12factor.net/) methodology for building *software-as-a-service apps* to show how μServices should be developed and deployed.
 - This project uses cutting edge technologies like Docker, Kubernetes, Elasticsearch Stack for

api-gateway/Dockerfile

@@ -1,12 +1,9 @@
-
 FROM openjdk:11
 ARG PROJECT_VERSION=0.1.0
 RUN mkdir -p /home/app
 WORKDIR /home/app
-ENV SPRING_PROFILES_ACTIVE dev
+ENV SPRING_PROFILES_ACTIVE=dev
 COPY api-gateway/ .
 ADD api-gateway/target/api-gateway-v${PROJECT_VERSION}.jar api-gateway.jar
 EXPOSE 8080
-ENTRYPOINT ["java", "-Dspring.profiles.active=${SPRING_PROFILES_ACTIVE}", "-jar", "api-gateway.jar"]
-
-
+ENTRYPOINT ["java", "-Dspring.profiles.active=${SPRING_PROFILES_ACTIVE}", "-jar", "api-gateway.jar"]

api-gateway/compose.yml

@@ -1,12 +1,21 @@
-
 version: '3'
 services:
   api-gateway-container:
-    image: selimhorri/api-gateway-ecommerce-boot:0.1.0
+    image: juanse201/api-gateway-ecommerce-boot:0.1.0
     ports:
       - 8080:8080
     environment:
       - SPRING_PROFILES_ACTIVE=dev
+      - SPRING_ZIPKIN_BASE_URL=http://zipkin:9411
+      - SPRING_CONFIG_IMPORT=optional:configserver:http://cloud-config-container:9296/
+      - EUREKA_CLIENT_REGION=default
+      - EUREKA_CLIENT_AVAILABILITY_ZONES_DEFAULT=myzone
+      - EUREKA_CLIENT_SERVICEURL_MYZONE=http://service-discovery-container:8761/eureka
+      - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://service-discovery-container:8761/eureka/
+    networks:
+      - microservices_network
 
-
-
+networks:
+  microservices_network:
+    external: true
+    name: microservices_network

api-gateway/pom.xml

@@ -64,6 +64,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>2.5.7</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

api-gateway/src/main/resources/application.yml

@@ -5,9 +5,9 @@ server:
 
 spring:
   zipkin:
-    base-url: ${SPRING_ZIPKIN_BASE_URL:http://localhost:9411/}
+    base-url: ${SPRING_ZIPKIN_BASE_URL:http://zipkin:9411/}
   config:
-    import: ${SPRING_CONFIG_IMPORT:optional:configserver:http://localhost:9296}
+    import: ${SPRING_CONFIG_IMPORT:optional:configserver:http://cloud-config-container:9296}
   application:
     name: API-GATEWAY
   profiles:
@@ -62,6 +62,12 @@ spring:
         predicates:
         - Path=/app/**
 
+eureka:
+  client:
+    service-url:
+      defaultZone: ${EUREKA_CLIENT_SERVICEURL_DEFAULTZONE:http://service-discovery-container:8761/eureka/}
+
+
 resilience4j:
   circuitbreaker:
     instances:

build-and-push.ps1

@@ -0,0 +1,49 @@
+# PowerShell script to build and push all microservice images to Docker Hub
+
+$ErrorActionPreference = 'Continue'
+
+# Remove all local Docker images (force, only if any exist)
+$localImages = docker images -q
+if ($localImages) {
+    Write-Host "Removing all local Docker images..." -ForegroundColor Yellow
+    docker rmi -f $localImages
+} else {
+    Write-Host "No local Docker images to remove." -ForegroundColor Green
+}
+
+# Array of service names
+$services = @(
+    "cloud-config",
+    "service-discovery",
+    "api-gateway",
+    "proxy-client",
+    "order-service",
+    "payment-service",
+    "product-service",
+    "shipping-service",
+    "user-service",
+    "favourite-service"
+)
+
+# Docker Hub username
+$dockerUser = "juanse201"
+
+
+foreach ($service in $services) {
+    $imageName = "$dockerUser/$service-ecommerce-boot:0.1.0"
+    $dockerfilePath = "./$service/Dockerfile"
+    Write-Host "Building $imageName ..."
+    docker build -t $imageName -f $dockerfilePath .
+    if ($LASTEXITCODE -ne 0) {
+        Write-Host "Build failed for $service" -ForegroundColor Red
+        exit 1
+    }
+    Write-Host "Pushing $imageName ..."
+    docker push $imageName
+    if ($LASTEXITCODE -ne 0) {
+        Write-Host "Push failed for $service" -ForegroundColor Red
+        exit 1
+    }
+}
+
+Write-Host "All images built and pushed successfully!" -ForegroundColor Green

cloud-config/Dockerfile

@@ -1,11 +1,8 @@
-
 FROM openjdk:11
 ARG PROJECT_VERSION=0.1.0
 RUN mkdir -p /home/app
 WORKDIR /home/app
 COPY cloud-config/ .
 ADD cloud-config/target/cloud-config-v${PROJECT_VERSION}.jar cloud-config.jar
 EXPOSE 9296
-ENTRYPOINT ["java", "-jar", "cloud-config.jar"]
-
-
+ENTRYPOINT ["java", "-jar", "cloud-config.jar"]

cloud-config/compose.yml

@@ -1,12 +1,10 @@
-
 version: '3'
 services:
   cloud-config-container:
-    image: selimhorri/cloud-config-ecommerce-boot:0.1.0
+    image: juanse201/cloud-config-ecommerce-boot:0.1.0
     ports:
       - 9296:9296
     environment:
       - SPRING_PROFILES_ACTIVE=dev
 
 
-

cloud-config/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 
 spring:
   zipkin:
-    base-url: ${SPRING_ZIPKIN_BASE_URL:http://localhost:9411/}
+    base-url: ${SPRING_ZIPKIN_BASE_URL:http://zipkin:9411/}
   application:
     name: CLOUD-CONFIG
   cloud:
@@ -14,6 +14,11 @@ spring:
           uri: https://github.com/SelimHorri/cloud-config-server
           clone-on-start: true
 
+eureka:
+  client:
+    service-url:
+      defaultZone: ${EUREKA_CLIENT_SERVICEURL_DEFAULTZONE:http://service-discovery-container:8761/eureka/}
+
 resilience4j:
   circuitbreaker:
     instances:

cloud-config/src/test/java/com/selimhorri/app/integration/CloudConfigApplicationIntegrationTests.java

@@ -0,0 +1,42 @@
+package com.selimhorri.app.integration;
+
+import com.selimhorri.app.CloudConfigApplication;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import static org.junit.jupiter.api.Assertions.*;
+
+@SpringBootTest(classes = CloudConfigApplication.class)
+class CloudConfigApplicationIntegrationTests {
+
+    @Autowired
+    private ApplicationContext context;
+
+    @Test
+    void contextLoads() {
+        assertNotNull(context);
+    }
+
+    @Test
+    void configServerBeanExists() {
+        // ConfigServerConfiguration bean should exist if config server is enabled
+        assertTrue(context.getBeanNamesForType(org.springframework.cloud.config.server.config.ConfigServerConfiguration.class).length > 0);
+    }
+
+    @Test
+    void eurekaClientBeanExists() {
+        // Eureka client bean should exist if Eureka is enabled
+        assertTrue(context.getBeanNamesForType(org.springframework.cloud.netflix.eureka.EurekaClientConfigBean.class).length > 0);
+    }
+
+    @Test
+    void mainClassIsLoaded() {
+        assertNotNull(context.getBean(CloudConfigApplication.class));
+    }
+
+    @Test
+    void environmentIsNotNull() {
+        assertNotNull(context.getEnvironment());
+    }
+}

cloud-config/src/test/java/com/selimhorri/app/unit/CloudConfigApplicationUnitTests.java

@@ -0,0 +1,30 @@
+package com.selimhorri.app.unit;
+
+import com.selimhorri.app.CloudConfigApplication;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import java.lang.annotation.Annotation;
+import static org.junit.jupiter.api.Assertions.*;
+
+class CloudConfigApplicationUnitTests {
+
+    @Test
+    void testSpringBootApplicationAnnotationPresent() {
+        assertTrue(CloudConfigApplication.class.isAnnotationPresent(org.springframework.boot.autoconfigure.SpringBootApplication.class));
+    }
+
+    @Test
+    void testEnableEurekaClientAnnotationPresent() {
+        assertTrue(CloudConfigApplication.class.isAnnotationPresent(org.springframework.cloud.netflix.eureka.EnableEurekaClient.class));
+    }
+
+    @Test
+    void testEnableConfigServerAnnotationPresent() {
+        assertTrue(CloudConfigApplication.class.isAnnotationPresent(org.springframework.cloud.config.server.EnableConfigServer.class));
+    }
+
+    @Test
+    void testClassIsPublic() {
+        assertTrue(java.lang.reflect.Modifier.isPublic(CloudConfigApplication.class.getModifiers()));
+    }
+}