fix(backend): fixing response status code for grpc request (#2741)

kubeshop · Jun 16, 2023 · 887b34c · 887b34c
1 parent 4bb77e5
commit 887b34c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 26 deletions.
diff --git a/api/grpc.yaml b/api/grpc.yaml
@@ -31,9 +31,12 @@ components:
 
     GRPCResponse:
       type: object
+      required:
+        - statusCode
       properties:
         statusCode:
           type: integer
+          default: 0
         metadata:
           type: array
           items:

diff --git a/cli/openapi/model_grpc_response.go b/cli/openapi/model_grpc_response.go
diff --git a/server/openapi/model_grpc_response.go b/server/openapi/model_grpc_response.go
@@ -10,7 +10,7 @@
 package openapi
 
 type GrpcResponse struct {
-	StatusCode int32 `json:"statusCode,omitempty"`
+	StatusCode int32 `json:"statusCode"`
 
 	Metadata []GrpcHeader `json:"metadata,omitempty"`
 
@@ -19,6 +19,15 @@ type GrpcResponse struct {
 
 // AssertGrpcResponseRequired checks if the required fields are not zero-ed
 func AssertGrpcResponseRequired(obj GrpcResponse) error {
+	elements := map[string]interface{}{
+		"statusCode": obj.StatusCode,
+	}
+	for name, el := range elements {
+		if isZero := IsZeroValue(el); isZero {
+			return &RequiredError{Field: name}
+		}
+	}
+
 	for _, el := range obj.Metadata {
 		if err := AssertGrpcHeaderRequired(el); err != nil {
 			return err

diff --git a/web/src/models/TriggerResult.model.ts b/web/src/models/TriggerResult.model.ts
@@ -24,7 +24,7 @@ const ResponseData = {
     return {
       body: get(response, 'body', ''),
       headers: get(response, 'metadata', undefined) as THeader[],
-      statusCode: get(response, 'statusCode', 200),
+      statusCode: get(response, 'statusCode', 0),
     };
   },
   [TriggerTypes.traceid](response: object) {
@@ -38,7 +38,7 @@ const ResponseData = {
 
 const TriggerResult = ({
   triggerType = 'http',
-  triggerResult: {http = {}, grpc = {}, traceid = {}} = {},
+  triggerResult: {http = {}, grpc = {statusCode: 0}, traceid = {}} = {},
 }: TRawTriggerResult): TriggerResult => {
   const type = triggerType as TriggerTypes;
 

diff --git a/web/src/types/Generated.types.ts b/web/src/types/Generated.types.ts
@@ -1565,7 +1565,7 @@ export interface external {
           request?: string;
         };
         GRPCResponse: {
-          statusCode?: number;
+          statusCode: number;
           metadata?: external["grpc.yaml"]["components"]["schemas"]["GRPCHeader"][];
           body?: string;
         };