kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 10:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

api: safely access legacy MBits field

Browse Source
This commit is contained in:
Seth Hoenig
2020-09-16 12:35:51 -05:00
parent 7d1f294baf
commit d5a422e320
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/resources.go
View File

@@ -111,6 +111,17 @@ type NetworkResource struct {
MBits *int `hcl:"mbits,optional"`
}
// COMPAT(0.13)
// XXX Deprecated. Please do not use. The method will be removed in Nomad
// 0.13 and is only being kept to allow any references to be removed before
// then.
func (n *NetworkResource) Megabits() int {
if n == nil || n.MBits == nil {
return 0
}
return *n.MBits
}
func (n *NetworkResource) Canonicalize() {
// COMPAT(0.13)
// Noop to maintain backwards compatibility

2
command/agent/job_endpoint.go
View File

@@ -1211,7 +1211,7 @@ func ApiNetworkResourceToStructs(in []*api.NetworkResource) []*structs.NetworkRe
Mode: nw.Mode,
CIDR: nw.CIDR,
IP: nw.IP,
MBits: *nw.MBits,
MBits: nw.Megabits(),
}
if nw.DNS != nil {

11
vendor/github.com/hashicorp/nomad/api/resources.go generated vendored
View File

@@ -111,6 +111,17 @@ type NetworkResource struct {
MBits *int `hcl:"mbits,optional"`
}
// COMPAT(0.13)
// XXX Deprecated. Please do not use. The method will be removed in Nomad
// 0.13 and is only being kept to allow any references to be removed before
// then.
func (n *NetworkResource) Megabits() int {
if n == nil || n.MBits == nil {
return 0
}
return *n.MBits
}
func (n *NetworkResource) Canonicalize() {
// COMPAT(0.13)
// Noop to maintain backwards compatibility