diff --git a/wren-ui/src/apollo/server/dataSource.ts b/wren-ui/src/apollo/server/dataSource.ts index c0fa99f106..90da180557 100644 --- a/wren-ui/src/apollo/server/dataSource.ts +++ b/wren-ui/src/apollo/server/dataSource.ts @@ -79,15 +79,23 @@ const dataSource = { DataSourceName.ATHENA, connectionInfo, ); - const { awsAccessKey, awsRegion, awsSecretKey, s3StagingDir, schema, webIdentityToken, roleArn, roleSessionName } = - decryptedConnectionInfo as ATHENA_CONNECTION_INFO; - + const { + awsAccessKey, + awsRegion, + awsSecretKey, + s3StagingDir, + schema, + webIdentityToken, + roleArn, + roleSessionName, + } = decryptedConnectionInfo as ATHENA_CONNECTION_INFO; + // Base fields shared by both authentication methods const base = { region_name: awsRegion, s3_staging_dir: s3StagingDir, schema_name: schema, - }; + }; // If OIDC fields are provided → send OIDC config if (webIdentityToken && roleArn) { return { diff --git a/wren-ui/src/components/pages/setup/dataSources/AthenaProperties.tsx b/wren-ui/src/components/pages/setup/dataSources/AthenaProperties.tsx index 7892b08019..ec7209ad66 100644 --- a/wren-ui/src/components/pages/setup/dataSources/AthenaProperties.tsx +++ b/wren-ui/src/components/pages/setup/dataSources/AthenaProperties.tsx @@ -99,10 +99,7 @@ export default function AthenaProperties(props: Props) { const initialTypeRef = useRef(null); - const authType = Form.useWatch( - 'athenaAuthType', - form, - ) as ATHENA_AUTH_METHOD; + const authType = Form.useWatch('athenaAuthType', form) as ATHENA_AUTH_METHOD; // Set default auth type when creating useEffect(() => { @@ -193,7 +190,7 @@ export default function AthenaProperties(props: Props) { > - + {/* Authentication method switch */} @@ -214,16 +211,14 @@ export default function AthenaProperties(props: Props) { {authType === ATHENA_AUTH_METHOD.oidc && ( )} {authType === ATHENA_AUTH_METHOD.instance_profile && ( -
- We will automatically detect AWS credentials from the Instance Profile role - assigned to this compute environment (EC2, ECS, EKS). +
+ We will automatically detect AWS credentials from the Instance Profile + role assigned to this compute environment (EC2, ECS, EKS).
)}