diff --git a/modules/mesh-provisioner-client/cmd/mesh-provisioner-client/route_names_test.go b/modules/mesh-provisioner-client/cmd/mesh-provisioner-client/route_names_test.go index 42b27ecf..76922ed1 100644 --- a/modules/mesh-provisioner-client/cmd/mesh-provisioner-client/route_names_test.go +++ b/modules/mesh-provisioner-client/cmd/mesh-provisioner-client/route_names_test.go @@ -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"}}` diff --git a/modules/route-adapter/cmd/route-provider/provider_test.go b/modules/route-adapter/cmd/route-provider/provider_test.go index 10c30933..abb464e1 100644 --- a/modules/route-adapter/cmd/route-provider/provider_test.go +++ b/modules/route-adapter/cmd/route-provider/provider_test.go @@ -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) } } diff --git a/modules/route-proxy/cmd/route-provider/provider_test.go b/modules/route-proxy/cmd/route-provider/provider_test.go index 6c580b97..d7ccaffc 100644 --- a/modules/route-proxy/cmd/route-provider/provider_test.go +++ b/modules/route-proxy/cmd/route-provider/provider_test.go @@ -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) } }