Skip to content

Commit

Permalink
provider: update Nomad dependency to 1.9.0 (#483)
Browse files Browse the repository at this point in the history
Nomad 1.9 removed support for hcl1. In order to update the Nomad
dependency, we too need to remove support as the package no longer
exists.

The change also removes the deprecated hcl2.enabled configuration
flag.
  • Loading branch information
jrasell authored Oct 15, 2024
1 parent 64b8be9 commit 1960711
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 221 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
## 2.4.0 (Unreleased)

BREAKING CHANGES:
* resource/nomad_job: HCL1 parsing has been removed and is no longer available ([#483](https://github.com/hashicorp/terraform-provider-nomad/pull/483))
* resource/nomad_job: The previously deprecated `hcl2.enabled` parameter has been removed ([#483](https://github.com/hashicorp/terraform-provider-nomad/pull/483))

IMPROVEMENTS:
* provider: update Go to 1.23.2 ([#482](https://github.com/hashicorp/terraform-provider-nomad/pull/482))
* provider: update Nomad to 1.9.0 ([#483](https://github.com/hashicorp/terraform-provider-nomad/pull/483))

## 2.3.1 (August 13, 2024)

Expand Down
29 changes: 13 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.23
replace (
// Fix error tidying due to Nomad downstream dependencies and the recent
// migration of the metrics library.
github.com/armon/go-metrics => github.com/hashicorp/go-metrics v0.5.3
github.com/armon/go-metrics => github.com/hashicorp/go-metrics v0.0.0-20230509193637-d9ca9af9f1f9
// Set to the version used by Nomad
// https://github.com/hashicorp/nomad/blob/v1.6.0-rc.1/go.mod#L74
github.com/hashicorp/hcl/v2 => github.com/hashicorp/hcl/v2 v2.9.2-0.20220525143345-ab3cae0737bc
Expand All @@ -18,13 +18,13 @@ require (
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-version v1.7.0
github.com/hashicorp/nomad v1.8.0
github.com/hashicorp/nomad/api v0.0.0-20240813123601-b34a6fe10b82
github.com/hashicorp/nomad v1.9.0
github.com/hashicorp/nomad/api v0.0.0-20241010071343-7ad36851ec02
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
github.com/hashicorp/vault/api v1.14.0
github.com/shoenig/test v1.11.0
github.com/stretchr/testify v1.9.0
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
)

require (
Expand All @@ -36,32 +36,30 @@ require (
github.com/bmatcuk/doublestar v1.1.5 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fatih/color v1.17.0 // indirect
github.com/go-test/deep v1.1.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/hashicorp/consul/api v1.27.0 // indirect
github.com/hashicorp/cronexpr v1.1.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840 // indirect
github.com/hashicorp/go-hclog v1.6.3 // indirect
github.com/hashicorp/go-plugin v1.6.0 // indirect
github.com/hashicorp/go-plugin v1.6.1 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/hc-install v0.6.4 // indirect
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
github.com/hashicorp/hcl/v2 v2.20.1 // indirect
github.com/hashicorp/hcl/v2 v2.20.2-0.20240517235513-55d9c02d147d // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-exec v0.21.0 // indirect
github.com/hashicorp/terraform-json v0.22.1 // indirect
github.com/hashicorp/terraform-plugin-go v0.23.0 // indirect
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/hashicorp/yamux v0.1.2 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand All @@ -73,21 +71,20 @@ require (
github.com/natefinch/atomic v1.0.1 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/zclconf/go-cty v1.14.4 // indirect
github.com/zclconf/go-cty-yaml v1.0.3 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/text v0.18.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.34.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 1960711

Please sign in to comment.