Clean up some dev config kms code (#2321)
* Clean up some dev config kms code Although it didn't matter in the combined state, the KMS for auth storage was not actually being set properly if only a worker was being instantiated.
This commit is contained in:
1 parent
661d6a551e
commit
090b2b28f8
5 files changed
+44
-36
No files matched your search
@@ -61,14 +61,6 @@ func TestDevController(t *testing.T) {
|
||||
"key_id": "global_worker-auth",
|
||||
},
|
||||
},
|
||||
{
|
||||
Type: "aead",
|
||||
Purpose: []string{"worker-auth-storage"},
|
||||
Config: map[string]string{
|
||||
"aead_type": "aes-gcm",
|
||||
"key_id": "global_worker-auth-storage",
|
||||
},
|
||||
},
|
||||
{
|
||||
Type: "aead",
|
||||
Purpose: []string{"recovery"},
|
||||
@@ -92,11 +84,9 @@ func TestDevController(t *testing.T) {
|
||||
exp.Seals[0].Config["key"] = actual.Seals[0].Config["key"]
|
||||
exp.Seals[1].Config["key"] = actual.Seals[1].Config["key"]
|
||||
exp.Seals[2].Config["key"] = actual.Seals[2].Config["key"]
|
||||
exp.Seals[3].Config["key"] = actual.Seals[3].Config["key"]
|
||||
exp.DevControllerKey = actual.Seals[0].Config["key"]
|
||||
exp.DevWorkerAuthKey = actual.Seals[1].Config["key"]
|
||||
exp.DevWorkerAuthStorageKey = actual.Seals[2].Config["key"]
|
||||
exp.DevRecoveryKey = actual.Seals[3].Config["key"]
|
||||
exp.DevRecoveryKey = actual.Seals[2].Config["key"]
|
||||
|
||||
assert.Equal(t, exp, actual)
|
||||
|
||||
@@ -188,6 +178,16 @@ func TestDevWorker(t *testing.T) {
|
||||
Purpose: []string{"proxy"},
|
||||
},
|
||||
},
|
||||
Seals: []*configutil.KMS{
|
||||
{
|
||||
Type: "aead",
|
||||
Purpose: []string{"worker-auth-storage"},
|
||||
Config: map[string]string{
|
||||
"aead_type": "aes-gcm",
|
||||
"key_id": "worker-auth-storage",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
Worker: &Worker{
|
||||
Name: "w_1234567890",
|
||||
@@ -201,6 +201,7 @@ func TestDevWorker(t *testing.T) {
|
||||
}
|
||||
|
||||
exp.Listeners[0].RawConfig = actual.Listeners[0].RawConfig
|
||||
exp.Seals[0].Config["key"] = actual.Seals[0].Config["key"]
|
||||
exp.Worker.TagsRaw = actual.Worker.TagsRaw
|
||||
assert.Equal(t, exp, actual)
|
||||
|
||||
@@ -221,6 +222,7 @@ func TestDevWorker(t *testing.T) {
|
||||
actual, err = Parse(devConfig + devWorkerKeyValueConfig)
|
||||
assert.NoError(t, err)
|
||||
exp.Listeners[0].RawConfig = actual.Listeners[0].RawConfig
|
||||
exp.Seals = nil
|
||||
exp.Worker.TagsRaw = actual.Worker.TagsRaw
|
||||
assert.Equal(t, exp, actual)
|
||||
|
||||
@@ -352,14 +354,6 @@ func TestDevCombined(t *testing.T) {
|
||||
"key_id": "global_worker-auth",
|
||||
},
|
||||
},
|
||||
{
|
||||
Type: "aead",
|
||||
Purpose: []string{"worker-auth-storage"},
|
||||
Config: map[string]string{
|
||||
"aead_type": "aes-gcm",
|
||||
"key_id": "global_worker-auth-storage",
|
||||
},
|
||||
},
|
||||
{
|
||||
Type: "aead",
|
||||
Purpose: []string{"recovery"},
|
||||
@@ -368,6 +362,14 @@ func TestDevCombined(t *testing.T) {
|
||||
"key_id": "global_recovery",
|
||||
},
|
||||
},
|
||||
{
|
||||
Type: "aead",
|
||||
Purpose: []string{"worker-auth-storage"},
|
||||
Config: map[string]string{
|
||||
"aead_type": "aes-gcm",
|
||||
"key_id": "worker-auth-storage",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
Controller: &Controller{
|
||||
@@ -396,8 +398,8 @@ func TestDevCombined(t *testing.T) {
|
||||
exp.Seals[3].Config["key"] = actual.Seals[3].Config["key"]
|
||||
exp.DevControllerKey = actual.Seals[0].Config["key"]
|
||||
exp.DevWorkerAuthKey = actual.Seals[1].Config["key"]
|
||||
exp.DevWorkerAuthStorageKey = actual.Seals[2].Config["key"]
|
||||
exp.DevRecoveryKey = actual.Seals[3].Config["key"]
|
||||
exp.DevRecoveryKey = actual.Seals[2].Config["key"]
|
||||
exp.DevWorkerAuthStorageKey = actual.Seals[3].Config["key"]
|
||||
exp.Worker.TagsRaw = actual.Worker.TagsRaw
|
||||
assert.Equal(t, exp, actual)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user