-
Notifications
You must be signed in to change notification settings - Fork 377
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* feat: remove useless data * feat: comment provider.Run * feat: projectID * feat: hepa openapi * feat: permission * feat: runtime cli * feat: fatal * feat: typo * feat: more info * feat: do clearing async * fix: NotFoundError Co-authored-by: 悟空 <[email protected]>
- Loading branch information
Showing
23 changed files
with
1,402 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| syntax = "proto3"; | ||
|
|
||
| package erda.common; | ||
|
|
||
| option go_package = "github.com/erda-project/erda-proto-go/common/pb"; | ||
|
|
||
| enum StatusEnum { | ||
| unknown_status = 0; | ||
| not_found = 404; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| syntax = "proto3"; | ||
|
|
||
| package erda.core.project; | ||
|
|
||
| import "google/protobuf/timestamp.proto"; | ||
| import "common/status.proto"; | ||
|
|
||
| option go_package = "github.com/erda-project/erda-proto-go/core/project/pb"; | ||
|
|
||
| service Project { | ||
| rpc CheckProjectExist(CheckProjectExistReq)returns(CheckProjectExistResp){} | ||
| rpc GetProjectByID(GetProjectByIDReq)returns(ProjectDto){} | ||
| } | ||
|
|
||
| message CheckProjectExistReq { | ||
| uint64 id = 1; | ||
| } | ||
|
|
||
| message CheckProjectExistResp { | ||
| bool ok = 1; | ||
| } | ||
|
|
||
| message GetProjectByIDReq { | ||
| uint64 id = 1; | ||
| optional string userID = 2; | ||
| } | ||
|
|
||
| message ProjectDto { | ||
| // project primary key | ||
| uint64 id = 1; | ||
| // project identifies | ||
| string name = 2; | ||
| // project display name | ||
| string displayName = 3; | ||
| // for string ddHook | ||
| reserved 4; | ||
| // org primary key | ||
| uint64 orgID = 5; | ||
| // the project creator userID | ||
| string creatorID = 6; | ||
| // the project logo url | ||
| string logo = 7; | ||
| // the project description | ||
| string desc = 8; | ||
| // the owners' userIDs of the project | ||
| // for owners | ||
| reserved 9; | ||
| // project active time | ||
| google.protobuf.Timestamp activeTime = 10; | ||
| // for string joined | ||
| reserved 11; | ||
| // for bool canUnblock | ||
| reserved 12; | ||
| // for string blockStatus | ||
| reserved 13; | ||
| // for bool CanManage | ||
| reserved 14; | ||
| // is the project public | ||
| bool isPublic = 15; | ||
| // for ProjectStats stats | ||
| reserved 16; | ||
| // for ProjectResourceUsage | ||
| reserved 17, 18, 19, 20; | ||
| // for clusterConfig | ||
| reserved 21; | ||
| // for ResourceConfigsInfo resourceConfig | ||
| reserved 22; | ||
| // for map<string, int> RollbackConfig | ||
| reserved 23; | ||
| // for float64 cpuQuota | ||
| reserved 24; | ||
| // for float64 memQuota | ||
| reserved 25; | ||
| google.protobuf.Timestamp createdTime = 26; | ||
| google.protobuf.Timestamp updatedTime = 27; | ||
| // project type | ||
| string type = 28; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // Copyright (c) 2021 Terminus, 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. | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| _ "embed" | ||
|
|
||
| // providers | ||
| _ "github.com/erda-project/erda-infra/providers/grpcclient" | ||
| _ "github.com/erda-project/erda-infra/providers/pprof" | ||
| _ "github.com/erda-project/erda-infra/providers/redis" | ||
| _ "github.com/erda-project/erda-proto-go/core/pipeline/cms/client" | ||
| _ "github.com/erda-project/erda/internal/core/legacy" | ||
| _ "github.com/erda-project/erda/internal/core/legacy/providers/token" | ||
| _ "github.com/erda-project/erda/internal/core/legacy/services/dingtalk/api" | ||
| _ "github.com/erda-project/erda/internal/core/messenger/eventbox" | ||
| _ "github.com/erda-project/erda/internal/core/messenger/notify" | ||
| _ "github.com/erda-project/erda/internal/core/messenger/notify-channel" | ||
| _ "github.com/erda-project/erda/internal/core/messenger/notifygroup" | ||
| _ "github.com/erda-project/erda/internal/core/project" | ||
|
|
||
| // infra | ||
| _ "github.com/erda-project/erda-infra/providers/grpcserver" | ||
| _ "github.com/erda-project/erda-infra/providers/httpserver" | ||
| _ "github.com/erda-project/erda-infra/providers/mysql" | ||
| _ "github.com/erda-project/erda-infra/providers/serviceregister" | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,6 +37,14 @@ [email protected]: | |
| addr: "${CLUSTER_MANAGER_GRPC_ADDR:cluster-manager:9095}" | ||
| erda.core.clustermanager.cluster-client: {} | ||
|
|
||
| [email protected]: | ||
| addr: "${CORE_SERVICES_GRPC_ADDR:core-services:9537}" | ||
| erda.core.project-client: {} | ||
|
|
||
| [email protected]: | ||
| addr: "${ORCHESTRATOR_GRPC_ADDR:orchestrator:7080}" | ||
| erda.orchestrator.runtime-client: {} | ||
|
|
||
| [email protected]: | ||
| addr: "${MSP_GRPC_ADDR:msp:7080}" | ||
| erda.msp.tenant-client: {} | ||
Oops, something went wrong.