diff --git a/main.capnp b/main.capnp index 7970447..8cecc29 100644 --- a/main.capnp +++ b/main.capnp @@ -7,7 +7,7 @@ using CSharp = import "programming_language/csharp.capnp"; $CSharp.namespace("FabAccessAPI.Schema"); using Authentication = import "auth.capnp".Authentication; -using Ressources = import "ressources.capnp".Ressources; +using Resources = import "resources.capnp".Resources; using Users = import "users.capnp".Users; interface Bootstrap @@ -26,8 +26,8 @@ struct Session { # An API session with the server. The below capabilities are set to NULL if the authenticated # user doesn't have permission to access the system in question. - ressources @0 : Ressources; - # Access to the ressources configured. + resources @0 : Resources; + # Access to the resources configured. users @1 : Users; # User administration. This includes both modifying other users and self-modification, so this diff --git a/resources.capnp b/resources.capnp index 04118d5..99ecc7b 100644 --- a/resources.capnp +++ b/resources.capnp @@ -7,10 +7,10 @@ using CSharp = import "programming_language/csharp.capnp"; $CSharp.namespace("FabAccessAPI.Schema"); using General = import "general.capnp"; -using Machine = import "machine.capnp".Machine; +using Resource = import "resource.capnp".Resource; -interface Ressources +interface Resources { - listAll @0 () -> ( machine_list :List(Machine) ); - get @1 ( name :Text ) -> Machine; + listAll @0 () -> ( list :List(Resource) ); + get @1 ( name :Text ) -> Resource; }