NMAAS-984: Initializing only if configuration doesn't exist

docker/nmaas-platform.properties.template

@@ -145,3 +145,14 @@ kubernetes.deployment.smtpServerUsername=${SMTP_LOGIN}
 kubernetes.deployment.smtpServerPassword=${SMTP_PASSWORD}
 kubernetes.deployment.defaultStorageClass=${K8S_DEPLOYMENT_DEFAULT_STORAGE_CLASS}
 kubernetes.deployment.forceDedicatedWorkers=false
+
+# -------------------- #
+# Portal configuration #
+# -------------------- #
+portal.config.maintenance=${PORTAL_MAINTENANCE_FLAG}
+portal.config.ssoLoginAllowed=${PORTAL_SSO_ALLOWED_FLAG}
+portal.config.defaultLanguage=${PORTAL_DEFAULT_LANG}
+portal.config.testInstance=${PORTAL_TEST_INSTANCE_FLAG}
+portal.config.sendAppInstanceFailureEmails=${PORTAL_SEND_FAILURE_NOTIF_FLAG}
+# string - list of emails with ':' as a separator, e.g. admin1@nmaas.eu;admin2@nmaas.eu
+portal.config.appInstanceFailureEmailList=${ADMIN_EMAIL}

src/main/java/net/geant/nmaas/portal/PortalConfig.java

 package net.geant.nmaas.portal;
 
+import lombok.extern.log4j.Log4j2;
 import net.geant.nmaas.monitor.MonitorManager;
 import net.geant.nmaas.monitor.ServiceType;
 import net.geant.nmaas.monitor.model.MonitorEntryView;
 import net.geant.nmaas.monitor.scheduling.ScheduleManager;
 import net.geant.nmaas.portal.api.configuration.ConfigurationView;
 import net.geant.nmaas.portal.api.exception.ProcessingException;
+import net.geant.nmaas.portal.exceptions.OnlyOneConfigurationSupportedException;
 import net.geant.nmaas.portal.persistent.entity.Content;
 import net.geant.nmaas.portal.persistent.entity.Domain;
 import net.geant.nmaas.portal.persistent.entity.Role;
@@ -32,6 +34,7 @@ import java.util.Optional;
 
 @Configuration
 @ComponentScan(basePackages={"net.geant.nmaas.portal.service"})
+@Log4j2
 public class PortalConfig {
 
 	private PasswordEncoder passwordEncoder;
@@ -185,7 +188,11 @@ public class PortalConfig {
 						.sendAppInstanceFailureEmails(this.sendAppInstanceFailureEmails)
 						.appInstanceFailureEmailList(Arrays.asList(this.appInstanceFailureEmailList.split(";")))
 						.build();
-				this.configurationManager.addConfiguration(configurationView);
+				try {
+					this.configurationManager.setConfiguration(configurationView);
+				} catch (OnlyOneConfigurationSupportedException e) {
+					log.debug("Portal configuration already exists. Skipping initialization.");
+				}
 			}
 		};
 	}

src/main/java/net/geant/nmaas/portal/api/configuration/ConfigurationController.java

@@ -29,8 +29,8 @@ public class ConfigurationController {
     @PostMapping
     @PreAuthorize("hasRole('ROLE_SYSTEM_ADMIN')")
     @ResponseStatus(code = HttpStatus.CREATED)
-    public Long addConfiguration(@RequestBody @Valid ConfigurationView configuration) {
-        return this.configurationManager.addConfiguration(configuration);
+    public Long setConfiguration(@RequestBody @Valid ConfigurationView configuration) {
+        return this.configurationManager.setConfiguration(configuration);
     }
 
     @PutMapping(value="/{id}")

src/main/java/net/geant/nmaas/portal/api/configuration/ConfigurationView.java

@@ -25,7 +25,7 @@ public class ConfigurationView {
     private boolean testInstance = false;
     @Builder.Default
     private boolean sendAppInstanceFailureEmails = false;
-
+    @Builder.Default
     private List<@Email String> appInstanceFailureEmailList = new ArrayList<>();
 
     public ConfigurationView(boolean maintenance, boolean ssoLoginAllowed, String defaultLanguage, boolean testInstance, boolean sendAppInstanceFailureEmails, List<String> appInstanceFailureEmailList) {

src/main/java/net/geant/nmaas/portal/service/ConfigurationManager.java

@@ -4,7 +4,7 @@ import net.geant.nmaas.portal.api.configuration.ConfigurationView;
 
 public interface ConfigurationManager {
 
-    Long addConfiguration(ConfigurationView configuration);
+    Long setConfiguration(ConfigurationView configuration);
     ConfigurationView getConfiguration();
     void updateConfiguration(Long id, ConfigurationView updatedConfiguration);
 }

src/main/java/net/geant/nmaas/portal/service/impl/ConfigurationManagerImpl.java

@@ -13,7 +13,6 @@ import org.modelmapper.ModelMapper;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.ApplicationScope;
 
-import java.util.ArrayList;
 import java.util.Optional;
 
 @ApplicationScope
@@ -33,7 +32,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager {
     }
 
     @Override
-    public Long addConfiguration(ConfigurationView configurationView) {
+    public Long setConfiguration(ConfigurationView configurationView) {
         if(repository.count() > 0){
             throw new OnlyOneConfigurationSupportedException("Configuration already exists. It can be either removed or updated");
         }

src/test/java/net/geant/nmaas/portal/service/impl/ConfigurationManagerTest.java

@@ -59,18 +59,18 @@ public class ConfigurationManagerTest {
     }
 
     @Test
-    public void shouldAddConfiguration(){
+    public void shouldSetConfiguration(){
         when(repository.count()).thenReturn(0L);
-        Long id = configurationManager.addConfiguration(modelMapper.map(config, ConfigurationView.class));
+        Long id = configurationManager.setConfiguration(modelMapper.map(config, ConfigurationView.class));
         assertEquals(config.getId(), id);
         verify(repository, times(1)).save(any());
     }
 
     @Test
-    public void shouldNotAddMultipleConfig(){
+    public void shouldNotSetConfigIfAlreadyExists(){
         assertThrows(OnlyOneConfigurationSupportedException.class, () -> {
             when(repository.count()).thenReturn(1L);
-            configurationManager.addConfiguration(modelMapper.map(config, ConfigurationView.class));
+            configurationManager.setConfiguration(modelMapper.map(config, ConfigurationView.class));
         });
     }
 

src/test/resources/application.properties

@@ -139,4 +139,15 @@ kubernetes.deployment.smtpServerHostname=nmaas-postfix
 kubernetes.deployment.smtpServerPort=587
 kubernetes.deployment.smtpServerUsername=
 kubernetes.deployment.smtpServerPassword=
-kubernetes.deployment.defaultStorageClass=storageClass
+kubernetes.deployment.defaultStorageClass=storageClass
\ No newline at end of file
+
+# ------------------------ #
+# Portal configuration #
+# ------------------------ #
+portal.config.maintenance=false
+portal.config.ssoLoginAllowed=false
+portal.config.defaultLanguage=en
+portal.config.testInstance=false
+portal.config.sendAppInstanceFailureEmails=false
+# string - list of emails with ':' as a separator, e.g. admin1@nmaas.eu;admin2@nmaas.eu
+portal.config.appInstanceFailureEmailList=admin@nmaas.eu
\ No newline at end of file