Merge pull request #2589 from newrelic/remove-deployment-marker

Remove deployment marker function

Author: jtduffy

newrelic-agent/src/main/java/com/newrelic/agent/AgentCommandLineParser.java

@@ -28,7 +28,6 @@
 import java.util.Map.Entry;
 
 class AgentCommandLineParser {
-    private static final String DEPLOYMENT_COMMAND = "deployment";
     private static final String VERIFY_INSTRUMENTATION = "verifyInstrumentation";
     /**
      * Used to create the custom instrumentation file.
@@ -39,13 +38,10 @@ class AgentCommandLineParser {
 
     static {
         commandOptionsMap = new HashMap<>();
-        commandOptionsMap.put(DEPLOYMENT_COMMAND, getDeploymentOptions());
         commandOptionsMap.put(INSTRUMENT_COMMAND, getInstrumentOptions());
         commandOptionsMap.put(VERIFY_INSTRUMENTATION, getVerifyInstrumentationOptions());
 
         commandDescriptions = new HashMap<>();
-        commandDescriptions.put(DEPLOYMENT_COMMAND, "[OPTIONS] [description]  Records a deployment. Note: This command is deprecated and will be removed " +
-                "in the next major release.");
         commandDescriptions.put(INSTRUMENT_COMMAND, "[OPTIONS]                Validates a custom instrumentation xml configuration file.");
     }
 
@@ -72,9 +68,7 @@ public void parseCommand(String[] args) {
                 cmd = parser.parse(commandOptions, args);
             }
 
-            if (DEPLOYMENT_COMMAND.equals(command)) {
-                deploymentCommand(cmd);
-            } else if (INSTRUMENT_COMMAND.equals(command)) {
+            if (INSTRUMENT_COMMAND.equals(command)) {
                 instrumentCommand(cmd);
             } else if (VERIFY_INSTRUMENTATION.equals(command)) {
                 verifyInstrumentation(cmd);
@@ -176,16 +170,6 @@ private static Options getBasicOptions() {
         return options;
     }
 
-    private static Options getDeploymentOptions() {
-        Options options = new Options();
-        options.addOption(Deployments.APP_NAME_OPTION, true, "Set the application name. Default is app_name setting in newrelic.yml");
-        options.addOption(Deployments.ENVIRONMENT_OPTION, true, "Set the environment (staging, production, test, development)");
-        options.addOption(Deployments.USER_OPTION, true, "Specify the user deploying");
-        options.addOption(Deployments.REVISION_OPTION, true, "Specify the revision being deployed");
-        options.addOption(Deployments.CHANGE_LOG_OPTION, false, "Reads the change log for a deployment from standard input");
-        return options;
-    }
-
     /**
      * Returns the instrumentation options.
      *

newrelic-agent/src/test/java/com/newrelic/agent/AgentCommandLineParserTest.java

@@ -55,17 +55,6 @@ public void parseCommand_withHelpOptionAndCommand_printsHelpText() {
         Assert.assertTrue(replacementOut.toString().contains("java -jar newrelic.jar"));
     }
 
-    @Test
-    public void parseCommand_withDeploymentOption_callsRecordDeployment() {
-        String[] args = new String[] { "deployment" };
-        AgentCommandLineParser parser = new AgentCommandLineParser();
-
-        try (MockedStatic<Deployments> deploymentsMock = Mockito.mockStatic(Deployments.class)) {
-            parser.parseCommand(args);
-            deploymentsMock.verify(() -> Deployments.recordDeployment(Mockito.any()));
-        }
-    }
-
     @Test
     public void parseCommand_withInstrumentOption_callsValidateInstrumentation() {
         String[] args = new String[] { "instrument" };