From bb847814dbc049b7c6204bfe43986e83326b4584 Mon Sep 17 00:00:00 2001 From: megh Date: Thu, 19 Oct 2023 19:58:29 -0600 Subject: [PATCH] Updates changelog and fixes linting and formatting errors --- Changelog.md | 2 +- src/Control/Carrier/ContainerRegistryApi/Authorization.hs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Changelog.md b/Changelog.md index 3b7a855050..cd80d8c442 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,7 +4,7 @@ - golang: Updates go.mod parser to be compatible with golang v1.21. ([#1304](https://github.com/fossas/fossa-cli/pull/1304)) - `fossa list-targets`: list-target command supports `--format` option with: `ndjson`, `text`, and `legacy`. ([#1296](https://github.com/fossas/fossa-cli/pull/1296)) -- container scanning: fixes transaction errors due to redirection ([]()) +- container scanning: Fixes a network error defect, when interacting with container registry redirects. ([#1308](https://github.com/fossas/fossa-cli/pull/1308/)) ## v3.8.17 diff --git a/src/Control/Carrier/ContainerRegistryApi/Authorization.hs b/src/Control/Carrier/ContainerRegistryApi/Authorization.hs index 693770bfa7..eaa7da8bdf 100644 --- a/src/Control/Carrier/ContainerRegistryApi/Authorization.hs +++ b/src/Control/Carrier/ContainerRegistryApi/Authorization.hs @@ -33,20 +33,20 @@ import Data.Aeson (FromJSON (parseJSON), decode', eitherDecode, withObject, (.:) import Data.ByteString.Lazy qualified as ByteStringLazy import Data.Map (Map) import Data.Map qualified as Map -import Data.String.Conversion (ConvertUtf8 (decodeUtf8), encodeUtf8, toString, toText) -import Data.Text (Text, isInfixOf) +import Data.String.Conversion (encodeUtf8, toString, toText) +import Data.Text (Text) import Data.Text qualified as Text import Data.Void (Void) import Effect.Logger (Logger) import Network.HTTP.Client ( Manager, - Request (host, method, shouldStripHeaderOnRedirect), + Request (method, shouldStripHeaderOnRedirect), Response (responseBody, responseHeaders, responseStatus), applyBasicAuth, applyBearerAuth, parseRequest, ) -import Network.HTTP.Types (methodGet, statusCode, methodHead) +import Network.HTTP.Types (statusCode) import Network.HTTP.Types.Header ( hAuthorization, hWWWAuthenticate,