Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-04-21 17:07:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

chore: refactoring gpg test data embeding it in go code (#7625)

Browse source 
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
This commit is contained in:
Leonardo Luz Almeida 2021-11-05 03:45:14 -04:00 committed by GitHub
parent b0278c4493
commit dc24380065
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 74 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
util/db/gpgkeys_test.go
View file

@ -12,7 +12,7 @@ import (
"k8s.io/client-go/kubernetes/fake"
"github.com/argoproj/argo-cd/v2/common"
"github.com/argoproj/argo-cd/v2/test"
"github.com/argoproj/argo-cd/v2/util/gpg/testdata"
"github.com/argoproj/argo-cd/v2/util/settings"
)
@ -37,7 +37,7 @@ var gpgCMSingleGoodPubkey = v1.ConfigMap{
},
},
Data: map[string]string{
"4AEE18F83AFDEB23": test.MustLoadFileToString("../gpg/testdata/github.asc"),
"4AEE18F83AFDEB23": testdata.Github_asc,
},
}
@ -51,8 +51,8 @@ var gpgCMMultiGoodPubkey = v1.ConfigMap{
},
},
Data: map[string]string{
"FDC79815400D88A9": test.MustLoadFileToString("../gpg/testdata/johndoe.asc"),
"F7842A5CEAA9C0B1": test.MustLoadFileToString("../gpg/testdata/janedoe.asc"),
"FDC79815400D88A9": testdata.Johndoe_asc,
"F7842A5CEAA9C0B1": testdata.Janedoe_asc,
},
}
@ -66,7 +66,7 @@ var gpgCMSingleKeyWrongId = v1.ConfigMap{
},
},
Data: map[string]string{
"5AEE18F83AFDEB23": test.MustLoadFileToString("../gpg/testdata/github.asc"),
"5AEE18F83AFDEB23": testdata.Github_asc,
},
}
@ -80,7 +80,7 @@ var gpgCMGarbagePubkey = v1.ConfigMap{
},
},
Data: map[string]string{
"4AEE18F83AFDEB23": test.MustLoadFileToString("../gpg/testdata/garbage.asc"),
"4AEE18F83AFDEB23": testdata.Garbage_asc,
},
}
@ -94,7 +94,7 @@ var gpgCMGarbageCMKey = v1.ConfigMap{
},
},
Data: map[string]string{
"wullerosekaufe": test.MustLoadFileToString("../gpg/testdata/github.asc"),
"wullerosekaufe": testdata.Github_asc,
},
}
@ -117,7 +117,7 @@ func getGPGKeysClientset(gpgCM v1.ConfigMap) *fake.Clientset {
func Test_ValidatePGPKey(t *testing.T) {
// Good case - single PGP key
{
key, err := validatePGPKey(test.MustLoadFileToString("../gpg/testdata/github.asc"))
key, err := validatePGPKey(testdata.Github_asc)
assert.NoError(t, err)
assert.NotNil(t, key)
assert.Equal(t, "4AEE18F83AFDEB23", key.KeyID)
@ -127,13 +127,13 @@ func Test_ValidatePGPKey(t *testing.T) {
}
// Bad case - Garbage
{
key, err := validatePGPKey(test.MustLoadFileToString("../gpg/testdata/garbage.asc"))
key, err := validatePGPKey(testdata.Garbage_asc)
assert.Error(t, err)
assert.Nil(t, key)
}
// Bad case - more than one key
{
key, err := validatePGPKey(test.MustLoadFileToString("../gpg/testdata/multi.asc"))
key, err := validatePGPKey(testdata.Multi_asc)
assert.Error(t, err)
assert.Nil(t, key)
}
@ -210,7 +210,7 @@ func Test_AddGPGPublicKey(t *testing.T) {
db := NewDB(testNamespace, settings, clientset)
// Key should be added
new, skipped, err := db.AddGPGPublicKey(context.Background(), test.MustLoadFileToString("../gpg/testdata/github.asc"))
new, skipped, err := db.AddGPGPublicKey(context.Background(), testdata.Github_asc)
assert.NoError(t, err)
assert.Len(t, new, 1)
assert.Len(t, skipped, 0)
@ -219,7 +219,7 @@ func Test_AddGPGPublicKey(t *testing.T) {
assert.Len(t, cm.Data, 1)
// Same key should not be added, but skipped
new, skipped, err = db.AddGPGPublicKey(context.Background(), test.MustLoadFileToString("../gpg/testdata/github.asc"))
new, skipped, err = db.AddGPGPublicKey(context.Background(), testdata.Github_asc)
assert.NoError(t, err)
assert.Len(t, new, 0)
assert.Len(t, skipped, 1)
@ -228,7 +228,7 @@ func Test_AddGPGPublicKey(t *testing.T) {
assert.Len(t, cm.Data, 1)
// New keys should be added
new, skipped, err = db.AddGPGPublicKey(context.Background(), test.MustLoadFileToString("../gpg/testdata/multi.asc"))
new, skipped, err = db.AddGPGPublicKey(context.Background(), testdata.Multi_asc)
assert.NoError(t, err)
assert.Len(t, new, 2)
assert.Len(t, skipped, 0)
@ -237,7 +237,7 @@ func Test_AddGPGPublicKey(t *testing.T) {
assert.Len(t, cm.Data, 3)
// Same new keys should be skipped
new, skipped, err = db.AddGPGPublicKey(context.Background(), test.MustLoadFileToString("../gpg/testdata/multi.asc"))
new, skipped, err = db.AddGPGPublicKey(context.Background(), testdata.Multi_asc)
assert.NoError(t, err)
assert.Len(t, new, 0)
assert.Len(t, skipped, 2)
@ -246,7 +246,7 @@ func Test_AddGPGPublicKey(t *testing.T) {
assert.Len(t, cm.Data, 3)
// Garbage input should result in error
new, skipped, err = db.AddGPGPublicKey(context.Background(), test.MustLoadFileToString("../gpg/testdata/garbage.asc"))
new, skipped, err = db.AddGPGPublicKey(context.Background(), testdata.Garbage_asc)
assert.Error(t, err)
assert.Nil(t, new)
assert.Nil(t, skipped)

59
util/gpg/testdata/data.go vendored Normal file
View file

@ -0,0 +1,59 @@
package testdata
import _ "embed"
var (
//go:embed bad_signature_bad.txt
Bad_signature_bad_txt string
//go:embed bad_signature_badkeyid.txt
Bad_signature_badkeyid_txt string
//go:embed bad_signature_malformed1.txt
Bad_signature_malformed1_txt string
//go:embed bad_signature_malformed2.txt
Bad_signature_malformed2_txt string
//go:embed bad_signature_malformed3.txt
Bad_signature_malformed3_txt string
//go:embed bad_signature_manipulated.txt
Bad_signature_manipulated_txt string
//go:embed bad_signature_nodata.txt
Bad_signature_nodata_txt string
//go:embed bad_signature_preeof1.txt
Bad_signature_preeof1_txt string
//go:embed bad_signature_preeof2.txt
Bad_signature_preeof2_txt string
//go:embed garbage.asc
Garbage_asc string
//go:embed github.asc
Github_asc string
//go:embed good_signature.txt
Good_signature_txt string
//go:embed janedoe.asc
Janedoe_asc string
//go:embed johndoe.asc
Johndoe_asc string
//go:embed multi.asc
Multi_asc string
//go:embed multi2.asc
Multi2_asc string
//go:embed unknown_signature1.txt
Unknown_signature1_txt string
//go:embed unknown_signature2.txt
Unknown_signature2_txt string
)