OS-8087. Fix data source connection issues

hystax · Dec 24, 2024 · 2d4578a · 2d4578a
1 parent 82266e3
commit 2d4578a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/ngui/server/graphql/resolvers/restapi.generated.ts b/ngui/server/graphql/resolvers/restapi.generated.ts
@@ -388,6 +388,7 @@ export type K8sConfig = {
 };
 
 export type K8sConfigInput = {
+  cost_model?: InputMaybe<Scalars['JSONObject']['input']>;
   password: Scalars['String']['input'];
   user: Scalars['String']['input'];
 };

diff --git a/ngui/server/graphql/schemas/restapi.graphql b/ngui/server/graphql/schemas/restapi.graphql
@@ -362,6 +362,7 @@ input NebiusConfigInput {
 input K8sConfigInput {
   password: String!
   user: String!
+  cost_model: JSONObject
 }
 
 input DatabricksConfigInput {

diff --git a/ngui/ui/src/components/forms/ConnectCloudAccountForm/ConnectCloudAccountForm.tsx b/ngui/ui/src/components/forms/ConnectCloudAccountForm/ConnectCloudAccountForm.tsx
@@ -119,7 +119,6 @@ const getAwsParameters = (formData) => {
       access_key_id: formData[AWS_ROOT_CREDENTIALS_FIELD_NAMES.ACCESS_KEY_ID],
       secret_access_key: formData[AWS_ROOT_CREDENTIALS_FIELD_NAMES.SECRET_ACCESS_KEY],
       use_edp_discount: formData[AWS_ROOT_USE_AWS_EDP_DISCOUNT_FIELD_NAMES.USE_EDP_DISCOUNT],
-      linked: false,
       cur_version: Number(formData[AWS_ROOT_EXPORT_TYPE_FIELD_NAMES.CUR_VERSION]),
       ...getConfigSchemeParameters()
     }

diff --git a/ngui/ui/src/containers/ConnectCloudAccountContainer/ConnectCloudAccountContainer.tsx b/ngui/ui/src/containers/ConnectCloudAccountContainer/ConnectCloudAccountContainer.tsx
@@ -32,7 +32,7 @@ const ConnectCloudAccountContainer = () => {
 
   const onSubmit = (params) => {
     const configName = {
-      [AWS_CNR]: params.linked ? "awsLinkedConfig" : "awsRootConfig",
+      [AWS_CNR]: params.config.linked ? "awsLinkedConfig" : "awsRootConfig",
       [AZURE_TENANT]: "azureTenantConfig",
       [AZURE_CNR]: "azureSubscriptionConfig",
       [GCP_CNR]: "gcpConfig",