Code

Resolve Merge Conflicts With Upstream#74

Code

Merged

dmccoystephenson merged 31 commits intodevelopCDOT-CV/jpo-cvmanager:developfrom merge_wydot_firmware_managerCDOT-CV/jpo-cvmanager:merge_wydot_firmware_managerCopy head branch name to clipboardJun 5, 2024

+1,163-517

Commits

Commits on Feb 2, 2024

• Merge pull request #10 from CDOT-CV/develop

  Show description for fcdebe2
  drewjj

  authored
  fcdebe2

  Copy full SHA for fcdebe2

Commits on Feb 26, 2024

• Merge pull request #12 from usdot-jpo-ode/candidate_r1

  Show description for 06f0caa
  dan-du-car

  authored
  06f0caa

  Copy full SHA for 06f0caa

Commits on Feb 28, 2024

• Merge pull request #13 from usdot-jpo-ode/master

  Show description for cc2d1f1
  dan-du-car

  authored
  cc2d1f1

  Copy full SHA for cc2d1f1

Commits on Mar 26, 2024

• Added support for storing ISS keys in postgres database

  dmccoystephenson

  committed
  a969604

  Copy full SHA for a969604

• Updated test_iss_token.py to account for new env var

  dmccoystephenson

  committed
  6fa9485

  Copy full SHA for 6fa9485

• Implemented unit tests for postgres ISS key storage

  dmccoystephenson

  committed
  d3a3193

  Copy full SHA for d3a3193

• Updated ISS Health Check README to include postgres storage info

  dmccoystephenson

  committed
  090e8d2

  Copy full SHA for 090e8d2

• Modified 'About' section in ISS Health Check README

  dmccoystephenson

  committed
  9ac4d8e

  Copy full SHA for 9ac4d8e

• Modified iss_token.py to exit if STORAGE_TYPE is invalid or unset

  dmccoystephenson

  committed
  43eb3c1

  Copy full SHA for 43eb3c1

• Made STORAGE_TYPE env var for ISS Health Check addon case insensitive

  dmccoystephenson

  committed
  7a80e62

  Copy full SHA for 7a80e62

• Added docker storage support for the Firmware Manager

  dmccoystephenson

  committed
  e16d8a3

  Copy full SHA for e16d8a3

• Improved clarity of documentation for docker firmware storage.

  dmccoystephenson

  committed
  f608bb7

  Copy full SHA for f608bb7

• Printed useful error message upon failure to decode JSON response from ISS.

  dmccoystephenson

  committed
  99a9326

  Copy full SHA for 99a9326

• Added new environment variables to ihc manifest

  dmccoystephenson

  committed
  42dc0d1

  Copy full SHA for 42dc0d1

• Used pytest.raises() instead of try/catch in test_iss_token.py

  dmccoystephenson

  committed
  79852e8

  Copy full SHA for 79852e8

• Updated multidict dependency to 6.0.5 in requirements.txt

  dmccoystephenson

  committed
  97fee13

  Copy full SHA for 97fee13

Commits on Mar 29, 2024

• Merge pull request #8 from Trihydro/requirements/update-multidict-version

  Show description for c534751
  payneBrandon

  authored
  c534751

  Copy full SHA for c534751

Commits on Apr 25, 2024

• Replaced single-line comments with docstrings in download_blob.py

  dmccoystephenson

  committed
  691f8b4

  Copy full SHA for 691f8b4

• Improved clarity of comments in sample.env for firmware_manager

  dmccoystephenson

  committed
  d59f431

  Copy full SHA for d59f431

• Modified upgrader.py to raise an exception if an unsupported blob storage provider is specified

  dmccoystephenson

  committed
  755538b

  Copy full SHA for 755538b

• Added module-specific logger for ISS Health Check addon

  dmccoystephenson

  committed
  5934f84

  Copy full SHA for 5934f84

• Added file type validation checks to download_blob.py

  dmccoystephenson

  committed
  5c4fcf0

  Copy full SHA for 5c4fcf0

• Added validation checks for SCMS data to iss_health_checker.py

  dmccoystephenson

  committed
  1cf0ea8

  Copy full SHA for 1cf0ea8

• Added a comment to explain why the last character is ignored in the insert_scms_data query

  dmccoystephenson

  committed
  da7a4ba

  Copy full SHA for da7a4ba

• Created RsuDataWrapper class in iss_health_checker.py to improve clarity

  dmccoystephenson

  committed
  ec3d455

  Copy full SHA for ec3d455

• Fixed logging configuration setup in iss_health_checker.py

  dmccoystephenson

  committed
  2ca5153

  Copy full SHA for 2ca5153

Commits on Apr 26, 2024

• Merge pull request #10 from Trihydro/pr/addressing-usdot-comments

  Show description for dbee31a
  payneBrandon

  authored
  dbee31a

  Copy full SHA for dbee31a

Commits on Apr 29, 2024

• Merge pull request #15 from Trihydro/dev

  Show description for 79ad929
  dan-du-car

  authored
  79ad929

  Copy full SHA for 79ad929

Commits on Jun 3, 2024

• Merge branch 'develop' into merge_wydot_firmware_manager

  drewjj

  authored
  0bb0535

  Copy full SHA for 0bb0535

• Update firmware manager to support the wydot changes and update tests

  drewjj

  committed
  0f640f5

  Copy full SHA for 0f640f5

Commits on Jun 5, 2024

• Remove duplicate sample env var

  drewjj

  committed
  e0cfd87

  Copy full SHA for e0cfd87