diff --git a/Gopkg.lock b/Gopkg.lock index 0e8dfe6a5..7c5cd6636 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -54,11 +54,11 @@ [[projects]] branch = "master" - digest = "1:576295579f90f43321d0ffc39a5f28cb1688d7114b12229ce0f98270a57a6bae" + digest = "1:40232678b99723a6dc6bcff25ddf64958d249a96ce48fcd3fcf8cea26feab699" name = "github.com/cortezaproject/corteza-protobuf" packages = ["."] pruneopts = "T" - revision = "40822fb4c9e28d028213089aff21b8b681d4527c" + revision = "814df3fd218934adc8285086dc13050bf7acf8cb" [[projects]] branch = "v2" diff --git a/compose/db/schema/mysql/20190825090000.automation-namespace.up.sql b/compose/db/schema/mysql/20190825090000.automation-namespace.up.sql index 0b75ba3fe..e979bf9d4 100644 --- a/compose/db/schema/mysql/20190825090000.automation-namespace.up.sql +++ b/compose/db/schema/mysql/20190825090000.automation-namespace.up.sql @@ -8,4 +8,3 @@ ALTER TABLE `compose_automation_script` ADD CONSTRAINT `compose_automation_script_namespace` FOREIGN KEY (`rel_namespace`) REFERENCES `compose_namespace` (`id`); - diff --git a/vendor/github.com/cortezaproject/corteza-protobuf/compose/script_runner.proto b/vendor/github.com/cortezaproject/corteza-protobuf/compose/script_runner.proto deleted file mode 100644 index ee4082de7..000000000 --- a/vendor/github.com/cortezaproject/corteza-protobuf/compose/script_runner.proto +++ /dev/null @@ -1,63 +0,0 @@ -syntax = "proto3"; - -package compose; -option go_package = "proto"; - -import "namespace.proto"; -import "module.proto"; -import "record.proto"; - -service ScriptRunner { - rpc Test(RunTestRequest) returns (RunTestResponse); - rpc Namespace (RunNamespaceRequest) returns (RunNamespaceResponse); - rpc Module (RunModuleRequest) returns (RunModuleResponse); - rpc Record (RunRecordRequest) returns (RunRecordResponse); -} - -message RunTestRequest { - string source = 1; - string name = 2; -} - -message RunNamespaceRequest { - string JWT = 1; - Script script = 2; - Namespace namespace = 3; -} - -message RunModuleRequest { - string JWT = 1; - Script script = 2; - Namespace namespace = 3; - Module module = 4; -} - -message RunRecordRequest { - string JWT = 1; - Script script = 2; - Namespace namespace = 3; - Module module = 4; - Record record = 5; -} - -message RunTestResponse {} - -message RunNamespaceResponse { - Namespace namespace = 1; -} - -message RunModuleResponse { - Module module = 1; -} - -message RunRecordResponse { - Record record = 1; -} - -message Script { - string source = 1; - string name = 2; - uint32 timeout = 3; // milliseconds - bool async = 4; -} - diff --git a/vendor/github.com/cortezaproject/corteza-protobuf/package.json b/vendor/github.com/cortezaproject/corteza-protobuf/package.json new file mode 100644 index 000000000..9eda009e7 --- /dev/null +++ b/vendor/github.com/cortezaproject/corteza-protobuf/package.json @@ -0,0 +1,6 @@ +{ + "name": "corteza-protobuf", + "version": "2019.9.0-rc.1", + "private": true, + "description": "Corteza Protobuf dummy package" +} diff --git a/vendor/github.com/cortezaproject/corteza-protobuf/service-corredor.proto b/vendor/github.com/cortezaproject/corteza-protobuf/service-corredor.proto new file mode 100644 index 000000000..1b5678215 --- /dev/null +++ b/vendor/github.com/cortezaproject/corteza-protobuf/service-corredor.proto @@ -0,0 +1,87 @@ +syntax = "proto3"; + +package corredor; + +import "compose/namespace.proto"; +import "compose/module.proto"; +import "compose/record.proto"; +import "system/mail_message.proto"; + +// Reasoning for having JWT in the *Request message (instead of meta-data): +// We're not using JWT as authentication token but as parameter that is passed +// to script runner and used there for setting up the API clients +// +// Script runner does not authenticate requests and blindly trusts all clients +service ScriptRunner { + rpc Test(RunTestRequest) returns (RunTestResponse); + rpc Namespace (RunNamespaceRequest) returns (RunNamespaceResponse); + rpc Module (RunModuleRequest) returns (RunModuleResponse); + rpc Record (RunRecordRequest) returns (RunRecordResponse); + + rpc MailMessage (RunMailMessageRequest) returns (RunMailMessageResponse); +} + +message RunTestRequest { + string source = 1; + string name = 2; +} + +message RunNamespaceRequest { + map config = 1; + + Script script = 2; + + compose.Namespace namespace = 3; +} + +message RunModuleRequest { + map config = 1; + + Script script = 2; + + compose.Namespace namespace = 3; + compose.Module module = 4; + +} + +message RunRecordRequest { + map config = 1; + + Script script = 2; + + compose.Namespace namespace = 3; + compose.Module module = 4; + compose.Record record = 5; +} + +message RunMailMessageRequest { + map config = 1; + + Script script = 2; + + system.MailMessage mailMessage = 3; +} + +message RunTestResponse {} + +message RunNamespaceResponse { + compose.Namespace namespace = 1; +} + +message RunModuleResponse { + compose.Module module = 1; +} + +message RunRecordResponse { + compose.Record record = 1; +} + +message RunMailMessageResponse {} + +message Script { + string source = 1; + string name = 2; + uint32 timeout = 3; // milliseconds + bool async = 4; +} + diff --git a/vendor/github.com/cortezaproject/corteza-protobuf/system/mail_message.proto b/vendor/github.com/cortezaproject/corteza-protobuf/system/mail_message.proto new file mode 100644 index 000000000..c1bd11f42 --- /dev/null +++ b/vendor/github.com/cortezaproject/corteza-protobuf/system/mail_message.proto @@ -0,0 +1,43 @@ +syntax = "proto3"; + +package system; +option go_package = "proto"; + +import "google/protobuf/timestamp.proto"; + +message MailMessage { + reserved 7 to 14; + reserved "parts"; + + // All typified data (date, to, cc, bcc...) + // is extracted and parsed + // + // Simple string values (subject, message-id, ...) + // are kept under Raw + // + message Header { + message MailAddress { + string address = 1; + string name = 2; + } + + message HeaderValues { + repeated string values = 1; + } + + google.protobuf.Timestamp date = 1; + + repeated MailAddress to = 2; + repeated MailAddress cc = 3; + repeated MailAddress bcc = 4; + repeated MailAddress from = 5; + repeated MailAddress replyTo = 6; + + map raw = 15; + } + + Header header = 6; + + + bytes rawBody = 15; +} diff --git a/vendor/github.com/cortezaproject/corteza-protobuf/system/user.proto b/vendor/github.com/cortezaproject/corteza-protobuf/system/user.proto new file mode 100644 index 000000000..e86e5e641 --- /dev/null +++ b/vendor/github.com/cortezaproject/corteza-protobuf/system/user.proto @@ -0,0 +1,34 @@ +syntax = "proto3"; + +package system; +option go_package = "proto"; + +service Users { + rpc MakeJWT(MakeJWTRequest) returns (MakeJWTResponse); + rpc FindByID(FindByIDRequest) returns (FindByIDResponse); +} + +message MakeJWTRequest { + uint64 userID = 1; +} + +message MakeJWTResponse { + string JWT = 1; +} + +message FindByIDRequest { + uint64 userID = 1; +} + +message FindByIDResponse { + User user = 1; +} + +message User { + uint64 ID = 1; + string email = 2; + string handle = 3; + string name = 4; + string kind = 5; +} +