@@ -10,15 +10,8 @@ import (
10
10
11
11
"github.com/spf13/cobra"
12
12
"github.com/spf13/viper"
13
- )
14
13
15
- const (
16
- flagDomainName = "domain-name"
17
- flagEnv = "env"
18
- flagRegion2 = "region2"
19
- flagTfcToken = "tfc-token"
20
- flagOrgAlternate = "org-alternate"
21
- flagTfcTokenAlternate = "tfc-token-alternate"
14
+ "github.com/silinternational/idp-cli/cmd/cli/flags"
22
15
)
23
16
24
17
const envProd = "prod"
@@ -36,41 +29,12 @@ func SetupMultiregionCmd(parentCommand *cobra.Command) {
36
29
InitSetupCmd (multiregionCmd )
37
30
InitStatusCmd (multiregionCmd )
38
31
39
- var domainName string
40
- multiregionCmd .PersistentFlags ().StringVar (& domainName , flagDomainName , "" , "Domain name" )
41
- if err := viper .BindPFlag (flagDomainName , multiregionCmd .PersistentFlags ().Lookup (flagDomainName )); err != nil {
42
- outputFlagError (multiregionCmd , err )
43
- }
44
-
45
- var env string
46
- multiregionCmd .PersistentFlags ().StringVar (& env , flagEnv , envProd , "Execution environment" )
47
- if err := viper .BindPFlag (flagEnv , multiregionCmd .PersistentFlags ().Lookup (flagEnv )); err != nil {
48
- outputFlagError (multiregionCmd , err )
49
- }
50
-
51
- var region2 string
52
- multiregionCmd .PersistentFlags ().StringVar (& region2 , flagRegion2 , "" , "Secondary AWS region" )
53
- if err := viper .BindPFlag (flagRegion2 , multiregionCmd .PersistentFlags ().Lookup (flagRegion2 )); err != nil {
54
- outputFlagError (multiregionCmd , err )
55
- }
56
-
57
- var tfcToken string
58
- multiregionCmd .PersistentFlags ().StringVar (& tfcToken , flagTfcToken , "" , "Token for Terraform Cloud authentication" )
59
- if err := viper .BindPFlag (flagTfcToken , multiregionCmd .PersistentFlags ().Lookup (flagTfcToken )); err != nil {
60
- outputFlagError (multiregionCmd , err )
61
- }
62
-
63
- var orgAlt string
64
- multiregionCmd .PersistentFlags ().StringVar (& orgAlt , flagOrgAlternate , "" , "Alternate Terraform Cloud organization" )
65
- if err := viper .BindPFlag (flagOrgAlternate , multiregionCmd .PersistentFlags ().Lookup (flagOrgAlternate )); err != nil {
66
- outputFlagError (multiregionCmd , err )
67
- }
68
-
69
- var tfcTokenAlt string
70
- multiregionCmd .PersistentFlags ().StringVar (& tfcTokenAlt , flagTfcTokenAlternate , "" , "Alternate token for Terraform Cloud" )
71
- if err := viper .BindPFlag (flagTfcTokenAlternate , multiregionCmd .PersistentFlags ().Lookup (flagTfcTokenAlternate )); err != nil {
72
- outputFlagError (multiregionCmd , err )
73
- }
32
+ flags .NewStringFlag (multiregionCmd , flags .DomainName , "" , "" , "Domain name" )
33
+ flags .NewStringFlag (multiregionCmd , flags .Env , "" , envProd , "Execution environment" )
34
+ flags .NewStringFlag (multiregionCmd , flags .Region2 , "" , "" , "Secondary AWS region" )
35
+ flags .NewStringFlag (multiregionCmd , flags .TfcToken , "" , "" , "Token for Terraform Cloud authentication" )
36
+ flags .NewStringFlag (multiregionCmd , flags .OrgAlternate , "" , "" , "Alternate Terraform Cloud organization" )
37
+ flags .NewStringFlag (multiregionCmd , flags .TfcTokenAlternate , "" , "" , "Alternate token for Terraform Cloud" )
74
38
}
75
39
76
40
func outputFlagError (cmd * cobra.Command , err error ) {
@@ -91,19 +55,19 @@ type PersistentFlags struct {
91
55
92
56
func getPersistentFlags () PersistentFlags {
93
57
pFlags := PersistentFlags {
94
- env : getRequiredParam (flagEnv ),
95
- idp : getRequiredParam ("idp" ),
96
- org : getRequiredParam ("org" ),
97
- tfcToken : getRequiredParam (flagTfcToken ),
98
- secondaryRegion : getRequiredParam (flagRegion2 ),
99
- readOnlyMode : viper .GetBool ("read-only-mode" ),
100
- tfcTokenAlt : getOption (flagTfcTokenAlternate , "" ),
101
- orgAlt : getOption (flagOrgAlternate , viper .GetString (flagOrgAlternate )),
58
+ env : getRequiredParam (flags . Env ),
59
+ idp : getRequiredParam (flags . Idp ),
60
+ org : getRequiredParam (flags . Org ),
61
+ tfcToken : getRequiredParam (flags . TfcToken ),
62
+ secondaryRegion : getRequiredParam (flags . Region2 ),
63
+ readOnlyMode : viper .GetBool (flags . ReadOnlyMode ),
64
+ tfcTokenAlt : getOption (flags . TfcTokenAlternate , "" ),
65
+ orgAlt : getOption (flags . OrgAlternate , viper .GetString (flags . OrgAlternate )),
102
66
}
103
67
104
68
if pFlags .orgAlt != "" && pFlags .tfcTokenAlt == "" {
105
69
log .Fatalf ("%[1]s was specified without %[2]s. Please include %[2]s or remove %[1]s." ,
106
- flagOrgAlternate , flagTfcTokenAlternate )
70
+ flags . OrgAlternate , flags . TfcTokenAlternate )
107
71
}
108
72
109
73
if pFlags .orgAlt == "" {
0 commit comments