diff --git a/deps.edn b/deps.edn index cd60815..b822c1b 100644 --- a/deps.edn +++ b/deps.edn @@ -1,4 +1,4 @@ -{:paths ["src/main"] +{:paths ["src"] :deps {funcool/promesa {:mvn/version "11.0.678"} thheller/shadow-cljs {:mvn/version "2.28.20"} org.jboss.xnio/xnio-api {:mvn/version "3.8.8.Final"} diff --git a/src/main/deps.cljs b/src/deps.cljs similarity index 100% rename from src/main/deps.cljs rename to src/deps.cljs diff --git a/src/main/providers/defaults.cljs b/src/main/providers/defaults.cljs deleted file mode 100644 index 4b4580e..0000000 --- a/src/main/providers/defaults.cljs +++ /dev/null @@ -1,12 +0,0 @@ -(ns providers.defaults - (:require ["path" :as path] - [configs :refer [cfg]] - [providers.k8s :as k8s] - [providers.harbor :as harbor] - [providers.docker :as docker])) - - -(def defaults - {:k8s k8s/defaults - :harbor harbor/defaults - :docker docker/defaults}) diff --git a/src/main/execution/general.clj b/src/pulumicljs/execution/general.clj similarity index 98% rename from src/main/execution/general.clj rename to src/pulumicljs/execution/general.clj index 43455d5..c06b956 100644 --- a/src/main/execution/general.clj +++ b/src/pulumicljs/execution/general.clj @@ -1,4 +1,4 @@ -(ns execution.general +(ns pulumicljs.execution.general (:require [clojure.walk])) diff --git a/src/main/execution/general.cljs b/src/pulumicljs/execution/general.cljs similarity index 99% rename from src/main/execution/general.cljs rename to src/pulumicljs/execution/general.cljs index b238849..b2a8e85 100644 --- a/src/main/execution/general.cljs +++ b/src/pulumicljs/execution/general.cljs @@ -1,4 +1,4 @@ -(ns execution.general (:require [clojure.walk :as walk])) +(ns pulumicljs.execution.general (:require [clojure.walk :as walk])) (defn new-resource [resource-type resource-name final-args provider dependencies] diff --git a/src/main/execution/providers.cljs b/src/pulumicljs/execution/providers.cljs similarity index 93% rename from src/main/execution/providers.cljs rename to src/pulumicljs/execution/providers.cljs index 3283feb..0ee9516 100644 --- a/src/main/execution/providers.cljs +++ b/src/pulumicljs/execution/providers.cljs @@ -1,12 +1,12 @@ -(ns execution.providers +(ns pulumicljs.execution.providers (:require ["@pulumi/pulumi" :as pulumi] ["@pulumi/vault" :as vault] ["@pulumiverse/harbor" :as harbor] ["@pulumi/kubernetes" :as k8s] [clojure.string :as str] [clojure.walk :as walk] - [execution.general :refer [resolve-template]] - [providers.k8s :as k8s-utils] - [providers.harbor :as harbor-utils] - [providers.docker :as docker-utils] [providers.vault :as vault-utils] - [execution.stack-processor :refer [deploy! component-specs]])) + [pulumicljs.execution.general :refer [resolve-template]] + [pulumicljs.providers.k8s :as k8s-utils] + [pulumicljs.providers.harbor :as harbor-utils] + [pulumicljs.providers.docker :as docker-utils] [pulumicljs.providers.vault :as vault-utils] + [pulumicljs.execution.stack-processor :refer [deploy! component-specs]])) (defn resolve-provider-template [constructor name config] {:constructor constructor diff --git a/src/main/execution/safe_fns.cljs b/src/pulumicljs/execution/safe_fns.cljs similarity index 97% rename from src/main/execution/safe_fns.cljs rename to src/pulumicljs/execution/safe_fns.cljs index c68a104..100deb7 100644 --- a/src/main/execution/safe_fns.cljs +++ b/src/pulumicljs/execution/safe_fns.cljs @@ -1,4 +1,4 @@ -(ns execution.safe-fns) +(ns pulumicljs.execution.safe-fns) (defn make-paths [& path-groups] (mapcat (fn [{:keys [paths backend]}] diff --git a/src/main/execution/stack_processor.cljs b/src/pulumicljs/execution/stack_processor.cljs similarity index 96% rename from src/main/execution/stack_processor.cljs rename to src/pulumicljs/execution/stack_processor.cljs index 806bb36..8302d77 100644 --- a/src/main/execution/stack_processor.cljs +++ b/src/pulumicljs/execution/stack_processor.cljs @@ -1,4 +1,4 @@ -(ns execution.stack-processor +(ns pulumicljs.execution.stack-processor (:require ["@pulumi/kubernetes" :as k8s] ["@local/crds/gateway" :as gateway-api] @@ -6,20 +6,20 @@ ["@pulumi/pulumi" :as pulumi] ["@pulumi/vault" :as vault] ["@pulumiverse/harbor" :as harbor] - [providers.defaults :as default] - [providers.vault :as vault-utils] - [execution.general :refer [deep-merge new-resource resource-factory deploy-stack-factory iterate-stack]] + [pulumicljs.providers.defaults :as default] + [pulumicljs.providers.vault :as vault-utils] + [pulumicljs.execution.general :refer [deep-merge new-resource resource-factory deploy-stack-factory iterate-stack]] ["@pulumi/docker" :as docker] ["@pulumi/docker-build" :as docker-build] [clojure.walk :as walk] [clojure.string :as str] ["path" :as path] [configs :refer [cfg]] - [providers.k8s :as k8s-utils] - [providers.harbor :as harbor-utils] - [providers.docker :as docker-utils] - [execution.safe-fns :refer [safe-fns]]) - (:require-macros [execution.general :refer [p-> build-registry]])) + [pulumicljs.providers.k8s :as k8s-utils] + [pulumicljs.providers.harbor :as harbor-utils] + [pulumicljs.providers.docker :as docker-utils] + [pulumicljs.execution.safe-fns :refer [safe-fns]]) + (:require-macros [pulumicljs.execution.general :refer [p-> build-registry]])) (defn safe-parse-int [s] (let [n (js/parseInt s 10)] diff --git a/src/pulumicljs/providers/defaults.cljs b/src/pulumicljs/providers/defaults.cljs new file mode 100644 index 0000000..33ab015 --- /dev/null +++ b/src/pulumicljs/providers/defaults.cljs @@ -0,0 +1,12 @@ +(ns pulumicljs.providers.defaults + (:require ["path" :as path] + [configs :refer [cfg]] + [pulumicljs.providers.k8s :as k8s] + [pulumicljs.providers.harbor :as harbor] + [pulumicljs.providers.docker :as docker])) + + +(def defaults + {:k8s k8s/defaults + :harbor harbor/defaults + :docker docker/defaults}) diff --git a/src/main/providers/docker.cljs b/src/pulumicljs/providers/docker.cljs similarity index 80% rename from src/main/providers/docker.cljs rename to src/pulumicljs/providers/docker.cljs index c786eb7..4fef177 100644 --- a/src/main/providers/docker.cljs +++ b/src/pulumicljs/providers/docker.cljs @@ -1,6 +1,6 @@ -(ns providers.docker +(ns pulumicljs.providers.docker (:require - [execution.general :refer [generic-transform deep-merge new-resource component-factory resource-factory deploy-stack-factory iterate-stack]] + [pulumicljs.execution.general :refer [generic-transform deep-merge new-resource component-factory resource-factory deploy-stack-factory iterate-stack]] ["@pulumi/docker-build" :as docker] ["path" :as path] [configs :refer [cfg]])) diff --git a/src/main/providers/harbor.cljs b/src/pulumicljs/providers/harbor.cljs similarity index 96% rename from src/main/providers/harbor.cljs rename to src/pulumicljs/providers/harbor.cljs index 5b0e0be..6b43344 100644 --- a/src/main/providers/harbor.cljs +++ b/src/pulumicljs/providers/harbor.cljs @@ -1,4 +1,4 @@ -(ns providers.harbor +(ns pulumicljs.providers.harbor (:require ["@pulumiverse/harbor" :as harbor])) diff --git a/src/main/providers/k8s.cljs b/src/pulumicljs/providers/k8s.cljs similarity index 99% rename from src/main/providers/k8s.cljs rename to src/pulumicljs/providers/k8s.cljs index 9968268..3cd977e 100644 --- a/src/main/providers/k8s.cljs +++ b/src/pulumicljs/providers/k8s.cljs @@ -1,4 +1,4 @@ -(ns providers.k8s (:require ["@pulumi/kubernetes" :as k8s])) +(ns pulumicljs.providers.k8s (:require ["@pulumi/kubernetes" :as k8s])) diff --git a/src/main/providers/vault.cljs b/src/pulumicljs/providers/vault.cljs similarity index 98% rename from src/main/providers/vault.cljs rename to src/pulumicljs/providers/vault.cljs index a90bc9d..35f3068 100644 --- a/src/main/providers/vault.cljs +++ b/src/pulumicljs/providers/vault.cljs @@ -1,4 +1,4 @@ -(ns providers.vault +(ns pulumicljs.providers.vault (:require ["@pulumi/kubernetes" :as k8s] ["@pulumi/pulumi" :as pulumi]