add new template name param

Author: YafimK

builder/upcloud/builder.go

@@ -105,6 +105,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 		StateData: map[string]interface{}{
 			"generated_data":  state.Get("generated_data"),
 			"template_prefix": b.config.TemplatePrefix,
+			"template_name":   b.config.TemplateName,
 		},
 	}
 

builder/upcloud/config.go

@@ -49,11 +49,11 @@ type Config struct {
 	StorageName string `mapstructure:"storage_name"`
 
 	// Optional configuration values
-	TemplatePrefix      string        `mapstructure:"template_prefix"`
-	IsTemplateNameFixed bool          `mapstructure:"is_template_name_fixed"`
-	StorageSize         int           `mapstructure:"storage_size"`
-	Timeout             time.Duration `mapstructure:"state_timeout_duration"`
-	CloneZones          []string      `mapstructure:"clone_zones"`
+	TemplatePrefix string        `mapstructure:"template_prefix"`
+	TemplateName   string        `mapstructure:"template_name"`
+	StorageSize    int           `mapstructure:"storage_size"`
+	Timeout        time.Duration `mapstructure:"state_timeout_duration"`
+	CloneZones     []string      `mapstructure:"clone_zones"`
 
 	RawNetworking []internal.NetworkInterface `mapstructure:"network_interfaces"`
 	Networking    []request.CreateServerInterface
@@ -79,7 +79,7 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 	c.setEnv()
 
 	// defaults
-	if c.TemplatePrefix == "" {
+	if c.TemplatePrefix == "" && len(c.TemplateName) == 0{
 		c.TemplatePrefix = DefaultTemplatePrefix
 	}
 
@@ -153,6 +153,18 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 		)
 	}
 
+	if len(c.TemplateName) > 40 {
+		errs = packer.MultiErrorAppend(
+			errs, errors.New("'template_name' is limited to 40 characters"),
+		)
+	}
+
+	if len(c.TemplatePrefix) > 0 && len(c.TemplateName) > 0 {
+		errs = packer.MultiErrorAppend(
+			errs, errors.New("you can either use 'template_prefix' or 'template_name' in your configuration"),
+		)
+	}
+
 	if errs != nil && len(errs.Errors) > 0 {
 		return nil, errs
 	}

builder/upcloud/config.hcl2spec.go

@@ -71,7 +71,7 @@ type FlatConfig struct {
 	StorageUUID               *string           `mapstructure:"storage_uuid" cty:"storage_uuid"`
 	StorageName               *string           `mapstructure:"storage_name" cty:"storage_name"`
 	TemplatePrefix            *string           `mapstructure:"template_prefix" cty:"template_prefix"`
-	IsTemplateNameFixed       *bool             `mapstructure:"is_template_name_fixed" cty:"is_template_name_fixed"`
+	TemplateName              *string           `mapstructure:"template_name" cty:"template_name"`
 	StorageSize               *int              `mapstructure:"storage_size" cty:"storage_size"`
 	Timeout                   *string           `mapstructure:"state_timeout_duration" cty:"state_timeout_duration"`
 	CloneZones                []string          `mapstructure:"clone_zones" cty:"clone_zones"`
@@ -154,7 +154,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"storage_uuid":                 &hcldec.AttrSpec{Name: "storage_uuid", Type: cty.String, Required: false},
 		"storage_name":                 &hcldec.AttrSpec{Name: "storage_name", Type: cty.String, Required: false},
 		"template_prefix":              &hcldec.AttrSpec{Name: "template_prefix", Type: cty.String, Required: false},
-		"is_template_name_fixed":       &hcldec.AttrSpec{Name: "is_template_name_fixed", Type: cty.Bool, Required: false},
+		"template_name":                &hcldec.AttrSpec{Name: "template_name", Type: cty.String, Required: false},
 		"storage_size":                 &hcldec.AttrSpec{Name: "storage_size", Type: cty.Number, Required: false},
 		"state_timeout_duration":       &hcldec.AttrSpec{Name: "state_timeout_duration", Type: cty.String, Required: false},
 		"clone_zones":                  &hcldec.AttrSpec{Name: "clone_zones", Type: cty.List(cty.String), Required: false},

builder/upcloud/step_create_template.go

@@ -50,19 +50,21 @@ func (s *StepCreateTemplate) Run(_ context.Context, state multistep.StateBag) mu
 	// creating template
 	templates := []*upcloud.Storage{}
 
+	// we either use template name or prefix.
+	var templateTitle string
+	if len(s.Config.TemplatePrefix) > 0 {
+		templateTitle = fmt.Sprintf("%s-%s", s.Config.TemplatePrefix, internal.GetNowString())
+	} else {
+		templateTitle = s.Config.TemplateName
+	}
+
 	for _, uuid := range storageUuids {
 		ui.Say(fmt.Sprintf("Creating template for storage %q...", uuid))
-
-		templateTitle := s.Config.TemplatePrefix
-		if !s.Config.IsTemplateNameFixed {
-			templateTitle = fmt.Sprintf("%s-%s", templateTitle, internal.GetNowString())
-		}
-
 		t, err := driver.CreateTemplate(uuid, templateTitle)
 		if err != nil {
 			return internal.StepHaltWithError(state, err)
 		}
-		
+
 		templates = append(templates, t)
 		ui.Say(fmt.Sprintf("Template for storage %q created...", uuid))
 	}