Merge pull request #28 from MichiBaum/develop

Develop
MichiBaum · Jun 7, 2024 · c29735b · c29735b
2 parents 26e1f56 + 011ef02
commit c29735b
Show file tree

Hide file tree

Showing 90 changed files with 14,119 additions and 392 deletions.
diff --git a/.env b/.env
@@ -1,5 +1,7 @@
+SPRING_ACTIVE_PROFILES=prod
+
 USERMANAGEMENT_DB_PASSWORD=PleaseChangeMe
 USERMANAGEMENT_DB=usermanagement
 
 AUTHENTICATION_DB_PASSWORD=PleaseChangeMe
-AUTHENTICATION_DB=authentication
+AUTHENTICATION_DB=authentication
diff --git a/.env.override b/.env.override
diff --git a/.github/workflows/contributors.yml b/.github/workflows/contributors.yml
@@ -1,14 +1,17 @@
 name: Update contributors in README.md
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
 
 jobs:
   contrib-readme-job:
     runs-on: ubuntu-latest
     name: Automate contrib in readme
     steps:
       - name: Contribute List
-        uses: akhilmhdh/contributors-readme-action@v2.0.2
+        uses: akhilmhdh/contributors-readme-action@v2.3.8
         with:
           collaborators: all
           commit_message: updated contributors in readme

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -1,7 +1,7 @@
 name: Build and Publish
 
 on:
-  pull_request:
+  push:
     branches:
       - master
 
@@ -10,19 +10,28 @@ jobs:
     name: 'Build, upload docker containers and deploy'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
+
+      - name: Set up node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Angular install
+        run: npm --prefix ./website install ./website
+
+      - name: Angular build
+        run: npm run --prefix website build-production
 
       - name: Generate Javadoc
         run: mvn javadoc:aggregate
 
-      - name: Maven Clean install
-#        Windows: ./mvnw clean install "-DdockerHub.username=${{secrets.DOCKER_USERNAME}}" "-DdockerHub.password=${{secrets.DOCKER_PASSWORD}}"
-        run: mvn clean install -DdockerHub.username=${{secrets.DOCKER_USERNAME}} -DdockerHub.password=${{secrets.DOCKER_PASSWORD}}
-
-      - name: Build & Publish docker images
-        run: mvn spring-boot:build-image --projects ./gateway-service,./admin-service,./javadoc-service,./registry-service,./usermanagement-service,./authentication-service -DdockerHub.username=${{secrets.DOCKER_USERNAME}} -DdockerHub.password=${{secrets.DOCKER_PASSWORD}}
+      - name: Maven package
+#        Windows: ./mvnw compile jib:build "-DdockerHub.username=${{secrets.DOCKER_USERNAME}}" "-DdockerHub.password=${{secrets.DOCKER_PASSWORD}}"
+        run: mvn package -DdockerHub.username=${{secrets.DOCKER_USERNAME}} -DdockerHub.password=${{secrets.DOCKER_PASSWORD}}
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
@@ -7,16 +7,19 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '17'
-      - name: Maven clean install
-        run: mvn clean install -DdockerHub.username=${{secrets.DOCKER_USERNAME}} -DdockerHub.password=${{secrets.DOCKER_PASSWORD}}
+          java-version: '21'
+
+      - name: Maven clean compile
+        run: mvn clean compile -DdockerHub.username=${{secrets.DOCKER_USERNAME}} -DdockerHub.password=${{secrets.DOCKER_PASSWORD}} -DdockerHub.publish=false
+
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-HELP.md
 target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/

diff --git a/README.md b/README.md
@@ -20,9 +20,11 @@ There are microservices build with spring, spring cloud and so forth.
 There are these microservices:
 - [Admin Service](./admin-service/README.md)
 - [Authentication Service](./authentication-service/README.md)
+- [Gateway Service](./gateway-service/README.md)
 - [Javadoc Service](./javadoc-service/README.md)
 - [Registry Service](./registry-service/README.md)
 - [Usermanagement Service](./usermanagement-service/README.md)
+- [Website Service](./website-service/README.md)
 
 ## Release
 
@@ -41,6 +43,24 @@ Build docker images:
 
     mvnw spring-boot:build-image --projects ./admin-service,./javadoc-service,./registry-service -DdockerHub.username=YourDockerHubUsername -DdockerHub.password=YourDockerHubPassword
 
+### Container
+
+#### Up
+
+    docker compose up --build -d
+
+#### Down
+
+    docker compose down
+
+#### Logs
+
+    # Follow
+    docker compose logs -f
+
+    # Single container 
+    docker compose logs ´name´
+
 ### Change HOSTS file
 
 #### Windows
@@ -54,6 +74,7 @@ In *C:\Windows\System32\drivers\etc* find file *hosts* and add those lines:
     127.0.0.1 javadoc.michibaum.ch
     127.0.0.1 usermanagement.michibaum.ch
     127.0.0.1 authentication.michibaum.ch
