treat ShareDevices like count

Author: tehut

command/agent/job_endpoint.go

@@ -1625,29 +1625,19 @@ func ApiResourcesToStructs(in *api.Resources) *structs.Resources {
 		out.Devices = []*structs.RequestedDevice{}
 
 		for _, d := range in.Devices {
-			//temp
-			var count uint64
-			if d.Count != nil {
-				count = *d.Count
-			}
-
-			out.Devices = append(out.Devices, &structs.RequestedDevice{
-				Name:         d.Name,
-				Count:        count,
-				Constraints:  ApiConstraintsToStructs(d.Constraints),
-				Affinities:   ApiAffinitiesToStructs(d.Affinities),
-				ShareDevices: ApiSharingToStructs(d.ShareDevices),
-			})
 			rd := &structs.RequestedDevice{
 				Name:        d.Name,
 				Constraints: ApiConstraintsToStructs(d.Constraints),
 				Affinities:  ApiAffinitiesToStructs(d.Affinities),
 			}
 			// Only set Count if not using FirstAvailable
-			if d.Count != nil {
+			if d.Count != nil && len(d.FirstAvailable) == 0 {
 				rd.Count = *d.Count
 			}
-			// Convert FirstAvailable options
+			if d.ShareDevices != nil && len(d.FirstAvailable) == 0 {
+				rd.ShareDevices = ApiShareDevicesToStructs(d.ShareDevices)
+			}
+			//// Convert FirstAvailable options
 			if len(d.FirstAvailable) > 0 {
 				rd.FirstAvailable = make([]*structs.DeviceOption, len(d.FirstAvailable))
 				for i, opt := range d.FirstAvailable {
@@ -1657,16 +1647,12 @@ func ApiResourcesToStructs(in *api.Resources) *structs.Resources {
 					if opt.Count != nil {
 						rd.FirstAvailable[i].Count = *opt.Count
 					}
+					rd.FirstAvailable[i].Name = opt.Name
+					if opt.ShareDevices != nil {
+						rd.FirstAvailable[i].ShareDevices = ApiShareDevicesToStructs(opt.ShareDevices)
+					}
 				}
 			}
-			//TODO: temp build out make better soon
-			if d.ShareDevices != nil || len(d.FirstAvailable) > 0 {
-				rd.DevicePreferences = &structs.DevicePreferences{FirstAvailable: rd.FirstAvailable}
-			}
-			if d.ShareDevices != nil {
-				rd.DevicePreferences.Enabled = d.ShareDevices.Enabled
-				rd.DevicePreferences.SharedDeviceId = d.ShareDevices.SharedDeviceId
-			}
 			out.Devices = append(out.Devices, rd)
 		}
 	}
@@ -1684,6 +1670,16 @@ func ApiResourcesToStructs(in *api.Resources) *structs.Resources {
 
 	return out
 }
+func ApiShareDevicesToStructs(in *api.ShareDevices) *structs.ShareDevices {
+	if in == nil {
+		return nil
+	}
+	return &structs.ShareDevices{
+		Enabled:        in.Enabled,
+		SharedDeviceId: in.SharedDeviceId,
+	}
+
+}
 
 func ApiNetworkResourceToStructs(in []*api.NetworkResource) []*structs.NetworkResource {
 	var out []*structs.NetworkResource
@@ -2367,14 +2363,3 @@ func validateEvalPriorityOpt(priority int) HTTPCodedError {
 	}
 	return nil
 }
-
-func ApiSharingToStructs(in *api.ShareDevices) *structs.ShareDevices {
-	if in == nil {
-		return nil
-	}
-	return &structs.ShareDevices{
-		Enabled:        in.Enabled,
-		SharedDeviceId: in.SharedDeviceId,
-	}
-
-}