Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade terraform-provider-nomad to v2.1.0 #220

Closed
wants to merge 3 commits into from
Closed

Upgrade terraform-provider-nomad to v2.1.0 #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
548ecc1
make tfgen
iwahbe Jan 19, 2024
f31b37e
make build_sdks
iwahbe Jan 19, 2024
18cf73a
Fix license issue
iwahbe Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion provider/cmd/pulumi-resource-nomad/bridge-metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,8 @@
},
"nomad:index/aclAuthMethod:AclAuthMethod": {
"maxTokenTtl": "max_token_ttl",
"tokenLocality": "token_locality"
"tokenLocality": "token_locality",
"tokenNameFormat": "token_name_format"
},
"nomad:index/aclBindingRule:AclBindingRule": {
"authMethod": "auth_method",
Expand All @@ -737,11 +738,14 @@
"nomad:index/csiVolume:CsiVolume": {
"capabilities": "capability",
"capacityMax": "capacity_max",
"capacityMaxBytes": "capacity_max_bytes",
"capacityMin": "capacity_min",
"capacityMinBytes": "capacity_min_bytes",
"cloneId": "clone_id",
"controllerRequired": "controller_required",
"controllersExpected": "controllers_expected",
"controllersHealthy": "controllers_healthy",
"externalId": "external_id",
"mountOptions": "mount_options",
"nodesExpected": "nodes_expected",
"nodesHealthy": "nodes_healthy",
Expand All @@ -754,6 +758,10 @@
},
"nomad:index/csiVolumeRegistration:CsiVolumeRegistration": {
"capabilities": "capability",
"capacityMax": "capacity_max",
"capacityMaxBytes": "capacity_max_bytes",
"capacityMin": "capacity_min",
"capacityMinBytes": "capacity_min_bytes",
"controllerRequired": "controller_required",
"controllersExpected": "controllers_expected",
"controllersHealthy": "controllers_healthy",
Expand Down Expand Up @@ -919,6 +927,7 @@
"policyOverride": "policy_override",
"purgeOnDestroy": "purge_on_destroy",
"readAllocationIds": "read_allocation_ids",
"rerunIfDead": "rerun_if_dead",
"taskGroups": "task_groups",
"vaultToken": "vault_token"
},
Expand Down
124 changes: 113 additions & 11 deletions provider/cmd/pulumi-resource-nomad/schema.json
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 17 additions & 11 deletions provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@ replace (
// pin the vault dep
github.com/hashicorp/vault => github.com/hashicorp/vault v1.2.0
github.com/spf13/afero => github.com/spf13/afero v1.2.2

// github.com/hashicorp/nomad/helper/pointer is part of the
// github.com/hashicorp/nomad license set, and thus BUSL.
//
// We have written our own version that is not BUSL.
github.com/hashicorp/nomad/helper/pointer => ./pointer
)

require (
github.com/hashicorp/terraform-provider-nomad v1.4.21-0.20230828192727-f173c57d416d
github.com/hashicorp/terraform-provider-nomad v1.4.21-0.20231220152456-9ae51ccf1f3f
github.com/pulumi/pulumi-terraform-bridge/v3 v3.71.0
github.com/pulumi/pulumi/sdk/v3 v3.101.1
)
Expand All @@ -42,7 +48,7 @@ require (
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/semver/v3 v3.2.0 // indirect
Expand Down Expand Up @@ -82,7 +88,7 @@ require (
github.com/cloudflare/circl v1.3.7 // indirect
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/deckarep/golang-set/v2 v2.5.0 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/djherbis/times v1.5.0 // indirect
Expand All @@ -95,6 +101,7 @@ require (
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.11.0 // indirect
github.com/go-jose/go-jose/v3 v3.0.1 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
Expand All @@ -110,7 +117,7 @@ require (
github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
github.com/hashicorp/cronexpr v1.1.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -135,8 +142,8 @@ require (
github.com/hashicorp/hcl/v2 v2.18.0 // indirect
github.com/hashicorp/hil v0.0.0-20210521165536-27a72121fd40 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/nomad v1.6.0 // indirect
github.com/hashicorp/nomad/api v0.0.0-20230718185111-87d411f4e3a6 // indirect
github.com/hashicorp/nomad v1.7.2 // indirect
github.com/hashicorp/nomad/api v0.0.0-20231219145541-859606a54ade // indirect
github.com/hashicorp/terraform-exec v0.19.0 // indirect
github.com/hashicorp/terraform-json v0.17.1 // indirect
github.com/hashicorp/terraform-plugin-go v0.20.0 // indirect
Expand All @@ -145,7 +152,7 @@ require (
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
github.com/hashicorp/vault v0.10.4 // indirect
github.com/hashicorp/vault/api v1.9.1 // indirect
github.com/hashicorp/vault/api v1.10.0 // indirect
github.com/hashicorp/vault/sdk v0.9.0 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
Expand Down Expand Up @@ -186,7 +193,7 @@ require (
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/term v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/posener/complete v1.2.3 // indirect
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
github.com/pulumi/esc v0.6.2 // indirect
Expand Down Expand Up @@ -231,7 +238,7 @@ require (
gocloud.dev v0.27.0 // indirect
gocloud.dev/secrets/hashivault v0.27.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
Expand All @@ -240,7 +247,7 @@ require (
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.15.0 // indirect
golang.org/x/tools v0.16.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.128.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
Expand All @@ -249,7 +256,6 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/grpc v1.60.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/frand v1.4.2 // indirect
Expand Down
Loading
Loading