Skip to content

Commit

Permalink
Merge pull request #1337 from felixfontein/typos
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
felixfontein authored Nov 3, 2023
2 parents 573253a + 09e147f commit 0a02327
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cmd/sops/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ func main() {
},
cli.StringSliceFlag{
Name: "hc-vault-transit",
Usage: "the full vault path to the key used to encrypt/decrypt. Make you choose and configure a key with encrption/decryption enabled (e.g. 'https://vault.example.org:8200/v1/transit/keys/dev'). Can be specified more than once",
Usage: "the full vault path to the key used to encrypt/decrypt. Make you choose and configure a key with encryption/decryption enabled (e.g. 'https://vault.example.org:8200/v1/transit/keys/dev'). Can be specified more than once",
},
cli.StringSliceFlag{
Name: "age",
Expand Down
2 changes: 1 addition & 1 deletion functional-tests/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ b: ba"#
.expect("Error running sops");
assert!(!output.status
.success(),
"SOPS succeeded decrypting a file with a missing decrytion key");
"SOPS succeeded decrypting a file with a missing decryption key");
}

#[test]
Expand Down
2 changes: 1 addition & 1 deletion hcvault/keysource_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func TestMain(m *testing.M) {
code = m.Run()
}

// This can't be deferred, as os.Exit simpy does not care
// This can't be deferred, as os.Exit simply does not care
if err := pool.Purge(resource); err != nil {
logger.Fatalf("could not purge resource: %s", err)
}
Expand Down
4 changes: 2 additions & 2 deletions kms/keysource_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func TestMain(m *testing.M) {
code = m.Run()
}

// This can't be deferred, as os.Exit simpy does not care
// This can't be deferred, as os.Exit simply does not care
if err := pool.Purge(resource); err != nil {
logger.Fatalf("could not purge resource: %s", err)
}
Expand Down Expand Up @@ -556,7 +556,7 @@ func Test_stsSessionName(t *testing.T) {
}
got, err := stsSessionName()
assert.Error(t, err)
assert.ErrorContains(t, err, "failed to construct STS session nam")
assert.ErrorContains(t, err, "failed to construct STS session name")
assert.Empty(t, got)
})

Expand Down
4 changes: 2 additions & 2 deletions pgp/keysource.go
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ func (r SecRing) ApplyToMasterKey(key *MasterKey) {
// errSet is a collection of captured errors.
type errSet []error

// Error joins the errors into a "; " seperated string.
// Error joins the errors into a "; " separated string.
func (e errSet) Error() string {
str := make([]string, len(e))
for i, err := range e {
Expand Down Expand Up @@ -623,7 +623,7 @@ func gnuPGHome(customPath string) string {
}

// shortenFingerprint returns the short ID of the given fingerprint.
// This is mostly used for compatability reasons, as older versions of GnuPG
// This is mostly used for compatibility reasons, as older versions of GnuPG
// do not always like long IDs.
func shortenFingerprint(fingerprint string) string {
if offset := len(fingerprint) - 16; offset > 0 {
Expand Down
2 changes: 1 addition & 1 deletion shamir/shamir_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func TestCombine_invalid(t *testing.T) {
t.Fatalf("should err")
}

// Mis-match in length
// Mismatch in length
parts := [][]byte{
[]byte("foo"),
[]byte("ba"),
Expand Down

0 comments on commit 0a02327

Please sign in to comment.