Give the route plan entries their credential-form, and read the entry's vault-name in the route providers' tests (issues 923, 945)
This commit is contained in:
@@ -96,12 +96,12 @@ func routeRun(t *testing.T, module, id, path, templatePath, entryKey, firstEntry
|
||||
}
|
||||
|
||||
// gitea's plan entry for its `web` route, as the controller writes it for a node whose public domain is example.org.
|
||||
const giteaRoutePlanEntry = `{"provision":"route","provider":"novox","provider-module":"route-proxy",` +
|
||||
const giteaRoutePlanEntry = `{"provision":"route","provider":"novox","provider-module":"route-proxy","credential-form":"pair",` +
|
||||
`"at":"novox.internal","from":"novox","as":"mesh_g14_gitea",` +
|
||||
`"names":{"name-web":"git.example.org","internal-name-web":"git.novox.internal",` +
|
||||
`"name-internal-api-refused":"git.example.org","internal-name-internal-api-refused":"git.novox.internal"}}`
|
||||
|
||||
const keycloakRoutePlanEntry = `{"provision":"route","provider":"novox","provider-module":"route-proxy",` +
|
||||
const keycloakRoutePlanEntry = `{"provision":"route","provider":"novox","provider-module":"route-proxy","credential-form":"pair",` +
|
||||
`"at":"novox.internal","from":"novox","as":"mesh_g14_keycloak",` +
|
||||
`"names":{"name":"keycloak.example.org","internal-name":"keycloak.novox.internal"}}`
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@ func TestAConsumerOfARouteIsToldItsNamesFromItsPlanEntry(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if e.Values["name-web"] != "git.example.org" || e.Values["name"] != "git.example.org" ||
|
||||
e.Values["internal-name"] != "git.novox.internal" || e.Credential != "" || e.User != "" || e.Refused != "" {
|
||||
e.Values["internal-name"] != "git.novox.internal" || e.VaultName != "" || e.User != "" || e.Refused != "" {
|
||||
t.Fatalf("the entry is %+v", e)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ func TestAConsumerOfARouteIsToldItsNamesFromItsPlanEntry(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if e.Values["name-web"] != "git.example.org" || e.Values["name"] != "git.example.org" ||
|
||||
e.Values["internal-name"] != "git.novox.internal" || e.Credential != "" || e.User != "" || e.Refused != "" {
|
||||
e.Values["internal-name"] != "git.novox.internal" || e.VaultName != "" || e.User != "" || e.Refused != "" {
|
||||
t.Fatalf("the entry is %+v", e)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user