Merge pull request #2 from OpenVoxProject/openvox

nmburgan · web-flow · commit a27bb3471c02 · 2025-12-31T14:46:04.000-08:00
CI and version: Changes for OpenVox namespacing
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,17 @@
+version: 2
+updates:
+  # raise PRs for gem updates
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "13:00"
+    open-pull-requests-limit: 10
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "13:00"
+    open-pull-requests-limit: 10
diff --git a/.github/release.yml b/.github/release.yml
@@ -0,0 +1,39 @@
+---
+# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
+
+changelog:
+  exclude:
+    labels:
+      - duplicate
+      - invalid
+      - modulesync
+      - question
+      - skip-changelog
+      - wont-fix
+      - wontfix
+
+  categories:
+    - title: Breaking Changes 🛠
+      labels:
+        - backwards-incompatible
+
+    - title: New Features 🎉
+      labels:
+        - enhancement
+
+    - title: Bug Fixes 🐛
+      labels:
+        - bug
+
+    - title: Documentation Updates 📚
+      labels:
+        - documentation
+        - docs
+
+    - title: Dependency Updates ⬆️
+      labels:
+        - dependencies
+
+    - title: Other Changes
+      labels:
+        - "*"
diff --git a/.github/workflows/lein-test.yaml b/.github/workflows/lein-test.yaml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '11', '17' ]
+        java: [ '17', '21' ]
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
@@ -26,7 +26,7 @@ jobs:
           distribution: temurin
           java-version: ${{ matrix.java }}
       - name: Install Clojure tools
-        uses: DeLaGuardo/setup-clojure@10.2
+        uses: DeLaGuardo/setup-clojure@13.4
         with:
           cli: latest              # Clojure CLI based on tools.deps
           lein: latest                  # Leiningen
@@ -36,4 +36,4 @@ jobs:
           cljstyle: latest             # cljstyle
           zprint: latest                # zprint
       - name: Run lein tests
-        run: lein test
+        run: lein test
diff --git a/.github/workflows/mend.yaml b/.github/workflows/mend.yaml
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -0,0 +1,18 @@
+---
+name: Release and publish package to clojars.org
+
+permissions:
+  contents: write
+  packages: write
+
+on:
+  workflow_dispatch:
+
+jobs:
+  release:
+    uses: 'openvoxproject/shared-actions/.github/workflows/clojure_release.yml@main'
+    secrets:
+      github_pat: ${{ secrets.OPENVOXBOT_COMMIT_AND_PRS }}
+      ssh_private_key: ${{ secrets.OPENVOXBOT_SSH_PRIVATE_KEY }}
+      clojars_username: ${{ secrets.CLOJARS_USERNAME }}
+      clojars_password: ${{ secrets.CLOJARS_PASSWORD }}
diff --git a/.travis.yml b/.travis.yml
diff --git a/CODEOWNERS b/CODEOWNERS
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # rbac-client
 
-A Clojure library designed to hold lightweight API clients for PE services.
+A Clojure library designed to hold lightweight API clients for PE services. Note: This is not used for OpenVox. However, openvox-server
+still has remnants of hooks allowing for the use of PE RBAC, so until we spend the time to remove the unused code, we keep this
+library around.
 
 ## Usage
 
@@ -46,5 +48,6 @@ sets of files.
 ## License
 
 Copyright © 2016 Puppet
+Copyright © 2025 Vox Pupuli
 
 Distributed under the Apache License version 2.0
