Remove repo listing route

This is no longer used since we pre-compute the indexes and write them to s3 on deploy.
clojars · Jul 3, 2023 · d2a1ee7 · d2a1ee7
1 parent 2bcad37
commit d2a1ee7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 159 deletions.
diff --git a/src/clojars/repo_indexing.clj b/src/clojars/repo_indexing.clj
@@ -61,7 +61,7 @@
      size
      "\n")))
 
-(defn generate-index
+(defn- generate-index
   ^String
   [path entries]
   (safe-hiccup/html5
@@ -96,7 +96,7 @@
 
 (def ^:private index-file-name "index.html")
 
-(defn get-path-entries
+(defn- get-path-entries
   [repo-bucket path]
   (->> (s3/list-entries repo-bucket path)
        ;; filter out index files
@@ -105,7 +105,7 @@
                       (str/ends-with? Key index-file-name))))
        (sort-entries)))
 
-(defn normalize-path
+(defn- normalize-path
   [path]
   (let [path (cond
                (str/blank? path)           nil
@@ -117,7 +117,7 @@
       (str path "/")
       path)))
 
-(defn handler
+(defn- handler
   [{:keys [error-reporter repo-bucket]} type {:as _data :keys [path]}]
   (when (= :repo-path-needs-index type)
     (let [path (normalize-path path)]

diff --git a/src/clojars/routes/repo_listing.clj b/src/clojars/routes/repo_listing.clj
diff --git a/src/clojars/system.clj b/src/clojars/system.clj
@@ -19,7 +19,6 @@
    [clojars.stats :refer [artifact-stats]]
    [clojars.storage :as storage]
    [clojars.web :as web]
-   [clojars.web.repo-listing :as repo-listing]
    [com.stuartsierra.component :as component]
    [duct.component.endpoint :refer [endpoint-component]]
    [duct.component.handler :refer [handler-component]]
@@ -93,16 +92,14 @@
           :notifications  (notifications/notification-component)
           :repo-bucket    (s3/s3-client (get-in config [:s3 :repo-bucket]))
           :repo-indexer   (repo-indexing/repo-indexing-component)
-          :repo-lister    (repo-listing/repo-lister (:cache-path config))
           :storage        (storage-component (:repo config) (:cdn-token config) (:cdn-url config))))
         (component/system-using
          {:app            [:clojars-app]
           :clojars-app    [:db :github :gitlab :error-reporter :event-emitter :http-client
-                           :mailer :repo-lister :stats :search :storage]
+                           :mailer :stats :search :storage]
           :event-emitter  [:error-reporter]
           :http           [:app]
           :notifications  [:db :mailer]
           :repo-indexer   [:error-reporter :repo-bucket]
-          :repo-lister    [:repo-bucket]
           :event-receiver [:error-reporter]
           :storage        [:error-reporter :repo-bucket]}))))
diff --git a/src/clojars/web.clj b/src/clojars/web.clj
@@ -15,7 +15,6 @@
    [clojars.routes.artifact :as artifact]
    [clojars.routes.group :as group]
    [clojars.routes.repo :as repo]
-   [clojars.routes.repo-listing :as repo-listing]
    [clojars.routes.session :as session]
    [clojars.routes.token :as token]
    [clojars.routes.token-breach :as token-breach]
@@ -48,7 +47,7 @@
                :status 400})))))
 
 (defn- main-routes
-  [{:as _system :keys [db event-emitter mailer repo-lister search stats]}]
+  [{:as _system :keys [db event-emitter mailer search stats]}]
   (let [db (:spec db)]
     (routes
      (GET "/" _
@@ -77,7 +76,6 @@
            #(html-doc "DMCA" {:account %}
                       (raw (slurp (io/resource "dmca.html"))))))
      session/routes
-     (repo-listing/routes repo-lister)
      (group/routes db event-emitter)
      (artifact/routes db stats)
      ;; user routes must go after artifact routes

diff --git a/src/clojars/web/repo_listing.clj b/src/clojars/web/repo_listing.clj
diff --git a/test/clojars/unit/web/repo_listing_test.clj b/test/clojars/unit/web/repo_listing_test.clj