Merge pull request #63 from YarikRevich/fix/api-server

Fix: properties directory handling

Author: YarikRevich

agent/src/main/resources/application.properties

@@ -4,4 +4,6 @@ spring.main.web-application-type=NONE
 
 # Describes Kafka related properties.
 kafka.bootstrap-server=localhost:9093
+
+# Describes Kafka topic used for response transfer.
 kafka.topic=logs

api-server/src/main/java/com/resourcetracker/entity/PropertiesEntity.java

@@ -18,11 +18,8 @@ public class PropertiesEntity {
   @ConfigProperty(name = "quarkus.http.port")
   Integer applicationPort;
 
-  @ConfigProperty(name = "config.root")
-  String configRootPath;
-
-  @ConfigProperty(name = "config.file")
-  String configFilePath;
+  @ConfigProperty(name = "config.directory")
+  String configDirectory;
 
   @ConfigProperty(name = "kafka.topic")
   String kafkaTopic;

api-server/src/main/java/com/resourcetracker/service/config/ConfigService.java

@@ -42,22 +42,15 @@ public class ConfigService {
   private ConfigEntity parsedConfigFile;
 
   /**
-   * Reads configuration from the opened configuration file using mapping with a configuration
-   * entity.
+   * Reads configuration from the opened configuration file using mapping with a configuration entity.
    */
   @PostConstruct
   private void configure() throws ConfigValidationException {
     InputStream configFile = null;
 
     try {
       try {
-        configFile =
-                new FileInputStream(
-                        Paths.get(
-                                        System.getProperty("user.home"),
-                                        properties.getConfigRootPath(),
-                                        properties.getConfigFilePath())
-                                .toString());
+        configFile = new FileInputStream(properties.getConfigDirectory());
       } catch (FileNotFoundException e) {
         logger.fatal(e.getMessage());
         Quarkus.asyncExit(1);

api-server/src/main/java/com/resourcetracker/service/waiter/WaiterHelper.java

@@ -8,15 +8,14 @@ quarkus.rest-client.small-rye-health-check.url=http://${quarkus.http.host}:${qua
 # Describes git configuration properties file.
 git.config.location=git.properties
 
-# Describes the path and name of a configuration file.
-config.root=.resourcetracker/config
-config.file=api-server.yaml
+# Describes location of application configurations.
+config.directory=${user.home}/.resourcetracker/config/api-server.yaml
 
 # Describes location of Terraform cloud provider configurations.
-terraform.directory=/Users/yaroslavsvitlytskyi/.resourcetracker/tf
+terraform.directory=${user.home}/.resourcetracker/tf
 
 # Describes location of local workspace.
-workspace.directory=/Users/yaroslavsvitlytskyi/.resourcetracker/workspace
+workspace.directory=${user.home}/.resourcetracker/workspace
 
 # Describes location of variable file.
 workspace.variables-file.name=tfvars.json
@@ -30,6 +29,7 @@ kafka.topic=logs
 # Describes Kafka partitions used for the deployment.
 kafka.partitions=1
 
+# Describes Kafka readiness period used for the deployment readiness check.
 kafka.readiness.period=4000
 
 # Describes the name of the storage bucket where remote Terraform state is saved.

api-server/src/main/resources/application.properties

@@ -17,11 +17,8 @@ public class PropertiesEntity {
   @Value(value = "${git.commit.id.abbrev}")
   private String gitCommitId;
 
-  @Value(value = "${config.root}")
-  private String configRootPath;
-
-  @Value(value = "${config.user.file}")
-  private String configUserFilePath;
+  @Value(value = "${config.directory}")
+  private String configDirectory;
 
   @Value(value = "${progress.visualization.period}")
   private Integer progressVisualizationPeriod;

cli/src/main/java/com/resourcetracker/entity/PropertiesEntity.java

@@ -37,13 +37,7 @@ public class ConfigService {
    */
   public ConfigService(@Autowired PropertiesEntity properties) {
     try {
-      configFile =
-          new FileInputStream(
-              Paths.get(
-                      System.getProperty("user.home"),
-                      properties.getConfigRootPath(),
-                      properties.getConfigUserFilePath())
-                  .toString());
+      configFile = new FileInputStream(properties.getConfigDirectory());
     } catch (FileNotFoundException e) {
       logger.fatal(e.getMessage());
     }

cli/src/main/java/com/resourcetracker/service/config/ConfigService.java

@@ -2,9 +2,8 @@
 spring.main.banner-mode=off
 spring.main.web-application-type=NONE
 
-# Describes the path and name of a configuration file.
-config.root=.resourcetracker/config
-config.user.file=user.yaml
+# Describes location of application configurations.
+config.directory=${user.home}/.resourcetracker/config/user.yaml
 
 # Describes visualizer state update period
 progress.visualization.period=1000

cli/src/main/resources/application.properties

@@ -176,14 +176,11 @@ public class PropertiesEntity {
   @Value(value = "${graph.properties.location}")
   private String graphPropertiesLocation;
 
-  @Value(value = "${config.root}")
-  private String configRootPath;
+  @Value(value = "${config.directory}")
+  private String configDirectory;
 
-  @Value(value = "${swap.root}")
-  private String swapRootPath;
-
-  @Value(value = "${config.user.file}")
-  private String configUserFilePath;
+  @Value(value = "${swap.directory}")
+  private String swapDirectory;
 
   @Value(value = "${api-server.directory}")
   private String apiServerDirectory;

gui/src/main/java/com/resourcetracker/entity/PropertiesEntity.java

@@ -34,13 +34,7 @@ public void configure() {
     InputStream configFile;
 
     try {
-      configFile =
-          new FileInputStream(
-              Paths.get(
-                      System.getProperty("user.home"),
-                      properties.getConfigRootPath(),
-                      properties.getConfigUserFilePath())
-                  .toString());
+      configFile = new FileInputStream(properties.getConfigDirectory());
     } catch (FileNotFoundException e) {
       logger.fatal(e.getMessage());
       return;