move generate func

ryota-sakamoto · Jun 16, 2024 · a9236c8 · a9236c8
1 parent cce66d7
commit a9236c8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pkg/cloudinit/generator.go b/pkg/cloudinit/generator.go
@@ -19,7 +19,7 @@ type WriteFile struct {
 	Permissions string `yaml:"permissions,omitempty"`
 }
 
-func Generate(c Config, vars map[string]string) (string, error) {
+func (c *Config) Generate(vars map[string]string) (string, error) {
 	buff := &bytes.Buffer{}
 	if err := yaml.NewEncoder(buff).Encode(c); err != nil {
 		return "", err

diff --git a/pkg/cloudinit/generator_test.go b/pkg/cloudinit/generator_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func TestGenerate(t *testing.T) {
-	result, err := cloudinit.Generate(cloudinit.Config{
+	result, err := (&cloudinit.Config{
 		Packages: []string{
 			"git",
 			"vim",
@@ -28,7 +28,7 @@ func TestGenerate(t *testing.T) {
 		RunCmds: []string{
 			"/use/bin/ok",
 		},
-	}, map[string]string{
+	}).Generate(map[string]string{
 		"Content": "content",
 	})
 	assert.NoError(t, err)

diff --git a/pkg/provisioner/instance.go b/pkg/provisioner/instance.go
@@ -26,7 +26,7 @@ func LaunchInstance(clusterName string, config InstanceConfig, cloudinitConfig c
 		return "", fmt.Errorf("instance already exists: %s", instanceName)
 	}
 
-	template, err := cloudinit.Generate(cloudinitConfig, map[string]string{
+	template, err := cloudinitConfig.Generate(map[string]string{
 		"KubernetesVersion": config.K8sVersion,
 		"Arch":              "amd64",
 	})