From cbd9096a4e811c90357d266cfad0f056405cea3f Mon Sep 17 00:00:00 2001
From: Johannes Batzill <johannes.batzill@harness.io>
Date: Tue, 14 Feb 2023 20:27:33 -0800
Subject: [PATCH] [WEB-SERVICES] generate latest (#343)

---
 web/src/services/code/index.tsx    | 14 +++++++-------
 web/src/services/code/swagger.yaml | 26 +++++++++++++-------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/web/src/services/code/index.tsx b/web/src/services/code/index.tsx
index d6975a8ab..256558b4d 100644
--- a/web/src/services/code/index.tsx
+++ b/web/src/services/code/index.tsx
@@ -7,9 +7,9 @@ import { getConfig } from '../config'
 export const SPEC_VERSION = '0.0.0'
 export type EnumAccessGrant = number
 
-export type EnumMergeMethod = 'merge' | 'rebase' | 'squash'
+export type EnumMergeCheckStatus = string
 
-export type EnumMergeStatus = string
+export type EnumMergeMethod = 'merge' | 'rebase' | 'squash'
 
 export type EnumParentResourceType = 'space' | 'repo'
 
@@ -176,8 +176,8 @@ export interface OpenapiGetContentOutput {
 }
 
 export interface OpenapiMergePullReq {
-  head_sha?: string
   method?: EnumMergeMethod
+  source_sha?: string
 }
 
 export interface OpenapiMoveRepoRequest {
@@ -369,11 +369,11 @@ export interface TypesPullReq {
   edited?: number
   is_draft?: boolean
   merge_base_sha?: string | null
+  merge_check_status?: EnumMergeCheckStatus
   merge_conflicts?: string | null
-  merge_head_sha?: string | null
-  merge_ref_sha?: string | null
-  merge_status?: EnumMergeStatus
-  merge_strategy?: EnumMergeMethod
+  merge_method?: EnumMergeMethod
+  merge_sha?: string | null
+  merge_target_sha?: string | null
   merged?: number | null
   merger?: TypesPrincipalInfo
   number?: number
diff --git a/web/src/services/code/swagger.yaml b/web/src/services/code/swagger.yaml
index 5a04f6570..62a792683 100644
--- a/web/src/services/code/swagger.yaml
+++ b/web/src/services/code/swagger.yaml
@@ -3547,14 +3547,14 @@ components:
   schemas:
     EnumAccessGrant:
       type: integer
+    EnumMergeCheckStatus:
+      type: string
     EnumMergeMethod:
       enum:
         - merge
         - rebase
         - squash
       type: string
-    EnumMergeStatus:
-      type: string
     EnumParentResourceType:
       enum:
         - space
@@ -3848,10 +3848,10 @@ components:
       type: object
     OpenapiMergePullReq:
       properties:
-        head_sha:
-          type: string
         method:
           $ref: '#/components/schemas/EnumMergeMethod'
+        source_sha:
+          type: string
       type: object
     OpenapiMoveRepoRequest:
       properties:
@@ -4165,19 +4165,19 @@ components:
         merge_base_sha:
           nullable: true
           type: string
+        merge_check_status:
+          $ref: '#/components/schemas/EnumMergeCheckStatus'
         merge_conflicts:
           nullable: true
           type: string
-        merge_head_sha:
-          nullable: true
-          type: string
-        merge_ref_sha:
-          nullable: true
-          type: string
-        merge_status:
-          $ref: '#/components/schemas/EnumMergeStatus'
-        merge_strategy:
+        merge_method:
           $ref: '#/components/schemas/EnumMergeMethod'
+        merge_sha:
+          nullable: true
+          type: string
+        merge_target_sha:
+          nullable: true
+          type: string
         merged:
           nullable: true
           type: integer