Skip to content

Commit b7917cd

Browse files
JonasProgrammerJonasProgrammer
committed
Make more data public (#64)
1 parent 2a5e413 commit b7917cd

File tree

2 files changed

+20
-26
lines changed

2 files changed

+20
-26
lines changed

‎driver.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ type Driver struct {
3737
originalKey string
3838
danglingKeys []*hcloud.SSHKey
3939
ServerID int
40+
cachedServer *hcloud.Server
4041
userData string
41-
volumes []string
42-
networks []string
42+
Volumes []string
43+
Networks []string
4344
UsePrivateNetwork bool
44-
firewalls []string
45-
cachedServer *hcloud.Server
46-
serverLabels map[string]string
45+
Firewalls []string
46+
ServerLabels map[string]string
4747

48-
additionalKeys []string
48+
AdditionalKeys []string
4949
AdditionalKeyIDs []int
5050
cachedAdditionalKeys []*hcloud.SSHKey
5151
}
@@ -184,11 +184,11 @@ func (d *Driver) SetConfigFromFlags(opts drivers.DriverOptions) error {
184184
d.IsExistingKey = d.KeyID != 0
185185
d.originalKey = opts.String(flagExKeyPath)
186186
d.userData = opts.String(flagUserData)
187-
d.volumes = opts.StringSlice(flagVolumes)
188-
d.networks = opts.StringSlice(flagNetworks)
187+
d.Volumes = opts.StringSlice(flagVolumes)
188+
d.Networks = opts.StringSlice(flagNetworks)
189189
d.UsePrivateNetwork = opts.Bool(flagUsePrivateNetwork)
190-
d.firewalls = opts.StringSlice(flagFirewalls)
191-
d.additionalKeys = opts.StringSlice(flagAdditionalKeys)
190+
d.Firewalls = opts.StringSlice(flagFirewalls)
191+
d.AdditionalKeys = opts.StringSlice(flagAdditionalKeys)
192192

193193
err := d.setLabelsFromFlags(opts)
194194
if err != nil {
@@ -209,13 +209,13 @@ func (d *Driver) SetConfigFromFlags(opts drivers.DriverOptions) error {
209209
}
210210

211211
func (d *Driver) setLabelsFromFlags(opts drivers.DriverOptions) error {
212-
d.serverLabels = make(map[string]string)
212+
d.ServerLabels = make(map[string]string)
213213
for _, label := range opts.StringSlice(flagServerLabel) {
214214
split := strings.SplitN(label, "=", 2)
215215
if len(split) != 2 {
216216
return errors.Errorf("server label %v is not in key=value format", label)
217217
}
218-
d.serverLabels[split[0]] = split[1]
218+
d.ServerLabels[split[0]] = split[1]
219219
}
220220
return nil
221221
}
@@ -260,7 +260,7 @@ func (d *Driver) PreCreateCheck() error {
260260
return errors.Wrap(err, "could not get location")
261261
}
262262

263-
if d.UsePrivateNetwork && len(d.networks) == 0 {
263+
if d.UsePrivateNetwork && len(d.Networks) == 0 {
264264
return errors.Errorf("No private network attached.")
265265
}
266266

@@ -307,7 +307,7 @@ func (d *Driver) Create() error {
307307

308308
d.KeyID = key.ID
309309
}
310-
for i, pubkey := range d.additionalKeys {
310+
for i, pubkey := range d.AdditionalKeys {
311311
key, err := d.getRemoteKeyWithSameFingerprint([]byte(pubkey))
312312
if err != nil {
313313
return errors.Wrapf(err, "error checking for existing key for %v", pubkey)
@@ -334,11 +334,11 @@ func (d *Driver) Create() error {
334334
srvopts := hcloud.ServerCreateOpts{
335335
Name: d.GetMachineName(),
336336
UserData: d.userData,
337-
Labels: d.serverLabels,
337+
Labels: d.ServerLabels,
338338
}
339339

340340
networks := []*hcloud.Network{}
341-
for _, networkIDorName := range d.networks {
341+
for _, networkIDorName := range d.Networks {
342342
network, _, err := d.getClient().Network.Get(context.Background(), networkIDorName)
343343
if err != nil {
344344
return errors.Wrap(err, "could not get network by ID or name")
@@ -351,7 +351,7 @@ func (d *Driver) Create() error {
351351
srvopts.Networks = networks
352352

353353
firewalls := []*hcloud.ServerCreateFirewall{}
354-
for _, firewallIDorName := range d.firewalls {
354+
for _, firewallIDorName := range d.Firewalls {
355355
firewall, _, err := d.getClient().Firewall.Get(context.Background(), firewallIDorName)
356356
if err != nil {
357357
return errors.Wrap(err, "could not get firewall by ID or name")
@@ -364,7 +364,7 @@ func (d *Driver) Create() error {
364364
srvopts.Firewalls = firewalls
365365

366366
volumes := []*hcloud.Volume{}
367-
for _, volumeIDorName := range d.volumes {
367+
for _, volumeIDorName := range d.Volumes {
368368
volume, _, err := d.getClient().Volume.Get(context.Background(), volumeIDorName)
369369
if err != nil {
370370
return errors.Wrap(err, "could not get volume by ID or name")

‎go.sum

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,10 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
55
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
66
github.com/docker/docker v0.0.0-20181018193557-f7e5154f37a4 h1:u7P9ul4ElF92ZjxTwdWBgrXAMWXCLLfgceq4hdAMcE4=
77
github.com/docker/docker v0.0.0-20181018193557-f7e5154f37a4/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
8-
github.com/docker/machine v0.16.1 h1:zrgroZounGVkxLmBqMyc1uT2GgapXVjIWHCfBf0udrA=
9-
github.com/docker/machine v0.16.1/go.mod h1:I8mPNDeK1uH+JTcUU7X0ZW8KiYz0jyAgNaeSJ1rCfDI=
108
github.com/docker/machine v0.16.2 h1:jyF9k3Zg+oIGxxSdYKPScyj3HqFZ6FjgA/3sblcASiU=
119
github.com/docker/machine v0.16.2/go.mod h1:I8mPNDeK1uH+JTcUU7X0ZW8KiYz0jyAgNaeSJ1rCfDI=
12-
github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
13-
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
10+
github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
1411
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
15-
github.com/hetznercloud/hcloud-go v1.14.0 h1:6IdF0Vox/6j1pyEdUCbFPIzEH/K9xZZzVuSFro8Y2vw=
16-
github.com/hetznercloud/hcloud-go v1.14.0/go.mod h1:8lR3yHBHZWy2uGcUi9Ibt4UOoop2wrVdERJgCtxsF3Q=
17-
github.com/hetznercloud/hcloud-go v1.17.0 h1:IKH0GLLoTEfgMuBY+GaaVTwjYChecrHFVo4/t0sIkGU=
18-
github.com/hetznercloud/hcloud-go v1.17.0/go.mod h1:8lR3yHBHZWy2uGcUi9Ibt4UOoop2wrVdERJgCtxsF3Q=
1912
github.com/hetznercloud/hcloud-go v1.24.0 h1:/CeHDzhH3Fhm83pjxvE3xNNLbvACl0Lu1/auJ83gG5U=
2013
github.com/hetznercloud/hcloud-go v1.24.0/go.mod h1:3YmyK8yaZZ48syie6xpm3dt26rtB6s65AisBHylXYFA=
2114
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
@@ -44,6 +37,7 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
4437
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb h1:fgwFCsaw9buMuxNd6+DQfAuSFqbNiQZpcgJQAgJsK6k=
4538
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4639
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
40+
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
4741
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
4842
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
4943
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=

0 commit comments

Comments
 (0)