Skip to content

Commit f86914e

Browse files
Add support for public/private host, cleanup summarize view (#363)
1 parent 1516c5c commit f86914e

File tree

1 file changed

+22
-6
lines changed

1 file changed

+22
-6
lines changed

cmd/printer/database.go

+22-6
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ func DatabaseList(databases []govultr.Database, meta *govultr.Meta) { //nolint:
7272
display(columns{"TAG", databases[d].Tag})
7373
display(columns{"DB NAME", databases[d].DBName})
7474
display(columns{"HOST", databases[d].Host})
75+
76+
if databases[d].PublicHost != "" {
77+
display(columns{"PUBLIC HOST", databases[d].PublicHost})
78+
}
79+
7580
display(columns{"USER", databases[d].User})
7681
display(columns{"PASSWORD", databases[d].Password})
7782
display(columns{"PORT", databases[d].Port})
@@ -129,6 +134,11 @@ func DatabaseList(databases []govultr.Database, meta *govultr.Meta) { //nolint:
129134
display(columns{"TAG", databases[d].ReadReplicas[r].Tag})
130135
display(columns{"DB NAME", databases[d].ReadReplicas[r].DBName})
131136
display(columns{"HOST", databases[d].ReadReplicas[r].Host})
137+
138+
if databases[d].ReadReplicas[r].PublicHost != "" {
139+
display(columns{"PUBLIC HOST", databases[d].ReadReplicas[r].PublicHost})
140+
}
141+
132142
display(columns{"USER", databases[d].ReadReplicas[r].User})
133143
display(columns{"PASSWORD", databases[d].ReadReplicas[r].Password})
134144
display(columns{"PORT", databases[d].ReadReplicas[r].Port})
@@ -178,10 +188,10 @@ func DatabaseList(databases []govultr.Database, meta *govultr.Meta) { //nolint:
178188
func DatabaseListSummary(databases []govultr.Database, meta *govultr.Meta) {
179189
defer flush()
180190

181-
display(columns{"ID", "REGION", "LABEL", "STATUS", "ENGINE", "VERSION", "HOST", "PORT", "USER", "PASSWORD"})
191+
display(columns{"ID", "REGION", "LABEL", "STATUS", "ENGINE", "VERSION"})
182192

183193
if len(databases) == 0 {
184-
display(columns{"---", "---", "---", "---", "---", "---", "---", "---", "---", "---"})
194+
display(columns{"---", "---", "---", "---", "---", "---"})
185195
MetaDBaaS(meta)
186196
return
187197
}
@@ -194,10 +204,6 @@ func DatabaseListSummary(databases []govultr.Database, meta *govultr.Meta) {
194204
databases[i].Status,
195205
databases[i].DatabaseEngine,
196206
databases[i].DatabaseEngineVersion,
197-
databases[i].Host,
198-
databases[i].Port,
199-
databases[i].User,
200-
databases[i].Password,
201207
})
202208
}
203209

@@ -224,6 +230,11 @@ func Database(database *govultr.Database) { //nolint: funlen,gocyclo
224230
display(columns{"TAG", database.Tag})
225231
display(columns{"DB NAME", database.DBName})
226232
display(columns{"HOST", database.Host})
233+
234+
if database.PublicHost != "" {
235+
display(columns{"PUBLIC HOST", database.PublicHost})
236+
}
237+
227238
display(columns{"USER", database.User})
228239
display(columns{"PASSWORD", database.Password})
229240
display(columns{"PORT", database.Port})
@@ -281,6 +292,11 @@ func Database(database *govultr.Database) { //nolint: funlen,gocyclo
281292
display(columns{"TAG", database.ReadReplicas[r].Tag})
282293
display(columns{"DB NAME", database.ReadReplicas[r].DBName})
283294
display(columns{"HOST", database.ReadReplicas[r].Host})
295+
296+
if database.ReadReplicas[r].PublicHost != "" {
297+
display(columns{"PUBLIC HOST", database.ReadReplicas[r].PublicHost})
298+
}
299+
284300
display(columns{"USER", database.ReadReplicas[r].User})
285301
display(columns{"PASSWORD", database.ReadReplicas[r].Password})
286302
display(columns{"PORT", database.ReadReplicas[r].Port})

0 commit comments

Comments
 (0)