chore: dump nanocl_utils to 0.2.3 and update openapi spec

next-hat · Oct 5, 2023 · 57b975f · 57b975f
1 parent d3def2d
commit 57b975f
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/nanocl/Cargo.toml b/bin/nanocl/Cargo.toml
@@ -56,7 +56,7 @@ termios = "0.3.3"
 liquid = "0.26.1"
 regex = "1.9.3"
 nanocld_client = { version = "0.10.0", features = ["tokio"] }
-nanocl_utils = { version = "0.2.1", features = [
+nanocl_utils = { version = "0.2.3", features = [
   "unix",
   "io_error",
   "http_client_error",

diff --git a/bin/nanocld/Cargo.toml b/bin/nanocld/Cargo.toml
@@ -70,7 +70,7 @@ nanocld_client = { version = "0.10.0", features = ["tokio"] }
 openssl = { version = "0.10.56", features = ["vendored"] }
 metrsd_client = "0.3.0"
 nanocl_stubs = { version = "0.10.0", features = ["serde"] }
-nanocl_utils = { version = "0.2.1", features = [
+nanocl_utils = { version = "0.2.3", features = [
   "unix",
   "ntex",
   "logger",

diff --git a/bin/nanocld/specs/swagger.yaml b/bin/nanocld/specs/swagger.yaml
@@ -4796,6 +4796,10 @@ components:
           nullable: true
         Target:
           $ref: '#/components/schemas/StreamTarget'
+    ProxySsl:
+      oneOf:
+      - $ref: '#/components/schemas/ProxySslConfig'
+      - type: string
     ProxySslConfig:
       type: object
       required:

diff --git a/bin/nanocld/src/services/openapi.rs b/bin/nanocld/src/services/openapi.rs
@@ -62,7 +62,7 @@ use nanocl_stubs::proxy::{
   ResourceProxyRule, ProxyRuleHttp, ProxyHttpLocation, ProxySslConfig,
   ProxyRuleStream, StreamTarget, ProxyStreamProtocol, UriTarget,
   LocationTarget, HttpTarget, UrlRedirect, UpstreamTarget, ProxyRule,
-  UnixTarget,
+  UnixTarget, ProxySsl,
 };
 use nanocl_stubs::state::{
   StateMeta, StateCargo, StateVirtualMachine, StateResource, StateDeployment,
@@ -448,6 +448,7 @@ impl Modify for VersionModifier {
     UpstreamTarget,
     UnixTarget,
     UriTarget,
+    ProxySsl,
     // DnsRules
     ResourceDnsRule,
     DnsEntry,

diff --git a/bin/ncdns/Cargo.toml b/bin/ncdns/Cargo.toml
@@ -30,7 +30,7 @@ futures = "0.3.26"
 serde = { version = "1.0.183", features = ["derive"] }
 serde_json = "1.0.107"
 nanocld_client = "0.10.0"
-nanocl_utils = { version = "0.2.1", features = [
+nanocl_utils = { version = "0.2.3", features = [
   "logger",
   "io_error",
   "http_error",

diff --git a/bin/ncproxy/Cargo.toml b/bin/ncproxy/Cargo.toml
@@ -40,7 +40,7 @@ notify = { version = "6.1.1", default-features = false, features = [
   "macos_kqueue",
 ] }
 nanocld_client = { version = "0.10.0" }
-nanocl_utils = { version = "0.2.1", features = [
+nanocl_utils = { version = "0.2.3", features = [
   "ntex",
   "logger",
   "io_error",

diff --git a/bin/ncvpnkit/Cargo.toml b/bin/ncvpnkit/Cargo.toml
@@ -11,5 +11,5 @@ futures-util = "0.3.28"
 ntex = { version = "0.7.5", features = ["tokio"] }
 vpnkitrc = { version = "0.1.1", features = ["tokio"] }
 nanocld_client = { version = "0.10.0" }
-nanocl_utils = { version = "0.2.1", features = ["logger"] }
+nanocl_utils = { version = "0.2.3", features = ["logger"] }
 serde_json = "1.0.107"
diff --git a/crates/nanocld_client/Cargo.toml b/crates/nanocld_client/Cargo.toml
@@ -30,7 +30,7 @@ ntex = { version = "0.7.5", features = ["openssl"] }
 serde = { version = "1.0.183", features = ["derive"] }
 bollard-next = { version = "0.15.3" }
 nanocl_stubs = { version = "0.10.0", features = ["serde"] }
-nanocl_utils = { version = "0.2.1", features = [
+nanocl_utils = { version = "0.2.3", features = [
   "io_error",
   "http_client_error",
 ] }

diff --git a/examples/custom_resource.yml b/examples/custom_resource.yml
@@ -4,18 +4,21 @@ ApiVersion: v0.10
 # See all options:
 # https://docs.next-hat.com/references/nanocl/resource
 Resources:
-  - Name: VpnUser
-    Kind: Kind
-    Version: v0.1
-    Data:
-      Url: vpn.nanocl.internal
-      Schema:
-        title: VpnUser
-        description: Create a new vpn user
-        type: object
-        required:
-          - Username
-        properties:
-          Username:
-            description: Cargo to watch for changes
-            type: string
+- Name: VpnUser
+  Kind: Kind
+  Version: v0.1
+  Data:
+    Url: vpn.nanocl.internal
+    Schema:
+      title: VpnUser
+      description: Create a new vpn user
+      type: object
+      required:
+      - Username
+      properties:
+        Username:
+          description: Username for the vpn user
+          type: string
+        Password:
+          description: Password for the vpn user
+          type: string