@@ -26,13 +26,14 @@ func main() {
2626 log .SetOutput (os .Stderr )
2727
2828 // Common command-line arguments.
29- host := flag .String ("host" , "" , "Duplo API base URL" )
30- token := flag .String ("token" , "" , "Duplo API token" )
29+ host := flag .String ("host" , "" , "DuploCloud base URL" )
30+ token := flag .String ("token" , "" , "DuploCloud API token" )
3131 debug := flag .Bool ("debug" , false , "Turn on verbose (debugging) output" )
3232 noCache := flag .Bool ("no-cache" , false , "Disable caching (not recommended)" )
3333 interactive := flag .Bool ("interactive" , false , "Allow getting Duplo credentials via an interactive browser session" )
3434 port := flag .Int ("port" , 0 , "Port to use for the local web server" )
3535 showVersion := flag .Bool ("version" , false , "Output version information and exit" )
36+ apiHost := flag .String ("api-host" , "" , "Specify an alternate DuploCloud API base URL if it differs from the UI host (defaults to the value of --host if omitted)" )
3637 admin = new (bool )
3738 duploOps = new (bool )
3839
@@ -76,13 +77,35 @@ func main() {
7677 os .Exit (1 )
7778 }
7879
79- // Refuse to call APIs over anything but https://
80- // Trim a trailing slash.
81- if host == nil || ! strings .HasPrefix (* host , "https://" ) {
82- log .Fatalf ("%s: %s" , os .Args [0 ], "--host must be present and start with https://" )
80+ // Validate the host.
81+ const fatalFmt = "%s: %s"
82+ if * host == "" {
83+ log .Fatalf (fatalFmt , os .Args [0 ], "--host must be present" )
84+ } else if strings .HasPrefix (* host , "http://localhost" ) {
85+ fmt .Fprintf (os .Stderr , "Using developer host %s\n " , * host )
86+ } else if ! strings .HasPrefix (* host , "https://" ) {
87+ // Refuse to call APIs over anything but https://
88+ log .Fatalf (fatalFmt , os .Args [0 ], "--host must start with https://" )
8389 }
90+
91+ // Trim a trailing slash.
8492 * host = strings .TrimSuffix (* host , "/" )
8593
94+ // Validate the api-host if provided.
95+ if * apiHost != "" {
96+ if strings .HasPrefix (* apiHost , "http://localhost" ) {
97+ fmt .Printf ("Using developer api-host %s\n " , * apiHost )
98+ } else if ! strings .HasPrefix (* apiHost , "https://" ) {
99+ // Refuse to call APIs over anything but https://
100+ log .Fatalf (fatalFmt , os .Args [0 ], "--api-host must start with https://" )
101+ }
102+ // Trim a trailing slash.
103+ * apiHost = strings .TrimSuffix (* apiHost , "/" )
104+ } else {
105+ // By default, the api host is the same as the UI host.
106+ apiHost = host
107+ }
108+
86109 // Possibly enable debugging
87110 if * debug {
88111 duplocloud .LogLevel = duplocloud .TRACE
@@ -92,21 +115,22 @@ func main() {
92115 internal .MustInitCache ("duplo-jit" , * noCache )
93116
94117 // Get AWS credentials and output them
118+ cacheKey := internal .GetHostCacheKey (* host )
119+
95120 switch cmd {
96121 case "aws" :
97122 var creds * internal.AwsConfigOutput
98- var cacheKey string
99123 if * admin {
100124
101125 // Build the cache key
102- cacheKey = strings .Join ([]string {strings . TrimPrefix ( * host , "https://" ) , "admin" }, "," )
126+ cacheKey = strings .Join ([]string {cacheKey , "admin" }, "," )
103127
104128 // Try to find credentials from the cache.
105129 creds = internal .CacheGetAwsConfigOutput (cacheKey )
106130
107131 // Otherwise, get the credentials from Duplo.
108132 if creds == nil {
109- client , _ := internal .MustDuploClient (* host , * token , * interactive , true , * port )
133+ client , _ := internal .MustDuploClient (* host , * apiHost , * token , * interactive , true , * port )
110134 result , err := client .AdminGetJitAwsCredentials ()
111135 internal .DieIf (err , "failed to get credentials" )
112136 creds = internal .ConvertAwsCreds (result )
@@ -115,14 +139,14 @@ func main() {
115139 } else if * duploOps {
116140
117141 // Build the cache key
118- cacheKey = strings .Join ([]string {strings . TrimPrefix ( * host , "https://" ) , "duplo-ops" }, "," )
142+ cacheKey = strings .Join ([]string {cacheKey , "duplo-ops" }, "," )
119143
120144 // Try to find credentials from the cache.
121145 creds = internal .CacheGetAwsConfigOutput (cacheKey )
122146
123147 // Otherwise, get the credentials from Duplo.
124148 if creds == nil {
125- client , _ := internal .MustDuploClient (* host , * token , * interactive , true , * port )
149+ client , _ := internal .MustDuploClient (* host , * apiHost , * token , * interactive , true , * port )
126150 result , err := client .AdminAwsGetJitAccess ("duplo-ops" )
127151 internal .DieIf (err , "failed to get credentials" )
128152 creds = internal .ConvertAwsCreds (result )
@@ -137,11 +161,11 @@ func main() {
137161
138162 // Identify the tenant name to use for the cache key.
139163 var tenantName string
140- client , _ := internal .MustDuploClient (* host , * token , * interactive , false , * port )
164+ client , _ := internal .MustDuploClient (* host , * apiHost , * token , * interactive , false , * port )
141165 * tenantID , tenantName = getTenantIDAndName (* tenantID , client )
142166
143167 // Build the cache key.
144- cacheKey = strings .Join ([]string {strings . TrimPrefix ( * host , "https://" ) , "tenant" , tenantName }, "," )
168+ cacheKey = strings .Join ([]string {cacheKey , "tenant" , tenantName }, "," )
145169
146170 // Try to find credentials from the cache.
147171 creds = internal .CacheGetAwsConfigOutput (cacheKey )
@@ -159,23 +183,22 @@ func main() {
159183 internal .OutputAwsCreds (creds , cacheKey )
160184
161185 case "duplo" :
162- _ , creds := internal .MustDuploClient (* host , * token , * interactive , true , * port )
186+ _ , creds := internal .MustDuploClient (* host , * apiHost , * token , * interactive , true , * port )
163187 internal .OutputDuploCreds (creds )
164188
165189 case "k8s" :
166190 var creds * clientauthv1beta1.ExecCredential
167- var cacheKey string
168191 if planID != nil && * planID != "" {
169192
170193 // Build the cache key
171- cacheKey = strings .Join ([]string {strings . TrimPrefix ( * host , "https://" ) , "plan" , * planID }, "," )
194+ cacheKey = strings .Join ([]string {cacheKey , "plan" , * planID }, "," )
172195
173196 // Try to find credentials from the cache.
174197 creds = internal .CacheGetK8sConfigOutput (cacheKey , "" )
175198
176199 // Otherwise, get the credentials from Duplo.
177200 if creds == nil {
178- client , _ := internal .MustDuploClient (* host , * token , * interactive , true , * port )
201+ client , _ := internal .MustDuploClient (* host , * apiHost , * token , * interactive , true , * port )
179202 result , err := client .AdminGetK8sJitAccess (* planID )
180203 internal .DieIf (err , "failed to get credentials" )
181204 creds = internal .ConvertK8sCreds (result )
@@ -190,11 +213,11 @@ func main() {
190213
191214 // Identify the tenant name to use for the cache key.
192215 var tenantName string
193- client , _ := internal .MustDuploClient (* host , * token , * interactive , false , * port )
216+ client , _ := internal .MustDuploClient (* host , * apiHost , * token , * interactive , false , * port )
194217 * tenantID , tenantName = getTenantIDAndName (* tenantID , client )
195218
196219 // Build the cache key.
197- cacheKey = strings .Join ([]string {strings . TrimPrefix ( * host , "https://" ) , "tenant" , tenantName }, "," )
220+ cacheKey = strings .Join ([]string {cacheKey , "tenant" , tenantName }, "," )
198221
199222 // Try to find credentials from the cache.
200223 creds = internal .CacheGetK8sConfigOutput (cacheKey , tenantName )
0 commit comments