Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add json to applications services #130

Draft
wants to merge 30 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
c810981
feat: add json to applications services
esoubiran-aneo Jan 30, 2023
6bf1122
fix: order
esoubiran-aneo Jan 30, 2023
62472fc
ci: fix proto
esoubiran-aneo Jan 30, 2023
9f17077
fix: protoc
esoubiran-aneo Jan 30, 2023
cd4f0f3
ci: restore
esoubiran-aneo Jan 30, 2023
eebd25e
feat: add google api
esoubiran-aneo Feb 8, 2023
71389ec
feat: add to common csproj
esoubiran-aneo Feb 8, 2023
d474e67
fix: end of file
esoubiran-aneo Feb 8, 2023
cd911d2
fix: end of file
esoubiran-aneo Feb 8, 2023
75f3504
fix: update http path
esoubiran-aneo Feb 8, 2023
9ba11ef
fix: import order
esoubiran-aneo Feb 8, 2023
70cd52e
fix: path
esoubiran-aneo Feb 8, 2023
9e80b32
fix: path
esoubiran-aneo Feb 8, 2023
aefd73e
fix: path
esoubiran-aneo Feb 8, 2023
4676e0c
fix: path
esoubiran-aneo Feb 8, 2023
56e3026
Merge branch 'main' into feat-implements-rest-json
esoubiran-aneo Feb 8, 2023
cae4495
Merge branch 'main' into feat-implements-rest-json
esoubiran-aneo Feb 8, 2023
7a9545b
Merge branch 'main' into feat-implements-rest-json
aneojgurhem Feb 9, 2023
8933f09
chore: fix formatting
aneojgurhem Feb 9, 2023
5dc2511
Merge branch 'main' into feat-implements-rest-json
aneojgurhem Feb 19, 2023
3301b69
Use .net7 for core package
aneojgurhem Feb 22, 2023
6859d85
Import Google.Api.CommonProtos instead of importing proto files thems…
aneojgurhem Feb 23, 2023
9552c01
Remove multiple package import
aneojgurhem Feb 23, 2023
c165ddb
Fix pipeline
aneojgurhem Feb 23, 2023
799269a
Fix version for ArmoniK.Api.Core.Tests
aneojgurhem Feb 23, 2023
1d97b54
Use .net7 for compilation in pipeline
aneojgurhem Feb 23, 2023
255f221
Merge branch 'main' into feat-implements-rest-json
aneojgurhem Feb 23, 2023
9869ef3
Use net7 for running tests
aneojgurhem Feb 23, 2023
d091419
Manage frameworks in tests
aneojgurhem Feb 23, 2023
f6c49e5
feat(web): build only wanted module
esoubiran-aneo Feb 23, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/publish-edge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,11 @@ jobs:
strategy:
fail-fast: false
matrix:
projects:
- packages/csharp/ArmoniK.Api.Tests
include:
- projects: packages/csharp/ArmoniK.Api.Tests
framework: 6.x
- projects: packages/csharp/ArmoniK.Api.Core.Tests
framework: 7.x
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -51,7 +54,7 @@ jobs:
- name: Install .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.x
dotnet-version: ${{ matrix.framework }}

- name: Run tests
run: |
Expand Down
31 changes: 31 additions & 0 deletions Protos/V1/annotations.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Copyright (c) 2015, Google Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

syntax = "proto3";

package google.api;

import "google/protobuf/descriptor.proto";
import "http.proto";

option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";
option java_multiple_files = true;
option java_outer_classname = "AnnotationsProto";
option java_package = "com.google.api";
option objc_class_prefix = "GAPI";

extend google.protobuf.MethodOptions {
// See `HttpRule`.
HttpRule http = 72295728;
}
9 changes: 7 additions & 2 deletions Protos/V1/applications_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ syntax = "proto3";

package armonik.api.grpc.v1.applications;

import "annotations.proto";
import "applications_common.proto";

option csharp_namespace = "ArmoniK.Api.gRPC.V1.Applications";
Expand All @@ -15,8 +16,12 @@ option csharp_namespace = "ArmoniK.Api.gRPC.V1.Applications";
service Applications {
/**
* Get a applications list using pagination, filters and sorting;
*/
rpc ListApplications(ListApplicationsRequest) returns (ListApplicationsResponse) {}
*/
rpc ListApplications(ListApplicationsRequest) returns (ListApplicationsResponse) {
option (google.api.http) = {
get: "/v1/applications"
};
}

/**
* Get count from tasks by status using an application.
Expand Down
Loading