Add notrackdep suffix to scope dependencies (#4)

* Add notrackdep suffix to scope dependencies * Apply suggestions from code review Co-Authored-By: Juan Antonio Fernández de Alba <[email protected]> * Applying suggested changes Co-authored-by: Juan Antonio Fernández de Alba <[email protected]>
undefinedlabs · Apr 28, 2020 · fda065a · fda065a
1 parent 164c927
commit fda065a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -11914,19 +11914,18 @@ const tc = __importStar(__webpack_require__(602));
 const version_parser_1 = __webpack_require__(368);
 const scopeAgentMetadataURL = "https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-agent/maven-metadata.xml";
 const scopeMavenInstrMetadataURL = "https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-instrumentation-for-maven/maven-metadata.xml";
+const scopeNoTrackDep = "_scope_notrackdep";
 function instrument(allowBeta) {
  return __awaiter(this, void 0, void 0, function* () {
  const workdir = process.cwd();
  const [agentVersion, instrVersion] = yield Promise.all([version_parser_1.getVersionToUse(scopeAgentMetadataURL, allowBeta), version_parser_1.getVersionToUse(scopeMavenInstrMetadataURL, false)]);
  const scopeAgentPath = yield tc.downloadTool(`https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-agent/${agentVersion}/scope-agent-${agentVersion}.jar`);
- if (!scopeAgentPath.endsWith(".jar")) {
- yield io.mv(scopeAgentPath, scopeAgentPath + ".jar");
- }
+ const finalScopeAgentPath = `${scopeAgentPath.replace('.jar', '')}${scopeNoTrackDep}.jar`;
+ yield io.mv(scopeAgentPath, finalScopeAgentPath);
  const mavenInstrumentatorPath = yield tc.downloadTool(`https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-instrumentation-for-maven/${instrVersion}/scope-instrumentation-for-maven-${instrVersion}.jar`);
- if (!mavenInstrumentatorPath.endsWith(".jar")) {
- yield io.mv(mavenInstrumentatorPath, mavenInstrumentatorPath + ".jar");
- }
- yield exec.exec("sh -c \"find " + workdir + " -name \\\"pom.xml\\\" -exec java -jar " + mavenInstrumentatorPath + ".jar \\\"" + scopeAgentPath + ".jar\\\" {} \\;\"");
+ const finalMavenInstrumentatorPath = `${mavenInstrumentatorPath.replace('.jar', '')}${scopeNoTrackDep}.jar`;
+ yield io.mv(mavenInstrumentatorPath, finalMavenInstrumentatorPath);
+ yield exec.exec(`sh -c "find ${workdir} -name \\"pom.xml\\" -exec java -jar ${finalMavenInstrumentatorPath} ${finalScopeAgentPath} {} \\;"`);
  });
 }
 exports.instrument = instrument;

diff --git a/src/executor.ts b/src/executor.ts
@@ -5,20 +5,19 @@ import {getVersionToUse} from "./version-parser";
 
 const scopeAgentMetadataURL = "https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-agent/maven-metadata.xml";
 const scopeMavenInstrMetadataURL = "https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-instrumentation-for-maven/maven-metadata.xml";
+const scopeNoTrackDep = "_scope_notrackdep";
 
 export async function instrument(allowBeta:boolean): Promise<void> {
  const workdir = process.cwd();
  const [agentVersion, instrVersion] = await Promise.all([getVersionToUse(scopeAgentMetadataURL, allowBeta), getVersionToUse(scopeMavenInstrMetadataURL, false)])
 
  const scopeAgentPath = await tc.downloadTool(`https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-agent/${agentVersion}/scope-agent-${agentVersion}.jar`);
- if(!scopeAgentPath.endsWith(".jar")) {
- await io.mv(scopeAgentPath, scopeAgentPath+".jar");
- }
+ const finalScopeAgentPath = `${scopeAgentPath.replace('.jar', '')}${scopeNoTrackDep}.jar`
+ await io.mv(scopeAgentPath, finalScopeAgentPath);
 
  const mavenInstrumentatorPath = await tc.downloadTool(`https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-instrumentation-for-maven/${instrVersion}/scope-instrumentation-for-maven-${instrVersion}.jar`);
- if(!mavenInstrumentatorPath.endsWith(".jar")){
- await io.mv(mavenInstrumentatorPath, mavenInstrumentatorPath+".jar");
- }
+ const finalMavenInstrumentatorPath = `${mavenInstrumentatorPath.replace('.jar', '')}${scopeNoTrackDep}.jar`
+ await io.mv(mavenInstrumentatorPath, finalMavenInstrumentatorPath);
 
- await exec.exec("sh -c \"find "+workdir+" -name \\\"pom.xml\\\" -exec java -jar "+mavenInstrumentatorPath+".jar \\\""+scopeAgentPath+".jar\\\" {} \\;\"");
-}
+ await exec.exec(`sh -c "find ${workdir} -name \\"pom.xml\\" -exec java -jar ${finalMavenInstrumentatorPath} ${finalScopeAgentPath} {} \\;"`);
+}