diff --git a/fs-repo-11-to-12/go.mod b/fs-repo-11-to-12/go.mod index 2d6d1d85..a0fbc7a9 100644 --- a/fs-repo-11-to-12/go.mod +++ b/fs-repo-11-to-12/go.mod @@ -4,12 +4,11 @@ go 1.15 require ( github.com/hsanjuan/ipfs-lite v1.1.19 - github.com/ipfs/fs-repo-migrations v1.7.1 + github.com/ipfs/fs-repo-migrations/tools v0.0.0-20211209222258-754a2dcb82ea github.com/ipfs/go-cid v0.0.7 github.com/ipfs/go-datastore v0.4.5 github.com/ipfs/go-filestore v1.0.0 github.com/ipfs/go-ipfs v0.8.0 - github.com/ipfs/go-ipfs-blockstore v1.0.3 // indirect github.com/ipfs/go-ipfs-ds-help v1.0.0 github.com/ipfs/go-ipfs-pinner v0.1.1 github.com/ipfs/go-ipld-format v0.2.0 diff --git a/fs-repo-11-to-12/go.sum b/fs-repo-11-to-12/go.sum index 4b751c39..3940aa3a 100644 --- a/fs-repo-11-to-12/go.sum +++ b/fs-repo-11-to-12/go.sum @@ -246,8 +246,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/ipfs/bbloom v0.0.1/go.mod h1:oqo8CVWsJFMOZqTglBG4wydCE4IQA/G2/SEofB0rjUI= github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs= github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0= -github.com/ipfs/fs-repo-migrations v1.7.1 h1:OQhSJQZiB/fXtyqEeUzXXb1Sz9xyA9vGkxd/zffeRhA= -github.com/ipfs/fs-repo-migrations v1.7.1/go.mod h1:AQI+fJEXvPeJg+DMqwEmt7SMGR9nHLnXuEb0kt479ZE= +github.com/ipfs/fs-repo-migrations/tools v0.0.0-20211209222258-754a2dcb82ea h1:lgfk2PMrJI3bh8FflcBTXyNi3rPLqa75J7KcoUfRJmc= +github.com/ipfs/fs-repo-migrations/tools v0.0.0-20211209222258-754a2dcb82ea/go.mod h1:fADeaHKxwS+SKhc52rsL0P1MUcnyK31a9AcaG0KcfY8= github.com/ipfs/go-bitswap v0.0.9/go.mod h1:kAPf5qgn2W2DrgAcscZ3HrM9qh4pH+X8Fkk3UPrwvis= github.com/ipfs/go-bitswap v0.1.0/go.mod h1:FFJEf18E9izuCqUtHxbWEvq+reg7o4CW5wSAE1wsxj0= github.com/ipfs/go-bitswap v0.1.2/go.mod h1:qxSWS4NXGs7jQ6zQvoPY3+NmOfHHG47mhkiLzBpJQIs= @@ -305,7 +305,6 @@ github.com/ipfs/go-ds-leveldb v0.4.2 h1:QmQoAJ9WkPMUfBLnu1sBVy0xWWlJPg0m4kRAiJL9 github.com/ipfs/go-ds-leveldb v0.4.2/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s= github.com/ipfs/go-ds-measure v0.1.0 h1:vE4TyY4aeLeVgnnPBC5QzKIjKrqzha0NCujTfgvVbVQ= github.com/ipfs/go-ds-measure v0.1.0/go.mod h1:1nDiFrhLlwArTME1Ees2XaBOl49OoCgd2A3f8EchMSY= -github.com/ipfs/go-filestore v0.0.3 h1:MhZ1jT5K3NewZwim6rS/akcJLm1xM+r6nz6foeB9EwE= github.com/ipfs/go-filestore v0.0.3/go.mod h1:dvXRykFzyyXN2CdNlRGzDAkXMDPyI+D7JE066SiKLSE= github.com/ipfs/go-filestore v1.0.0 h1:QR7ekKH+q2AGiWDc7W2Q0qHuYSRZGUJqUn0GsegEPb0= github.com/ipfs/go-filestore v1.0.0/go.mod h1:/XOCuNtIe2f1YPbiXdYvD0BKLA0JR1MgPiFOdcuu9SM= @@ -317,7 +316,6 @@ github.com/ipfs/go-ipfs v0.8.0 h1:hQmPWBpnFpKeGUovpDV/XPFAzQ3fGj51OTP+fd7B/yw= github.com/ipfs/go-ipfs v0.8.0/go.mod h1:iU9jeKJrinNYdWSNZyTjpfcmGHH4oflEySOUboEQsoQ= github.com/ipfs/go-ipfs-blockstore v0.0.1/go.mod h1:d3WClOmRQKFnJ0Jz/jj/zmksX0ma1gROTlovZKBmN08= github.com/ipfs/go-ipfs-blockstore v0.1.0/go.mod h1:5aD0AvHPi7mZc6Ci1WCAhiBQu2IsfTduLl+422H6Rqw= -github.com/ipfs/go-ipfs-blockstore v0.1.4 h1:2SGI6U1B44aODevza8Rde3+dY30Pb+lbcObe1LETxOQ= github.com/ipfs/go-ipfs-blockstore v0.1.4/go.mod h1:Jxm3XMVjh6R17WvxFEiyKBLUGr86HgIYJW/D/MwqeYQ= github.com/ipfs/go-ipfs-blockstore v1.0.0/go.mod h1:knLVdhVU9L7CC4T+T4nvGdeUIPAXlnd9zmXfp+9MIjU= github.com/ipfs/go-ipfs-blockstore v1.0.3 h1:RDhK6fdg5YsonkpMuMpdvk/pRtOQlrIRIybuQfkvB2M= @@ -335,7 +333,6 @@ github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1Y github.com/ipfs/go-ipfs-delay v0.0.1 h1:r/UXYyRcddO6thwOnhiznIAiSvxMECGgtv35Xs1IeRQ= github.com/ipfs/go-ipfs-delay v0.0.1/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw= github.com/ipfs/go-ipfs-ds-help v0.0.1/go.mod h1:gtP9xRaZXqIQRh1HRpp595KbBEdgqWFxefeVKOV8sxo= -github.com/ipfs/go-ipfs-ds-help v0.1.1 h1:IW/bXGeaAZV2VH0Kuok+Ohva/zHkHmeLFBxC1k7mNPc= github.com/ipfs/go-ipfs-ds-help v0.1.1/go.mod h1:SbBafGJuGsPI/QL3j9Fc5YPLeAu+SzOkI0gFwAg+mOs= github.com/ipfs/go-ipfs-ds-help v1.0.0 h1:bEQ8hMGs80h0sR8O4tfDgV6B01aaF9qeTrujrTLYV3g= github.com/ipfs/go-ipfs-ds-help v1.0.0/go.mod h1:ujAbkeIgkKAWtxxNkoZHWLCyk5JpPoKnGyCcsoF6ueE= @@ -384,7 +381,6 @@ github.com/ipfs/go-log/v2 v2.0.1/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBW github.com/ipfs/go-log/v2 v2.0.2/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0= github.com/ipfs/go-log/v2 v2.0.3/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0= github.com/ipfs/go-log/v2 v2.0.5/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw= -github.com/ipfs/go-log/v2 v2.1.1 h1:G4TtqN+V9y9HY9TA6BwbCVyyBZ2B9MbCjR2MtGx8FR0= github.com/ipfs/go-log/v2 v2.1.1/go.mod h1:2v2nsGfZsvvAJz13SyFzf9ObaqwHiHxsPLEHntrv9KM= github.com/ipfs/go-log/v2 v2.1.3 h1:1iS3IU7aXRlbgUpN8yTTpJ53NXYjAe37vcI5+5nYrzk= github.com/ipfs/go-log/v2 v2.1.3/go.mod h1:/8d0SH3Su5Ooc31QlL1WysJhvyOTDCjcCZ9Axpmri6g= @@ -548,7 +544,6 @@ github.com/libp2p/go-libp2p-core v0.5.7/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX github.com/libp2p/go-libp2p-core v0.6.0/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo= github.com/libp2p/go-libp2p-core v0.6.1/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8= github.com/libp2p/go-libp2p-core v0.7.0/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8= -github.com/libp2p/go-libp2p-core v0.8.0 h1:5K3mT+64qDTKbV3yTdbMCzJ7O6wbNsavAEb8iqBvBcI= github.com/libp2p/go-libp2p-core v0.8.0/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8= github.com/libp2p/go-libp2p-core v0.8.5 h1:aEgbIcPGsKy6zYcC+5AJivYFedhYa4sW7mIpWpUaLKw= github.com/libp2p/go-libp2p-core v0.8.5/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8= @@ -787,7 +782,6 @@ github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod h1:2FMWW+ github.com/minio/sha256-simd v0.0.0-20190328051042-05b4dd3047e5/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U= github.com/minio/sha256-simd v0.1.0/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U= github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= -github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU= github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= @@ -844,7 +838,6 @@ github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa github.com/multiformats/go-multihash v0.0.9/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew= github.com/multiformats/go-multihash v0.0.10/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew= github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= -github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I= github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= github.com/multiformats/go-multihash v0.0.15 h1:hWOPdrNqDjwHDx82vsYGSDZNyktOJJ2dzZJzFkOV1jM= github.com/multiformats/go-multihash v0.0.15/go.mod h1:D6aZrWNLFTV/ynMpKsNtB40mJzmCl4jb1alC0OvHiHg= @@ -885,6 +878,7 @@ github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTm github.com/otiai10/copy v1.5.1 h1:a/cs2E1/1V0az8K5nblbl+ymEa4E11AfaOLMar8V34w= github.com/otiai10/copy v1.5.1/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= +github.com/otiai10/curr v1.0.0 h1:TJIWdbX0B+kpNagQrjgq8bCMrbhiuX73M2XwgtDMoOI= github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= github.com/otiai10/mint v1.3.2 h1:VYWnrP5fXmz1MXvjuUvcBrXSjGE6xjON+axB/UrpO3E= @@ -1040,7 +1034,6 @@ go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -1053,11 +1046,9 @@ go.uber.org/goleak v1.0.0 h1:qsup4IcBdlmsnGfqyLl4Ntn3C2XCCuKAE7DwHpScyUo= go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= @@ -1091,7 +1082,6 @@ golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= @@ -1149,7 +1139,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1222,7 +1211,6 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY= golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/fs-repo-11-to-12/main.go b/fs-repo-11-to-12/main.go index 8be58581..c85add5d 100644 --- a/fs-repo-11-to-12/main.go +++ b/fs-repo-11-to-12/main.go @@ -2,7 +2,7 @@ package main import ( mg11 "github.com/ipfs/fs-repo-migrations/fs-repo-11-to-12/migration" - migrate "github.com/ipfs/fs-repo-migrations/go-migrate" + migrate "github.com/ipfs/fs-repo-migrations/tools/go-migrate" ) func main() { diff --git a/fs-repo-11-to-12/migration/migration.go b/fs-repo-11-to-12/migration/migration.go index e176ac74..6a0e8e2c 100644 --- a/fs-repo-11-to-12/migration/migration.go +++ b/fs-repo-11-to-12/migration/migration.go @@ -11,10 +11,10 @@ import ( "path/filepath" "sync" - log "github.com/ipfs/fs-repo-migrations/stump" + log "github.com/ipfs/fs-repo-migrations/tools/stump" - migrate "github.com/ipfs/fs-repo-migrations/go-migrate" - mfsr "github.com/ipfs/fs-repo-migrations/mfsr" + migrate "github.com/ipfs/fs-repo-migrations/tools/go-migrate" + mfsr "github.com/ipfs/fs-repo-migrations/tools/mfsr" cid "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" filestore "github.com/ipfs/go-filestore" diff --git a/fs-repo-11-to-12/migration/migration_test.go b/fs-repo-11-to-12/migration/migration_test.go index 2d17ab76..bec635d4 100644 --- a/fs-repo-11-to-12/migration/migration_test.go +++ b/fs-repo-11-to-12/migration/migration_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - migrate "github.com/ipfs/fs-repo-migrations/go-migrate" + migrate "github.com/ipfs/fs-repo-migrations/tools/go-migrate" cid "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" query "github.com/ipfs/go-datastore/query" diff --git a/fs-repo-11-to-12/migration/setup.go b/fs-repo-11-to-12/migration/setup.go index fb21c296..a7b29cf9 100644 --- a/fs-repo-11-to-12/migration/setup.go +++ b/fs-repo-11-to-12/migration/setup.go @@ -8,9 +8,9 @@ import ( "path/filepath" ipfslite "github.com/hsanjuan/ipfs-lite" - migrate "github.com/ipfs/fs-repo-migrations/go-migrate" - lock "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/repolock" - log "github.com/ipfs/fs-repo-migrations/stump" + migrate "github.com/ipfs/fs-repo-migrations/tools/go-migrate" + lock "github.com/ipfs/fs-repo-migrations/tools/repolock" + log "github.com/ipfs/fs-repo-migrations/tools/stump" cid "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" ipfspinner "github.com/ipfs/go-ipfs-pinner" diff --git a/fs-repo-11-to-12/migration/swapper.go b/fs-repo-11-to-12/migration/swapper.go index 0d6bf633..a41630df 100644 --- a/fs-repo-11-to-12/migration/swapper.go +++ b/fs-repo-11-to-12/migration/swapper.go @@ -5,7 +5,7 @@ import ( "sync" "sync/atomic" - log "github.com/ipfs/fs-repo-migrations/stump" + log "github.com/ipfs/fs-repo-migrations/tools/stump" cid "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" query "github.com/ipfs/go-datastore/query" diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/LICENSE b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/LICENSE similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/LICENSE rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/LICENSE diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/go-migrate/LICENSE b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/go-migrate/LICENSE similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/go-migrate/LICENSE rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/go-migrate/LICENSE diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/go-migrate/README.md b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/go-migrate/README.md similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/go-migrate/README.md rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/go-migrate/README.md diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/go-migrate/cli.go b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/go-migrate/cli.go similarity index 91% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/go-migrate/cli.go rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/go-migrate/cli.go index 64d9cff6..2a843597 100644 --- a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/go-migrate/cli.go +++ b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/go-migrate/cli.go @@ -15,27 +15,25 @@ type Flags struct { NoRevert bool } -func (f *Flags) Setup() { +func SetupFlags() Flags { + f := Flags{} flag.BoolVar(&f.Force, "f", false, "whether to force a migration (ignores warnings)") flag.BoolVar(&f.Revert, "revert", false, "whether to apply the migration backwards") flag.BoolVar(&f.Verbose, "verbose", false, "enable verbose logging") flag.BoolVar(&f.Help, "help", false, "display help message") flag.StringVar(&f.Path, "path", "", "file path to migrate for fs based migrations (required)") flag.BoolVar(&f.NoRevert, "no-revert", false, "do not attempt to automatically revert on failure") + + flag.Parse() + return f } var SupportNoRevert = map[string]bool{ "4-to-5": true, } -func (f *Flags) Parse() { - flag.Parse() -} - func Run(m Migration) error { - f := Flags{} - f.Setup() - f.Parse() + f := SetupFlags() if f.Help { flag.Usage() @@ -65,12 +63,12 @@ func Run(m Migration) error { Flags: f, Verbose: f.Verbose, }) - } else { - return m.Apply(Options{ - Flags: f, - Verbose: f.Verbose, - }) } + + return m.Apply(Options{ + Flags: f, + Verbose: f.Verbose, + }) } func Main(m Migration) { diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/go-migrate/doc.go b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/go-migrate/doc.go similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/go-migrate/doc.go rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/go-migrate/doc.go diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/go-migrate/migrate.go b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/go-migrate/migrate.go similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/go-migrate/migrate.go rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/go-migrate/migrate.go diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/.gitignore b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/.gitignore similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/.gitignore rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/.gitignore diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/COPYING b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/COPYING similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/COPYING rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/COPYING diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/README.txt b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/README.txt similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/README.txt rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/README.txt diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock.go b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock.go similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock.go rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock.go diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock_appengine.go b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock_appengine.go similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock_appengine.go rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock_appengine.go diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock_darwin_amd64.go b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock_darwin_amd64.go similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock_darwin_amd64.go rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock_darwin_amd64.go diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock_freebsd.go b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock_freebsd.go similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock_freebsd.go rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock_freebsd.go diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock_linux_amd64.go b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock_linux_amd64.go similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock_linux_amd64.go rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock_linux_amd64.go diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock_linux_arm.go b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock_linux_arm.go similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock_linux_arm.go rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock_linux_arm.go diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock_plan9.go b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock_plan9.go similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock_plan9.go rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock_plan9.go diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock_sigzero.go b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock_sigzero.go similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock/lock_sigzero.go rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/lock/lock_sigzero.go diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/mfsr/mfsr.go b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/mfsr/mfsr.go similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/mfsr/mfsr.go rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/mfsr/mfsr.go diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/repolock/lock.go b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/repolock/lock.go similarity index 93% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/repolock/lock.go rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/repolock/lock.go index 6d33c4ec..41a19a0f 100644 --- a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/repolock/lock.go +++ b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/repolock/lock.go @@ -6,7 +6,7 @@ import ( "os" "path" - "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock" + "github.com/ipfs/fs-repo-migrations/tools/lock" ) var errRepoLock = `failed to acquire repo lock at %s/%s diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/stump/LICENSE b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/stump/LICENSE similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/stump/LICENSE rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/stump/LICENSE diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/stump/README.md b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/stump/README.md similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/stump/README.md rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/stump/README.md diff --git a/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/stump/log.go b/fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/stump/log.go similarity index 100% rename from fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/stump/log.go rename to fs-repo-11-to-12/vendor/github.com/ipfs/fs-repo-migrations/tools/stump/log.go diff --git a/fs-repo-11-to-12/vendor/modules.txt b/fs-repo-11-to-12/vendor/modules.txt index 1a3f7a29..7a8443f8 100644 --- a/fs-repo-11-to-12/vendor/modules.txt +++ b/fs-repo-11-to-12/vendor/modules.txt @@ -80,13 +80,13 @@ github.com/huin/goupnp/soap github.com/huin/goupnp/ssdp # github.com/ipfs/bbloom v0.0.4 github.com/ipfs/bbloom -# github.com/ipfs/fs-repo-migrations v1.7.1 +# github.com/ipfs/fs-repo-migrations/tools v0.0.0-20211209222258-754a2dcb82ea ## explicit -github.com/ipfs/fs-repo-migrations/go-migrate -github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/lock -github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/repolock -github.com/ipfs/fs-repo-migrations/mfsr -github.com/ipfs/fs-repo-migrations/stump +github.com/ipfs/fs-repo-migrations/tools/go-migrate +github.com/ipfs/fs-repo-migrations/tools/lock +github.com/ipfs/fs-repo-migrations/tools/mfsr +github.com/ipfs/fs-repo-migrations/tools/repolock +github.com/ipfs/fs-repo-migrations/tools/stump # github.com/ipfs/go-bitswap v0.3.3 github.com/ipfs/go-bitswap github.com/ipfs/go-bitswap/decision @@ -202,7 +202,6 @@ github.com/ipfs/go-ipfs/thirdparty/cidv0v1 github.com/ipfs/go-ipfs/thirdparty/dir github.com/ipfs/go-ipfs/thirdparty/verifbs # github.com/ipfs/go-ipfs-blockstore v1.0.3 -## explicit github.com/ipfs/go-ipfs-blockstore # github.com/ipfs/go-ipfs-chunker v0.0.5 github.com/ipfs/go-ipfs-chunker