From 8ad2b1063341cbdfc194c385836e827e69544eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Blaise?= Date: Fri, 8 Jan 2021 15:58:49 +0100 Subject: [PATCH] Finish generate command --- cmd/generate.go | 28 +++++++++++++++++++++++++++- main.go | 2 +- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/cmd/generate.go b/cmd/generate.go index 7fff712..aaa8534 100644 --- a/cmd/generate.go +++ b/cmd/generate.go @@ -19,6 +19,7 @@ import ( "fmt" "github.com/ca-gip/dploy/internal/services" "github.com/spf13/cobra" + "log" "os" "regexp" "strings" @@ -36,8 +37,33 @@ TODO`, k8s := services.LoadFromPath(curr) filters, _ := cmd.Flags().GetStringSlice("filter") inventories := k8s.FilterFromVars(filters) + playbookPath, _ := cmd.Flags().GetString("playbook") + playbook := k8s.GetPlaybook(playbookPath) + if playbook == nil { + log.Fatalf(`%s not a valid path`, playbookPath) + } + + tags, _ := cmd.Flags().GetStringSlice("tags") + limit, _ := cmd.Flags().GetStringSlice("limit") + skipTags, _ := cmd.Flags().GetStringSlice("skip-tags") + check, _ := cmd.Flags().GetBool("check") + diff, _ := cmd.Flags().GetBool("diff") + vaultPassFile, _ := cmd.Flags().GetString("vault-password-file") + askVaultPass, _ := cmd.Flags().GetBool("ask-vault-password") + + commands := &services.AnsibleCommandTpl{ + Inventory: inventories, + Playbook: playbook, + Tags: tags, + Limit: limit, + SkipTags: skipTags, + Check: check, + Diff: diff, + VaultPasswordFile: vaultPassFile, + AskVaultPass: askVaultPass, + } - fmt.Println(inventories) + commands.GenerateCmd() }, } diff --git a/main.go b/main.go index fc8aa3a..9c82f58 100644 --- a/main.go +++ b/main.go @@ -28,7 +28,7 @@ func main() { // Check: true, // Diff: true, // VaultPasswordFile: "/path/to/passwordfile", - // AskVaultPassFile: false, + // AskVaultPass: false, //} //tpl.GenerateCmd()