Report fwup version to nerves hub #44
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Why: * NH needs to know the fwup version to make decisions about delta updates * Resolves Issue nerves-hub#43 This change addresses the need by: * Grab fwup version when creating config * Add fwup version to config params * Add a spec to check that fwup version key is present
|
@mobileoverlord @fhunleth let me know what you guys think about this. The test is pretty naive and would fail in a testing env without fwup installed so that's a downside but the tradeoff of extracting a module and creating a mock for this didn't really seem worth it. |
fhunleth
approved these changes
Aug 31, 2020
|
IMHO, fwup should be installed everywhere, so I think we should just view that as a given. ;) |
fhunleth
reviewed
Aug 31, 2020
lib/nerves_hub_link/configurator.ex
Outdated
| @@ -48,7 +48,9 @@ defmodule NervesHubLink.Configurator do | |||
| |> Keyword.put_new(:verify, :verify_peer) | |||
| |> Keyword.put_new(:server_name_indication, to_charlist(base.device_api_sni)) | |||
|
|
|||
| %{base | params: Nerves.Runtime.KV.get_all_active(), socket: socket, ssl: ssl} | |||
| params = Map.put(Nerves.Runtime.KV.get_all_active(), "nerves_fw_fwup_version", fwup_version()) | |||
There was a problem hiding this comment.
Suggested change
| params = Map.put(Nerves.Runtime.KV.get_all_active(), "nerves_fw_fwup_version", fwup_version()) | |
| params = Map.put(Nerves.Runtime.KV.get_all_active(), "fwup_version", fwup_version()) |
I'm not sure that the nerves_fw_ prefix matters here. My preference would be to drop it, but I don't feel strongly about it.
jjcarstens
reviewed
Aug 31, 2020
lib/nerves_hub_link/configurator.ex
Outdated
|
|
||
| defp fwup_version do | ||
| {version_string, 0} = System.cmd("fwup", ["--version"]) | ||
| version_string |> String.trim() |
There was a problem hiding this comment.
Suggested change
| version_string |> String.trim() | |
| String.trim(version_string) |
piping for a short call might be unnecessary
Why: * We don't need to prefix data unnecessarily * We don't need to pipe simple transformations This change addresses the need by: * Remove nerves_fw prefix * Don't pipe
Mrjaco12
added a commit
to verypossible/nerves_hub_web
that referenced
this pull request
Aug 31, 2020
Why: * We want to appropriately capture fwup version from devices * We want to match the way fwup version sent from: * nerves-hub/nerves_hub_link#44 * nerves-hub/nerves_hub_link_http#6 This change addresses the need by: * Update the matching string for fwup_version in the various functions that check conn/channel
fhunleth
approved these changes
Aug 31, 2020
jjcarstens
approved these changes
Aug 31, 2020
mobileoverlord
approved these changes
Sep 1, 2020
mobileoverlord
pushed a commit
to nerves-hub/nerves_hub_web
that referenced
this pull request
Sep 17, 2020
Why: * We want to appropriately capture fwup version from devices * We want to match the way fwup version sent from: * nerves-hub/nerves_hub_link#44 * nerves-hub/nerves_hub_link_http#6 This change addresses the need by: * Update the matching string for fwup_version in the various functions that check conn/channel
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why:
This change addresses the need by: