Skip to content

Add Azure identity fields to data plane details popup #1918

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

Draft
GregorShear wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add Azure identity fields to data plane details popup #1918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/api/dataPlanes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ export interface BaseDataPlaneQuery {
cidr_blocks: string[] | null;
gcp_service_account_email: string | null;
aws_iam_user_arn: string | null;
azure_application_name: string | null;
azure_application_client_id: string | null;
data_plane_fqdn: string | null;
// aws_link_endpoints: AwsLinkEndpoint | null;
}
Expand All @@ -38,6 +40,8 @@ const COLUMNS = [
'cidr_blocks',
'gcp_service_account_email',
'aws_iam_user_arn',
// 'azure_application_name', TODO uncomment after RLS policy is updated
'azure_application_client_id',
// 'aws_link_endpoints', TODO uncomment after https://github.com/estuary/flow/pull/1816 is done
];

Expand Down
2 changes: 2 additions & 0 deletions src/components/shared/Entity/DetailsForm/useDataPlaneOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ export const useDataPlaneOptions = () => {
gcp_service_account_email: null,
aws_iam_user_arn: null,
data_plane_fqdn: null,
azure_application_name: null,
azure_application_client_id: null,
},
dataPlaneNames.at(0)
)
Expand Down
24 changes: 24 additions & 0 deletions src/components/tables/DataPlanes/DataPlaneDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,30 @@ function DataPlaneDialog({ onClose, dataPlane }: DataPlaneDialogProps) {
},
]}
/>

<DataPlaneDialogField
label={intl.formatMessage({
id: 'data.azureConsentLink',
})}
value={
dataPlane.azure_application_client_id
? `https://login.microsoftonline.com/organizations/v2.0/adminconsent?client_id=${dataPlane.azure_application_client_id}&scope=https://storage.azure.com/.default`
: intl.formatMessage({
id: 'admin.dataPlanes.dialog.notAvailable',
})
}
/>
<DataPlaneDialogField
label={intl.formatMessage({
id: 'data.azureApplicationName',
})}
value={
dataPlane.azure_application_name ??
intl.formatMessage({
id: 'admin.dataPlanes.dialog.notAvailable',
})
}
/>
<ToggleField
lowercaseButton
label={intl.formatMessage({
Expand Down
4 changes: 4 additions & 0 deletions src/hooks/dataPlanes/useEvaluateDataPlaneOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ export const useEvaluateDataPlaneOptions = () => {
gcp_service_account_email: null,
aws_iam_user_arn: null,
data_plane_fqdn: null,
azure_application_name: null,
azure_application_client_id: null,
},
defaultDataPlaneName
);
Expand Down Expand Up @@ -134,6 +136,8 @@ export const useEvaluateDataPlaneOptions = () => {
gcp_service_account_email: null,
aws_iam_user_arn: null,
data_plane_fqdn: null,
azure_application_name: null,
azure_application_client_id: null,
},
existingDataPlane.name ?? ''
)
Expand Down
3 changes: 3 additions & 0 deletions src/lang/en-US/Data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ export const Data: Record<string, string> = {
'data.scope': `Scope`,
'data.gcpServiceAccount': `GCP Service Account Email`,
'data.awsIamUserArn': `AWS IAM User ARN`,
'data.azureApplicationName': `Azure Application Name`,
'data.azureApplicationClientId': `Azure Application Client ID`,
'data.azureConsentLink': `Azure Consent Link`,
'data.idProvider': `IAM OIDC`,
'data.errors': `Errors`,
'data.completed': `Completed`,
Expand Down