Skip to content
Snippets Groups Projects
Commit e194cb75 authored by JonasS's avatar JonasS
Browse files

refactor: Follow go naming convention, extract user-data logic to function

parent 58349d6f
No related branches found
No related tags found
No related merge requests found
......@@ -3,11 +3,11 @@ package main
import (
"context"
"fmt"
ioutil "io/ioutil"
"net"
"os"
"strings"
"time"
ioutil "io/ioutil"
"github.com/docker/machine/libmachine/drivers"
"github.com/docker/machine/libmachine/log"
......@@ -535,19 +535,14 @@ func (d *Driver) makeCreateServerOptions() (*hcloud.ServerCreateOpts, error) {
return nil, err
}
UserData := d.userData
if d.userDataFromFile == true {
readUserData, err := ioutil.ReadFile(d.userData)
userData, err := d.getUserData()
if err != nil {
return nil, err
}
UserData = string(readUserData)
}
srvopts := hcloud.ServerCreateOpts{
Name: d.GetMachineName(),
UserData: UserData,
UserData: userData,
Labels: d.ServerLabels,
PlacementGroup: pgrp,
}
......@@ -592,6 +587,20 @@ func (d *Driver) makeCreateServerOptions() (*hcloud.ServerCreateOpts, error) {
return &srvopts, nil
}
func (d *Driver) getUserData() (string, error) {
userData := d.userData
if !d.userDataFromFile {
return userData, nil
}
readUserData, err := ioutil.ReadFile(d.userData)
if err != nil {
return "", err
}
return string(readUserData), nil
}
func (d *Driver) setPublicNetIfRequired(srvopts *hcloud.ServerCreateOpts) error {
pip4, err := d.getPrimaryIPv4()
if err != nil {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment