Browse Source

Rename package.json to avoid dependabot alert (#8219)

This `package.json` contains outdated dependences, it is only used in a
test.

---------

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Lauri Tulmin 1 year ago
parent
commit
8aeffa5e80

+ 7 - 2
instrumentation/vaadin-14.2/javaagent/src/vaadin16Test/java/io/opentelemetry/javaagent/instrumentation/vaadin/Vaadin16Test.java

@@ -13,14 +13,19 @@ import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
 import io.opentelemetry.sdk.testing.assertj.TracesAssert;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 
 public class Vaadin16Test extends AbstractVaadinTest {
 
   @Override
   protected void prepareVaadinBaseDir(File baseDir) {
-    copyResource("/pnpm/package.json", baseDir);
-    copyResource("/pnpm/pnpm-lock.yaml", baseDir);
+    Path basePath = Paths.get(baseDir.toURI());
+    // underscore "_" prefix is used to hide these files from dependabot
+    // (they are only used for tests ok for them to have outdated dependencies)
+    copyClasspathResource("/pnpm/_package.json", basePath.resolve("package.json"));
+    copyClasspathResource("/pnpm/_pnpm-lock.yaml", basePath.resolve("pnpm-lock.yaml"));
   }
 
   @Override

+ 0 - 0
instrumentation/vaadin-14.2/javaagent/src/vaadin16Test/resources/pnpm/package.json → instrumentation/vaadin-14.2/javaagent/src/vaadin16Test/resources/pnpm/_package.json


+ 0 - 0
instrumentation/vaadin-14.2/javaagent/src/vaadin16Test/resources/pnpm/pnpm-lock.yaml → instrumentation/vaadin-14.2/javaagent/src/vaadin16Test/resources/pnpm/_pnpm-lock.yaml


+ 1 - 5
instrumentation/vaadin-14.2/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/AbstractVaadinTest.java

@@ -23,7 +23,6 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
@@ -95,10 +94,7 @@ public abstract class AbstractVaadinTest
 
   protected void prepareVaadinBaseDir(File baseDir) {}
 
-  protected static void copyResource(String resource, File destinationDirectory) {
-    int lastSlash = resource.lastIndexOf('/');
-    String fileName = lastSlash == -1 ? resource : resource.substring(lastSlash + 1);
-    Path destination = Paths.get(destinationDirectory.toURI()).resolve(fileName);
+  protected static void copyClasspathResource(String resource, Path destination) {
     if (!Files.exists(destination)) {
       try (InputStream inputStream = AbstractVaadinTest.class.getResourceAsStream(resource)) {
         Files.copy(inputStream, destination);