Added rust service, fixed claims for nodejs service, adde 'kid' for security service - build nodejs-service, build rust-service, build authentication-service

Author: rodrigorodrigues

.github/workflows/docker-build-push-image-rust-service.yml

@@ -0,0 +1,55 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI - Build and push Docker images - Rust Service
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    if: contains(toJson(github), 'build rust-service')
+    name: Build Jar/Docker Image and Publish to DockerHub
+
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      # Login to Dockerhub
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: ./rust-service
+          file: ./rust-service/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: fielcapao/microservices-design-patterns-rust-service-service:latest
+          build-args: |
+            GITHUB_SHA=$GITHUB_SHA
+            GITHUB_REF=$GITHUB_REF
+            PORT=8089
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

README.md

@@ -386,6 +386,7 @@ Access it [Swagger UI](http://localhost:{SERVICE_PORT}/swagger-ui.html) - `http:
 * [X] Java - Quarkus/JDK 25
 * [X] Java - Add TestContainers
 * [] Add Open Telemetry
+* [X] Rust – Add Service using Rust/Actix-web
 
 ### References
 [Pattern Microservice Architecture](https://microservices.io/patterns/microservices.html)

authentication-service/src/main/java/com/microservice/authentication/AuthenticationServiceApplication.java

@@ -148,6 +148,7 @@ JwtEncoder jwtEncoder(AuthenticationProperties properties) {
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("alg", JWSAlgorithm.HS256.getName());
                     jsonObject.put("typ", "JWT");
+                    jsonObject.put("kid", "test");
 
                     JWSHeader header = JWSHeader.parse(jsonObject);
                     SignedJWT signedJWT = new SignedJWT(header, claimsSet);
@@ -156,6 +157,7 @@ JwtEncoder jwtEncoder(AuthenticationProperties properties) {
                     return Jwt.withTokenValue(signedJWT.serialize())
                         .header("alg", header.getAlgorithm().getName())
                         .header("typ", "JWT")
+                        .header("kid", header.getKeyID())
                         .subject(claimsSet.getSubject())
                         .issuer(claimsSet.getIssuer())
                         .claims(claims -> claims.putAll(claimsSet.getClaims()))

authentication-service/src/main/java/com/microservice/authentication/controller/JwksSymmetricController.java

@@ -24,8 +24,8 @@ public class JwksSymmetricController {
 	@ResponseBody
 	public Map<String, Object> index() {
 		OctetSequenceKey key = new OctetSequenceKey.Builder(authenticationProperties.getJwt().getKeyValue().getBytes(StandardCharsets.UTF_8))
-//				.algorithm(Algorithm.parse("HS256"))
-//				.keyID("test")
+				.algorithm(Algorithm.parse("HS256"))
+				.keyID("test")
 				.build();
 
 //		return new JWKSet(key).toJSONObject();

docker/docker-compose.yml

@@ -192,6 +192,32 @@ services:
         aliases:
           - receipt-api
 
+  warehouse-api:
+    build:
+      args:
+        - PORT=8089
+      context: ../rust-service
+      dockerfile: Dockerfile
+    container_name: warehouse-api
+    environment:
+      - HOST_NAME=warehouse-api
+      - CONSUL_SERVER=service-discovery
+      - MONGODB_URI=mongodb://mongodb-datasource/docker
+      - SERVER_PORT=8089
+      - RUST_LOG=TRACE
+      - APP_NAME=rust-service
+      - CONSUL_ENABLED=true
+      - SPRING_PROFILES_ACTIVE=dev
+    depends_on:
+      - service-discovery
+      - mongodb-datasource
+    ports:
+      - 8089:8089
+    networks:
+      net:
+        aliases:
+          - warehouse-api
+
   post-api:
     build:
       args:

docker/service-discovery-load-configuration.sh

@@ -10,4 +10,5 @@ if ! curl -k --retry 5 --retry-connrefused --retry-delay 5 -H "Content-Type: app
     curl --request PUT --data-binary @spring-cloud-config/edge-server.yml http://service-discovery:8500/v1/kv/config/edge-server/data
     curl --request PUT --data-binary @spring-cloud-config/authentication-service.yml http://service-discovery:8500/v1/kv/config/authentication-service/data
     curl --request PUT --data-binary @spring-cloud-config/quarkus-service.yml http://service-discovery:8500/v1/kv/config/quarkus-service/data
+    curl --request PUT --data-binary @spring-cloud-config/applicationDev.yml http://service-discovery:8500/v1/kv/config/rust-service/dev
 fi

docker/spring-cloud-config/edge-server.yml

@@ -59,6 +59,8 @@ spring:
                     uri: lb://week-menu-api
                     predicates:
                         - Path=/api/week-menu/**
+                    filters:
+                      - StripPrefix=2
                   - id: kotlin-service
                     uri: lb://kotlin-service
                     predicates:
@@ -73,7 +75,7 @@ spring:
                     uri: lb://python-service
                     predicates:
                         - Path=/api/products/**,/api/receipts/**
-                  - id: kotlin-service-swagger
+                  - id: python-service-swagger
                     uri: lb://kotlin-service
                     predicates:
                         - Path=/swagger/python-service/**
@@ -83,6 +85,16 @@ spring:
                     uri: lb://go-service
                     predicates:
                         - Path=/api/posts/**
+                  - id: rust-service
+                    uri: lb://rust-service
+                    predicates:
+                      - Path=/api/warehouses/**
+                  - id: rust-service-swagger
+                    uri: lb://rust-service
+                    predicates:
+                      - Path=/swagger/rust-service/**
+                    filters:
+                      - RewritePath=/rust-service/(?<segment>.*), /$\{segment}
 
 com:
     microservice:

edge-server/src/main/java/com/springboot/edgeserver/EdgeServerApplication.java

@@ -27,9 +27,13 @@
 import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.core.task.support.TaskExecutorAdapter;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.server.reactive.ServerHttpRequestDecorator;
 import org.springframework.security.authentication.ReactiveAuthenticationManager;
 import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
 import org.springframework.session.ReactiveSessionRepository;
@@ -41,6 +45,8 @@
 import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import org.springframework.web.server.ResponseStatusException;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilter;
 
 import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
 import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
@@ -57,6 +63,26 @@ public static void main(String[] args) {
 		SpringApplication.run(EdgeServerApplication.class, args);
 	}
 
+	@Bean
+	@Order(Ordered.HIGHEST_PRECEDENCE)
+	WebFilter writeableHeaders() {
+		return (exchange, chain) -> {
+			HttpHeaders writeableHeaders = HttpHeaders.copyOf(
+					exchange.getRequest().getHeaders());
+			ServerHttpRequestDecorator writeableRequest = new ServerHttpRequestDecorator(
+					exchange.getRequest()) {
+				@Override
+				public HttpHeaders getHeaders() {
+					return writeableHeaders;
+				}
+			};
+			ServerWebExchange writeableExchange = exchange.mutate()
+					.request(writeableRequest)
+					.build();
+			return chain.filter(writeableExchange);
+		};
+	}
+
 	@Bean
 	@ConditionalOnMissingBean
 	public SpringSessionWebSessionStore<Session> springSessionWebSessionStore(ReactiveSessionRepository reactiveSessionRepository) {

nodejs-service/package-lock.json

@@ -17,7 +17,6 @@
         "await-sleep": "0.0.1",
         "body-parser": "^1.18.3",
         "cookie-parser": "1.4.3",
-        "cors": "2.8.5",
         "dotenv": "6.2.0",
         "express": "^4.16.3",
         "express-actuator": "1.1.0",
@@ -41,7 +40,8 @@
         "zipkin-transport-http": "0.16.2",
         "consul": "2.0.1",
         "yaml": "2.8.2",
-        "request": "2.88.2"
+        "request": "2.88.2",
+        "jwks-rsa": "3.2.1"
     },
     "devDependencies": {
         "@babel/core": "^7.7.4",