Merge branch 'main' into feat-partitions

aneoconsulting · Dec 14, 2022 · 6b093e7 · 6b093e7
2 parents 5a48e4b + ea97df8
commit 6b093e7
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 3 deletions.
diff --git a/Api/common/protofiles.sh b/Api/common/protofiles.sh
@@ -6,8 +6,8 @@ export README_PATH=$REPOSITORY_PATH/README.md
 
 armonik_worker_files=("agent_service.proto" "worker_service.proto")
 armonik_client_files=("submitter_service.proto" "tasks_service.proto" "sessions_service.proto" \
-                      "results_service.proto" "applications_service.proto" "partitions_service.proto")
+                      "results_service.proto" "applications_service.proto" "auth_service.proto" "partitions_service.proto")
 armonik_common_files=("objects.proto" "task_status.proto" "session_status.proto" \
                       "result_status.proto" "agent_common.proto" "sessions_common.proto"  \
                       "submitter_common.proto"  "tasks_common.proto"  "worker_common.proto" \
-                      "results_common.proto" "applications_common.proto" "partitions_common.proto")
+                      "results_common.proto" "applications_common.proto" "auth_common.proto" "partitions_common.proto")
diff --git a/Api/csharp/ArmoniK.Api.Client/ArmoniK.Api.Client.csproj b/Api/csharp/ArmoniK.Api.Client/ArmoniK.Api.Client.csproj
@@ -53,7 +53,10 @@
     <Protobuf Include="..\..\..\Protos\V1\results_service.proto" GrpcServices="Client">
       <Link>gRPC\Protos\results_service.proto</Link>
     </Protobuf>
-        <Protobuf Include="..\..\..\Protos\V1\partitions_service.proto" GrpcServices="Client">
+     <Protobuf Include="..\..\..\Protos\V1\auth_service.proto" GrpcServices="Client">
+      <Link>gRPC\Protos\auth_service.proto</Link>
+    </Protobuf>
+    <Protobuf Include="..\..\..\Protos\V1\partitions_service.proto" GrpcServices="Client">
       <Link>gRPC\Protos\partitions_service.proto</Link>
     </Protobuf>
   </ItemGroup>

diff --git a/Api/csharp/ArmoniK.Api.Common/ArmoniK.Api.Common.csproj b/Api/csharp/ArmoniK.Api.Common/ArmoniK.Api.Common.csproj
@@ -50,6 +50,10 @@
     <Protobuf Include="..\..\..\Protos\V1\applications_common.proto" Link="applications_common.proto">
       <GrpcServices>Message</GrpcServices>
       <ProtoCompile>True</ProtoCompile>
+    </Protobuf>
+      <Protobuf Include="..\..\..\Protos\V1\auth_common.proto" Link="auth_common.proto">
+      <GrpcServices>Message</GrpcServices>
+      <ProtoCompile>True</ProtoCompile>
     </Protobuf>
     <Protobuf Include="..\..\..\Protos\V1\sessions_common.proto" Link="sessions_common.proto">
       <GrpcServices>Message</GrpcServices>

diff --git a/Api/csharp/ArmoniK.Api.Core/ArmoniK.Api.Core.csproj b/Api/csharp/ArmoniK.Api.Core/ArmoniK.Api.Core.csproj
@@ -31,6 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Protobuf Include="..\..\..\Protos\V1\auth_service.proto" GrpcServices="Both">
+      <Link>gRPC\Protos\auth_service.proto</Link>
+    </Protobuf>
     <Protobuf Include="..\..\..\Protos\V1\submitter_service.proto" GrpcServices="Both">
       <Link>gRPC\Protos\submitter_service.proto</Link>
     </Protobuf>

diff --git a/Protos/V1/auth_common.proto b/Protos/V1/auth_common.proto
@@ -0,0 +1,30 @@
+/**
+ * Messages describing authentication and associated requests and responses.
+ */
+syntax = "proto3";
+
+package armonik.api.grpc.v1.auth;
+
+option csharp_namespace = "ArmoniK.Api.gRPC.V1.Auth";
+
+/**
+ * A user.
+ */
+message User {
+  string username = 1; /** Username. If authentication is disabled, must be set to 'Anonymous' */
+
+  repeated string roles = 2; /** Roles. If authentication is disabled, must return []. */
+  repeated string permissions = 3; /** Permissions. If authentication is disabled, must return every permissions. */
+}
+
+/**
+ * Request to get current user informations.
+ */
+message GetCurrentUserRequest {}
+
+/**
+ * Response to get current user informations.
+ */
+message GetCurrentUserResponse {
+  User user = 1; /** Return current user. If auth failed, must throw a gRPC error. */
+}
diff --git a/Protos/V1/auth_service.proto b/Protos/V1/auth_service.proto
@@ -0,0 +1,20 @@
+/**
+ * Authentication related methods within a service.
+ */
+syntax = "proto3";
+
+package armonik.api.grpc.v1.auth;
+
+import "auth_common.proto";
+
+option csharp_namespace = "ArmoniK.Api.gRPC.V1.Auth";
+
+/**
+ * Service for authentication management.
+ */
+service Authentication {
+  /**
+   * Get current user
+   */
+  rpc GetCurrentUser(GetCurrentUserRequest) returns (GetCurrentUserResponse) {}
+}
diff --git a/Protos/V1/sessions_common.proto b/Protos/V1/sessions_common.proto
@@ -38,6 +38,8 @@ message SessionSummary {
   session_status.SessionStatus status = 2; /** The session status. */
   google.protobuf.Timestamp created_at = 3; /** The creation date. */
   google.protobuf.Timestamp cancelled_at = 4; /** The cancellation date. Only set when status is 'cancelled'. */
+
+  TaskOptions options = 5; /** The default task options. */
 }
 
 /**
@@ -104,6 +106,11 @@ message ListSessionsRequest {
    * Must be set for every request.
    */
   Sort sort = 4;
+
+  /**
+   * Flag to tell if server must return task options in summary sessions
+   */
+  bool with_task_options = 5;
 }
 
 /**