Skip to content

Commit 557b4f8

Browse files
cody-constine-ttdcody-constine-ttd
committed
Finished merge
1 parent 24bb77e commit 557b4f8

File tree

3 files changed

+21
-268
lines changed

3 files changed

+21
-268
lines changed

‎pom.xml‎

Lines changed: 13 additions & 253 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,9 @@
2424
<vertx.verticle>com.uid2.core.vertx.CoreVerticle</vertx.verticle>
2525
<launcher.class>io.vertx.core.Launcher</launcher.class>
2626

27-
<<<<<<< HEAD
2827
<uid2-shared.version>7.21.0</uid2-shared.version>
2928
<image.version>${project.version}</image.version>
3029
</properties>
31-
=======
32-
<uid2-shared.version>7.20.0</uid2-shared.version>
33-
<image.version>${project.version}</image.version>
34-
</properties>
35-
>>>>>>> main
3630

3731
<repositories>
3832
<repository>
@@ -183,121 +177,17 @@
183177
<version>5.12.0</version>
184178
<scope>test</scope>
185179
</dependency>
186-
187-
</dependencies>
188-
189-
<<<<<<< HEAD
190-
<dependencies>
191-
<dependency>
192-
<groupId>com.uid2</groupId>
193-
<artifactId>uid2-shared</artifactId>
194-
<version>${uid2-shared.version}</version>
195-
</dependency>
196-
<dependency>
197-
<groupId>io.vertx</groupId>
198-
<artifactId>vertx-core</artifactId>
199-
</dependency>
200-
<dependency>
201-
<groupId>io.vertx</groupId>
202-
<artifactId>vertx-config</artifactId>
203-
<version>${vertx.version}</version>
204-
</dependency>
205-
<dependency>
206-
<groupId>io.vertx</groupId>
207-
<artifactId>vertx-web</artifactId>
208-
<version>${vertx.version}</version>
209-
</dependency>
210-
<dependency>
211-
<groupId>io.vertx</groupId>
212-
<artifactId>vertx-web-client</artifactId>
213-
<version>${vertx.version}</version>
214-
</dependency>
215-
<dependency>
216-
<groupId>com.google.auth</groupId>
217-
<artifactId>google-auth-library-oauth2-http</artifactId>
218-
<version>1.14.0</version>
219-
</dependency>
220-
<dependency>
221-
<groupId>io.vertx</groupId>
222-
<artifactId>vertx-junit5</artifactId>
223-
<scope>test</scope>
224-
</dependency>
225-
<dependency>
226-
<groupId>org.junit.jupiter</groupId>
227-
<artifactId>junit-jupiter-api</artifactId>
228-
<version>${junit-jupiter.version}</version>
229-
<scope>test</scope>
230-
</dependency>
231-
<dependency>
232-
<groupId>org.junit.jupiter</groupId>
233-
<artifactId>junit-jupiter-engine</artifactId>
234-
<version>${junit-jupiter.version}</version>
235-
<scope>test</scope>
236-
</dependency>
237-
<dependency>
238-
<groupId>org.mockito</groupId>
239-
<artifactId>mockito-inline</artifactId>
240-
<version>5.2.0</version>
241-
<scope>test</scope>
242-
</dependency>
243-
<dependency>
244-
<groupId>net.bytebuddy</groupId>
245-
<artifactId>byte-buddy</artifactId>
246-
<version>1.14.17</version>
247-
</dependency>
248-
<dependency>
249-
<groupId>io.vertx</groupId>
250-
<artifactId>vertx-micrometer-metrics</artifactId>
251-
<version>${vertx.version}</version>
252-
</dependency>
253-
<dependency>
254-
<groupId>co.nstant.in</groupId>
255-
<artifactId>cbor</artifactId>
256-
<version>0.9</version>
257-
</dependency>
258-
<dependency>
259-
<groupId>com.amazonaws</groupId>
260-
<artifactId>aws-java-sdk-s3</artifactId>
261-
<version>1.12.701</version>
262-
</dependency>
263-
<dependency>
264-
<groupId>io.micrometer</groupId>
265-
<artifactId>micrometer-registry-prometheus</artifactId>
266-
<version>${micrometer.version}</version>
267-
</dependency>
268-
<dependency>
269-
<groupId>ch.qos.logback</groupId>
270-
<artifactId>logback-core</artifactId>
271-
<version>1.4.12</version>
272-
</dependency>
273-
<dependency>
274-
<groupId>ch.qos.logback</groupId>
275-
<artifactId>logback-classic</artifactId>
276-
<version>1.4.12</version>
277-
</dependency>
278-
<dependency>
279-
<groupId>com.github.loki4j</groupId>
280-
<artifactId>loki-logback-appender</artifactId>
281-
<version>1.2.0</version>
282-
</dependency>
283-
<dependency>
284-
<groupId>commons-codec</groupId>
285-
<artifactId>commons-codec</artifactId>
286-
<version>1.15</version>
287-
</dependency>
288-
<dependency>
289-
<groupId>software.amazon.awssdk</groupId>
290-
<artifactId>secretsmanager</artifactId>
291-
</dependency>
292-
<dependency>
293-
<groupId>software.amazon.awssdk</groupId>
294-
<artifactId>kms</artifactId>
295-
</dependency>
296-
<dependency>
297-
<groupId>software.amazon.awssdk</groupId>
298-
<artifactId>sts</artifactId>
299-
</dependency>
300-
180+
<dependency>
181+
<groupId>org.mockito</groupId>
182+
<artifactId>mockito-inline</artifactId>
183+
<version>5.2.0</version>
184+
<scope>test</scope>
185+
</dependency>
186+
<dependency>
187+
<groupId>net.bytebuddy</groupId>
188+
<artifactId>byte-buddy</artifactId>
189+
<version>1.14.17</version>
190+
</dependency>
301191
</dependencies>
302192

