From e194cb75f3a7921e40090bd70798a4f353dfa602 Mon Sep 17 00:00:00 2001
From: JonasS <jonass@dev.jsje.de>
Date: Tue, 6 Dec 2022 17:51:01 +0100
Subject: [PATCH] refactor: Follow go naming convention, extract user-data
logic to function
---
driver.go | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/driver.go b/driver.go
index 1fcc7c8..7e077ae 100644
--- a/driver.go
+++ b/driver.go
@@ -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)
- if err != nil {
- return nil, err
- }
- UserData = string(readUserData)
+ userData, err := d.getUserData()
+ if err != nil {
+ return nil, err
}
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 {
--
GitLab