refactor(CustomisationGenerator): Consolidate Pi Connect configuration paths

- Moved Pi Connect configuration path and deployment key filename constants to the header file for better accessibility.
- Updated the implementation to utilize these constants in script generation and testing, ensuring consistency across the codebase.
- Removed hardcoded strings in favor of the new constants to enhance maintainability and clarity.

Author: tdewey-rpi

src/customization_generator.cpp

@@ -11,9 +11,6 @@
 
 namespace rpi_imager {
 
-constexpr auto PI_CONNECT_CONFIG_PATH = ".config/com.raspberrypi.connect";
-constexpr auto PI_CONNECT_DEPLOY_KEY_FILENAME = "deploy.key";
-
 QString CustomisationGenerator::shellQuote(const QString& value) {
     QString t = value;
     t.replace("'", "'\"'\"'");

src/customization_generator.h

@@ -12,6 +12,10 @@
 
 namespace rpi_imager {
 
+// Raspberry Pi Connect configuration paths
+constexpr auto PI_CONNECT_CONFIG_PATH = ".config/com.raspberrypi.connect";
+constexpr auto PI_CONNECT_DEPLOY_KEY_FILENAME = "auth.key";
+
 /**
  * @brief Generates firstrun.sh and cloud-init customisation scripts for Raspberry Pi images
  * 

src/test/customization_generator_test.cpp

@@ -277,8 +277,8 @@ TEST_CASE("CustomisationGenerator Raspberry Pi Connect", "[customization]") {
     QByteArray script = CustomisationGenerator::generateSystemdScript(settings, token);
     QString scriptStr = QString::fromUtf8(script);
 
-    REQUIRE_THAT(scriptStr.toStdString(), ContainsSubstring("com.raspberrypi.connect"));
-    REQUIRE_THAT(scriptStr.toStdString(), ContainsSubstring("deploy.key"));
+    REQUIRE_THAT(scriptStr.toStdString(), ContainsSubstring(PI_CONNECT_CONFIG_PATH));
+    REQUIRE_THAT(scriptStr.toStdString(), ContainsSubstring(PI_CONNECT_DEPLOY_KEY_FILENAME));
     REQUIRE_THAT(scriptStr.toStdString(), ContainsSubstring("test-token-12345"));
     REQUIRE_THAT(scriptStr.toStdString(), ContainsSubstring("rpi-connect-signin.service"));
 }
@@ -448,8 +448,8 @@ TEST_CASE("CustomisationGenerator handles null/empty piConnect token", "[customi
     QString scriptStr = QString::fromUtf8(script);
 
     // Should not include Pi Connect setup if token is empty
-    REQUIRE_FALSE(scriptStr.contains("com.raspberrypi.connect"));
-    REQUIRE_FALSE(scriptStr.contains("deploy.key"));
+    REQUIRE_FALSE(scriptStr.contains(PI_CONNECT_CONFIG_PATH));
+    REQUIRE_FALSE(scriptStr.contains(PI_CONNECT_DEPLOY_KEY_FILENAME));
 }
 
 TEST_CASE("CustomisationGenerator handles invalid keyboard layout", "[customization][negative]") {
@@ -597,13 +597,15 @@ TEST_CASE("CustomisationGenerator generates cloud-init user-data with Pi Connect
     QString yaml = QString::fromUtf8(userdata);
 
     REQUIRE_THAT(yaml.toStdString(), ContainsSubstring("write_files:"));
-    REQUIRE_THAT(yaml.toStdString(), ContainsSubstring("- path: /home/testuser/.config/com.raspberrypi.connect/deploy.key"));
+    QString expectedPath = QString("- path: /home/testuser/") + PI_CONNECT_CONFIG_PATH + "/" + PI_CONNECT_DEPLOY_KEY_FILENAME;
+    REQUIRE_THAT(yaml.toStdString(), ContainsSubstring(expectedPath.toStdString()));
     REQUIRE_THAT(yaml.toStdString(), ContainsSubstring("permissions: '0600'"));
     REQUIRE_THAT(yaml.toStdString(), ContainsSubstring("owner: testuser:testuser"));
     REQUIRE_THAT(yaml.toStdString(), ContainsSubstring("content: |"));
     REQUIRE_THAT(yaml.toStdString(), ContainsSubstring("test-token-abcd-1234"));
     REQUIRE_THAT(yaml.toStdString(), ContainsSubstring("runcmd:"));
-    REQUIRE_THAT(yaml.toStdString(), ContainsSubstring("install -o testuser -m 700 -d /home/testuser/.config/com.raspberrypi.connect"));
+    QString expectedInstallDir = QString("install -o testuser -m 700 -d /home/testuser/") + PI_CONNECT_CONFIG_PATH;
+    REQUIRE_THAT(yaml.toStdString(), ContainsSubstring(expectedInstallDir.toStdString()));
 }
 
 TEST_CASE("CustomisationGenerator generates cloud-init network-config with WiFi", "[cloudinit][network]") {
@@ -701,6 +703,6 @@ TEST_CASE("CustomisationGenerator cloud-init handles empty Pi Connect token", "[
 
     // Should not include write_files or runcmd for Pi Connect
     REQUIRE_FALSE(yaml.contains("write_files:"));
-    REQUIRE_FALSE(yaml.contains("com.raspberrypi.connect"));
+    REQUIRE_FALSE(yaml.contains(PI_CONNECT_CONFIG_PATH));
 }