pengjunjie/ragflow
1
0
Fork 1
mirror of https://github.com/infiniflow/ragflow.git synced 2026-01-30 15:16:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: S3 parameter error (#12290)

Browse Source 
### What problem does this PR solve?

Fix: S3 parameter error

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)

---------

Co-authored-by: Kevin Hu <kevinhu.sh@gmail.com>
This commit is contained in:
chanx
2025-12-29 17:38:01 +08:00
committed by GitHub
parent d142b9095e
commit dccda35f65
3 changed files with 89 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/src/pages/user-setting/data-source/constant/index.tsx
View File

@ -747,7 +747,6 @@ export const DataSourceFormDefaultValues = {
config: {
bucket_name: '',
bucket_type: 's3',
authMode: 'access_key',
prefix: '',
credentials: {
aws_access_key_id: '',

20
web/src/pages/user-setting/data-source/constant/s3-constant.tsx
View File

@ -1,4 +1,4 @@
import { FormFieldType } from '@/components/dynamic-form';
import { FilterFormField, FormFieldType } from '@/components/dynamic-form';
import { TFunction } from 'i18next';
import { BedrockRegionList } from '../../setting-model/constant';
@ -50,7 +50,7 @@ export const S3Constant = (t: TFunction) => [
},
{
label: 'Authentication',
name: 'config.authMode',
name: 'config.credentials.authentication_method',
type: FormFieldType.Segmented,
options: [
{ label: 'Access Key', value: 'access_key' },
@ -67,7 +67,7 @@ export const S3Constant = (t: TFunction) => [
label: 'AWS Access Key ID',
type: FormFieldType.Text,
customValidate: (val: string, formValues: any) => {
const authMode = formValues?.config?.authMode;
const authMode = formValues?.config?.credentials?.authentication_method;
const bucketType = formValues?.config?.bucket_type;
console.log('authMode', authMode, val);
if (
@ -79,7 +79,7 @@ export const S3Constant = (t: TFunction) => [
return true;
},
shouldRender: (formValues: any) => {
const authMode = formValues?.config?.authMode;
const authMode = formValues?.config?.credentials?.authentication_method;
const bucketType = formValues?.config?.bucket_type;
return authMode === 'access_key' || bucketType === 's3_compatible';
},
@ -89,7 +89,7 @@ export const S3Constant = (t: TFunction) => [
label: 'AWS Secret Access Key',
type: FormFieldType.Password,
customValidate: (val: string, formValues: any) => {
const authMode = formValues?.config?.authMode;
const authMode = formValues?.config?.credentials?.authentication_method;
const bucketType = formValues?.config?.bucket_type;
if (authMode === 'access_key' || bucketType === 's3_compatible') {
return Boolean(val) || '"AWS Secret Access Key" is required';
@ -97,7 +97,7 @@ export const S3Constant = (t: TFunction) => [
return true;
},
shouldRender: (formValues: any) => {
const authMode = formValues?.config?.authMode;
const authMode = formValues?.config?.credentials?.authentication_method;
const bucketType = formValues?.config?.bucket_type;
return authMode === 'access_key' || bucketType === 's3_compatible';
},
@ -109,7 +109,7 @@ export const S3Constant = (t: TFunction) => [
type: FormFieldType.Text,
placeholder: 'arn:aws:iam::123456789012:role/YourRole',
customValidate: (val: string, formValues: any) => {
const authMode = formValues?.config?.authMode;
const authMode = formValues?.config?.credentials?.authentication_method;
const bucketType = formValues?.config?.bucket_type;
if (authMode === 'iam_role' || bucketType === 's3') {
return Boolean(val) || '"AWS Secret Access Key" is required';
@ -117,17 +117,17 @@ export const S3Constant = (t: TFunction) => [
return true;
},
shouldRender: (formValues: any) => {
const authMode = formValues?.config?.authMode;
const authMode = formValues?.config?.credentials?.authentication_method;
const bucketType = formValues?.config?.bucket_type;
return authMode === 'iam_role' && bucketType === 's3';
},
},
{
name: 'static.tip',
name: FilterFormField + '.tip',
label: ' ',
type: FormFieldType.Custom,
shouldRender: (formValues: any) => {
const authMode = formValues?.config?.authMode;
const authMode = formValues?.config?.credentials?.authentication_method;
const bucketType = formValues?.config?.bucket_type;
return authMode === 'assume_role' && bucketType === 's3';
},