[public-api] Remove gp-lint

gitpod-io · May 2, 2022 · bea7a54 · bea7a54
1 parent e0452ea
commit bea7a54
Show file tree

Hide file tree

Showing 21 changed files with 483 additions and 1,538 deletions.
diff --git a/components/public-api-server/pkg/apiv1/prebuild.go b/components/public-api-server/pkg/apiv1/prebuild.go
@@ -21,7 +21,6 @@ type PrebuildService struct {
 
 func (p *PrebuildService) GetPrebuild(ctx context.Context, req *v1.GetPrebuildRequest) (*v1.GetPrebuildResponse, error) {
 	return &v1.GetPrebuildResponse{
-		ResponseStatus: nil,
 		Prebuild: &v1.Prebuild{
 			PrebuildId: req.GetPrebuildId(),
 			Spec: &v1.PrebuildSpec{

diff --git a/components/public-api-server/pkg/apiv1/workspace.go b/components/public-api-server/pkg/apiv1/workspace.go
@@ -21,7 +21,6 @@ type WorkspaceService struct {
 
 func (w *WorkspaceService) GetWorkspace(ctx context.Context, r *v1.GetWorkspaceRequest) (*v1.GetWorkspaceResponse, error) {
 	return &v1.GetWorkspaceResponse{
-		ResponseStatus: nil,
 		Result: &v1.Workspace{
 			WorkspaceId: r.GetWorkspaceId(),
 			OwnerId:     "mock_owner",

diff --git a/components/public-api-server/pkg/apiv1/workspace_test.go b/components/public-api-server/pkg/apiv1/workspace_test.go
@@ -20,7 +20,6 @@ func TestWorkspaceService_GetWorkspace(t *testing.T) {
 	})
 	require.NoError(t, err)
 	require.Equal(t, &v1.GetWorkspaceResponse{
-		ResponseStatus: nil,
 		Result: &v1.Workspace{
 			WorkspaceId: workspaceID,
 			OwnerId:     "mock_owner",

diff --git a/components/public-api/BUILD.yaml b/components/public-api/BUILD.yaml
diff --git a/components/public-api/generate.sh b/components/public-api/generate.sh
@@ -18,7 +18,6 @@ COMPONENTS_DIR="$ROOT_DIR"/components
 source "$ROOT_DIR"/scripts/protoc-generator.sh
 
 lint
-leeway run .:lint
 
 install_dependencies
 go_protoc "$COMPONENTS_DIR" "gitpod/v1"

diff --git a/components/public-api/gitpod/v1/prebuilds.proto b/components/public-api/gitpod/v1/prebuilds.proto
@@ -3,7 +3,6 @@ syntax = "proto3";
 package gitpod.v1;
 
 import "gitpod/v1/workspaces.proto";
-import "google/rpc/status.proto";
 
 option go_package = "github.com/gitpod-io/gitpod/public-api/v1";
 
@@ -34,36 +33,28 @@ message GetPrebuildRequest {
     string prebuild_id = 1;
 }
 message GetPrebuildResponse {
-    google.rpc.Status response_status = 1;
-
-    Prebuild prebuild = 2;
+    Prebuild prebuild = 1;
 }
 
 message GetRunningPrebuildRequest {
     string context_url = 1;
 }
 message GetRunningPrebuildResponse {
-    google.rpc.Status response_status = 1;
-
-    Prebuild prebuild = 2;
+    Prebuild prebuild = 1;
 }
 
 message ListenToPrebuildStatusRequest{
     string prebuild_id = 1;
 }
 message ListenToPrebuildStatusResponse {
-    google.rpc.Status response_status = 1;
-
-    PrebuildStatus status = 2;
+    PrebuildStatus status = 1;
 }
 
 message ListenToPrebuildLogsRequest {
     string prebuild_id = 1;
 }
 message ListenToPrebuildLogsResponse {
-    google.rpc.Status response_status = 1;
-
-    string line = 2;
+    string line = 1;
 }
 
 ////////////////////////////////

diff --git a/components/public-api/gitpod/v1/workspaces.proto b/components/public-api/gitpod/v1/workspaces.proto
@@ -6,7 +6,6 @@ option go_package = "github.com/gitpod-io/gitpod/public-api/v1";
 
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/field_mask.proto";
-import "google/rpc/status.proto";
 import "gitpod/v1/pagination.proto";
 
 service WorkspacesService {
@@ -58,20 +57,16 @@ message ListWorkspacesResponse {
         WorkspaceInstance last_active_instances = 2;
     }
 
-    google.rpc.Status response_status = 1;
+    string next_page_token = 1;
 
-    string next_page_token = 2;
-
-    repeated WorkspaceAndInstance result = 3;
+    repeated WorkspaceAndInstance result = 2;
 }
 
 message GetWorkspaceRequest {
     string workspace_id = 1;
 }
 message GetWorkspaceResponse {
-    google.rpc.Status response_status = 1;
-
-    Workspace result = 2;
+    Workspace result = 1;
 }
 
 message CreateAndStartWorkspaceRequest {
@@ -85,9 +80,7 @@ message CreateAndStartWorkspaceRequest {
     StartWorkspaceSpec start_spec = 5;
 }
 message CreateAndStartWorkspaceResponse {
-    google.rpc.Status response_status = 1;
-
-    string workspace_id = 2;
+    string workspace_id = 1;
 }
 
 message StartWorkspaceRequest {
@@ -97,56 +90,44 @@ message StartWorkspaceRequest {
     StartWorkspaceSpec spec = 3;
 }
 message StartWorkspaceResponse {
-    google.rpc.Status response_status = 1;
-
-    string instance_id = 2;
-    string workspace_url = 3;
+    string instance_id = 1;
+    string workspace_url = 2;
 }
 
 message GetActiveWorkspaceInstanceRequest {
     string workspace_id = 1;
 }
 message GetActiveWorkspaceInstanceResponse {
-    google.rpc.Status response_status = 1;
-
-    WorkspaceInstance instance = 2;
+    WorkspaceInstance instance = 1;
 }
 
 message GetWorkspaceInstanceOwnerTokenRequest {
     string instance_id = 1;
 }
 message GetWorkspaceInstanceOwnerTokenResponse {
-    google.rpc.Status response_status = 1;
-
-    string owner_token = 2;
+    string owner_token = 1;
 }
 
 message ListenToWorkspaceInstanceRequest {
     string instance_id = 1;
 }
 message ListenToWorkspaceInstanceResponse {
-    google.rpc.Status response_status = 1;
-
-    WorkspaceInstanceStatus instance_status = 2;
+    WorkspaceInstanceStatus instance_status = 1;
 }
 
 message ListenToImageBuildLogsRequest {
     string instance_id = 1;
 }
 message ListenToImageBuildLogsResponse {
-    google.rpc.Status response_status = 1;
-
-    string line = 2;
+    string line = 1;
 }
 
 message StopWorkspaceRequest {
     string idempotency_token = 1;
 
     string workspace_id = 2;
 }
-message StopWorkspaceResponse {
-    google.rpc.Status response_status = 1;
-}
+message StopWorkspaceResponse {}
 
 ////////////////////////////////
 // Shared messages come here