diff --git a/ext/travisci/test.sh b/ext/travisci/test.sh
diff --git a/project.clj b/project.clj
@@ -1,44 +1,39 @@
-(defn deploy-info
-  [url]
-  {:url url
-   :username :env/clojars_jenkins_username
-   :password :env/clojars_jenkins_password
-   :sign-releases false})
-
-(defproject puppetlabs/rbac-client "1.1.6-SNAPSHOT"
+(defproject org.openvoxproject/rbac-client "1.1.6-SNAPSHOT"
   :description "Tools for interacting with PE RBAC"
   :license {:name "Apache License, Version 2.0"
             :url "http://www.apache.org/licenses/LICENSE-2.0.html"}
 
-  :parent-project {:coords [puppetlabs/clj-parent "5.6.17"]
+  :parent-project {:coords [org.openvoxproject/clj-parent "7.5.1"]
                    :inherit [:managed-dependencies]}
 
   :dependencies [[org.clojure/clojure]
                  [ring/ring-core]
                  [ring/ring-json]
-                 [puppetlabs/ring-middleware]
+                 [org.openvoxproject/ring-middleware]
                  [slingshot]
-                 [puppetlabs/kitchensink]
-                 [puppetlabs/http-client]
-                 [puppetlabs/trapperkeeper]
-                 [puppetlabs/i18n]]
+                 [org.openvoxproject/kitchensink]
+                 [org.openvoxproject/http-client]
+                 [org.openvoxproject/trapperkeeper]
+                 [org.openvoxproject/i18n]]
 
   :pedantic? :abort
-  :profiles {:dev {:dependencies [[puppetlabs/kitchensink :classifier "test"]
-                                  [puppetlabs/trapperkeeper :classifier "test"]
-                                  [puppetlabs/trapperkeeper-webserver-jetty9]
-                                  [puppetlabs/trapperkeeper-webserver-jetty9 :classifier "test"]
-                                  [org.bouncycastle/bcpkix-jdk15on]
+  :profiles {:dev {:dependencies [[org.openvoxproject/kitchensink :classifier "test"]
+                                  [org.openvoxproject/trapperkeeper :classifier "test"]
+                                  [org.openvoxproject/trapperkeeper-webserver-jetty10]
+                                  [org.openvoxproject/trapperkeeper-webserver-jetty10 :classifier "test"]
+                                  [org.bouncycastle/bcpkix-jdk18on]
                                   ; transitive dependency
                                   [org.clojure/tools.nrepl "0.2.13"]]}
              :testutils {:source-paths ^:replace  ["test"]}}
 
   :plugins [[lein-parent "0.3.7"]
-            [puppetlabs/i18n "0.8.0"]]
+            [org.openvoxproject/i18n "0.9.4"]]
 
   :classifiers  [["test" :testutils]]
 
   :test-paths ["test"]
 
-  :deploy-repositories [["releases" ~(deploy-info "https://clojars.org/repo")]
-                        ["snapshots" "https://artifactory.delivery.puppetlabs.net/artifactory/clojure-snapshots__local/"]])
+  :deploy-repositories [["releases" {:url "https://clojars.org/repo"
+                                     :username :env/CLOJARS_USERNAME
+                                     :password :env/CLOJARS_PASSWORD
+                                     :sign-releases false}]])
diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,9 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "addLabels": ["renovate", "dependencies"],
+  "assigneesFromCodeOwners": true,
+  "automerge": true,
+  "automergeType": "pr",
+  "dependencyDashboard": true,
+  "enabledManagers": ["leiningen"]
+}
diff --git a/test/puppetlabs/rbac_client/test_core.clj b/test/puppetlabs/rbac_client/test_core.clj
@@ -1,56 +1,61 @@
 (ns puppetlabs.rbac-client.test-core
   (:require [clojure.test :refer [deftest testing is]]
             [puppetlabs.rbac-client.core :as core]
-            [puppetlabs.trapperkeeper.testutils.webserver :refer [with-test-webserver]]
+            [puppetlabs.trapperkeeper.testutils.bootstrap :refer [with-app-with-config]]
+            [puppetlabs.trapperkeeper.services.webserver.jetty10-service :refer [jetty10-service]]
             [puppetlabs.trapperkeeper.testutils.logging :refer [with-test-logging]]
             [puppetlabs.http.client.sync :refer [create-client]]
             [puppetlabs.rbac-client.test-server :as test-server]
             [slingshot.test]))
 
+(def test-port 38924)
+
 (deftest test-api-caller
   (with-test-logging
     (let [client (create-client {})
-          app (constantly {:status 200 :body "ok"})
-          port 38924]
-      (with-test-webserver app port
+          handler (constantly {:status 200 :body "ok"})]
+      (with-app-with-config app
+        [jetty10-service (test-server/build-test-service handler "/")]
+        {:webserver {:port test-port}}
         (is (= "ok"
-               (:body (core/api-caller client (format "http://localhost:%s/" port) :get ""))))))
+               (:body (core/api-caller client (format "http://localhost:%s/" test-port) :get ""))))))
 
     (let [client (create-client {})
-          app (constantly {:status 500 :body "server error"})
-          port 38924]
-      (with-test-webserver app port
-        (is (= "server error" (:body (core/api-caller client (format "http://localhost:%s/" port) :get ""))))
+          handler (constantly {:status 500 :body "server error"})]
+      (with-app-with-config app
+        [jetty10-service (test-server/build-test-service handler "/")]
+        {:webserver {:port test-port}}
+        (is (= "server error" (:body (core/api-caller client (format "http://localhost:%s/" test-port) :get ""))))
         (is (thrown+? [:kind :puppetlabs.rbac-client/status-error]
-                      (:body (core/api-caller client (format "http://localhost:%s/" port) :get "" {:status-errors true}))))))
+                      (:body (core/api-caller client (format "http://localhost:%s/" test-port) :get "" {:status-errors true}))))))
 