303193
<build>
@@ -319,8 +209,8 @@
319209
<artifactId>maven-compiler-plugin</artifactId>
320210
<version>3.11.0</version>
321211
<configuration>
322-
<source>11</source>
323-
<target>11</target>
212+
<source>16</source>
213+
<target>16</target>
324214
</configuration>
325215
</plugin>
326216
<plugin>
@@ -422,134 +312,4 @@
422312
</plugin>
423313
</plugins>
424314
</build>
425-
=======
426-
<build>
427-
<plugins>
428-
<plugin>
429-
<groupId>org.jacoco</groupId>
430-
<artifactId>jacoco-maven-plugin</artifactId>
431-
<version>0.8.12</version>
432-
<executions>
433-
<execution>
434-
<goals>
435-
<goal>prepare-agent</goal>
436-
</goals>
437-
</execution>
438-
</executions>
439-
</plugin>
440-
<plugin>
441-
<groupId>org.apache.maven.plugins</groupId>
442-
<artifactId>maven-compiler-plugin</artifactId>
443-
<version>3.12.1</version>
444-
<configuration>
445-
<source>21</source>
446-
<target>21</target>
447-
<release>21</release>
448-
</configuration>
449-
</plugin>
450-
<plugin>
451-
<groupId>org.apache.maven.plugins</groupId>
452-
<artifactId>maven-source-plugin</artifactId>
453-
<version>3.2.1</version>
454-
<executions>
455-
<execution>
456-
<id>attach-sources</id>
457-
<goals>
458-
<goal>jar</goal>
459-
</goals>
460-
</execution>
461-
</executions>
462-
</plugin>
463-
<plugin>
464-
<groupId>io.reactiverse</groupId>
465-
<artifactId>vertx-maven-plugin</artifactId>
466-
<version>${vertx-maven-plugin.version}</version>
467-
<executions>
468-
<execution>
469-
<id>vmp</id>
470-
<goals>
471-
<goal>initialize</goal>
472-
<goal>package</goal>
473-
</goals>
474-
</execution>
475-
</executions>
476-
<configuration>
477-
<redeploy>true</redeploy>
478-
<jvmArgs>
479-
<jvmArg>-Djava.security.egd=file:/dev/./urandom</jvmArg>
480-
</jvmArgs>
481-
</configuration>
482-
</plugin>
483-
<plugin>
484-
<groupId>org.apache.maven.plugins</groupId>
485-
<artifactId>maven-assembly-plugin</artifactId>
486-
<version>3.3.0</version>
487-
<configuration>
488-
<!-- get all project dependencies -->
489-
<descriptorRefs>
490-
<descriptorRef>jar-with-dependencies</descriptorRef>
491-
</descriptorRefs>
492-
<!-- MainClass in manifest make a executable jar -->
493-
<archive>
494-
<manifest>
495-
<mainClass>com.uid2.core.Main</mainClass>
496-
</manifest>
497-
</archive>
498-
</configuration>
499-
<executions>
500-
<execution>
501-
<id>make-assembly</id>
502-
<!-- bind to the packaging phase -->
503-
<phase>package</phase>
504-
<goals>
505-
<goal>single</goal>
506-
</goals>
507-
</execution>
508-
</executions>
509-
</plugin>
510-
<plugin>
511-
<groupId>org.codehaus.mojo</groupId>
512-
<artifactId>properties-maven-plugin</artifactId>
513-
<version>1.0.0</version>
514-
<executions>
515-
<execution>
516-
<phase>generate-resources</phase>
517-
<goals>
518-
<goal>write-project-properties</goal>
519-
</goals>
520-
<configuration>
521-
<outputFile>${project.build.outputDirectory}/${project.artifactId}.properties</outputFile>
522-
</configuration>
523-
</execution>
524-
</executions>
525-
</plugin>
526-
<plugin>
527-
<groupId>org.codehaus.mojo</groupId>
528-
<artifactId>exec-maven-plugin</artifactId>
529-
<version>${exec-maven-plugin.version}</version>
530-
<executions>
531-
<execution>
532-
<id>default-cli</id>
533-
<goals>
534-
<goal>java</goal>
535-
</goals>
536-
<configuration>
537-
<mainClass>com.uid2.core.Main</mainClass>
538-
</configuration>
539-
</execution>
540-
</executions>
541-
</plugin>
542-
<plugin>
543-
<groupId>org.apache.maven.plugins</groupId>
544-
<artifactId>maven-surefire-plugin</artifactId>
545-
<version>${maven-surefire-plugin.version}</version>
546-
</plugin>
547-
<plugin>
548-
<groupId>com.azure.tools</groupId>
549-
<artifactId>azure-sdk-build-tool</artifactId>
550-
<version>1.0.0</version>
551-
</plugin>
552-
</plugins>
553-
</build>
554-
>>>>>>> main
555315
</project>

