From b9a2d8698a22c4b267e252caad56d8b31fcadd38 Mon Sep 17 00:00:00 2001
From: esendjer <esendjer@gmail.com>
Date: Wed, 19 Jan 2022 14:56:37 +0500
Subject: Handlers for `generate systemd` with custom dependencies

This commit includes:
* Handlers for generate systemd unit
  with manually defined dependencies such as:
  Wants=, After= and Requires=

* The new unit and e2e tests for checking generated systemd units
  for container and pod with custom dependencies

* Documented descriptions for custom dependencies options

Signed-off-by: Eugene (Evgenii) Shubin <esendjer@gmail.com>
---
 pkg/api/handlers/libpod/generate.go | 28 +++++++++++++++++-----------
 pkg/api/server/register_generate.go | 21 +++++++++++++++++++++
 2 files changed, 38 insertions(+), 11 deletions(-)

(limited to 'pkg/api')

diff --git a/pkg/api/handlers/libpod/generate.go b/pkg/api/handlers/libpod/generate.go
index aadb5ad52..9b62a1388 100644
--- a/pkg/api/handlers/libpod/generate.go
+++ b/pkg/api/handlers/libpod/generate.go
@@ -17,17 +17,20 @@ func GenerateSystemd(w http.ResponseWriter, r *http.Request) {
 	runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime)
 	decoder := r.Context().Value(api.DecoderKey).(*schema.Decoder)
 	query := struct {
-		Name             bool    `schema:"useName"`
-		New              bool    `schema:"new"`
-		NoHeader         bool    `schema:"noHeader"`
-		TemplateUnitFile bool    `schema:"templateUnitFile"`
-		RestartPolicy    *string `schema:"restartPolicy"`
-		RestartSec       uint    `schema:"restartSec"`
-		StopTimeout      uint    `schema:"stopTimeout"`
-		StartTimeout     uint    `schema:"startTimeout"`
-		ContainerPrefix  string  `schema:"containerPrefix"`
-		PodPrefix        string  `schema:"podPrefix"`
-		Separator        string  `schema:"separator"`
+		Name             bool     `schema:"useName"`
+		New              bool     `schema:"new"`
+		NoHeader         bool     `schema:"noHeader"`
+		TemplateUnitFile bool     `schema:"templateUnitFile"`
+		RestartPolicy    *string  `schema:"restartPolicy"`
+		RestartSec       uint     `schema:"restartSec"`
+		StopTimeout      uint     `schema:"stopTimeout"`
+		StartTimeout     uint     `schema:"startTimeout"`
+		ContainerPrefix  string   `schema:"containerPrefix"`
+		PodPrefix        string   `schema:"podPrefix"`
+		Separator        string   `schema:"separator"`
+		Wants            []string `schema:"wants"`
+		After            []string `schema:"after"`
+		Requires         []string `schema:"requires"`
 	}{
 		StartTimeout:    0,
 		StopTimeout:     util.DefaultContainerConfig().Engine.StopTimeout,
@@ -55,6 +58,9 @@ func GenerateSystemd(w http.ResponseWriter, r *http.Request) {
 		PodPrefix:        query.PodPrefix,
 		Separator:        query.Separator,
 		RestartSec:       &query.RestartSec,
+		Wants:            query.Wants,
+		After:            query.After,
+		Requires:         query.Requires,
 	}
 
 	report, err := containerEngine.GenerateSystemd(r.Context(), utils.GetName(r), options)
diff --git a/pkg/api/server/register_generate.go b/pkg/api/server/register_generate.go
index 47057959c..6b7f0cfe7 100644
--- a/pkg/api/server/register_generate.go
+++ b/pkg/api/server/register_generate.go
@@ -72,6 +72,27 @@ func (s *APIServer) registerGenerateHandlers(r *mux.Router) error {
 	//    type: integer
 	//    default: 0
 	//    description: Configures the time to sleep before restarting a service.
+	//  - in: query
+	//    name: wants
+	//    type: array
+	//    items:
+	//        type: string
+	//    default: []
+	//    description: Systemd Wants list for the container or pods.
+	//  - in: query
+	//    name: after
+	//    type: array
+	//    items:
+	//        type: string
+	//    default: []
+	//    description: Systemd After list for the container or pods.
+	//  - in: query
+	//    name: requires
+	//    type: array
+	//    items:
+	//        type: string
+	//    default: []
+	//    description: Systemd Requires list for the container or pods.
 	// produces:
 	// - application/json
 	// responses:
-- 
cgit v1.2.3-54-g00ecf