build: update Nomad dependency to 1.9.0

CHANGELOG.md

@@ -1,7 +1,11 @@
 ## UNRELEASED
 
+BREAKING CHANGES:
+* template: HCL1 parsing has been removed and is no longer available [[GH-581](https://github.com/hashicorp/nomad-pack/pull/581)]
+
 IMPROVEMENTS:
 * build: Update Go version to 1.23.2 [[GH-580](https://github.com/hashicorp/nomad-pack/pull/580)]
+* deps: Update Nomad version to 1.9.0 [[GH-581](https://github.com/hashicorp/nomad-pack/pull/581)]
 
 BUG FIXES:
 * cli: Update references to `hello-world` pack in command help text to `hello_world` [[GH-523](https://github.com/hashicorp/nomad-pack/pull/523)]

internal/cli/helpers.go

@@ -192,7 +192,7 @@ func renderVariableOverrideFile(
 // between layers.
 // Uses open api client to parse rendered hcl templates to
 // open api jobs to send to nomad
-func parseJob(cmd *baseCommand, hcl string, hclV1 bool, errCtx *errors.UIErrorContext) (*api.Job, error) {
+func parseJob(cmd *baseCommand, hcl string, errCtx *errors.UIErrorContext) (*api.Job, error) {
 	// instantiate client to parse hcl
 	c, err := cmd.getAPIClient()
 	if err != nil {
@@ -202,7 +202,6 @@ func parseJob(cmd *baseCommand, hcl string, hclV1 bool, errCtx *errors.UIErrorCo
 
 	parsedJob, err := c.Jobs().ParseHCLOpts(&api.JobsParseRequest{
 		JobHCL:       hcl,
-		HCLv1:        hclV1,
 		Canonicalize: true,
 	})
 	if err != nil {

internal/cli/plan.go

@@ -189,13 +189,6 @@ func (c *PlanCommand) Flags() *flag.Sets {
 					Sentinel policies.`,
 		})
 
-		f.BoolVar(&flag.BoolVar{
-			Name:    "hcl1",
-			Target:  &c.jobConfig.PlanConfig.HCL1,
-			Default: false,
-			Usage:   `If set, HCL1 parser is used for parsing the job spec.`,
-		})
-
 		f.BoolVarP(&flag.BoolVarP{
 			BoolVar: &flag.BoolVar{
 				Name:    "verbose",

internal/cli/run.go

@@ -262,14 +262,6 @@ func (c *RunCommand) Flags() *flag.Sets {
 					when updating a job.`,
 		})
 
-		f.BoolVar(&flag.BoolVar{
-			Name:    "hcl1",
-			Target:  &c.jobConfig.RunConfig.HCL1,
-			Default: false,
-			Usage: `If set, the hcl V1 parser will be used to parse the job
-					file.`,
-		})
-
 		f.BoolVar(&flag.BoolVar{
 			Name:    "rollback",
 			Hidden:  true,

internal/cli/stop.go

@@ -113,9 +113,8 @@ func (c *StopCommand) Run(args []string) int {
 			tplErrorContext.Add(errors.UIContextPrefixTemplateName, tplName)
 
 			// get job struct from template
-			// TODO: Should we add an hcl1 flag?
 			var job *api.Job
-			job, err = parseJob(c.baseCommand, tpl, false, tplErrorContext)
+			job, err = parseJob(c.baseCommand, tpl, tplErrorContext)
 			if err != nil {
 				// err output is handled by parseJob
 				return 1

internal/cli/testhelper/testhelper.go

@@ -270,7 +270,6 @@ func NomadRun(s *agent.TestAgent, path string) error {
 	// Parse into JSON Jobspec
 	j, err := c.Jobs().ParseHCLOpts(&api.JobsParseRequest{
 		JobHCL:       string(jB),
-		HCLv1:        false,
 		Canonicalize: true,
 	})
 	if err != nil {

internal/runner/job/cli.go

@@ -19,15 +19,13 @@ type RunCLIConfig struct {
 	VaultToken      string
 	VaultNamespace  string
 	EnableRollback  bool
-	HCL1            bool
 	PreserveCounts  bool
 	PolicyOverride  bool
 }
 
 // PlanCLIConfig specifies the configuration that is used by the Nomad Pack
 // plan command.
 type PlanCLIConfig struct {
-	HCL1           bool
 	PolicyOverride bool
 	Verbose        bool
 	Diff           bool

internal/runner/job/job.go

@@ -107,17 +107,10 @@ func (r *Runner) Deploy(ui terminal.UI, errorContext *errors.UIErrorContext) *er
 		tplErrorContext := errorContext.Copy()
 		tplErrorContext.Add(errors.UIContextPrefixTemplateName, tplName)
 
-		templateFormat := func() string {
-			if r.cfg.RunConfig.HCL1 {
-				return "hcl1"
-			}
-			return "hcl2"
-		}()
-
 		// submit the source of the job to Nomad, too
 		submission := &api.JobSubmission{
 			Source: r.rawTemplates[tplName],
-			Format: templateFormat,
+			Format: "hcl2",
 		}
 
 		registerOpts := api.RegisterOptions{
@@ -260,7 +253,6 @@ func (r *Runner) ParseTemplates() []*errors.WrappedUIContext {
 
 		ncJob, err := r.client.Jobs().ParseHCLOpts(&api.JobsParseRequest{
 			JobHCL:       tpl,
-			HCLv1:        r.cfg.RunConfig.HCL1,
 			Canonicalize: false,
 		})
 		if err != nil {
@@ -273,7 +265,6 @@ func (r *Runner) ParseTemplates() []*errors.WrappedUIContext {
 
 		job, err := r.client.Jobs().ParseHCLOpts(&api.JobsParseRequest{
 			JobHCL:       tpl,
-			HCLv1:        r.cfg.RunConfig.HCL1,
 			Canonicalize: true,
 		})
 		if err != nil {