api: safely access legacy MBits field

hashicorp · Sep 16, 2020 · cf3af87 · cf3af87
1 parent f950643
commit cf3af87
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/api/resources.go b/api/resources.go
@@ -111,6 +111,17 @@ type NetworkResource struct {
 	MBits *int
 }
 
+// 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

diff --git a/command/agent/job_endpoint.go b/command/agent/job_endpoint.go
@@ -1193,7 +1193,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 {

diff --git a/vendor/github.com/hashicorp/nomad/api/resources.go b/vendor/github.com/hashicorp/nomad/api/resources.go