+    127.0.0.1 michibaum.ch
 
 #### Linux
 

diff --git a/admin-service/.gitignore b/admin-service/.gitignore
@@ -1,33 +1,4 @@
-HELP.md
 target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
+!**/src/test/**/target/
diff --git a/admin-service/pom.xml b/admin-service/pom.xml
@@ -5,16 +5,16 @@
 	<parent>
 		<groupId>com.michibaum</groupId>
 		<artifactId>microservice</artifactId>
-		<version>1.0.0-TEST-4</version>
+		<version>1.0.0-TEST-8</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>admin-service</artifactId>
 	<name>admin-service</name>
 
 	<properties>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 	</properties>
 
 	<dependencies>
@@ -32,11 +32,6 @@
 			<groupId>de.codecentric</groupId>
 			<artifactId>spring-boot-admin-starter-server</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
@@ -63,39 +58,43 @@
 
 	<build>
 		<sourceDirectory>src/main/kotlin</sourceDirectory>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
+				<groupId>com.google.cloud.tools</groupId>
+				<artifactId>jib-maven-plugin</artifactId>
+				<version>3.4.0</version>
 				<configuration>
-					<layers>
-						<enabled>true</enabled>
-					</layers>
-					<additionalProperties>
-						<time>${maven.build.timestamp}</time>
-					</additionalProperties>
-					<excludeDevtools>true</excludeDevtools>
-					<optimizedLaunch>true</optimizedLaunch>
-					<image>
+					<from>
+						<image>eclipse-temurin:21-jre</image>
+						<auth>
+							<!--suppress UnresolvedMavenProperty -->
+							<username>${dockerHub.username}</username>
+							<!--suppress UnresolvedMavenProperty -->
+							<password>${dockerHub.password}</password>
+						</auth>
+					</from>
+					<to>
 						<!--suppress UnresolvedMavenProperty -->
-						<name>registry.hub.docker.com/${dockerHub.username}/${project.artifactId}:${project.version}</name>
-						<publish>true</publish>
-					</image>
-					<docker>
-						<publishRegistry>
+						<image>docker.io/${dockerHub.username}/${project.artifactId}</image>
+						<auth>
 							<!--suppress UnresolvedMavenProperty -->
 							<username>${dockerHub.username}</username>
 							<!--suppress UnresolvedMavenProperty -->
 							<password>${dockerHub.password}</password>
-							<url>${dockerHub.url}</url>
-						</publishRegistry>
-					</docker>
+						</auth>
+					</to>
 				</configuration>
 				<executions>
 					<execution>
+						<phase>package</phase>
 						<goals>
-							<goal>build-info</goal>
-							<goal>build-image</goal>
+							<goal>build</goal>
 						</goals>
 					</execution>
 				</executions>

diff --git a/admin-service/src/main/kotlin/com/michibaum/admin_service/AdminServiceApplication.kt b/admin-service/src/main/kotlin/com/michibaum/admin_service/AdminServiceApplication.kt
@@ -2,6 +2,7 @@ package com.michibaum.admin_service
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import de.codecentric.boot.admin.server.config.EnableAdminServer
+import org.springframework.boot.Banner
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient
 import org.springframework.scheduling.annotation.EnableScheduling
 import org.springframework.boot.runApplication
@@ -13,5 +14,7 @@ import org.springframework.boot.runApplication
 class AdminServiceApplication
 
 fun main(args: Array<String>) {
-    runApplication<AdminServiceApplication>(*args)
+    runApplication<AdminServiceApplication>(*args){
+        setBannerMode(Banner.Mode.OFF)
+    }
 }
diff --git a/admin-service/src/main/resources/application.yml b/admin-service/src/main/resources/application.yml
@@ -33,6 +33,12 @@ spring:
 eureka:
   instance:
     prefer-ip-address: true
+  client:
+    enabled: true
+    fetch-registry: true
+    register-with-eureka: true
+    refresh:
+      enable: true
 
 management:
   endpoints:

diff --git a/admin-service/src/main/resources/logback-spring.xml b/admin-service/src/main/resources/logback-spring.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>
+                %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%throwable
+            </Pattern>
+        </layout>
+    </appender>
+
+    <!-- LOG everything at INFO level -->
+    <root level="info">
+        <appender-ref ref="RollingFile" />
+        <appender-ref ref="Console" />
+    </root>
+
+</configuration>
diff --git a/authentication-library/.gitignore b/authentication-library/.gitignore
diff --git a/authentication-library/pom.xml b/authentication-library/pom.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-4</version>
+        <version>1.0.0-TEST-8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>authentication-library</artifactId>
     <name>authentication-library</name>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencies>

diff --git a/authentication-service/.gitignore b/authentication-service/.gitignore
@@ -0,0 +1,4 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/