-    (let [client (create-client {})
-          app (constantly {:status 500 :body "ok"})
-          port 38924]
+    (let [client (create-client {})]
       (is (thrown+? [:kind :puppetlabs.rbac-client/connection-failure]
-                    (:body (core/api-caller client (format "http://localhost:%s/" port) :get "")))))))
+                    (:body (core/api-caller client (format "http://localhost:%s/" test-port) :get "")))))))
 
 (deftest test-json-api-caller
   (with-test-logging
     (let [client (create-client {})
-          app (test-server/make-json-handler {:status 200
-                                              :body {:foo 1 :bar {:baz 2}}})
-          port 38924]
-      (with-test-webserver app port
-        (let [response (core/json-api-caller client (format "http://localhost:%s/foo" port) :get "/bar?p=1")]
+          handler (test-server/make-json-handler {:status 200
+                                                  :body {:foo 1 :bar {:baz 2}}})]
+      (with-app-with-config app
+        [jetty10-service (test-server/build-test-service handler "/")]
+        {:webserver {:port test-port}}
+        (let [response (core/json-api-caller client (format "http://localhost:%s/foo" test-port) :get "/bar?p=1")]
           (is (= 200 (:status response)))
           (is (= 1 (get-in response [:body :foo])))
           (is (= "application/json" (get-in response [:body :_request :headers :accept])))
           (is (= "/foo/bar" (get-in response [:body :_request :uri])))
           (is (= "1" (get-in response [:body :_request :params :p]))))))
 
     (let [client (create-client {})
-          app (test-server/make-json-handler {:status 400
-                                              :body {:kind :invalid
-                                                     :msg "oops"}})
-          port 38924]
-      (with-test-webserver app port
+          handler (test-server/make-json-handler {:status 400
+                                                  :body {:kind :invalid
+                                                         :msg "oops"}})]
+      (with-app-with-config app
+        [jetty10-service (test-server/build-test-service handler "/")]
+        {:webserver {:port test-port}}
         (is (thrown+? [:kind :invalid]
-                      (core/json-api-caller client (format "http://localhost:%s/" port) :get "" {:throw-body true})))
+                      (core/json-api-caller client (format "http://localhost:%s/" test-port) :get "" {:throw-body true})))
         (is (thrown+? [:kind :puppetlabs.rbac-client/status-error]
-                      (core/json-api-caller client (format "http://localhost:%s/" port) :get "" {:status-errors true})))))))
+                      (core/json-api-caller client (format "http://localhost:%s/" test-port) :get "" {:status-errors true})))))))
diff --git a/test/puppetlabs/rbac_client/test_server.clj b/test/puppetlabs/rbac_client/test_server.clj
@@ -12,7 +12,7 @@
   (let [handler (fn handler
                   [request]
                   (-> response
-                      (assoc-in [:body :_request] (dissoc request :body))
+                      (assoc-in [:body :_request] (dissoc request :body :response))
                       (assoc :headers {"Content-Type" "application/json"})))]
     (-> handler
         wrap-json-response
@@ -26,9 +26,9 @@
     :body "Not Found"}))
 
 (defn build-test-service
-  [handler]
+  [handler path]
   (tk/service
    [[:WebserverService add-ring-handler]]
    (init [this context]
-         (add-ring-handler handler)
+         (add-ring-handler handler path)
          context)))
diff --git a/test/puppetlabs/rbac_client/testutils/config.clj b/test/puppetlabs/rbac_client/testutils/config.clj
@@ -24,7 +24,7 @@
    :ssl-key "dev-resources/ssl/key.pem"})
 
 (defn jetty-ssl-config
-  "Return a TK Webserver Jetty9 config that defines an SSL server running on
+  "Return a TK Webserver Jetty10 config that defines an SSL server running on
   `localhost` on a random port, and uses the SSL files in the
   `dev-resources/ssl` directory. Note that while an effort is made to choose an
   open port, the port cannot be guaranteed to be open."
