commit dcdf815fff07252df223c9dea52b158d6afed51a
author Jose Granha <jose.granha@gmail.com> Thu Feb 01 10:03:52 2024 +0000
committer Jose Granha <jose.granha@gmail.com> Tue Feb 27 09:54:22 2024 +0000
tree 99d3a8b31afda4a6ab2877d74a0ec139e3307aaf
parent 76ff279b1d788a1fa865bf65ecfa8f4c611d7d84

Deprecate usage of SitePaths.secure_config

Add changes in DefaultSecureStore to hold the secure.config location.

Bug: Issue 323087130
Change-Id: I638d5561482dbf240b811d7eea6a6cae6c8f0fab

src/main/java/com/googlesource/gerrit/plugins/secureconfig/SecureConfigStore.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/secureconfig/SecureConfigStore.java b/src/main/java/com/googlesource/gerrit/plugins/secureconfig/SecureConfigStore.java
index 1d6c8b4..50d8135 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/secureconfig/SecureConfigStore.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/secureconfig/SecureConfigStore.java
@@ -29,6 +29,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -38,22 +39,27 @@
 
 @Singleton
 public class SecureConfigStore extends SecureStore {
+  private static final String SECURE_CONFIG_FILE = "secure.config";
+
   private final FileBasedConfig sec;
   private final Map<String, FileBasedConfig> pluginSec;
   private final SitePaths site;
   private final Codec codec;
   private long secFileLastmodified;
+  private final Path secure_config;
 
   @Inject
   SecureConfigStore(SitePaths site, PBECodec codec) {
     this.site = site;
+    secure_config = site.etc_dir.resolve(SECURE_CONFIG_FILE);
+
     this.codec = codec;
-    sec = new FileBasedConfig(site.secure_config.toFile(), FS.DETECTED);
+    sec = new FileBasedConfig(secure_config.toFile(), FS.DETECTED);
     try {
       sec.load();
       secFileLastmodified = sec.getFile().lastModified();
     } catch (IOException | ConfigInvalidException e) {
-      throw new RuntimeException("Cannot load secure.config", e);
+      throw new RuntimeException("Cannot load " + SECURE_CONFIG_FILE, e);
     }
     this.pluginSec = new HashMap<>();
   }
@@ -72,7 +78,7 @@
     if (pluginSec.containsKey(pluginName)) {
       cfg = pluginSec.get(pluginName);
     } else {
-      String filename = pluginName + ".secure.config";
+      String filename = pluginName + "." + SECURE_CONFIG_FILE;
       File pluginConfigFile = site.etc_dir.resolve(filename).toFile();
       if (pluginConfigFile.exists()) {
         cfg = new FileBasedConfig(pluginConfigFile, FS.DETECTED);
@@ -144,7 +150,7 @@
     try {
       saveSecure(sec);
     } catch (IOException e) {
-      throw new RuntimeException("Cannot save secure.config", e);
+      throw new RuntimeException("Cannot save " + SECURE_CONFIG_FILE, e);
     }
   }