ComputerSurge/komodo
3
0
Fork 0
forked from github-starred/komodo
Code Pull Requests 1 Actions Packages Releases Activity

fix stuff after main rebase

Browse Source
This commit is contained in:
mbecker20
2025-09-27 14:26:58 -07:00
parent c34f5ebf49
commit 78be913541
3 changed files with 10 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

844
Cargo.lock generated
View File

@@ -941,59 +941,7 @@ dependencies = [
[[package]]
name = "cache"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"anyhow",
"tokio",
@@ -1185,59 +1133,7 @@ dependencies = [
[[package]]
name = "command"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"komodo_client",
"run_command",
@@ -1263,59 +1159,7 @@ checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb"
[[package]]
name = "config"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"colored",
"indexmap 2.11.4",
@@ -1600,59 +1444,7 @@ checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
[[package]]
name = "database"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"anyhow",
"async-compression",
@@ -1960,59 +1752,7 @@ dependencies = [
[[package]]
name = "environment"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"anyhow",
"formatting",
@@ -2022,59 +1762,7 @@ dependencies = [
[[package]]
name = "environment_file"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"thiserror 2.0.16",
]
@@ -2170,59 +1858,7 @@ dependencies = [
[[package]]
name = "formatting"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"serror",
]
@@ -2394,59 +2030,7 @@ checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
[[package]]
name = "git"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"anyhow",
"cache",
@@ -3046,59 +2630,7 @@ dependencies = [
[[package]]
name = "interpolate"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"anyhow",
"komodo_client",
@@ -3229,59 +2761,7 @@ dependencies = [
[[package]]
name = "komodo_cli"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"anyhow",
"chrono",
@@ -3307,59 +2787,7 @@ dependencies = [
[[package]]
name = "komodo_client"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"anyhow",
"async_timing_util",
@@ -3395,59 +2823,7 @@ dependencies = [
[[package]]
name = "komodo_core"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"anyhow",
"arc-swap",
@@ -3521,59 +2897,7 @@ dependencies = [
[[package]]
name = "komodo_periphery"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"anyhow",
"arc-swap",
@@ -3697,59 +3021,7 @@ dependencies = [
[[package]]
name = "logger"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"anyhow",
"komodo_client",
@@ -4519,59 +3791,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
[[package]]
name = "periphery_client"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"komodo_client",
"resolver_api",
@@ -5118,59 +4338,7 @@ dependencies = [
[[package]]
name = "response"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version = "1.19.5"
=======
version = "2.0.0-dev-0"
>>>>>>> 6fbead30 (noise library and cli key utilities)
=======
version = "2.0.0-dev-1"
>>>>>>> 2bbaa170 (dev-1)
=======
version = "2.0.0-dev-2"
>>>>>>> 151a2100 (dev-2)
=======
version = "2.0.0-dev-3"
>>>>>>> 9f84a329 (deploy 2.0.0-dev-3)
=======
version = "2.0.0-dev-4"
>>>>>>> a9ef50d6 (deploy 2.0.0-dev-4)
=======
version = "2.0.0-dev-5"
>>>>>>> 3edfbe8b (deploy 2.0.0-dev-5)
=======
version = "2.0.0-dev-6"
>>>>>>> a853b2c8 (deploy 2.0.0-dev-6)
=======
version = "2.0.0-dev-7"
>>>>>>> fc28dbeb (deploy 2.0.0-dev-7)
=======
version = "2.0.0-dev-8"
>>>>>>> 0779afdc (deploy 2.0.0-dev-8)
=======
version = "2.0.0-dev-9"
>>>>>>> 2b441fb0 (deploy 2.0.0-dev-9)
=======
version = "2.0.0-dev-10"
>>>>>>> 0706f1ee (dev-10)
=======
version = "2.0.0-dev-11"
>>>>>>> 898c76bb (deploy 2.0.0-dev-11)
=======
version = "2.0.0-dev-12"
>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12)
dependencies = [
"anyhow",
"axum",
@@ -5534,9 +4702,9 @@ checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
[[package]]
name = "serde"
version = "1.0.227"
version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80ece43fc6fbed4eb5392ab50c07334d3e577cbf40997ee896fe7af40bba4245"
checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
dependencies = [
"serde_core",
"serde_derive",
@@ -5564,18 +4732,18 @@ dependencies = [
[[package]]
name = "serde_core"
version = "1.0.227"
version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a576275b607a2c86ea29e410193df32bc680303c82f31e275bbfcafe8b33be5"
checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.227"
version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51e694923b8824cf0e9b382adf0f60d4e05f348f357b38833a3fa5ed7c2ede04"
checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
dependencies = [
"proc-macro2",
"quote",

1
bin/periphery/src/api/build/mod.rs
View File

@@ -25,7 +25,6 @@ use resolver_api::Resolve;
use tokio::fs;
use crate::{
build::{parse_build_args, parse_secret_args, write_dockerfile},
config::periphery_config,
docker::docker_login,
helpers::{format_extra_args, format_labels},

4
client/core/rs/src/entities/mod.rs
View File

@@ -137,6 +137,10 @@ pub fn optional_string(string: impl Into<String>) -> Option<String> {
}
}
pub fn optional_str(str: &str) -> Option<&str> {
if str.is_empty() { None } else { Some(str) }
}
pub fn to_general_name(name: &str) -> String {
name.trim().replace('\n', "_").to_string()
}