Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling #1375

Open
wants to merge 48 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
b508531
spelling: associated
jsoref Sep 23, 2021
f770eaf
spelling: confirms
jsoref Sep 23, 2021
344c512
spelling: constructor
jsoref Sep 23, 2021
01f574e
spelling: contain
jsoref Sep 23, 2021
a9530f0
spelling: contribution
jsoref Sep 23, 2021
df8296f
spelling: created
jsoref Sep 23, 2021
c32672c
spelling: current
jsoref Sep 23, 2021
f75bd10
spelling: database
jsoref Sep 23, 2021
7b0ecb5
spelling: deferred
jsoref Sep 23, 2021
4b2249b
spelling: delivered
jsoref Sep 23, 2021
2c17a77
spelling: deserialization
jsoref Sep 23, 2021
aff5627
spelling: destination
jsoref Sep 23, 2021
d3ef82f
spelling: diagnostics
jsoref Sep 23, 2021
5b2c020
spelling: diagram
jsoref Sep 23, 2021
1dfaefb
spelling: dockerfile
jsoref Sep 23, 2021
08e89cc
spelling: failover
jsoref Sep 23, 2021
7b75081
spelling: http
jsoref Sep 23, 2021
d785cc2
spelling: indicates
jsoref Sep 23, 2021
e5ff8e8
spelling: inited
jsoref Sep 23, 2021
4188d0c
spelling: introspection
jsoref Sep 23, 2021
79e1ae7
spelling: javascript
jsoref Sep 23, 2021
2ab7cac
spelling: mandatory
jsoref Sep 23, 2021
2a9b5e3
spelling: matcher
jsoref Sep 23, 2021
7bc3f7f
spelling: notification
jsoref Sep 23, 2021
52b04eb
spelling: notifications
jsoref Sep 23, 2021
7e600b8
spelling: notifier
jsoref Sep 23, 2021
a87859c
spelling: occurred
jsoref Sep 23, 2021
8e50f9a
spelling: operations
jsoref Sep 23, 2021
2a477e8
spelling: opportunistic
jsoref Sep 23, 2021
2db3e1c
spelling: password
jsoref Sep 23, 2021
faf1efc
spelling: performs
jsoref Sep 23, 2021
13829e5
spelling: protocol
jsoref Sep 23, 2021
cdf1a8b
spelling: provided
jsoref Sep 23, 2021
e845a85
spelling: representing
jsoref Sep 23, 2021
c22a00c
spelling: responsible
jsoref Sep 23, 2021
e2ad9c0
spelling: retrieve
jsoref Sep 23, 2021
6c6c3e4
spelling: retrieving
jsoref Sep 23, 2021
355ee3a
spelling: semantics
jsoref Sep 23, 2021
c84dbe7
spelling: serialization
jsoref Sep 23, 2021
8e025b3
spelling: successful
jsoref Sep 23, 2021
627d450
spelling: transaction
jsoref Sep 23, 2021
790ac14
spelling: unify
jsoref Sep 23, 2021
6d113f6
spelling: unintended
jsoref Sep 23, 2021
8ee4393
spelling: unprivileged
jsoref Sep 23, 2021
9d012bd
spelling: uoid
jsoref Sep 23, 2021
765d63e
spelling: update
jsoref Sep 23, 2021
b84dd70
spelling: version
jsoref Sep 23, 2021
e698321
spelling: vulnerabilities
jsoref Sep 23, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
### Httputil
- [ed8ffc5](https://github.com/quay/clair/commit/ed8ffc50b56c9b11873f00bb2deb4fba9107ec95): create package and RateLimiter
### Initialize
- [5df82e1](https://github.com/quay/clair/commit/5df82e19e971c67ebdecf3f92682d4ae897db53a): update call to Libindex contstructor
- [5df82e1](https://github.com/quay/clair/commit/5df82e19e971c67ebdecf3f92682d4ae897db53a): update call to Libindex constructor
### Introspection
- [ec59a43](https://github.com/quay/clair/commit/ec59a431032713654e2eb7a29ad7c446dd16a490): enable readiness endpoint

Expand Down Expand Up @@ -111,7 +111,7 @@
- [1ece08f](https://github.com/quay/clair/commit/1ece08f49434828c8c672f08ec45844b99187983): database metrics for notifier
- [84ba35f](https://github.com/quay/clair/commit/84ba35f29ee81849cb2f424b3624895f9bd05a79): implement prometheus http
### Local-Dev
- [1c85589](https://github.com/quay/clair/commit/1c85589abdef98b5af8d4f6e2cd9eb5db6a723a0): remove unintented change in config.yaml
- [1c85589](https://github.com/quay/clair/commit/1c85589abdef98b5af8d4f6e2cd9eb5db6a723a0): remove unintended change in config.yaml
### Logging
- [9f3d167](https://github.com/quay/clair/commit/9f3d167d5d85d345c7d0ee666be075a545a553f4): move to zlog throughout
### Matcher
Expand Down Expand Up @@ -200,7 +200,7 @@
### Clairctl
- [835af27](https://github.com/quay/clair/commit/835af272fad49342f51adb4633ff639de3cc14a1): fix and codify import arguments
- [b9ef107](https://github.com/quay/clair/commit/b9ef1073ca48ed5ed7caaa3e0fbad03a7d83592c): update import and export online help
- [9883e80](https://github.com/quay/clair/commit/9883e80f331190e60de711b0705e9b37017fc5b1): unifiy config, client handling
- [9883e80](https://github.com/quay/clair/commit/9883e80f331190e60de711b0705e9b37017fc5b1): unify config, client handling
### Config
- [dc8ba89](https://github.com/quay/clair/commit/dc8ba8912fa482378ef393aa51b4e9528d2877f2): expose notification summary toggle
- [bb3cd66](https://github.com/quay/clair/commit/bb3cd669f66345aaa0fc5df6f502f34922cc069e): add 'omitempty' to 'updaters' config struct for correct marshalling
Expand Down Expand Up @@ -443,7 +443,7 @@
### Config
- [3ccc6e0](https://github.com/quay/clair/commit/3ccc6e03be0ce1b6c439d5c0649ee785dc7c559f): add support for per-scanner configuration
### Dockerfile
- [5a73cb4](https://github.com/quay/clair/commit/5a73cb49d64e839d7675979b5e3f348d94dd26a5): make -mod=vendor opportunisitic ([#999](https://github.com/quay/clair/issues/999))
- [5a73cb4](https://github.com/quay/clair/commit/5a73cb49d64e839d7675979b5e3f348d94dd26a5): make -mod=vendor opportunistic ([#999](https://github.com/quay/clair/issues/999))
- [#999](https://github.com/quay/clair/issues/999)### Dockerfile: Update To Alpine
- [de32b07](https://github.com/quay/clair/commit/de32b0728ccdbafb85988e2f87618c9d576fc87e): 3.11 for newest rpm
### Go.Mod
Expand Down Expand Up @@ -480,7 +480,7 @@
### Config
- [b2666e5](https://github.com/quay/clair/commit/b2666e57202d7c690a40d7c86975c13e0b3db56e): set a canonical default port
### Dockerfile
- [33da12a](https://github.com/quay/clair/commit/33da12a3bb9a28fdbcc6302caa4212d38a2acbbb): run as unprivledged user by default
- [33da12a](https://github.com/quay/clair/commit/33da12a3bb9a28fdbcc6302caa4212d38a2acbbb): run as unprivileged user by default
### Documentation
- [fe324a5](https://github.com/quay/clair/commit/fe324a58e6be8c36da74afcd5487d0da4a547d5b): start writing v4-specific docs
### Httptransport
Expand Down Expand Up @@ -647,7 +647,7 @@
- [162e8cd](https://github.com/quay/clair/commit/162e8cdafc66be28b021f83da736a2b612ddda99): enable suse updater
- [0609ed9](https://github.com/quay/clair/commit/0609ed964b0673806462a24147e6028da85d8a38): removed worker config
- [af2c688](https://github.com/quay/clair/commit/af2c68863482ae9f93a2db1533be260468a6ea2d): not properly loaded error ([#140](https://github.com/quay/clair/issues/140))
- [#140](https://github.com/quay/clair/issues/140) - fixes [#134](https://github.com/quay/clair/issues/134)- [30055af](https://github.com/quay/clair/commit/30055af03e357b44cfbacb3088eab337a94e51e8): fallover correctly to default config
- [#140](https://github.com/quay/clair/issues/140) - fixes [#134](https://github.com/quay/clair/issues/134)- [30055af](https://github.com/quay/clair/commit/30055af03e357b44cfbacb3088eab337a94e51e8): failover correctly to default config
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not entirely certain

- [20af787](https://github.com/quay/clair/commit/20af78743774b18795cbf5210cc97cc172b1880d): fix default fallback
- [4fc32d2](https://github.com/quay/clair/commit/4fc32d22713a47eabf5b12b81897fdd34d59935b): add top-level YAML namespace 'clair'
- Fixes [#95](https://github.com/quay/clair/issues/95)- [bb7745f](https://github.com/quay/clair/commit/bb7745f3fe21e85b5fe37919e11d6d121e08b9a1): better document example
Expand Down Expand Up @@ -773,7 +773,7 @@
- [627b98e](https://github.com/quay/clair/commit/627b98ef3126d517d3e80aef4c2ab9ed3d14b893): fix SQL error reporting
### Db/Pgsql/Migration
- [8df8170](https://github.com/quay/clair/commit/8df8170ba54d945cf2e2ad201bcdb8cc09fddc06): convert to pure SQL
### Dckerfile
### Dockerfile
- [80f150f](https://github.com/quay/clair/commit/80f150f93bf3b12e6c9bcea2d71ccfa956bd50c9): Add docker-compose.yml
### Detectors/Feature
- [fc908e6](https://github.com/quay/clair/commit/fc908e65ba6c0ad3edb344cfb263adff8efe6f4e): add apk feature detector
Expand Down Expand Up @@ -984,7 +984,7 @@
- [eeb13a0](https://github.com/quay/clair/commit/eeb13a02baa5db60b997454af8f059a6381f42da): add index on Vulnerability_Notification.deleted_at
- [7cff31a](https://github.com/quay/clair/commit/7cff31a058230a94838b7fd8493380d444c31f5a): add ldfv compound index
### Pkg
- [c3904c9](https://github.com/quay/clair/commit/c3904c9696bddc20a27db9b4142ae704350bbe3f): Add fsutil to contian file system utility functions
- [c3904c9](https://github.com/quay/clair/commit/c3904c9696bddc20a27db9b4142ae704350bbe3f): Add fsutil to contain file system utility functions
- [78cef02](https://github.com/quay/clair/commit/78cef02fdad4afd12a2a00df51d457c796278bfa): cerrors -> commonerr
- [03bac0f](https://github.com/quay/clair/commit/03bac0f1b6f504a416937e309a62fdfc308dc397): utils/tar.go -> pkg/tarutil
### Pkg/Gitutil
Expand Down
6 changes: 3 additions & 3 deletions Documentation/concepts/api_internal.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ Further information and usage is an effort left to the reader.
## Updates Diffs

The `update_diff/` endpoint exposes the api for diffing two update operations.
This is used by the notifier to determine the added and removed vulnerabilities on security databsae update.
This is used by the notifier to determine the added and removed vulnerabilities on security database update.

## Update Operation

The `update_operation` endpoint exposes the api for viewing updaters' activity.
This is used by the notifier to determine if new updates have occured and triggers an update diff to see what has changed.
This is used by the notifier to determine if new updates have occurred and triggers an update diff to see what has changed.

## AffectedManifest

The `affected_manifest` endpoint exposes the api for retreiving affected manifests given a list of Vulnerabilities.
The `affected_manifest` endpoint exposes the api for retrieving affected manifests given a list of Vulnerabilities.
This is used by the notifier to determine the manifests that need to have a notification generated.
2 changes: 1 addition & 1 deletion Documentation/concepts/indexing.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Indexing

The [Indexer](../reference/indexer.md) service is responsble for "indexing a manifest".
The [Indexer](../reference/indexer.md) service is responsible for "indexing a manifest".

Indexing involves taking a manifest representing a container image and computing its constituent parts. The indexer is trying to discover what packages exist in the image, what distribution the image is derived from, and what package repositories are used within the image. Once this information is computed it is persisted in an IndexReport.

Expand Down
4 changes: 2 additions & 2 deletions Documentation/concepts/notifications.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

ClairV4 implements a notification system.

The notifier service will keep track of new security database updates and inform an interested client if new or removed vulnerabilites affect an indexed manifest.
The notifier service will keep track of new security database updates and inform an interested client if new or removed vulnerabilities affect an indexed manifest.

The interested client can subscribe to notifications via several mechanisms:
* Webhook delivery
Expand Down Expand Up @@ -58,7 +58,7 @@ When you configure notifier for webhook delivery you provide the service with th
When the notifier has determined an updated security database has changed the affected status of an indexed manifest, it will deliver the following JSON body to the configured target:
```json
{
"notifiction_id": {uuid_string},
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

"notification_id": {uuid_string},
"callback": {url_to_notifications}
}
```
Expand Down
2 changes: 1 addition & 1 deletion Documentation/contribution.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contribuion
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change will break external deep links to this anchor.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's fine, they'll end up dumped in the same spot.

# Contribution
The following sections provides information on how to contribute to Clair.

- [Commit Style](./contribution/commit_style.md)
Expand Down
6 changes: 3 additions & 3 deletions Documentation/howto/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ In a combined deployment, all the Clair processes run in a single OS process. Th

A load balancer is still recommended if you plan on performing TLS termination. Typically this will be a OpenShift route or a Kubernetes ingress.

![combo mode single db deployment diagran](./clairv4_combo_single_db.png)
![combo mode single db deployment diagram](./clairv4_combo_single_db.png)

In the above diagram, Clair is running in combo mode and talking to a single database. To configure this model you will provide all node types the same database and start Clair in **combo** mode.

Expand All @@ -33,7 +33,7 @@ In this mode, any configuration informing Clair how to talk to other nodes is ig

For added flexibility, it's also supported to split the databases while in combo mode.

![combo mode multiple db deployment diagran](./clairv4_combo_multi_db.png)
![combo mode multiple db deployment diagram](./clairv4_combo_multi_db.png)

In the above diagram, Clair is running in combo mode but database load is split between multiple databases. Since Clair is conceptually a set of micro-services, its processes do not share database tables even when combined into the same OS process.

Expand All @@ -58,7 +58,7 @@ In a distributed deployment, each Clair process runs in its own OS process. Typi

A load balancer **must** be setup in this deployment model. The load balancer will route traffic between Clair nodes along with routing API requests via [path based routing](https://devcentral.f5.com/s/articles/the-three-http-routing-patterns-you-should-know-30764) to the correct services. In a Kubernetes or OpenShift deployment this is usually handled with the Service and Routes abstractions. If deploying on bare metal, a load balancer will need to be configured appropriately.

![distributed mode multiple db deployment diagran](./clairv4_distributed_multi_db.png)
![distributed mode multiple db deployment diagram](./clairv4_distributed_multi_db.png)

In the above diagram, a load balancer is configured to route traffic coming from the client to the correct service. This routing is path based routing and requires a layer 7 load balancer. Traefik, Nginx, and HAProxy are all capable of this. As mentioned above, this functionality is native to OpenShift and Kubernetes.

Expand Down
6 changes: 3 additions & 3 deletions Documentation/reference/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: ClairV4 v0.1
language_tabs:
- python: Python
- go: Golang
- javascript: Javascript
- javascript: JavaScript
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

appears harmless

language_clients:
- python: ""
- go: ""
Expand Down Expand Up @@ -1184,7 +1184,7 @@ Notification
|---|---|---|---|---|
|id|string|false|none|a unique identifier for this notification|
|manifest|string|false|none|The hash of the manifest affected by the provided vulnerability.|
|reason|string|false|none|the reason for the notifcation, [added | removed]|
|reason|string|false|none|the reason for the notification, [added | removed]|
|vulnerability|[VulnSummary](#schemavulnsummary)|false|none|A summary of a vulnerability|

<h2 id="tocS_Environment">Environment</h2>
Expand Down Expand Up @@ -1285,7 +1285,7 @@ IndexReport
|» **additionalProperties**|[Distribution](#schemadistribution)|false|none|An indexed distribution discovered in a layer. See<br>https://www.freedesktop.org/software/systemd/man/os-release.html<br>for explanations and example of fields.|
|environments|object|true|none|A map of lists containing Environment objects keyed by the<br>associated Package.id.|
|» **additionalProperties**|[[Environment](#schemaenvironment)]|false|none|[The environment a particular package was discovered in.]|
|success|boolean|true|none|A bool indicating succcessful index|
|success|boolean|true|none|A bool indicating successful index|
|err|string|true|none|An error message on event of unsuccessful index|

<h2 id="tocS_VulnerabilityReport">VulnerabilityReport</h2>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/reference/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ An address in `<host>:<post>` syntax where traces can be submitted.
#### `$.trace.jaeger.collector.username`
a string value

#### `$.trace.jaeger.collector.passwordd`
#### `$.trace.jaeger.collector.password`
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a noteworthy bug fix

a string value

#### `$.trace.jaeger.service_name`
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ goimports-local:
# you'll need to have npx to run this gen.
.PHONY: gen-api-reference
gen-api-reference:
npx widdershins --search false --language_tabs 'python:Python' 'go:Golang' 'javascript:Javascript' --summary ./openapi.yaml -o ./Documentation/reference/api.md
npx widdershins --search false --language_tabs 'python:Python' 'go:Golang' 'javascript:JavaScript' --summary ./openapi.yaml -o ./Documentation/reference/api.md

# start a local development environment.
# each services runs in it's own container to test service->service communication.
Expand Down
4 changes: 2 additions & 2 deletions clair-error/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func (e *ErrRequestFail) Error() string {
return fmt.Sprintf("code: %v status %v", e.Code, e.Status)
}

// ErrBadManifest inidcates a manifest could not be parsed
// ErrBadManifest indicates a manifest could not be parsed
type ErrBadManifest struct {
E error
}
Expand All @@ -29,7 +29,7 @@ func (e *ErrBadManifest) Unwrap() error {
return e.E
}

// ErrBadManifest inidcates a manifest could not be parsed
// ErrBadManifest indicates a manifest could not be parsed
type ErrBadIndexReport struct {
E error
}
Expand Down
12 changes: 6 additions & 6 deletions clair-error/notifications.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/google/uuid"
)

// ErrNoUpdateOperation inidcates that the queried updater has no
// ErrNoUpdateOperation indicates that the queried updater has no
// update operations associated.
type ErrNoUpdateOperation struct {
Updater string
Expand All @@ -31,7 +31,7 @@ func (e ErrBadNotification) Unwrap() error {
return e.E
}

// ErrDeleteNotification indicates an error while deleting notifcations.
// ErrDeleteNotification indicates an error while deleting notifications.
// The wrapped error will contain further details.
type ErrDeleteNotification struct {
NotificationID uuid.UUID
Expand All @@ -55,7 +55,7 @@ func (e ErrNoReceipt) Error() string {
return fmt.Sprintf("no receipt exists for notification id %s", e.NotificationID)
}

// ErrReceipt indicates an error retreiving a receipt for referenced notification id.
// ErrReceipt indicates an error retrieving a receipt for referenced notification id.
type ErrReceipt struct {
NotificationID uuid.UUID
E error
Expand All @@ -69,7 +69,7 @@ func (e ErrReceipt) Unwrap() error {
return e.E
}

// ErrCreated indicates an error occured when retrieving created notification ids.
// ErrCreated indicates an error occurred when retrieving created notification ids.
type ErrCreated struct {
E error
}
Expand All @@ -82,7 +82,7 @@ func (e ErrCreated) Unwrap() error {
return e.E
}

// ErrFailed indicates an error occured when retrieving created notification ids.
// ErrFailed indicates an error occurred when retrieving created notification ids.
type ErrFailed struct {
E error
}
Expand All @@ -95,7 +95,7 @@ func (e ErrFailed) Unwrap() error {
return e.E
}

// ErrPutNotifications indicates an issues occured when persisting a slice of
// ErrPutNotifications indicates an issues occurred when persisting a slice of
// computed notifications.
// The wrapped error will contain further details.
type ErrPutNotifications struct {
Expand Down
10 changes: 5 additions & 5 deletions config.yaml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,19 @@ notifier:
callback: "http://clair-notifier/notifier/api/v1/notifications"
tls:
root_ca: "optional/path/to/rootca"
cert: "madatory/path/to/cert"
key: "madatory/path/to/key"
cert: "mandatory/path/to/cert"
key: "mandatory/path/to/key"
stomp:
desitnation: "notifications"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

destination: "notifications"
direct: false
callback: "http://clair-notifier/notifier/api/v1/notifications"
login:
login: "username"
passcode: "passcode"
tls:
root_ca: "optional/path/to/rootca"
cert: "madatory/path/to/cert"
key: "madatory/path/to/key"
cert: "mandatory/path/to/cert"
key: "mandatory/path/to/key"



Expand Down
2 changes: 1 addition & 1 deletion config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func Test_Config_Validate_Failure(t *testing.T) {
}
}

func TestConfigUpateRetention(t *testing.T) {
func TestConfigUpdateRetention(t *testing.T) {
var table = []struct {
name string
conf config.Config
Expand Down
2 changes: 1 addition & 1 deletion config/indexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type Indexer struct {
// This value tunes how often a waiting Indexer will poll for the lock.
// TODO: Move to async operating mode
ScanLockRetry int `yaml:"scanlock_retry" json:"scanlock_retry"`
// A positive values represeting quantity.
// A positive values representing quantity.
//
// Indexers will index a Manifest's layers concurrently.
// This value tunes the number of layers an Indexer will scan in parallel.
Expand Down
2 changes: 1 addition & 1 deletion httptransport/client/matcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func (c *HTTP) LatestUpdateOperations(ctx context.Context, k driver.UpdateKind)
// updateOperations is a private method implementing the common bits for retrieving UpdateOperations
//
// an ouCache is passed in by the caller to cache any responses providing an etag.
// if a subsequent response provides a StatusNotModified status, the map of UpdateOprations is served from cache.
// if a subsequent response provides a StatusNotModified status, the map of UpdateOperations is served from cache.
func (c *HTTP) updateOperations(ctx context.Context, req *http.Request, cache *uoCache) (map[string][]driver.UpdateOperation, error) {
res, err := c.c.Do(req)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion httptransport/discoveryhandler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestDiscoveryEndpoint(t *testing.T) {
if _, ok := m["openapi"]; !ok {
t.Fatalf("returned json did not container openapi key at the root")
}
t.Logf("openapi verion: %v", m["openapi"])
t.Logf("openapi version: %v", m["openapi"])
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logging output change

}

func TestDiscoveryFailure(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion httptransport/indexstatehandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
)

// IndexStateHandler utilizes a Stater to report the
// curent runtime state of an Indexer.
// current runtime state of an Indexer.
//
// Indexers running with different scanner versions
// will produce unique states and indicate to clients
Expand Down
2 changes: 1 addition & 1 deletion httptransport/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func (t *Server) configureDiscovery(_ context.Context) error {
func (t *Server) configureComboMode(ctx context.Context) error {
// requires both indexer and matcher services
if t.indexer == nil || t.matcher == nil {
return clairerror.ErrNotInitialized{Msg: "Combo mode requires both indexer and macher services"}
return clairerror.ErrNotInitialized{Msg: "Combo mode requires both indexer and matcher services"}
}

err := t.configureIndexerMode(ctx)
Expand Down
2 changes: 1 addition & 1 deletion httptransport/updateoperationhandler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestUpdateOperationHandler(t *testing.T) {
t.Run("Errors", testUpdateOperationHandlerErrors)
}

// testUpdateOperationHandlerErrors confirms the handler perfoms the correct
// testUpdateOperationHandlerErrors confirms the handler performs the correct
// actions when a matcher.Differ is failing.
func testUpdateOperationHandlerErrors(t *testing.T) {
t.Parallel()
Expand Down
4 changes: 2 additions & 2 deletions httptransport/vulnerabilityreporthandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (h *VulnerabilityReportHandler) ServeHTTP(w http.ResponseWriter, r *http.Re
return
}

initd, err := h.Matcher.Initialized(ctx)
inited, err := h.Matcher.Initialized(ctx)
if err != nil {
resp := &je.Response{
Code: "internal-server-error",
Expand All @@ -68,7 +68,7 @@ func (h *VulnerabilityReportHandler) ServeHTTP(w http.ResponseWriter, r *http.Re
je.Error(w, resp, http.StatusInternalServerError)
return
}
if !initd {
if !inited {
w.WriteHeader(http.StatusAccepted)
return
}
Expand Down