enable auto-update

piomin · Jan 22, 2023 · 8b5decb · 8b5decb
1 parent 83172de
commit 8b5decb
Show file tree

Hide file tree

Showing 9 changed files with 150 additions and 33 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,31 @@
+version: 2.1
+
+jobs:
+  analyze:
+    docker:
+      - image: 'cimg/openjdk:17.0'
+    steps:
+      - checkout
+      - run:
+          name: Analyze on SonarCloud
+          command: mvn verify sonar:sonar -DskipTests
+
+orbs:
+  maven: circleci/[email protected]
+  tcc: atomicjar/[email protected]
+
+executors:
+  j17:
+    docker:
+      - image: 'cimg/openjdk:17.0'
+
+workflows:
+  maven_test:
+    jobs:
+      - maven/test:
+          executor: j17
+          context: Testcontainers
+          pre-steps:
+            - tcc/setup
+      - analyze:
+          context: SonarCloud
diff --git a/admin-service/pom.xml b/admin-service/pom.xml
@@ -67,6 +67,25 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.8.8</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>report</id>
+						<phase>test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/department-service/pom.xml b/department-service/pom.xml
@@ -121,6 +121,25 @@
                     </from>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.8</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/employee-service/pom.xml b/employee-service/pom.xml
@@ -65,12 +65,6 @@
             <artifactId>de.flapdoodle.embed.mongo</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.fabric8</groupId>
-            <artifactId>kubernetes-server-mock</artifactId>
-            <version>4.10.3</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -96,6 +90,25 @@
                     </from>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.8</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/employee-service/src/test/java/pl/piomin/services/employee/EmployeeAPITest.java b/employee-service/src/test/java/pl/piomin/services/employee/EmployeeAPITest.java
@@ -1,44 +1,21 @@
 package pl.piomin.services.employee;
 
-import io.fabric8.kubernetes.client.Config;
-import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import pl.piomin.services.employee.model.Employee;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@EnableKubernetesMockClient(crud = true)
 @TestMethodOrder(MethodOrderer.Alphanumeric.class)
 class EmployeeAPITest {
 
-    static KubernetesClient client;
-
     @Autowired
     TestRestTemplate restTemplate;
 
-    @BeforeAll
-    static void init() {
-        System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY,
-            client.getConfiguration().getMasterUrl());
-        System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY,
-            "true");
-        System.setProperty(
-            Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false");
-        System.setProperty(
-            Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false");
-        System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true");
-        System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY,
-            "default");
-        client.configMaps().inNamespace("default").createNew()
-            .withNewMetadata().withName("employee").endMetadata()
-            .addToData("application.properties",
-                "spring.data.mongodb.uri=mongodb://localhost:27017/test")
-            .done();
-    }
-
     @Test
     void addEmployeeTest() {
         Employee employee = new Employee("1", "1", "Test", 30, "test");

diff --git a/gateway-service/pom.xml b/gateway-service/pom.xml
@@ -5,6 +5,7 @@
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>2.5.5</version>
+		<relativePath />
 	</parent>
 	<artifactId>gateway-service</artifactId>
 	<groupId>pl.piomin.services</groupId>
@@ -70,6 +71,25 @@
 					</from>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.8.8</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>report</id>
+						<phase>test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

diff --git a/organization-service/pom.xml b/organization-service/pom.xml
@@ -87,6 +87,25 @@
 					</from>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.8.8</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>report</id>
+						<phase>test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

diff --git a/pom.xml b/pom.xml
@@ -6,6 +6,12 @@
 	<version>1.1</version>
 	<packaging>pom</packaging>
 
+	<properties>
+		<sonar.projectKey>piomin_spring-microservices-kubernetes</sonar.projectKey>
+		<sonar.organization>piomin</sonar.organization>
+		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
+	</properties>
+
 	<modules>
 		<module>admin-service</module>
 		<module>employee-service</module>

diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,13 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",":dependencyDashboard"
+  ],
+  "packageRules": [
+    {
+      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
+      "automerge": true
+    }
+  ],
+  "prCreation": "not-pending"
+}