mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2023-01-24 14:08:40 -04:00
commit b7c9d907e5
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 69 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

53
doc/bugs/S3_remote_errors_with_garage_endpoint/comment_4_f17018fbc7a8205a3ef0bdea74069fb9._comment Normal file
View file

@ -0,0 +1,53 @@
[[!comment format=mdwn
username="jpds"
avatar="http://cdn.libravatar.org/avatar/24d746ec6a7726b162c12ecceb3ee267"
subject="comment 4"
date="2023-01-24T15:55:36Z"
content="""
I think this can all be removed as only the 'region' should be in the `S3.*` calls:
```
diff --git a/Remote/S3.hs b/Remote/S3.hs
index f5014202e..d017378a8 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -913,14 +913,7 @@ s3Configuration c = cfg
Nothing -> S3.s3RequestStyle cfg
}
where
- h = fromJust $ getRemoteConfigValue hostField c
datacenter = fromJust $ getRemoteConfigValue datacenterField c
- -- When the default S3 host is configured, connect directly to
- -- the S3 endpoint for the configured datacenter.
- -- When another host is configured, it's used as-is.
- endpoint
- | h == AWS.s3DefaultHost = AWS.s3HostName $ T.pack datacenter
- | otherwise = T.encodeUtf8 $ T.pack h
port = case getRemoteConfigValue portField c of
Just s ->
case reads s of
@@ -948,8 +941,8 @@ s3Configuration c = cfg
| otherwise -> AWS.HTTP
cfg = case getRemoteConfigValue signatureField c of
Just (SignatureVersion 4) ->
- S3.s3v4 proto endpoint False S3.SignWithEffort
- _ -> S3.s3 proto endpoint False
+ S3.s3v4 proto datacenter False S3.SignWithEffort
+ _ -> S3.s3 proto datacenter False
data S3Info = S3Info
{ bucket :: S3.Bucket
```
But now I get this as an error and I do not know why:
```
initremote garage (checking bucket...) (creating bucket in garage...)
git-annex: getRemoteConfigValue datacenter found value of unexpected type [Char]. This is a bug in git-annex!
CallStack (from HasCallStack):
error, called at ./Annex/SpecialRemote/Config.hs:179:28 in main:Annex.SpecialRemote.Config
getRemoteConfigValue, called at ./Remote/S3.hs:916:33 in main:Remote.S3
failed
initremote: 1 failed
```
"""]]

8
doc/todo/copy_with_both_--to_and_--from_/comment_9_3152d196f56561d31a00514c343669ad._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="nobodyinperson"
avatar="http://cdn.libravatar.org/avatar/736a41cd4988ede057bae805d000f4f5"
subject="comment 9"
date="2023-01-23T22:38:28Z"
content="""
Thank you, joey for your work! I'll try it when I find the time.
"""]]

8
doc/todo/nitpick__58___show_one_column_per_UUID_in_git_annex_lis/comment_2_049625685f6147f38392e2df1dadac33._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="nobodyinperson"
avatar="http://cdn.libravatar.org/avatar/736a41cd4988ede057bae805d000f4f5"
subject="comment 2"
date="2023-01-23T22:55:10Z"
content="""
+1 for `--unique-repos` and a config `annex.listuniquerepos` as I have the same setup as OP. `git annex list` is a very compact view that can't always be swapped for the verbose `git annex whereis`.
"""]]