🔥 : remove unused dockerDaemon settings

gaia-app · Sep 17, 2021 · 929914c · 929914c
1 parent 65779b8
commit 929914c
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 31 deletions.
diff --git a/src/main/java/io/gaia_app/settings/bo/Settings.java b/src/main/java/io/gaia_app/settings/bo/Settings.java
@@ -24,11 +24,6 @@ public class Settings {
      */
     private List<EnvVar> envVars = new ArrayList<>();
 
-    /**
-     * The docker daemon url used by Gaia to spawn its runners
-     */
-    private String dockerDaemonUrl;
-
     public String getExternalUrl() {
         return externalUrl;
     }
@@ -51,14 +46,6 @@ public List<String> env() {
                 .collect(Collectors.toList());
     }
 
-    public String getDockerDaemonUrl() {
-        return dockerDaemonUrl;
-    }
-
-    public void setDockerDaemonUrl(String dockerDaemonUrl) {
-        this.dockerDaemonUrl = dockerDaemonUrl;
-    }
-
     /**
      * Merging two settings objets
      * @param saved the settings to merge
@@ -67,9 +54,6 @@ public void merge(Settings saved) {
         if (saved.externalUrl != null) {
             this.externalUrl = saved.externalUrl;
         }
-        if (saved.dockerDaemonUrl != null) {
-            this.dockerDaemonUrl = saved.dockerDaemonUrl;
-        }
         if (saved.envVars != null) {
             this.envVars.addAll(saved.envVars);
         }

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -15,7 +15,6 @@ spring.data.mongodb.uri=${gaia.mongodb.uri}
 gaia.mongodb.uri=mongodb://localhost/gaia
 
 gaia.externalUrl=http://localhost:${server.port:8080}
-gaia.dockerDaemonUrl=unix:///var/run/docker.sock
 
 docker.registry.api.url=https://registry.hub.docker.com/v2
 

diff --git a/src/test/java/io/gaia_app/settings/bo/SettingsIT.java b/src/test/java/io/gaia_app/settings/bo/SettingsIT.java
@@ -35,11 +35,6 @@ void externalUrl_shouldBeConfigurableViaProperty(){
         assertEquals("http://172.17.0.1:8080", settings.getExternalUrl());
     }
 
-    @Test
-    void dockerDaemonUrl_shouldBeConfigurableViaProperty(){
-        assertEquals("unix:///var/run/docker.sock", settings.getDockerDaemonUrl());
-    }
-
     @Test
     void envVars_shouldBeConfigurableViaProperty(){
         assertEquals("test", settings.getEnvVars().get(0).name);
@@ -67,7 +62,6 @@ void settings_shouldBeMergedWithSavedSettings(){
         settings.merge(savedSettings);
 
         assertEquals("https://gaia.io", settings.getExternalUrl());
-        assertEquals("unix:///var/run/docker.sock", settings.getDockerDaemonUrl());
         assertThat(settings.getEnvVars()).hasSize(3)
                 .containsExactlyInAnyOrder(existingEnvVar, testVar, otherTestVar);
     }

diff --git a/src/test/java/io/gaia_app/settings/repository/SettingsRepositoryIT.java b/src/test/java/io/gaia_app/settings/repository/SettingsRepositoryIT.java
@@ -12,7 +12,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @SpringBootTest
-@TestPropertySource(properties = {"gaia.externalUrl=http://gaia.io", "gaia.dockerDaemonUrl=unix:///var/run/docker.sock"})
+@TestPropertySource(properties = {"gaia.externalUrl=http://gaia.io"})
 class SettingsRepositoryIT extends SharedMongoContainerTest {
 
     @Autowired
@@ -21,9 +21,6 @@ class SettingsRepositoryIT extends SharedMongoContainerTest {
     @Autowired
     private SettingsRepository settingsRepository;
 
-    @Autowired
-    private Settings settings;
-
     @Test
     void itShouldSaveSettings(){
         // given
@@ -34,7 +31,6 @@ void itShouldSaveSettings(){
         // then
         var saved = mongoTemplate.findAll(Settings.class).get(0);
         assertEquals("http://gaia.io", saved.getExternalUrl());
-        assertEquals("unix:///var/run/docker.sock", saved.getDockerDaemonUrl());
     }
 
     @Test

diff --git a/src/test/java/io/gaia_app/settings/repository/SettingsRepositoryTest.java b/src/test/java/io/gaia_app/settings/repository/SettingsRepositoryTest.java
@@ -28,7 +28,6 @@ class SettingsRepositoryTest {
     void setUp() {
         settings = new Settings();
         settings.setExternalUrl("externalUrl");
-        settings.setDockerDaemonUrl("dockerDaemonUrl");
 
         settingsRepository = new SettingsRepository(mongoTemplate, settings);
     }
@@ -37,7 +36,6 @@ void setUp() {
     void settings_shouldBeLoadedFromDatabase(){
         var savedSettings = new Settings();
         savedSettings.setExternalUrl("savedExternalUrl");
-        savedSettings.setDockerDaemonUrl("savedDockerDaemonUrl");
 
         when(mongoTemplate.findAll(Settings.class)).thenReturn(List.of(savedSettings));
 
@@ -46,7 +44,6 @@ void settings_shouldBeLoadedFromDatabase(){
 
         //then
         assertEquals("savedExternalUrl", settings.getExternalUrl());
-        assertEquals("savedDockerDaemonUrl", settings.getDockerDaemonUrl());
 
         verify(mongoTemplate).findAll(Settings.class);
         verifyNoMoreInteractions(mongoTemplate);