Do not override existing CHEF_TELEMETRY_ENDPOINT env var if it is pre…

…sent

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>

components/chef-cli/lib/chef-cli/telemeter/sender.rb

@@ -10,7 +10,7 @@ def run
         if ChefCLI::Telemeter.enabled?
           # dev mode telemetry gets sent to a different location
           if ChefCLI::Config.telemetry.dev
-            ENV["CHEF_TELEMETRY_ENDPOINT"] = "https://telemetry-acceptance.chef.io"
+            ENV["CHEF_TELEMETRY_ENDPOINT"] ||= "https://telemetry-acceptance.chef.io"
           end
           session_files.each { |path| process_session(path) }
         else

components/chef-cli/spec/unit/telemeter/sender_spec.rb

@@ -53,9 +53,21 @@
       context "and telemetry dev mode is true" do
         let(:dev_mode) { true }
         let(:session_files) { [] } # Ensure we don't send anything without mocking :allthecalls:
-        it "configures the environment to submit to the Acceptance telemetry endpoint" do
-          subject.run
-          expect(ENV["CHEF_TELEMETRY_ENDPOINT"]).to eq "https://telemetry-acceptance.chef.io"
+        context "and a custom telemetry endpoint is not set" do
+          it "configures the environment to submit to the Acceptance telemetry endpoint" do
+            subject.run
+            expect(ENV["CHEF_TELEMETRY_ENDPOINT"]).to eq "https://telemetry-acceptance.chef.io"
+          end
+        end
+
+        context "and a custom telemetry endpoint is already set" do
+          before do
+            ENV["CHEF_TELEMETRY_ENDPOINT"] = "https://localhost"
+          end
+          it "should not overwrite the custom value" do
+            subject.run
+            expect(ENV["CHEF_TELEMETRY_ENDPOINT"]).to eq "https://localhost"
+          end
         end
       end