Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull request update/241224 #504

Closed
wants to merge 4 commits into from
Closed

Pull request update/241224 #504

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6c6442
OS-8019. GCP optimization & gcp tenant cloud accounts
sd-hystax Dec 23, 2024
c84413c
OS-8054. [UI] Add support for gcp_tenant
ek-hystax Dec 23, 2024
807d7c1
OS-8085. Display pool and organization names in the roles section on …
ek-hystax Dec 23, 2024
ed1f380
OS-8086. Fix gcp tenant connection and update forms
ek-hystax Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
OS-8086. Fix gcp tenant connection and update forms
  • Loading branch information
@ek-hystax
ek-hystax authored Dec 23, 2024
commit ed1f3808f0379c60ebacc981a8e9af202ed220cd
1 change: 1 addition & 0 deletions ngui/server/api/restapi/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class RestApiClient extends BaseClient {
...params.azureSubscriptionConfig,
...params.azureTenantConfig,
...params.gcpConfig,
...params.gcpTenantConfig,
...params.alibabaConfig,
...params.nebiusConfig,
...params.databricksConfig,
Expand Down
1 change: 1 addition & 0 deletions ngui/server/graphql/resolvers/restapi.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ export type CreateDataSourceInput = {
azureTenantConfig?: InputMaybe<AzureTenantConfigInput>;
databricksConfig?: InputMaybe<DatabricksConfigInput>;
gcpConfig?: InputMaybe<GcpConfigInput>;
gcpTenantConfig?: InputMaybe<GcpTenantConfigInput>;
k8sConfig?: InputMaybe<K8sConfigInput>;
name?: InputMaybe<Scalars['String']['input']>;
nebiusConfig?: InputMaybe<NebiusConfigInput>;
Expand Down
1 change: 1 addition & 0 deletions ngui/server/graphql/schemas/restapi.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ input CreateDataSourceInput {
azureSubscriptionConfig: AzureSubscriptionConfigInput
azureTenantConfig: AzureTenantConfigInput
gcpConfig: GcpConfigInput
gcpTenantConfig: GcpTenantConfigInput
alibabaConfig: AlibabaConfigInput
nebiusConfig: NebiusConfigInput
databricksConfig: DatabricksConfigInput
Expand Down
0 ...nantCredentials /GcpTenantCredentials.tsx → ...enantCredentials/GcpTenantCredentials.tsx
View file
Open in desktop
File renamed without changes.
0 ...tialFields/GcpTenantCredentials /index.ts → ...ntialFields/GcpTenantCredentials/index.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ngui/ui/src/components/DataSourceCredentialFields/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import AzureSubscriptionCredentials, {
import AzureTenantCredentials, { FIELD_NAMES as AZURE_TENANT_CREDENTIALS_FIELD_NAMES } from "./AzureTenantCredentials";
import DatabricksCredentials, { FIELD_NAMES as DATABRICKS_CREDENTIALS_FIELD_NAMES } from "./DatabricksCredentials";
import GcpCredentials, { FIELD_NAMES as GCP_CREDENTIALS_FIELD_NAMES } from "./GcpCredentials";
import GcpTenantCredentials, { FIELD_NAMES as GCP_TENANT_CREDENTIALS_FIELD_NAMES } from "./GcpTenantCredentials ";
import GcpTenantCredentials, { FIELD_NAMES as GCP_TENANT_CREDENTIALS_FIELD_NAMES } from "./GcpTenantCredentials";
import KubernetesCredentials, { FIELD_NAMES as KUBERNETES_CREDENTIALS_FIELD_NAMES } from "./KubernetesCredentials";
import NebiusCredentials from "./NebiusCredentials";

Expand Down
13 changes: 12 additions & 1 deletion ngui/ui/src/containers/ConnectCloudAccountContainer/ConnectCloudAccountContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,17 @@ import { useOrganizationInfo } from "hooks/useOrganizationInfo";
import { useRefetchApis } from "hooks/useRefetchApis";
import { CLOUD_ACCOUNTS } from "urls";
import { trackEvent, GA_EVENT_CATEGORIES } from "utils/analytics";
import { ALIBABA_CNR, AWS_CNR, AZURE_CNR, AZURE_TENANT, DATABRICKS, GCP_CNR, KUBERNETES_CNR, NEBIUS } from "utils/constants";
import {
ALIBABA_CNR,
AWS_CNR,
AZURE_CNR,
AZURE_TENANT,
DATABRICKS,
GCP_CNR,
GCP_TENANT,
KUBERNETES_CNR,
NEBIUS
} from "utils/constants";

const ConnectCloudAccountContainer = () => {
const { organizationId } = useOrganizationInfo();
Expand All @@ -26,6 +36,7 @@ const ConnectCloudAccountContainer = () => {
[AZURE_TENANT]: "azureTenantConfig",
[AZURE_CNR]: "azureSubscriptionConfig",
[GCP_CNR]: "gcpConfig",
[GCP_TENANT]: "gcpTenantConfig",
[ALIBABA_CNR]: "alibabaConfig",
[NEBIUS]: "nebiusConfig",
[DATABRICKS]: "databricksConfig",
Expand Down
4 changes: 3 additions & 1 deletion ngui/ui/src/graphql/api/restapi/queries/restapi.queries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const GcpDataSourceConfigFragment = gql`
`;

const GcpTenantDataSourceConfigFragment = gql`
fragment GcpTenantDataSourceConfigFragment on GcpDataSource {
fragment GcpTenantDataSourceConfigFragment on GcpTenantDataSource {
config {
billing_data {
dataset_name
Expand Down Expand Up @@ -173,6 +173,7 @@ const GET_DATA_SOURCES = gql`
...AzureTenantDataSourceConfigFragment
...AzureSubscriptionDataSourceConfigFragment
...GcpDataSourceConfigFragment
...GcpTenantDataSourceConfigFragment
...AlibabaDataSourceConfigFragment
...NebiusDataSourceConfigFragment
...DatabricksDataSourceConfigFragment
Expand All @@ -183,6 +184,7 @@ const GET_DATA_SOURCES = gql`
${AzureTenantDataSourceConfigFragment}
${AzureSubscriptionDataSourceConfigFragment}
${GcpDataSourceConfigFragment}
${GcpTenantDataSourceConfigFragment}
${AlibabaDataSourceConfigFragment}
${NebiusDataSourceConfigFragment}
${DatabricksDataSourceConfigFragment}
Expand Down
Loading