From 9e28ce4bcbda3d88b7ff6c1dbaf9249baa5f739f Mon Sep 17 00:00:00 2001
From: Nikita Tkachenko <nikita.tkachenko@datadoghq.com>
Date: Wed, 27 Sep 2023 16:57:42 +0200
Subject: [PATCH] Remove Application Key configuration since the backend no
 longer requires it

---
 README.md                                     |   4 +-
 .../datadog/DatadogGlobalConfiguration.java   | 145 ------------------
 .../tracer/DatadogTracerConfigurator.java     |   1 -
 .../DatadogGlobalConfiguration/config.jelly   |   7 -
 .../help-targetApplicationKeyEntry.html       |   4 -
 ...-targetCredentialsApplicationKeyEntry.html |   6 -
 .../DatadogTracerJobProperty/help-on.html     |   1 +
 7 files changed, 4 insertions(+), 164 deletions(-)
 delete mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApplicationKeyEntry.html
 delete mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApplicationKeyEntry.html

diff --git a/README.md b/README.md
index 1ced9ebe9..1d8facc40 100644
--- a/README.md
+++ b/README.md
@@ -232,7 +232,9 @@ The plugin can automatically configure Datadog <a target="_blank" href="https://
 
 Before enabling Test Visibility, be sure to properly configure the plugin to submit data to Datadog.
 
-To enable Test Visibility, go to the `Configure` page of the job or pipeline whose tests need to be traced, tick `Enable Datadog Test Visibility` checkbox in the `General` section and save your changes. 
+To enable Test Visibility, go to the `Configure` page of the job or pipeline whose tests need to be traced, tick `Enable Datadog Test Visibility` checkbox in the `General` section and save your changes.
+
+Please bear in mind that Test Visibility is a separate Datadog product that is billed separately.
 
 ## Data collected
 
diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration.java b/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration.java
index 51d6d897d..6c950b19b 100644
--- a/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration.java
+++ b/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration.java
@@ -90,7 +90,6 @@ public class DatadogGlobalConfiguration extends GlobalConfiguration {
     private static final String TARGET_LOG_INTAKE_URL_PROPERTY = "DATADOG_JENKINS_PLUGIN_TARGET_LOG_INTAKE_URL";
     private static final String TARGET_WEBHOOK_INTAKE_URL_PROPERTY = "DATADOG_JENKINS_TARGET_WEBHOOK_INTAKE_URL";
     private static final String TARGET_API_KEY_PROPERTY = "DATADOG_JENKINS_PLUGIN_TARGET_API_KEY";
-    private static final String TARGET_APPLICATION_KEY_PROPERTY = "DATADOG_JENKINS_PLUGIN_TARGET_APPLICATION_KEY";
     private static final String TARGET_LOG_COLLECTION_PORT_PROPERTY = "DATADOG_JENKINS_PLUGIN_TARGET_LOG_COLLECTION_PORT";
     private static final String TARGET_TRACE_SERVICE_NAME_PROPERTY = "DATADOG_JENKINS_PLUGIN_TRACE_SERVICE_NAME";
     private static final String HOSTNAME_PROPERTY = "DATADOG_JENKINS_PLUGIN_HOSTNAME";
@@ -141,9 +140,6 @@ public class DatadogGlobalConfiguration extends GlobalConfiguration {
     private Secret targetApiKey = null;
     private String targetCredentialsApiKey = null;
     private Secret usedApiKey = null;
-    private Secret targetApplicationKey = null;
-    private String targetCredentialsApplicationKey = null;
-    private Secret usedApplicationKey = null;
     private String targetHost = DEFAULT_TARGET_HOST_VALUE;
     private Integer targetPort = DEFAULT_TARGET_PORT_VALUE;
     private Integer targetLogCollectionPort = DEFAULT_TARGET_LOG_COLLECTION_PORT_VALUE;
@@ -199,11 +195,6 @@ private void loadEnvVariables(){
             this.targetApiKey = Secret.fromString(targetApiKeyEnvVar);
         }
 
-        String targetApplicationKeyEnvVar = System.getenv(TARGET_APPLICATION_KEY_PROPERTY);
-        if(StringUtils.isNotBlank(targetApplicationKeyEnvVar)){
-            this.targetApplicationKey = Secret.fromString(targetApplicationKeyEnvVar);
-        }
-
         final DatadogAgentConfiguration agentConfig = DatadogAgentConfiguration.resolve(System.getenv());
         if(StringUtils.isNotBlank(agentConfig.getHost())){
             this.targetHost = agentConfig.getHost();
@@ -504,78 +495,6 @@ public FormValidation doCheckTargetCredentialsApiKey(
         return FormValidation.ok();
     }
 
-    /**
-     * Populates the targetCredentialsApplicationKey field from the configuration screen with all of the valid credentials
-     *
-     * @param item - The context within which to list available credentials
-     * @param targetCredentialsApplicationKey - A String containing the application key as a credential
-     * @return a ListBoxModel object used to display all of the available credentials.
-     */
-    public ListBoxModel doFillTargetCredentialsApplicationKeyItems(
-            @AncestorInPath Item item,
-            @QueryParameter("targetCredentialsApplicationKey") String targetCredentialsApplicationKey
-    ) {
-        StandardListBoxModel result = new StandardListBoxModel();
-        // If the users does not have permissions to list credentials, only list the current value
-        if (item == null) {
-            if (!Jenkins.get().hasPermission(Jenkins.ADMINISTER)) {
-                return result.includeCurrentValue(targetCredentialsApplicationKey);
-            }
-        } else {
-            if (!item.hasPermission(Item.EXTENDED_READ)
-                    && !item.hasPermission(CredentialsProvider.USE_ITEM)) {
-                return result.includeCurrentValue(targetCredentialsApplicationKey);
-            }
-        }
-        return result.includeEmptyValue()
-                .includeMatchingAs(ACL.SYSTEM,
-                        Jenkins.get(),
-                        StringCredentials.class,
-                        Collections.emptyList(),
-                        CredentialsMatchers.instanceOf(StringCredentials.class))
-                .includeCurrentValue(targetCredentialsApplicationKey);
-    }
-
-    /**
-     * Tests the targetCredentialsApplicationKey field from the configuration screen, to check its' validity.
-     *
-     * @param item - The context within which to list available credentials.
-     * @param targetCredentialsApplicationKey - A String containing the API key as a credential
-     * @return a FormValidation object used to display a message to the user on the configuration
-     * screen.
-     */
-    @RequirePOST
-    public FormValidation doCheckTargetCredentialsApplicationKey(
-            @AncestorInPath Item item,
-            @QueryParameter("targetCredentialsApplicationKey") String targetCredentialsApplicationKey
-    ) {
-        // Don't validate for users that do not have permission to list credentials
-        if (item == null) {
-            if (!Jenkins.get().hasPermission(Jenkins.ADMINISTER)) {
-                return FormValidation.ok();
-            }
-        } else {
-            if (!item.hasPermission(Item.EXTENDED_READ)
-                    && !item.hasPermission(CredentialsProvider.USE_ITEM)) {
-                return FormValidation.ok();
-            }
-        }
-        if (StringUtils.isBlank(targetCredentialsApplicationKey)) {
-            return FormValidation.ok();
-        }
-        if (targetCredentialsApplicationKey.startsWith("${") && targetCredentialsApplicationKey.endsWith("}")) {
-            return FormValidation.warning("Cannot validate expression based credentials");
-        }
-        if (CredentialsProvider.listCredentials(StringCredentials.class,
-                item,
-                ACL.SYSTEM,
-                Collections.emptyList(),
-                CredentialsMatchers.withId(targetCredentialsApplicationKey)).isEmpty()) {
-            return FormValidation.error("Cannot find currently selected credentials");
-        }
-        return FormValidation.ok();
-    }
-
     /**
      * Tests the hostname field from the configuration screen, to determine if
      * the hostname is of a valid format, according to the RFC 1123.
@@ -765,8 +684,6 @@ public boolean configure(final StaplerRequest req, final JSONObject formData) th
             this.setTargetWebhookIntakeURL(formData.getString("targetWebhookIntakeURL"));
             this.setTargetApiKey(formData.getString("targetApiKey"));
             this.setTargetCredentialsApiKey(formData.getString("targetCredentialsApiKey"));
-            this.setTargetApplicationKey(formData.getString("targetApplicationKey"));
-            this.setTargetCredentialsApplicationKey(formData.getString("targetCredentialsApplicationKey"));
             this.setTargetHost(formData.getString("targetHost"));
             String portStr = formData.getString("targetPort");
             if (validatePort(portStr)) {
@@ -849,9 +766,6 @@ public boolean configure(final StaplerRequest req, final JSONObject formData) th
             final Secret apiKeySecret = findSecret(formData.getString("targetApiKey"), formData.getString("targetCredentialsApiKey"));
             this.setUsedApiKey(apiKeySecret);
 
-            final Secret applicationKeySecret = findSecret(formData.getString("targetApplicationKey"), formData.getString("targetCredentialsApplicationKey"));
-            this.setUsedApplicationKey(applicationKeySecret);
-
             //When form is saved....
             DatadogClient client = ClientFactory.getClient(DatadogClient.ClientType.valueOf(this.getReportWith()), this.getTargetApiURL(),
                 this.getTargetLogIntakeURL(), this.getTargetWebhookIntakeURL(), this.getUsedApiKey(), this.getTargetHost(),
@@ -1016,65 +930,6 @@ public void setTargetCredentialsApiKey(final String targetCredentialsApiKey) {
         this.targetCredentialsApiKey = targetCredentialsApiKey;
     }
 
-    /**
-     * Getter function for the targetApplicationKey global configuration.
-     *
-     * @return a Secret containing the targetApplicationKey global configuration.
-     */
-    public Secret getTargetApplicationKey() {
-        return targetApplicationKey;
-    }
-
-    /**
-     * Setter function for the targetApplicationKey global configuration.
-     *
-     * @param targetApplicationKey = A string containing the plaintext representation of a
-     *            DataDog Application Key
-     */
-    @DataBoundSetter
-    public void setTargetApplicationKey(final String targetApplicationKey) {
-        this.targetApplicationKey = Secret.fromString(fixEmptyAndTrim(targetApplicationKey));
-    }
-
-    /**
-     * Getter function for the application key global configuration.
-     *
-     * @return a Secret containing the usedApplicationKey global configuration.
-     */
-    public Secret getUsedApplicationKey() {
-        return usedApplicationKey;
-    }
-
-    /**
-     * Setter function for the application key global configuration..
-     *
-     * @param usedApplicationKey = A Secret containing the DataDog Application Key
-     */
-    @DataBoundSetter
-    public void setUsedApplicationKey(final Secret usedApplicationKey) {
-        this.usedApplicationKey = usedApplicationKey;
-    }
-
-    /**
-     * Getter function for the targetCredentialsApplicationKey global configuration.
-     *
-     * @return a String containing the ID of the targetCredentialsApplicationKey global configuration.
-     */
-    public String getTargetCredentialsApplicationKey() {
-        return targetCredentialsApplicationKey;
-    }
-
-    /**
-     * Setter function for the credentials targetCredentialsApplicationKey global configuration.
-     *
-     * @param targetCredentialsApplicationKey = A string containing the plaintext representation of a
-     *            DataDog Application Key
-     */
-    @DataBoundSetter
-    public void setTargetCredentialsApplicationKey(final String targetCredentialsApplicationKey) {
-        this.targetCredentialsApplicationKey = targetCredentialsApplicationKey;
-    }
-
     /**
      * Getter function for the targetHost global configuration.
      *
diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java
index 1b7e931e3..48be9c254 100644
--- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java
+++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java
@@ -117,7 +117,6 @@ private static Map<String, String> getCommonEnvVariables(DatadogGlobalConfigurat
                 variables.put("DD_CIVISIBILITY_AGENTLESS_ENABLED", "true");
                 variables.put("DD_SITE", getSite(datadogConfig.getTargetApiURL()));
                 variables.put("DD_API_KEY", Secret.toString(datadogConfig.getUsedApiKey()));
-                variables.put("DD_APPLICATION_KEY", Secret.toString(datadogConfig.getUsedApplicationKey()));
                 break;
             case DSD:
                 variables.put("DD_AGENT_HOST", datadogConfig.getTargetHost());
diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/config.jelly b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/config.jelly
index 191f675ee..7f0b723d6 100644
--- a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/config.jelly
+++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/config.jelly
@@ -61,13 +61,6 @@
         </f:entry>
 
         <f:validateButton title="${%Test Key}" progress="${%Testing...}" method="testConnection" with="targetApiKey,targetCredentialsApiKey,targetApiURL" checkMethod="post" />
-
-        <f:entry title="Datadog Application Key" field="targetApplicationKeyEntry" description="Optional, required only for Intelligent Test Runner in Tests Visibility">
-          <f:password field="targetApplicationKey" default="${targetApplicationKey}" checkMethod="post" />
-        </f:entry>
-        <f:entry title="Datadog Application Key (Select from Credentials)" field="targetCredentialsApplicationKeyEntry" description="Optional, required only for Intelligent Test Runner in Tests Visibility">
-          <f:select field="targetCredentialsApplicationKey" default="${targetCredentialsApplicationKey}" checkMethod="post" />
-        </f:entry>
     </f:radioBlock>
 
     <f:entry title="Logs">
diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApplicationKeyEntry.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApplicationKeyEntry.html
deleted file mode 100644
index c8d6728f0..000000000
--- a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApplicationKeyEntry.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-    Enter your Datadog application key, which can be found
-    <a target="_blank" href="https://app.datadoghq.com/organization-settings/application-keys">here</a>.
-</div>
diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApplicationKeyEntry.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApplicationKeyEntry.html
deleted file mode 100644
index bc9c0ae11..000000000
--- a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApplicationKeyEntry.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-    Enter your Datadog application key, which can be found
-    <a target="_blank" href="https://app.datadoghq.com/organization-settings/application-keys">here</a>.
-    This field is an alternative to specifying the application key directly (field above), use it only if you would like to store your application key with
-    <a target="_blank" href="https://www.jenkins.io/doc/book/using/using-credentials/"> Jenkins Credentials.</a>
-</div>
diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html
index 14eb46c98..ee4ea96bc 100644
--- a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html
+++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html
@@ -1,4 +1,5 @@
 <div>
     Enable Datadog <a target="_blank" href="https://docs.datadoghq.com/continuous_integration/tests/">Test Visibility</a> for this job.
     This requires <a target="_blank" href="/configure">configuring</a> Datadog Plugin connectivity.
+    Please bear in mind that Test Visibility is a separate Datadog product that is billed separately.
 </div>