From 367c05b1d3f66ae577e392bbe983f2cb0d9bd18e Mon Sep 17 00:00:00 2001
From: Jamil Bou Kheir <jamilbk@users.noreply.github.com>
Date: Fri, 4 Feb 2022 14:14:47 -0800
Subject: [PATCH] telemetry recipe

---
 omnibus/cookbooks/firezone/libraries/config.rb  |  2 +-
 omnibus/cookbooks/firezone/recipes/config.rb    |  2 --
 omnibus/cookbooks/firezone/recipes/default.rb   |  1 +
 omnibus/cookbooks/firezone/recipes/telemetry.rb | 10 ++++++++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/omnibus/cookbooks/firezone/libraries/config.rb b/omnibus/cookbooks/firezone/libraries/config.rb
index 30e1ef9d9..f8f836380 100644
--- a/omnibus/cookbooks/firezone/libraries/config.rb
+++ b/omnibus/cookbooks/firezone/libraries/config.rb
@@ -255,11 +255,11 @@ class Firezone
         'WIREGUARD_IPV6_ADDRESS' => attributes['wireguard']['ipv6']['address'],
         # Allow env var to override config
         'TELEMETRY_ENABLED' => ENV.fetch('TELEMETRY_ENABLED', attributes['telemetry']['enabled'] == false ? "false" : "true"),
+        'TELEMETRY_ID' => attributes['telemetry_id'],
         'CONNECTIVITY_CHECKS_ENABLED' => attributes['connectivity_checks']['enabled'].to_s,
         'CONNECTIVITY_CHECKS_INTERVAL' => attributes['connectivity_checks']['interval'].to_s,
 
         # secrets
-        'TELEMETRY_ID' => attributes['telemetry_id'],
         'SECRET_KEY_BASE' => attributes['secret_key_base'],
         'LIVE_VIEW_SIGNING_SALT' => attributes['live_view_signing_salt'],
         'COOKIE_SIGNING_SALT' => attributes['cookie_signing_salt'],
diff --git a/omnibus/cookbooks/firezone/recipes/config.rb b/omnibus/cookbooks/firezone/recipes/config.rb
index f2968fdfc..f0a3a6005 100644
--- a/omnibus/cookbooks/firezone/recipes/config.rb
+++ b/omnibus/cookbooks/firezone/recipes/config.rb
@@ -39,8 +39,6 @@ Firezone::Config.load_or_create_secrets!(
   node
 )
 
-node.default['firezone']['telemetry_id'] = SecureRandom.uuid()
-
 node.default['firezone']['wireguard_public_key'] =
   `echo '#{node['firezone']['wireguard_private_key']}' | #{node['firezone']['install_directory']}/embedded/bin/wg pubkey`.chomp
 
diff --git a/omnibus/cookbooks/firezone/recipes/default.rb b/omnibus/cookbooks/firezone/recipes/default.rb
index 63a9a809c..293b21281 100644
--- a/omnibus/cookbooks/firezone/recipes/default.rb
+++ b/omnibus/cookbooks/firezone/recipes/default.rb
@@ -5,6 +5,7 @@
 #
 # Copyright:: 2021, Firezone, All Rights Reserved.
 
+include_recipe "firezone::telemetry"
 include_recipe "firezone::config"
 include_recipe "firezone::setcap"
 include_recipe "firezone::log_management"
diff --git a/omnibus/cookbooks/firezone/recipes/telemetry.rb b/omnibus/cookbooks/firezone/recipes/telemetry.rb
index c8c9bb0f6..56ea73534 100644
--- a/omnibus/cookbooks/firezone/recipes/telemetry.rb
+++ b/omnibus/cookbooks/firezone/recipes/telemetry.rb
@@ -10,6 +10,7 @@
 include_recipe 'firezone::config'
 
 disable_telemetry_path = "#{node['firezone']['install_directory']}/.disable-telemetry"
+telemetry_id_path = "#{node['firezone']['install_directory']}/.telemetry-id"
 
 if node['firezone']['telemetry']['enabled'] == false
   file 'disable_telemetry' do
@@ -23,4 +24,13 @@ else
     path disable_telemetry_path
     action :delete
   end
+  file 'telemetry_id' do
+    action :create_if_missing
+    path telemetry_id_path
+    mode '0644'
+    user node['firezone']['user']
+    group node['firezone']['group']
+    content SecureRandom.uuid()
+  end
+  node['firezone']['telemetry_id'] = File.read(telemetry_id_path)
 end