Merge pull request #13604 from jwhonce/issues/12804

Update swagger to improve compatibility

5 files changed, 23 insertions, 5 deletions

diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go
index eb1a5d59c..89d914e0a 100644
--- a/pkg/api/handlers/compat/networks.go
+++ b/pkg/api/handlers/compat/networks.go
@@ -242,7 +242,7 @@ func CreateNetwork(w http.ResponseWriter, r *http.Request) {
 
 	body := struct {
 		ID      string `json:"Id"`
-		Warning []string
+		Warning string
 	}{
 		ID: newNetwork.ID,
 	}
diff --git a/pkg/api/server/register_exec.go b/pkg/api/server/register_exec.go
index c19ca7859..90136463d 100644
--- a/pkg/api/server/register_exec.go
+++ b/pkg/api/server/register_exec.go
@@ -169,7 +169,7 @@ func (s *APIServer) registerExecHandlers(r *mux.Router) error {
 	// - application/json
 	// responses:
 	//   200:
-	//     description: no error
+	//     $ref: "#/responses/InspectExecSession"
 	//   404:
 	//     $ref: "#/responses/NoSuchExecInstance"
 	//   500:
diff --git a/pkg/api/server/register_networks.go b/pkg/api/server/register_networks.go
index 4466c938f..b900aa953 100644
--- a/pkg/api/server/register_networks.go
+++ b/pkg/api/server/register_networks.go
@@ -105,8 +105,15 @@ func (s *APIServer) registerNetworkHandlers(r *mux.Router) error {
 	//    schema:
 	//      $ref: "#/definitions/NetworkCreateRequest"
 	// responses:
-	//   200:
-	//     $ref: "#/responses/CompatNetworkCreate"
+	//   201:
+	//     description: network created
+	//     schema:
+	//       type: object
+	//       properties:
+	//         Id:
+	//           type: string
+	//         Warning:
+	//           type: string
 	//   400:
 	//     $ref: "#/responses/BadParamError"
 	//   500:
diff --git a/pkg/api/server/swagger.go b/pkg/api/server/swagger.go
index 9b652be87..6cf89581a 100644
--- a/pkg/api/server/swagger.go
+++ b/pkg/api/server/swagger.go
@@ -235,3 +235,12 @@ type swagSystemAuthResponse struct {
 		entities.AuthReport
 	}
 }
+
+// Inspect response
+// swagger:response InspectExecSession
+type swagInspectExecSession struct {
+	// in:body
+	Body struct {
+		define.InspectExecSession
+	}
+}
diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go
index 4d9ced900..bed3183e9 100644
--- a/pkg/domain/entities/types.go
+++ b/pkg/domain/entities/types.go
@@ -20,7 +20,7 @@ type Volume struct {
 }
 
 type Report struct {
-	Id  []string //nolint
+	Id  []string // nolint
 	Err map[string]error
 }
 
@@ -98,8 +98,10 @@ type EventsOptions struct {
 // ContainerCreateResponse is the response struct for creating a container
 type ContainerCreateResponse struct {
 	// ID of the container created
+	// required: true
 	ID string `json:"Id"`
 	// Warnings during container creation
+	// required: true
 	Warnings []string `json:"Warnings"`
 }