Merge pull request #294 from fussybeaver/ND-1.42-moby-api

Match generated swagger moby API with v23.0.1 moby release
fussybeaver · Mar 12, 2023 · 7b9673c · 7b9673c
2 parents a12c6b2 + 83eff5b
commit 7b9673c
Show file tree

Hide file tree

Showing 7 changed files with 542 additions and 49 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,9 @@
 .DS_Store
 Cargo.lock
-/target
+**/target
 doc
 main.rs
 .metals
-codegen/target/generated-sources/target
-/.idea
+**/.idea
 .vscode/
-/codegen/.idea
+**/.swagger-codegen
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,7 +37,7 @@ time = ["dep:time", "bollard-stubs/time"]
 
 [dependencies]
 base64 = "0.21"
-bollard-stubs = { path = "codegen/swagger", version = "=1.42.0-rc.7", default-features = false }
+bollard-stubs = { path = "codegen/swagger", version = "=1.42.0-rc.8", default-features = false }
 bollard-buildkit-proto = { path = "codegen/proto", version = "=0.1.0", optional = true }
 bytes = "1"
 chrono = { version = "0.4", features = ["serde"], optional = true }

diff --git a/codegen/swagger/Cargo.toml b/codegen/swagger/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bollard-stubs"
-version = "1.42.0-rc.7"
+version = "1.42.0-rc.8"
 authors = [ "Bollard contributors" ]
 description = "Stubs used for the Bollard rust async Docker client API"
 license = "Apache-2.0"

diff --git a/codegen/swagger/README.md b/codegen/swagger/README.md
@@ -7,9 +7,9 @@ To see how to make this your own, look here:
 
 [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)
 
-- API version: 1.42.0-rc.7
-- Code generation suffix: 1.42.0-rc.7
-- Build date: 2023-01-13T16:40:08.828Z
+- API version: 1.42.0-rc.8
+- Code generation suffix: 1.42.0-rc.8
+- Build date: 2023-03-12T17:12:39.215Z
 
 This autogenerated project defines an API crate `bollard-stubs` which contains:
 * Data types representing the underlying data model.

diff --git a/codegen/swagger/pom.xml b/codegen/swagger/pom.xml
@@ -19,19 +19,15 @@
                 <goal>generate</goal>
               </goals>
               <configuration>
-                <!-- moby commit a06bae909494b43daadc0ee60dbce79231616470 is v20.10.16 + a fix for issue https://github.com/moby/moby/issues/43655 
-                <inputSpec>https://raw.githubusercontent.com/moby/moby/v20.10.16/docs/api/v1.41.yaml</inputSpec>
-                <inputSpec>https://docs.docker.com/engine/api/v1.41.yaml</inputSpec>
-                -->
-                <inputSpec>https://raw.githubusercontent.com/moby/moby/a06bae909494b43daadc0ee60dbce79231616470/docs/api/v1.41.yaml</inputSpec>
+                <inputSpec>https://raw.githubusercontent.com/moby/moby/v23.0.1/docs/api/v1.42.yaml</inputSpec>
                 <language>bollard.BollardCodegen</language>
                 <output>${project.basedir}</output>
                 <generateApis>true</generateApis>
                 <templateDirectory>${project.basedir}/src/main/resources/bollard</templateDirectory>
                 <supportingFilesToGenerate>models.rs,lib.rs,Cargo.toml,config,README.md</supportingFilesToGenerate>
                 <configOptions>
                   <packageName>bollard-stubs</packageName>
-                  <packageVersion>1.42.0-rc.7</packageVersion>
+                  <packageVersion>1.42.0-rc.8</packageVersion>
                 </configOptions>
               </configuration>
             </execution>

diff --git a/codegen/swagger/src/lib.rs b/codegen/swagger/src/lib.rs
@@ -13,7 +13,7 @@ use std::io::Error;
 #[allow(unused_imports)]
 use std::collections::HashMap;
 
-pub const BASE_PATH: &str = "/v1.41";
+pub const BASE_PATH: &str = "/v1.42";
 
 pub mod models;