Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add circleci support #265

Merged
merged 2 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .circleci/config.yml
nenadalm marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
version: 2.1

orbs:
node: circleci/[email protected]
docker: circleci/[email protected]
4 changes: 4 additions & 0 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ If you have a trouble, please see link:./doc/non-supported-clojure-version.adoc[
| https://maven.apache.org[Maven]
|

| .circleci/config.yml
| https://circleci.com/[CircleCI]
|

| .github/workflows/*.yml
| https://github.com/features/actions[GitHub Actions]
|
Expand Down
4 changes: 4 additions & 0 deletions src/antq/core.clj
nenadalm marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
[antq.changelog :as changelog]
[antq.dep.babashka :as dep.bb]
[antq.dep.boot :as dep.boot]
[antq.dep.circle-ci :as dep.circle-ci]
[antq.dep.clojure :as dep.clj]
[antq.dep.clojure.tool :as dep.clj.tool]
[antq.dep.github-action :as dep.gh-action]
Expand All @@ -32,6 +33,7 @@
[antq.report.table]
[antq.upgrade :as upgrade]
[antq.upgrade.boot]
[antq.upgrade.circle-ci]
[antq.upgrade.clojure]
[antq.upgrade.clojure.tool]
[antq.upgrade.github-action]
Expand All @@ -43,6 +45,7 @@
[antq.util.maven :as u.maven]
[antq.util.ver :as u.ver]
[antq.ver :as ver]
[antq.ver.circle-ci-orb]
[antq.ver.git-sha]
[antq.ver.git-tag-and-sha]
[antq.ver.github-tag]
Expand Down Expand Up @@ -275,6 +278,7 @@
(let [skip (set (:skip options))]
(mapcat #(concat
(when-not (skip "boot") (dep.boot/load-deps %))
(when-not (skip "circle-ci") (dep.circle-ci/load-deps %))
(when-not (skip "clojure-cli") (dep.clj/load-deps %))
(when-not (skip "github-action") (dep.gh-action/load-deps %))
(when-not (skip "pom") (dep.pom/load-deps %))
Expand Down
33 changes: 33 additions & 0 deletions src/antq/dep/circle_ci.clj
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
(ns antq.dep.circle-ci
(:require
[clojure.java.io :as io]
[clojure.string :as str]
[clj-yaml.core :as yaml]
[antq.util.dep :as u.dep]
[antq.record :as r]))

(defn extract-deps [file-path content-str]
(let [parsed (yaml/parse-string content-str)]
(->> parsed
:orbs
vals
(into
[]
(map (fn [orb-s]
nenadalm marked this conversation as resolved.
Show resolved Hide resolved
(let [[name version] (str/split orb-s #"@")]
nenadalm marked this conversation as resolved.
Show resolved Hide resolved
(r/map->Dependency {:name name
:version version
:type :circle-ci-orb
:project :circle-ci
:file file-path}))))))))

(defn load-deps
{:malli/schema [:function
[:=> :cat [:maybe r/?dependencies]]
[:=> [:cat 'string?] [:maybe r/?dependencies]]]}
([] (load-deps "."))
([dir]
(let [config-file (io/file dir ".circleci/config.yml")]
(when (.exists config-file)
(extract-deps (u.dep/relative-path config-file)
(slurp config-file))))))
4 changes: 2 additions & 2 deletions src/antq/record.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
[:map [:url 'string?]])

(def ?type
[:enum :git-sha :git-tag-and-sha :github-tag :java])
[:enum :git-sha :git-tag-and-sha :github-tag :java :circle-ci-orb])

(def ?project
[:enum :boot :clojure :clojure-tool :github-action :gradle :leiningen :pom :shadow-cljs])
[:enum :boot :clojure :clojure-tool :github-action :gradle :leiningen :pom :shadow-cljs :circle-ci])

(def ?dependency
[:map
Expand Down
25 changes: 25 additions & 0 deletions src/antq/upgrade/circle_ci.clj
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
(ns antq.upgrade.circle-ci
(:require
[clojure.string :as str]
[antq.upgrade :as upgrade]
[rewrite-indented.zip :as ri.zip]))

(defn- update-value
[new-value]
(fn [line]
(str/replace line #"([^@]+\s*@\s*['\"]?)[^\s'\"]+(['\"]?)"
(str "$1" new-value "$2"))))

(defn upgrade-dep [loc version-checked-dep]
(loop [loc loc]
(if-let [loc (ri.zip/find-next-string loc #(re-seq (re-pattern (str "[^:]+\\s*:\\s*" (:name version-checked-dep) "@")) %))]
(recur (-> (ri.zip/update loc (update-value (:latest-version version-checked-dep)))
ri.zip/next))
(ri.zip/move-to-root loc))))

(defmethod upgrade/upgrader :circle-ci
[version-checked-dep]
(some-> (:file version-checked-dep)
(ri.zip/of-file)
(upgrade-dep version-checked-dep)
(ri.zip/root-string)))
26 changes: 26 additions & 0 deletions src/antq/ver/circle_ci_orb.clj
nenadalm marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
(ns antq.ver.circle-ci-orb
(:require
[clojure.java.io :as io]
[clojure.string :as str]
[clojure.data.json :as json]
[antq.ver :as ver]))

(defn orb-id [ns name]
nenadalm marked this conversation as resolved.
Show resolved Hide resolved
(-> (io/as-url (str "https://internal.circleci.com/api/v2/orbs?ns=" ns "&name=" name))
slurp
nenadalm marked this conversation as resolved.
Show resolved Hide resolved
(json/read-str :key-fn keyword)
:items
first
:id))

(defn orb-versions [id]
nenadalm marked this conversation as resolved.
Show resolved Hide resolved
(-> (io/as-url (str "https://internal.circleci.com/api/v2/orbs/" id))
slurp
nenadalm marked this conversation as resolved.
Show resolved Hide resolved
(json/read-str :key-fn keyword)
:versions))

(defmethod ver/get-sorted-versions :circle-ci-orb
[dep _options]
(let [[ns name] (str/split (:name dep) #"/")
nenadalm marked this conversation as resolved.
Show resolved Hide resolved
id (orb-id ns name)]
(orb-versions id)))
28 changes: 28 additions & 0 deletions test/antq/dep/circle_ci_test.clj
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
(ns antq.dep.circle-ci-test
(:require
[antq.dep.circle-ci :as sut]
[antq.record :as r]
[clojure.test :as t]
[clojure.java.io :as io]))

(defn- git-tag-dependency
nenadalm marked this conversation as resolved.
Show resolved Hide resolved
[m]
(r/map->Dependency (merge {:project :circle-ci
:type :circle-ci-orb
:file "dep/test_circle_ci.yml"} m)))

(t/deftest extract-deps-test
(let [deps (sut/extract-deps "dep/test_circle_ci.yml"
(slurp (io/resource "dep/test_circle_ci.yml")))]
(t/is (sequential? deps))
(t/is (every? #(instance? antq.record.Dependency %) deps))
(t/is (= #{(git-tag-dependency {:name "circleci/node" :version "6.3.0"})
(git-tag-dependency {:name "circleci/docker" :version "2.8.0"})}
(set deps)))))

(t/deftest load-deps-test
(let [deps (sut/load-deps)]
(t/is (= #{".circleci/config.yml"}
(set (map :file deps)))))

(t/is (nil? (sut/load-deps "non_existing_directory"))))
34 changes: 34 additions & 0 deletions test/antq/upgrade/circle_ci_test.clj
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
(ns antq.upgrade.circle-ci-test
(:require
[antq.upgrade :as upgrade]
[antq.upgrade.circle-ci]
[antq.record :as r]
[antq.dep.circle-ci :as dep.circle-ci]
[antq.test-helper :as h]
[clojure.java.io :as io]
[clojure.test :as t]))

(def ^:private node-dep
(r/map->Dependency {:project :circle-ci
:type :circle-ci-orb
:name "circleci/node"
:version "6.3.0"
:latest-version "7.0.0"
:file (io/resource "dep/test_circle_ci.yml")}))

(t/deftest upgrade-dep-test
(t/testing "supported"
(let [from-deps (->> (:file node-dep)
(slurp)
(dep.circle-ci/extract-deps ""))
temp-content (->> node-dep
(upgrade/upgrader))
to-deps (h/with-temp-file
[temp-file temp-content]
(->> (assoc node-dep
:version "7.0.0"
:file temp-file)
(upgrade/upgrader)
(dep.circle-ci/extract-deps "")))]
(t/is (= #{{:name "circleci/node" :version {:- "6.3.0" :+ "7.0.0"}}}
(h/diff-deps from-deps to-deps))))))
5 changes: 5 additions & 0 deletions test/resources/dep/test_circle_ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
version: 2.1

orbs:
node: circleci/[email protected]
docker: circleci/[email protected]