‎src/main/java/com/uid2/core/vertx/CoreVerticle.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -260,17 +260,17 @@ private void handleAttestAsync(RoutingContext rc) {
260260
if (!attestationResult.isSuccess()) {
261261
AttestationFailure failure = attestationResult.getFailure();
262262
switch (failure) {
263-
case AttestationFailure.BAD_FORMAT:
264-
case AttestationFailure.INVALID_PROTOCOL:
265-
case AttestationFailure.BAD_CERTIFICATE:
266-
case AttestationFailure.BAD_PAYLOAD:
267-
case AttestationFailure.UNKNOWN_ATTESTATION_URL:
268-
case AttestationFailure.FORBIDDEN_ENCLAVE:
263+
case BAD_FORMAT:
264+
case INVALID_PROTOCOL:
265+
case BAD_CERTIFICATE:
266+
case BAD_PAYLOAD:
267+
case UNKNOWN_ATTESTATION_URL:
268+
case FORBIDDEN_ENCLAVE:
269269
setAttestationFailureReason(rc, failure, Collections.singletonMap("reason", attestationResult.getReason()));
270270
Error(attestationResult.getReason(), 403, rc, failure.explain());
271271
return;
272-
case AttestationFailure.UNKNOWN:
273-
case AttestationFailure.INTERNAL_ERROR:
272+
case UNKNOWN:
273+
case INTERNAL_ERROR:
274274
setAttestationFailureReason(rc, failure, Collections.singletonMap("reason", attestationResult.getReason()));
275275
Error(attestationResult.getReason(), 500, rc, failure.explain());
276276
return;

‎src/test/java/com/uid2/core/vertx/TestCoreVerticle.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -778,16 +778,9 @@ void s3encryptionKeyRetrieveNoKeysOrError(Vertx vertx, VertxTestContext testCont
778778
HttpResponse<Buffer> response2 = ar2.result();
779779
assertEquals(500, response2.statusCode());
780780

781-
<<<<<<< HEAD
782781
JsonObject json2 = response2.bodyAsJsonObject();
783782
assertEquals("error", json2.getString("status"));
784783
assertEquals("error generating attestation token", json2.getString("message"));
785-
=======
786-
JsonObject json2 = response2.bodyAsJsonObject();
787-
System.out.println(json2);
788-
assertEquals("error", json2.getString("status"));
789-
assertEquals("error generating attestation token", json2.getString("message"));
790-
>>>>>>> main
791784

792785
testContext.completeNow();
793786
} else {

0 commit comments

Comments
 (0)