Skip to content

Commit 58d3f2f

Browse files
committed
Add Azure identity fields to data plane details popup
Closes #1917
1 parent 3fa92f5 commit 58d3f2f

File tree

5 files changed

+37
-0
lines changed

5 files changed

+37
-0
lines changed

src/api/dataPlanes.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ export interface BaseDataPlaneQuery {
2626
cidr_blocks: string[] | null;
2727
gcp_service_account_email: string | null;
2828
aws_iam_user_arn: string | null;
29+
azure_application_name: string | null;
30+
azure_application_client_id: string | null;
2931
data_plane_fqdn: string | null;
3032
// aws_link_endpoints: AwsLinkEndpoint | null;
3133
}
@@ -38,6 +40,8 @@ const COLUMNS = [
3840
'cidr_blocks',
3941
'gcp_service_account_email',
4042
'aws_iam_user_arn',
43+
// 'azure_application_name', TODO uncomment after RLS policy is updated
44+
'azure_application_client_id',
4145
// 'aws_link_endpoints', TODO uncomment after https://github.com/estuary/flow/pull/1816 is done
4246
];
4347

src/components/shared/Entity/DetailsForm/useDataPlaneOptions.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ export const useDataPlaneOptions = () => {
4242
gcp_service_account_email: null,
4343
aws_iam_user_arn: null,
4444
data_plane_fqdn: null,
45+
azure_application_name: null,
46+
azure_application_client_id: null,
4547
},
4648
dataPlaneNames.at(0)
4749
)

src/components/tables/DataPlanes/DataPlaneDialog.tsx

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,30 @@ function DataPlaneDialog({ onClose, dataPlane }: DataPlaneDialogProps) {
130130
},
131131
]}
132132
/>
133+
134+
<DataPlaneDialogField
135+
label={intl.formatMessage({
136+
id: 'data.azureConsentLink',
137+
})}
138+
value={
139+
dataPlane.azure_application_client_id
140+
? `https://login.microsoftonline.com/organizations/v2.0/adminconsent?client_id=${dataPlane.azure_application_client_id}&scope=https://storage.azure.com/.default`
141+
: intl.formatMessage({
142+
id: 'admin.dataPlanes.dialog.notAvailable',
143+
})
144+
}
145+
/>
146+
<DataPlaneDialogField
147+
label={intl.formatMessage({
148+
id: 'data.azureApplicationName',
149+
})}
150+
value={
151+
dataPlane.azure_application_name ??
152+
intl.formatMessage({
153+
id: 'admin.dataPlanes.dialog.notAvailable',
154+
})
155+
}
156+
/>
133157
<ToggleField
134158
lowercaseButton
135159
label={intl.formatMessage({

src/hooks/dataPlanes/useEvaluateDataPlaneOptions.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ export const useEvaluateDataPlaneOptions = () => {
107107
gcp_service_account_email: null,
108108
aws_iam_user_arn: null,
109109
data_plane_fqdn: null,
110+
azure_application_name: null,
111+
azure_application_client_id: null,
110112
},
111113
defaultDataPlaneName
112114
);
@@ -134,6 +136,8 @@ export const useEvaluateDataPlaneOptions = () => {
134136
gcp_service_account_email: null,
135137
aws_iam_user_arn: null,
136138
data_plane_fqdn: null,
139+
azure_application_name: null,
140+
azure_application_client_id: null,
137141
},
138142
existingDataPlane.name ?? ''
139143
)

src/lang/en-US/Data.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ export const Data: Record<string, string> = {
3333
'data.scope': `Scope`,
3434
'data.gcpServiceAccount': `GCP Service Account Email`,
3535
'data.awsIamUserArn': `AWS IAM User ARN`,
36+
'data.azureApplicationName': `Azure Application Name`,
37+
'data.azureApplicationClientId': `Azure Application Client ID`,
38+
'data.azureConsentLink': `Azure Consent Link`,
3639
'data.idProvider': `IAM OIDC`,
3740
'data.errors': `Errors`,
3841
'data.completed': `Completed`,

0 commit comments

Comments
 (0)