From fc4b60603eb800303a737e313a7a24ed8a78717b Mon Sep 17 00:00:00 2001
From: baixinsui <baixinsui@outlook.com>
Date: Fri, 27 Dec 2024 13:51:45 +0800
Subject: [PATCH] deployer changed to multiple files map (#1388)

---
 .../policies/AddOrUpdateServicePolicy.tsx     |   2 +-
 .../deletePolicy/useDeleteServicePolicy.tsx   |   4 +-
 .../updatePolicy/useUpdateServicePolicy.tsx   |  10 +-
 .../content/common/ocl/DeploymentScript.tsx   |   4 +-
 .../deployment/DeploymentInfomation.tsx       |   2 +-
 .../delete/useDeletePolicyRequest.tsx         |   4 +-
 .../content/workflows/Workflows.tsx           |   4 +-
 src/xpanse-api/generated/sdk.gen.ts           | 136 +++++++++---------
 src/xpanse-api/generated/types.gen.ts         |  56 ++++----
 9 files changed, 115 insertions(+), 107 deletions(-)

diff --git a/src/components/content/catalog/services/policies/AddOrUpdateServicePolicy.tsx b/src/components/content/catalog/services/policies/AddOrUpdateServicePolicy.tsx
index 9d0cbebfa..3a15f8951 100644
--- a/src/components/content/catalog/services/policies/AddOrUpdateServicePolicy.tsx
+++ b/src/components/content/catalog/services/policies/AddOrUpdateServicePolicy.tsx
@@ -75,7 +75,7 @@ export const AddOrUpdateServicePolicy = ({
             };
             setUpdatePolicyRequest(policyUpdateRequest);
             updatePoliciesManagementServiceRequest.mutate({
-                id: currentServicePolicy.servicePolicyId,
+                policyId: currentServicePolicy.servicePolicyId,
                 policyUpdateRequest: policyUpdateRequest,
             });
         }
diff --git a/src/components/content/catalog/services/policies/deletePolicy/useDeleteServicePolicy.tsx b/src/components/content/catalog/services/policies/deletePolicy/useDeleteServicePolicy.tsx
index a0e1638db..a46956d47 100644
--- a/src/components/content/catalog/services/policies/deletePolicy/useDeleteServicePolicy.tsx
+++ b/src/components/content/catalog/services/policies/deletePolicy/useDeleteServicePolicy.tsx
@@ -8,9 +8,9 @@ import { deleteServicePolicy, DeleteServicePolicyData } from '../../../../../../
 
 export const useDeleteServicePolicy = () => {
     return useMutation({
-        mutationFn: (id: string) => {
+        mutationFn: (policyId: string) => {
             const deleteData: DeleteServicePolicyData = {
-                id: id,
+                policyId: policyId,
             };
             return deleteServicePolicy(deleteData);
         },
diff --git a/src/components/content/catalog/services/policies/updatePolicy/useUpdateServicePolicy.tsx b/src/components/content/catalog/services/policies/updatePolicy/useUpdateServicePolicy.tsx
index 1a9fca5fd..28912635e 100644
--- a/src/components/content/catalog/services/policies/updatePolicy/useUpdateServicePolicy.tsx
+++ b/src/components/content/catalog/services/policies/updatePolicy/useUpdateServicePolicy.tsx
@@ -12,9 +12,15 @@ import {
 
 export const useUpdateServicePolicy = () => {
     return useMutation({
-        mutationFn: ({ id, policyUpdateRequest }: { id: string; policyUpdateRequest: ServicePolicyUpdateRequest }) => {
+        mutationFn: ({
+            policyId,
+            policyUpdateRequest,
+        }: {
+            policyId: string;
+            policyUpdateRequest: ServicePolicyUpdateRequest;
+        }) => {
             const data: UpdateServicePolicyData = {
-                id: id,
+                policyId: policyId,
                 requestBody: policyUpdateRequest,
             };
             return updateServicePolicy(data);
diff --git a/src/components/content/common/ocl/DeploymentScript.tsx b/src/components/content/common/ocl/DeploymentScript.tsx
index aad2a00c7..b59e2b710 100644
--- a/src/components/content/common/ocl/DeploymentScript.tsx
+++ b/src/components/content/common/ocl/DeploymentScript.tsx
@@ -15,11 +15,11 @@ export function DeploymentScriptText({ deployment }: { deployment: Deployment })
         const yamlDocument = new YAML.Document();
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-expect-error
-        yamlDocument.contents = deployment.deployer ? deployment.deployer : deployment.scriptsRepo;
+        yamlDocument.contents = deployment.scriptFiles ? deployment.scriptFiles : deployment.scriptsRepo;
         return (
             <Popover
                 content={<pre className={oclDisplayStyles.oclDeploymentScript}>{yamlDocument.toString()}</pre>}
-                title={'Deployment Script'}
+                title={'Deployment Scripts'}
                 trigger='hover'
             >
                 <Button className={oclDisplayStyles.oclDataHover} type={'link'}>
diff --git a/src/components/content/deployment/DeploymentInfomation.tsx b/src/components/content/deployment/DeploymentInfomation.tsx
index 87dbccb59..a5ce54954 100644
--- a/src/components/content/deployment/DeploymentInfomation.tsx
+++ b/src/components/content/deployment/DeploymentInfomation.tsx
@@ -32,7 +32,7 @@ function DeploymentInfomation({ deployment }: { deployment: Deployment }): React
                 <Descriptions.Item label='Service Availability Config'>
                     <DeploymentText deployment={deployment} />
                 </Descriptions.Item>
-                <Descriptions.Item label='Deployment Script'>
+                <Descriptions.Item label='Deployment Scripts'>
                     <DeploymentScriptText deployment={deployment} />
                 </Descriptions.Item>
             </Descriptions>
diff --git a/src/components/content/policies/delete/useDeletePolicyRequest.tsx b/src/components/content/policies/delete/useDeletePolicyRequest.tsx
index efbeaf5c9..fcaf3bbeb 100644
--- a/src/components/content/policies/delete/useDeletePolicyRequest.tsx
+++ b/src/components/content/policies/delete/useDeletePolicyRequest.tsx
@@ -8,9 +8,9 @@ import { deleteUserPolicy, DeleteUserPolicyData } from '../../../../xpanse-api/g
 
 export function useDeletePolicyRequest() {
     return useMutation({
-        mutationFn: (id: string) => {
+        mutationFn: (policyId: string) => {
             const data: DeleteUserPolicyData = {
-                id: id,
+                policyId: policyId,
             };
             return deleteUserPolicy(data);
         },
diff --git a/src/components/content/workflows/Workflows.tsx b/src/components/content/workflows/Workflows.tsx
index 5f1bdc371..12b99e158 100644
--- a/src/components/content/workflows/Workflows.tsx
+++ b/src/components/content/workflows/Workflows.tsx
@@ -52,7 +52,7 @@ function Workflows(): React.JSX.Element {
     const completeFailedTasksQuery = useMutation({
         mutationFn: (taskId: string) => {
             const data: ManageFailedOrderData = {
-                id: taskId,
+                taskId: taskId,
                 retryOrder: true,
             };
             return manageFailedOrder(data);
@@ -79,7 +79,7 @@ function Workflows(): React.JSX.Element {
     const closeFailedTasksQuery = useMutation({
         mutationFn: (taskId: string) => {
             const data: ManageFailedOrderData = {
-                id: taskId,
+                taskId: taskId,
                 retryOrder: false,
             };
             return manageFailedOrder(data);
diff --git a/src/xpanse-api/generated/sdk.gen.ts b/src/xpanse-api/generated/sdk.gen.ts
index 440f3ee69..936c6d1ec 100644
--- a/src/xpanse-api/generated/sdk.gen.ts
+++ b/src/xpanse-api/generated/sdk.gen.ts
@@ -177,7 +177,7 @@ import type {
 /**
  * Manage failed task orders.<br> Required role: <b>admin</b> or <b>user</b> </br>
  * @param data The data for the request.
- * @param data.id ID of the workflow task that needs to be handled
+ * @param data.taskId ID of the workflow task that needs to be handled
  * @param data.retryOrder Controls if the order must be retried again or simply closed.
  * @returns unknown OK
  * @throws ApiError
@@ -185,9 +185,9 @@ import type {
 export const manageFailedOrder = (data: ManageFailedOrderData): CancelablePromise<ManageFailedOrderResponse> => {
     return __request(OpenAPI, {
         method: 'PUT',
-        url: '/xpanse/workflow/task/{id}',
+        url: '/xpanse/workflow/task/{taskId}',
         path: {
-            id: data.id,
+            taskId: data.taskId,
         },
         query: {
             retryOrder: data.retryOrder,
@@ -207,7 +207,7 @@ export const manageFailedOrder = (data: ManageFailedOrderData): CancelablePromis
 /**
  * Complete tasks by task ID and set global process variables .<br> Required role: <b>admin</b> or <b>user</b> </br>
  * @param data The data for the request.
- * @param data.id ID of the workflow task that needs to be handled
+ * @param data.taskId ID of the workflow task that needs to be handled
  * @param data.requestBody
  * @returns unknown OK
  * @throws ApiError
@@ -215,9 +215,9 @@ export const manageFailedOrder = (data: ManageFailedOrderData): CancelablePromis
 export const completeTask = (data: CompleteTaskData): CancelablePromise<CompleteTaskResponse> => {
     return __request(OpenAPI, {
         method: 'PUT',
-        url: '/xpanse/workflow/complete/task/{id}',
+        url: '/xpanse/workflow/complete/task/{taskId}',
         path: {
-            id: data.id,
+            taskId: data.taskId,
         },
         body: data.requestBody,
         mediaType: 'application/json',
@@ -718,7 +718,7 @@ export const cancelServiceTemplateRequestByRequestId = (
 };
 
 /**
- * Publishes the same service template to catalog again using.<br> Required role: <b>admin</b> or <b>isv</b> </br>
+ * Publishes the same service template to catalog again.<br> Required role: <b>admin</b> or <b>isv</b> </br>
  * @param data The data for the request.
  * @param data.serviceTemplateId id of service template
  * @returns ServiceTemplateRequestInfo OK
@@ -778,7 +778,7 @@ export const fetchUpdate = (data: FetchUpdateData): CancelablePromise<FetchUpdat
 /**
  * Get details of policy belongs to the registered service template.<br> Required role: <b>admin</b> or <b>isv</b> </br>
  * @param data The data for the request.
- * @param data.id
+ * @param data.policyId
  * @returns ServicePolicy OK
  * @throws ApiError
  */
@@ -787,9 +787,9 @@ export const getServicePolicyDetails = (
 ): CancelablePromise<GetServicePolicyDetailsResponse> => {
     return __request(OpenAPI, {
         method: 'GET',
-        url: '/xpanse/service/policies/{id}',
+        url: '/xpanse/service/policies/{policyId}',
         path: {
-            id: data.id,
+            policyId: data.policyId,
         },
         errors: {
             400: 'Bad Request',
@@ -806,7 +806,7 @@ export const getServicePolicyDetails = (
 /**
  * Update the policy belongs to the registered service template.<br> Required role: <b>admin</b> or <b>isv</b> </br>
  * @param data The data for the request.
- * @param data.id ID of the policy to be updated
+ * @param data.policyId ID of the policy to be updated
  * @param data.requestBody
  * @returns ServicePolicy OK
  * @throws ApiError
@@ -814,9 +814,9 @@ export const getServicePolicyDetails = (
 export const updateServicePolicy = (data: UpdateServicePolicyData): CancelablePromise<UpdateServicePolicyResponse> => {
     return __request(OpenAPI, {
         method: 'PUT',
-        url: '/xpanse/service/policies/{id}',
+        url: '/xpanse/service/policies/{policyId}',
         path: {
-            id: data.id,
+            policyId: data.policyId,
         },
         body: data.requestBody,
         mediaType: 'application/json',
@@ -835,42 +835,16 @@ export const updateServicePolicy = (data: UpdateServicePolicyData): CancelablePr
 /**
  * Delete the policy belongs to the registered service template.<br> Required role: <b>admin</b> or <b>isv</b> </br>
  * @param data The data for the request.
- * @param data.id
+ * @param data.policyId
  * @returns void No Content
  * @throws ApiError
  */
 export const deleteServicePolicy = (data: DeleteServicePolicyData): CancelablePromise<DeleteServicePolicyResponse> => {
     return __request(OpenAPI, {
         method: 'DELETE',
-        url: '/xpanse/service/policies/{id}',
+        url: '/xpanse/service/policies/{policyId}',
         path: {
-            id: data.id,
-        },
-        errors: {
-            400: 'Bad Request',
-            401: 'Unauthorized',
-            403: 'Forbidden',
-            408: 'Request Timeout',
-            422: 'Unprocessable Entity',
-            500: 'Internal Server Error',
-            502: 'Bad Gateway',
-        },
-    });
-};
-
-/**
- * Get the details of the policy created by the user.<br> Required role: <b>admin</b> or <b>user</b> </br>
- * @param data The data for the request.
- * @param data.id
- * @returns UserPolicy OK
- * @throws ApiError
- */
-export const getPolicyDetails = (data: GetPolicyDetailsData): CancelablePromise<GetPolicyDetailsResponse> => {
-    return __request(OpenAPI, {
-        method: 'GET',
-        url: '/xpanse/policies/{id}',
-        path: {
-            id: data.id,
+            policyId: data.policyId,
         },
         errors: {
             400: 'Bad Request',
@@ -913,32 +887,6 @@ export const updateUserPolicy = (data: UpdateUserPolicyData): CancelablePromise<
     });
 };
 
-/**
- * Delete the policy created by the user.<br> Required role: <b>admin</b> or <b>user</b> </br>
- * @param data The data for the request.
- * @param data.id
- * @returns void No Content
- * @throws ApiError
- */
-export const deleteUserPolicy = (data: DeleteUserPolicyData): CancelablePromise<DeleteUserPolicyResponse> => {
-    return __request(OpenAPI, {
-        method: 'DELETE',
-        url: '/xpanse/policies/{id}',
-        path: {
-            id: data.id,
-        },
-        errors: {
-            400: 'Bad Request',
-            401: 'Unauthorized',
-            403: 'Forbidden',
-            408: 'Request Timeout',
-            422: 'Unprocessable Entity',
-            500: 'Internal Server Error',
-            502: 'Bad Gateway',
-        },
-    });
-};
-
 /**
  * Users in the ISV role get all cloud provider credentials added by the user for a cloud service provider.<br> Required role: <b>isv</b> </br>
  * @param data The data for the request.
@@ -2016,6 +1964,58 @@ export const getPricesByService = (data: GetPricesByServiceData): CancelableProm
     });
 };
 
+/**
+ * Get the details of the policy created by the user.<br> Required role: <b>admin</b> or <b>user</b> </br>
+ * @param data The data for the request.
+ * @param data.policyId
+ * @returns UserPolicy OK
+ * @throws ApiError
+ */
+export const getPolicyDetails = (data: GetPolicyDetailsData): CancelablePromise<GetPolicyDetailsResponse> => {
+    return __request(OpenAPI, {
+        method: 'GET',
+        url: '/xpanse/policies/{policyId}',
+        path: {
+            policyId: data.policyId,
+        },
+        errors: {
+            400: 'Bad Request',
+            401: 'Unauthorized',
+            403: 'Forbidden',
+            408: 'Request Timeout',
+            422: 'Unprocessable Entity',
+            500: 'Internal Server Error',
+            502: 'Bad Gateway',
+        },
+    });
+};
+
+/**
+ * Delete the policy created by the user.<br> Required role: <b>admin</b> or <b>user</b> </br>
+ * @param data The data for the request.
+ * @param data.policyId
+ * @returns void No Content
+ * @throws ApiError
+ */
+export const deleteUserPolicy = (data: DeleteUserPolicyData): CancelablePromise<DeleteUserPolicyResponse> => {
+    return __request(OpenAPI, {
+        method: 'DELETE',
+        url: '/xpanse/policies/{policyId}',
+        path: {
+            policyId: data.policyId,
+        },
+        errors: {
+            400: 'Bad Request',
+            401: 'Unauthorized',
+            403: 'Forbidden',
+            408: 'Request Timeout',
+            422: 'Unprocessable Entity',
+            500: 'Internal Server Error',
+            502: 'Bad Gateway',
+        },
+    });
+};
+
 /**
  * Get metrics of a deployed service or a resource.<br> Required role: <b>admin</b> or <b>user</b> </br>
  * @param data The data for the request.
diff --git a/src/xpanse-api/generated/types.gen.ts b/src/xpanse-api/generated/types.gen.ts
index 7b89e6eb0..c63503a41 100644
--- a/src/xpanse-api/generated/types.gen.ts
+++ b/src/xpanse-api/generated/types.gen.ts
@@ -747,9 +747,11 @@ export type Deployment = {
      */
     serviceAvailabilityConfig?: Array<AvailabilityZoneConfig>;
     /**
-     * The real deployer, something like terraform scripts. Either deployer or deployFromGitRepo must be provided.
+     * Deployment scripts stored in a Map. file name as the key and content as the value. Either scriptFiles or scriptsRepo must be provided.
      */
-    deployer?: string;
+    scriptFiles?: {
+        [key: string]: string;
+    };
     scriptsRepo?: ScriptsRepo;
 };
 
@@ -1729,7 +1731,7 @@ export type ReviewServiceTemplateRequest = {
     /**
      * The comment of review registration.
      */
-    reviewComment?: string;
+    reviewComment: string;
 };
 
 /**
@@ -1741,7 +1743,7 @@ export enum reviewResult {
 }
 
 /**
- * Deployment scripts hosted on a GIT repo. Either deployer or deployFromGitRepo must be provided.
+ * Deployment scripts hosted on a GIT repo. Either scriptFiles or scriptsRepo must be provided.
  */
 export type ScriptsRepo = {
     /**
@@ -2850,28 +2852,28 @@ export enum status3 {
 }
 
 export type ManageFailedOrderData = {
-    /**
-     * ID of the workflow task that needs to be handled
-     */
-    id: string;
     /**
      * Controls if the order must be retried again or simply closed.
      */
     retryOrder: boolean;
+    /**
+     * ID of the workflow task that needs to be handled
+     */
+    taskId: string;
 };
 
 export type ManageFailedOrderResponse = unknown;
 
 export type CompleteTaskData = {
-    /**
-     * ID of the workflow task that needs to be handled
-     */
-    id: string;
     requestBody: {
         [key: string]: {
             [key: string]: unknown;
         };
     };
+    /**
+     * ID of the workflow task that needs to be handled
+     */
+    taskId: string;
 };
 
 export type CompleteTaskResponse = unknown;
@@ -3077,7 +3079,7 @@ export type FetchUpdateData = {
 export type FetchUpdateResponse = ServiceTemplateRequestInfo;
 
 export type GetServicePolicyDetailsData = {
-    id: string;
+    policyId: string;
 };
 
 export type GetServicePolicyDetailsResponse = ServicePolicy;
@@ -3086,24 +3088,18 @@ export type UpdateServicePolicyData = {
     /**
      * ID of the policy to be updated
      */
-    id: string;
+    policyId: string;
     requestBody: ServicePolicyUpdateRequest;
 };
 
 export type UpdateServicePolicyResponse = ServicePolicy;
 
 export type DeleteServicePolicyData = {
-    id: string;
+    policyId: string;
 };
 
 export type DeleteServicePolicyResponse = void;
 
-export type GetPolicyDetailsData = {
-    id: string;
-};
-
-export type GetPolicyDetailsResponse = UserPolicy;
-
 export type UpdateUserPolicyData = {
     /**
      * ID of the policy to be updated
@@ -3114,12 +3110,6 @@ export type UpdateUserPolicyData = {
 
 export type UpdateUserPolicyResponse = UserPolicy;
 
-export type DeleteUserPolicyData = {
-    id: string;
-};
-
-export type DeleteUserPolicyResponse = void;
-
 export type GetIsvCloudCredentialsData = {
     /**
      * The cloud service provider.
@@ -3749,6 +3739,18 @@ export type GetPricesByServiceData = {
 
 export type GetPricesByServiceResponse = Array<FlavorPriceResult>;
 
+export type GetPolicyDetailsData = {
+    policyId: string;
+};
+
+export type GetPolicyDetailsResponse = UserPolicy;
+
+export type DeleteUserPolicyData = {
+    policyId: string;
+};
+
+export type DeleteUserPolicyResponse = void;
+
 export type GetMetricsData = {
     /**
      * Start UNIX timestamp in milliseconds. If no value filled,the default value is the UNIX timestamp in milliseconds of the five minutes ago.