@@ -207,8 +207,7 @@ defmodule NervesHub.Devices do
207207 { :error , :not_found }
208208
209209 device ->
210- { :ok ,
211- Repo . preload ( device , [ :org , :product , :latest_connection , deployment_group: [ :firmware ] ] ) }
210+ { :ok , Repo . preload ( device , [ :org , :product , :latest_connection , deployment_group: [ :firmware ] ] ) }
212211 end
213212 end
214213
@@ -218,8 +217,7 @@ defmodule NervesHub.Devices do
218217 end
219218
220219 @ spec get_device_by_identifier ( Org . t ( ) , String . t ( ) ) :: { :ok , Device . t ( ) } | { :error , :not_found }
221- def get_device_by_identifier ( org , identifier , preload_assoc \\ nil )
222- when is_binary ( identifier ) do
220+ def get_device_by_identifier ( org , identifier , preload_assoc \\ nil ) when is_binary ( identifier ) do
223221 get_device_by_identifier_query ( org , identifier , preload_assoc )
224222 |> Repo . one ( )
225223 |> case do
@@ -229,8 +227,7 @@ defmodule NervesHub.Devices do
229227 end
230228
231229 @ spec get_device_by_identifier! ( Org . t ( ) , String . t ( ) ) :: Device . t ( )
232- def get_device_by_identifier! ( org , identifier , preload_assoc \\ nil )
233- when is_binary ( identifier ) do
230+ def get_device_by_identifier! ( org , identifier , preload_assoc \\ nil ) when is_binary ( identifier ) do
234231 get_device_by_identifier_query ( org , identifier , preload_assoc )
235232 |> Repo . one! ( )
236233 end
@@ -442,8 +439,7 @@ defmodule NervesHub.Devices do
442439 |> get_device_by_certificate ( )
443440 end
444441
445- def get_device_by_certificate ( % DeviceCertificate { device: % Device { } = device } ) ,
446- do: { :ok , Repo . preload ( device , :org ) }
442+ def get_device_by_certificate ( % DeviceCertificate { device: % Device { } = device } ) , do: { :ok , Repo . preload ( device , :org ) }
447443
448444 def get_device_by_certificate ( _ ) , do: { :error , :not_found }
449445
@@ -522,8 +518,7 @@ defmodule NervesHub.Devices do
522518
523519 @ spec create_ca_certificate_from_x509 ( Org . t ( ) , X509.Certificate . t ( ) , binary ( ) | nil ) ::
524520 { :ok , CACertificate . t ( ) } | { :error , Ecto.Changeset . t ( ) }
525- def create_ca_certificate_from_x509 ( % Org { } = org , otp_cert , description \\ nil )
526- when is_tuple ( otp_cert ) do
521+ def create_ca_certificate_from_x509 ( % Org { } = org , otp_cert , description \\ nil ) when is_tuple ( otp_cert ) do
527522 { not_before , not_after } = Certificate . get_validity ( otp_cert )
528523
529524 params = % {
@@ -624,9 +619,7 @@ defmodule NervesHub.Devices do
624619 DeploymentGroup
625620 |> where ( [ dep ] , dep . product_id == ^ product_id )
626621 |> join ( :inner , [ dep ] , dev in Device , on: dev . deployment_id == dep . id )
627- |> join ( :inner , [ dep , dev ] , f in Firmware ,
628- on: f . uuid == fragment ( "d1.firmware_metadata->>'uuid'" )
629- )
622+ |> join ( :inner , [ dep , dev ] , f in Firmware , on: f . uuid == fragment ( "d1.firmware_metadata->>'uuid'" ) )
630623 # Exclude the current firmware, we don't need to generate that one
631624 |> where ( [ dep , dev , f ] , f . id != dep . firmware_id )
632625 |> select ( [ dep , dev , f ] , { f . id , dep . firmware_id } )
@@ -639,9 +632,7 @@ defmodule NervesHub.Devices do
639632 DeploymentGroup
640633 |> where ( [ dep ] , dep . id == ^ deployment_id )
641634 |> join ( :inner , [ dep ] , dev in Device , on: dev . deployment_id == dep . id )
642- |> join ( :inner , [ dep , dev ] , f in Firmware ,
643- on: f . uuid == fragment ( "d1.firmware_metadata->>'uuid'" )
644- )
635+ |> join ( :inner , [ dep , dev ] , f in Firmware , on: f . uuid == fragment ( "d1.firmware_metadata->>'uuid'" ) )
645636 # Exclude the current firmware, we don't need to generate that one
646637 |> where ( [ dep , dev , f ] , f . id != dep . firmware_id )
647638 |> select ( [ dep , dev , f ] , { f . id , dep . firmware_id } )
@@ -1225,8 +1216,7 @@ defmodule NervesHub.Devices do
12251216 DeploymentGroup . t ( ) | non_neg_integer ( )
12261217 ) ::
12271218 { :ok , % { updated: non_neg_integer ( ) , ignored: non_neg_integer ( ) } }
1228- def move_many_to_deployment_group ( device_ids , deployment_id )
1229- when is_number ( deployment_id ) do
1219+ def move_many_to_deployment_group ( device_ids , deployment_id ) when is_number ( deployment_id ) do
12301220 deployment_group =
12311221 DeploymentGroup |> where ( id: ^ deployment_id ) |> preload ( :firmware ) |> Repo . one ( )
12321222
@@ -1460,9 +1450,7 @@ defmodule NervesHub.Devices do
14601450 Enum . all? ( deployment_group_tags , fn tag -> tag in device_tags end )
14611451 end
14621452
1463- def maybe_copy_firmware_keys ( % { firmware_metadata: % { uuid: uuid } , org_id: source } , % Org {
1464- id: target
1465- } ) do
1453+ def maybe_copy_firmware_keys ( % { firmware_metadata: % { uuid: uuid } , org_id: source } , % Org { id: target } ) do
14661454 existing_target_keys = from ( k in OrgKey , where: [ org_id: ^ target ] , select: k . key )
14671455
14681456 from (
@@ -1541,9 +1529,7 @@ defmodule NervesHub.Devices do
15411529 # Device already has an inflight update, fetch it
15421530 case Repo . get_by ( InflightUpdate , device_id: device_id , deployment_id: deployment_group . id ) do
15431531 nil ->
1544- Logger . error (
1545- "An inflight update could not be created or found for the device (#{ device_id } )"
1546- )
1532+ Logger . error ( "An inflight update could not be created or found for the device (#{ device_id } )" )
15471533
15481534 :error
15491535
@@ -1713,21 +1699,13 @@ defmodule NervesHub.Devices do
17131699 """
17141700 @ spec get_delta_or_firmware_url ( Device . t ( ) , Firmware . t ( ) | DeploymentGroup . t ( ) ) ::
17151701 { :ok , String . t ( ) } | { :error , :failure }
1716- def get_delta_or_firmware_url (
1717- % Device { } = device ,
1718- % DeploymentGroup {
1719- delta_updatable: true ,
1720- firmware: target
1721- }
1722- ) do
1702+ def get_delta_or_firmware_url ( % Device { } = device , % DeploymentGroup { delta_updatable: true , firmware: target } ) do
17231703 get_delta_or_firmware_url ( device , target )
17241704 end
17251705
17261706 def get_delta_or_firmware_url (
17271707 % { firmware_metadata: % { uuid: source_uuid } , product_id: product_id } = device ,
1728- % Firmware {
1729- delta_updatable: true
1730- } = target
1708+ % Firmware { delta_updatable: true } = target
17311709 ) do
17321710 # Get firmware delta URL if available but otherwise deliver full firmware
17331711 with { :delta_updatable , true } <-
@@ -1789,10 +1767,7 @@ defmodule NervesHub.Devices do
17891767 end
17901768 end
17911769
1792- def get_delta_or_firmware_url (
1793- % Device { firmware_metadata: fw_meta } = device ,
1794- % DeploymentGroup { firmware: target } = dg
1795- ) do
1770+ def get_delta_or_firmware_url ( % Device { firmware_metadata: fw_meta } = device , % DeploymentGroup { firmware: target } = dg ) do
17961771 Logger . warning (
17971772 "Delivering full firmware: deltas disabled for deployment group." ,
17981773 device_id: device . id ,
@@ -1804,10 +1779,7 @@ defmodule NervesHub.Devices do
18041779 Firmwares . get_firmware_url ( target )
18051780 end
18061781
1807- def get_delta_or_firmware_url (
1808- % Device { firmware_metadata: fw_meta } = device ,
1809- % Firmware { } = target
1810- ) do
1782+ def get_delta_or_firmware_url ( % Device { firmware_metadata: fw_meta } = device , % Firmware { } = target ) do
18111783 Logger . warning (
18121784 "Delivering full firmware: deltas disabled for firmware." ,
18131785 device_id: device . id ,
0 commit comments