mirror of
				https://github.com/mickael-kerjean/filestash.git
				synced 2025-11-01 02:43:35 +08:00 
			
		
		
		
	feature (plg_backend_s3): add param for forcePathStyle - #584
Co-authored-by: xiayan.cn <xiayan.cn@bytedance.com> Co-authored-by: Mickael <mickael@kerjean.me>
This commit is contained in:
		| @ -75,7 +75,7 @@ func (s S3Backend) Init(params map[string]string, app *App) (IBackend, error) { | |||||||
| 	config := &aws.Config{ | 	config := &aws.Config{ | ||||||
| 		Credentials:                   credentials.NewChainCredentials(creds), | 		Credentials:                   credentials.NewChainCredentials(creds), | ||||||
| 		CredentialsChainVerboseErrors: aws.Bool(true), | 		CredentialsChainVerboseErrors: aws.Bool(true), | ||||||
| 		S3ForcePathStyle:              aws.Bool(true), | 		S3ForcePathStyle:              aws.Bool(params["url_style"] == "path-style"), | ||||||
| 		Region:                        aws.String(params["region"]), | 		Region:                        aws.String(params["region"]), | ||||||
| 	} | 	} | ||||||
| 	if params["endpoint"] != "" { | 	if params["endpoint"] != "" { | ||||||
| @ -113,7 +113,13 @@ func (s S3Backend) LoginForm() Form { | |||||||
| 				Name:        "advanced", | 				Name:        "advanced", | ||||||
| 				Type:        "enable", | 				Type:        "enable", | ||||||
| 				Placeholder: "Advanced", | 				Placeholder: "Advanced", | ||||||
| 				Target:      []string{"s3_role_arn", "s3_path", "s3_session_token", "s3_encryption_key", "s3_region", "s3_endpoint"}, | 				Target:      []string{"s3_endpoint", "s3_role_arn", "s3_path", "s3_session_token", "s3_encryption_key", "s3_region", "s3_url_style"}, | ||||||
|  | 			}, | ||||||
|  | 			FormElement{ | ||||||
|  | 				Id:          "s3_endpoint", | ||||||
|  | 				Name:        "endpoint", | ||||||
|  | 				Type:        "text", | ||||||
|  | 				Placeholder: "Endpoint", | ||||||
| 			}, | 			}, | ||||||
| 			FormElement{ | 			FormElement{ | ||||||
| 				Id:          "s3_role_arn", | 				Id:          "s3_role_arn", | ||||||
| @ -146,10 +152,13 @@ func (s S3Backend) LoginForm() Form { | |||||||
| 				Placeholder: "Region", | 				Placeholder: "Region", | ||||||
| 			}, | 			}, | ||||||
| 			FormElement{ | 			FormElement{ | ||||||
| 				Id:          "s3_endpoint", | 				Id:          "s3_url_style", | ||||||
| 				Name:        "endpoint", | 				Name:        "url_style", | ||||||
| 				Type:        "text", | 				Type:        "select", | ||||||
| 				Placeholder: "Endpoint", | 				Default:     "path-style", | ||||||
|  | 				Opts:        []string{"path-style", "virtual-hosted–style"}, | ||||||
|  | 				Description: "Amazon S3 supports both virtual-hosted–style and path-style URL access in all AWS Regions. Default: \"path-style\"", | ||||||
|  | 				Placeholder: "S3 URL Style", | ||||||
| 			}, | 			}, | ||||||
| 		}, | 		}, | ||||||
| 	} | 	} | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user
	 Yanick.xia
					Yanick.xia