depot-store-server: fix configs (#498)

finos · Jan 6, 2025 · 1251ee8 · 1251ee8
1 parent a2cd537
commit 1251ee8
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 35 deletions.
diff --git a/legend-depot-server/src/test/resources/sample-server-config.json b/legend-depot-server/src/test/resources/sample-server-config.json
@@ -31,14 +31,17 @@
       ]
     }
   },
-  "projects": {"defaultBranch": "master"},
-  "storages": [{
-    "org.finos.legend.depot.store.mongo.core.MongoConfiguration": {
-      "url": "mongodb://127.0.0.1:27017",
-      "database": "depot-dev",
-      "tracing": false
+  "projects": {
+    "defaultBranch": "master"
+  },
+  "storages": [
+    {
+      "org.finos.legend.depot.store.mongo.core.MongoConfiguration": {
+        "url": "mongodb://127.0.0.1:27017",
+        "database": "depot-dev"
+      }
     }
-  }],
+  ],
   "openTracing": {
     "openTracingUri": "URL here",
     "serviceName": "legend-depot-server",

diff --git a/legend-depot-store-server/src/main/resources/docker/config/config.json b/legend-depot-store-server/src/main/resources/docker/config/config.json
@@ -31,14 +31,22 @@
       ]
     }
   },
-  "artifactRepositoryProviderConfiguration": {},
+    "artifactRepositoryProviderConfiguration": {
+    "org.finos.legend.depot.services.artifacts.repository.maven.MavenArtifactRepositoryConfiguration": {
+    "settingsLocation": "/config/settings.xml"
+}
+},
+    "artifactsRetentionPolicyConfiguration": {
+      "maximumSnapshotsAllowed": 5,
+      "ttlForVersionsInDays": 365,
+      "ttlForSnapshotsInDays": 30
+  },
   "artifactsRefreshPolicyConfiguration": {
          "versionsUpdateIntervalInMillis": 3600000,
          "includeProjectPropertiesConfiguration": {
              "properties": []
         }
  },
-  "artifactsRetentionPolicyConfiguration": {},
   "projects": {"defaultBranch": "master"},
   "storages": [{
     "org.finos.legend.depot.store.mongo.core.MongoConfiguration": {
@@ -104,16 +112,5 @@
     "org.pac4j.j2e.filter.CallbackFilter": 4,
     "CORS": 5
   },
-  "artifactRepositoryProviderConfiguration": {
-
-    "org.finos.legend.depot.services.artifacts.repository.maven.MavenArtifactRepositoryConfiguration": {
-      "settingsLocation": "/config/settings.xml"
-    }
-  },
-  "artifactsRetentionPolicyConfiguration": {
-    "maximumSnapshotsAllowed": 5,
-    "ttlForVersionsInDays": 365,
-    "ttlForSnapshotsInDays": 30
-  }
   "queue-interval": 30
 }
diff --git a/legend-depot-store-server/src/test/resources/sample-server-config.json b/legend-depot-store-server/src/test/resources/sample-server-config.json
@@ -31,17 +31,33 @@
       ]
     }
   },
-  "artifactRepositoryProviderConfiguration": {},
-  "artifactsRefreshPolicyConfiguration": {},
-  "artifactsRetentionPolicyConfiguration": {},
-  "projects": {"defaultBranch": "master"},
-  "storages": [{
-    "org.finos.legend.depot.store.mongo.core.MongoConfiguration": {
-      "url": "mongodb://127.0.0.1:27017",
-      "database": "depot-dev",
-      "tracing": false
+  "artifactRepositoryProviderConfiguration": {
+    "org.finos.legend.depot.services.artifacts.repository.maven.MavenArtifactRepositoryConfiguration": {
+      "settingsLocation": "legend-depot-store-server/src/test/resources/sample-repository-settings.xml"
+    }
+  },
+  "artifactsRetentionPolicyConfiguration": {
+    "maximumSnapshotsAllowed": 5,
+    "ttlForVersionsInDays": 365,
+    "ttlForSnapshotsInDays": 30
+  },
+  "artifactsRefreshPolicyConfiguration": {
+    "versionsUpdateIntervalInMillis": 3600000,
+    "includeProjectPropertiesConfiguration": {
+      "properties": []
     }
-  }],
+  },
+  "projects": {
+    "defaultBranch": "master"
+  },
+  "storages": [
+    {
+      "org.finos.legend.depot.store.mongo.core.MongoConfiguration": {
+        "url": "mongodb://127.0.0.1:27017",
+        "database": "depot-dev"
+      }
+    }
+  ],
   "openTracing": {
     "openTracingUri": "your URL here",
     "serviceName": "legend-depot-store",
@@ -103,10 +119,5 @@
     "org.pac4j.j2e.filter.CallbackFilter": 4,
     "CORS": 5
   },
-  "artifactRepositoryProviderConfiguration": {
-    "org.finos.legend.depot.services.artifacts.repository.maven.MavenArtifactRepositoryConfiguration": {
-      "settingsLocation": "legend-depot-store-server/src/test/resources/sample-repository-settings.xml"
-    }
-  },
   "queue-interval": 30
 }