From b2af1092656765e4c140debf161d1ab911b050e2 Mon Sep 17 00:00:00 2001
From: Arya <90748009+aryamohanan@users.noreply.github.com>
Date: Thu, 10 Oct 2024 11:48:08 +0530
Subject: [PATCH] fix: removed deprecated INSTANA_URL and INSTANA_KEY
 environment variables (#1373)

BREAKING CHANGE:
- The INSTANA_URL and INSTANA_KEY environment variables have been removed.
- Any references to these should be replaced with the environment variables INSTANA_ENDPOINT_URL and INSTANA_AGENT_KEY.
---
 packages/serverless/src/environment.js       | 9 +--------
 packages/serverless/test/environment_test.js | 2 --
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/serverless/src/environment.js b/packages/serverless/src/environment.js
index 9b81692b91..f34224b942 100644
--- a/packages/serverless/src/environment.js
+++ b/packages/serverless/src/environment.js
@@ -9,9 +9,6 @@ const logger = require('./console_logger');
 
 const instanaEndpointUrlEnvVar = 'INSTANA_ENDPOINT_URL';
 const instanaAgentKeyEnvVar = 'INSTANA_AGENT_KEY';
-// The following two environment variables are deprecated and will be removed soon.
-const deprecatedInstanaUrlEnvVar = 'INSTANA_URL';
-const deprecatedInstanaKeyEnvVar = 'INSTANA_KEY';
 const instanaZoneEnvVar = 'INSTANA_ZONE';
 
 let valid = false;
@@ -29,11 +26,7 @@ exports.sendUnencrypted = process.env[exports.sendUnencryptedEnvVar] === 'true';
 const customZone = process.env[instanaZoneEnvVar] ? process.env[instanaZoneEnvVar] : undefined;
 
 exports.validate = function validate({ validateInstanaAgentKey } = {}) {
-  _validate(
-    process.env[instanaEndpointUrlEnvVar] || process.env[deprecatedInstanaUrlEnvVar],
-    process.env[instanaAgentKeyEnvVar] || process.env[deprecatedInstanaKeyEnvVar],
-    validateInstanaAgentKey
-  );
+  _validate(process.env[instanaEndpointUrlEnvVar], process.env[instanaAgentKeyEnvVar], validateInstanaAgentKey);
 };
 
 // exposed for testing
diff --git a/packages/serverless/test/environment_test.js b/packages/serverless/test/environment_test.js
index 62f02c6018..b9a60b61ac 100644
--- a/packages/serverless/test/environment_test.js
+++ b/packages/serverless/test/environment_test.js
@@ -15,8 +15,6 @@ describe('environment util', () => {
     //
     'INSTANA_ENDPOINT_URL',
     'INSTANA_AGENT_KEY',
-    'INSTANA_URL',
-    'INSTANA_KEY',
     'INSTANA_ZONE',
     'INSTANA_TAGS'
   ];