Merge pull request #1681 from ioito/hotfix/qx-remove-vhd-sdk

fix(azure): remove vhd sdk

Author: ioito

go.mod

@@ -6,7 +6,6 @@ require (
 	cloud.google.com/go/storage v1.39.1
 	github.com/Azure/go-autorest/autorest v0.9.6
 	github.com/Azure/go-autorest/autorest/azure/auth v0.4.2
-	github.com/Microsoft/azure-vhd-utils v0.0.0-20181115010904-44cbada2ece3
 	github.com/aliyun/alibaba-cloud-sdk-go v1.61.684
 	github.com/aliyun/aliyun-oss-go-sdk v2.0.4+incompatible
 	github.com/aokoli/goutils v1.0.1
@@ -124,5 +123,3 @@ require (
 	gopkg.in/ini.v1 v1.62.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
-
-replace github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v36.1.0+incompatible

go.sum

@@ -9,7 +9,6 @@ cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc=
 cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI=
 cloud.google.com/go/storage v1.39.1 h1:MvraqHKhogCOTXTlct/9C3K3+Uy2jBmFYb3/Sp6dVtY=
 cloud.google.com/go/storage v1.39.1/go.mod h1:xK6xZmxZmo+fyP7+DEF6FhNc24/JAe95OLyOHCXFH1o=
-github.com/Azure/azure-sdk-for-go v36.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0=
 github.com/Azure/go-autorest/autorest v0.9.6 h1:5YWtOnckcudzIw8lPPBcWOnmIFWMtHci1ZWAZulMSx0=
@@ -35,8 +34,6 @@ github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6L
 github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k=
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Microsoft/azure-vhd-utils v0.0.0-20181115010904-44cbada2ece3 h1:gImoAO1xAcC1oDlYmD/X7dggsodGf2DFJOVE5m0ssms=
-github.com/Microsoft/azure-vhd-utils v0.0.0-20181115010904-44cbada2ece3/go.mod h1:u0H9gMieFLxkUy8RS0X8VbFWyPs2815qQAaitRbj6x0=
 github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM=
 github.com/a8m/mark v0.1.1-0.20170507133748-44f2db618845/go.mod h1:c8Mh99Cw82nrsAnPgxQSZHkswVOJF7/MqZb1ZdvriLM=
 github.com/aliyun/alibaba-cloud-sdk-go v1.61.684 h1:MHqPW0la4Op96JGMkpB7Kxrz0Se5nowF6rLhHTZBUn4=
@@ -199,7 +196,6 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
@@ -426,7 +422,6 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
 google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -435,7 +430,6 @@ gopkg.in/fatih/set.v0 v0.2.1/go.mod h1:5eLWEndGL4zGGemXWrKuts+wTJR0y+w+auqUJZbmy
 gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/urfave/cli.v1 v1.19.1/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
 gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

pkg/multicloud/azure/storageaccount.go

@@ -29,8 +29,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Microsoft/azure-vhd-utils/vhdcore/common"
-	"github.com/Microsoft/azure-vhd-utils/vhdcore/diskstream"
+	"yunion.io/x/cloudmux/pkg/multicloud/azure/vhdcore/common"
+	"yunion.io/x/cloudmux/pkg/multicloud/azure/vhdcore/diskstream"
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"

pkg/multicloud/azure/upload.go

@@ -24,11 +24,11 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/Microsoft/azure-vhd-utils/vhdcore/block/bitmap"
-	"github.com/Microsoft/azure-vhd-utils/vhdcore/common"
-	"github.com/Microsoft/azure-vhd-utils/vhdcore/diskstream"
-	"github.com/Microsoft/azure-vhd-utils/vhdcore/footer"
-	"github.com/Microsoft/azure-vhd-utils/vhdcore/validator"
+	"yunion.io/x/cloudmux/pkg/multicloud/azure/vhdcore/block/bitmap"
+	"yunion.io/x/cloudmux/pkg/multicloud/azure/vhdcore/common"
+	"yunion.io/x/cloudmux/pkg/multicloud/azure/vhdcore/diskstream"
+	"yunion.io/x/cloudmux/pkg/multicloud/azure/vhdcore/footer"
+	"yunion.io/x/cloudmux/pkg/multicloud/azure/vhdcore/validator"
 
 	"yunion.io/x/cloudmux/pkg/multicloud/azure/concurrent"
 	"yunion.io/x/cloudmux/pkg/multicloud/azure/progress"

…tils/vhdcore/bat/blockAllocationTable.go …zure/vhdcore/bat/blockAllocationTable.govendor/github.com/Microsoft/azure-vhd-utils/vhdcore/bat/blockAllocationTable.go renamed to pkg/multicloud/azure/vhdcore/bat/blockAllocationTable.go vendor/github.com/Microsoft/azure-vhd-utils/vhdcore/bat/blockAllocationTable.go renamed to pkg/multicloud/azure/vhdcore/bat/blockAllocationTable.go

@@ -3,7 +3,7 @@ package bat
 import (
 	"math"
 
-	"github.com/Microsoft/azure-vhd-utils/vhdcore"
+	"yunion.io/x/cloudmux/pkg/multicloud/azure/vhdcore"
 )
 
 // BlockAllocationTable type represents the Block Allocation Table (BAT) of the disk, BAT served as
@@ -20,7 +20,6 @@ import (
 // the 'block bitmap section'. Each bit in the bitmap indicates the state of the corresponding sector
 // in 'data section', 1 indicates sector contains valid data, 0 indicates the sector have never been
 // modified.
-//
 type BlockAllocationTable struct {
 	BATEntriesCount uint32
 	BAT             []uint32
@@ -30,7 +29,6 @@ type BlockAllocationTable struct {
 // NewBlockAllocationTable creates an instance of BlockAllocationTable, BAT is the block allocation table,
 // each entry in this table is the absolute sector offset to a block, blockSize is the size of block's
 // 'data section' in bytes.
-//
 func NewBlockAllocationTable(blockSize uint32, bat []uint32) *BlockAllocationTable {
 	return &BlockAllocationTable{BATEntriesCount: uint32(len(bat)), blockSize: blockSize, BAT: bat}
 }
@@ -41,7 +39,6 @@ func NewBlockAllocationTable(blockSize uint32, bat []uint32) *BlockAllocationTab
 // required to store the bitmap.
 // As per vhd specification sectors per block must be power of two. The sector length is always 512 bytes.
 // This means the block size will be power of two as well e.g. 512 * 2^3, 512 * 2^4, 512 * 2^5 etc..
-//
 func (b *BlockAllocationTable) GetBitmapSizeInBytes() int32 {
 	return int32(b.blockSize / uint32(vhdcore.VhdSectorLength) / 8)
 }
@@ -58,20 +55,17 @@ func (b *BlockAllocationTable) GetSectorPaddedBitmapSizeInBytes() int32 {
 // GetBitmapAddress returns the address of the 'block bitmap section' of a given block. Address is the
 // absolute byte offset of the 'block bitmap section'. A block consists of 'block bitmap section' and
 // 'data section'
-//
 func (b *BlockAllocationTable) GetBitmapAddress(blockIndex uint32) int64 {
 	return int64(b.BAT[blockIndex]) * vhdcore.VhdSectorLength
 }
 
 // GetBlockDataAddress returns the address of the 'data section' of a given block. Address is the absolute
 // byte offset of the 'data section'. A block consists of 'block bitmap section' and 'data section'
-//
 func (b *BlockAllocationTable) GetBlockDataAddress(blockIndex uint32) int64 {
 	return b.GetBitmapAddress(blockIndex) + int64(b.GetSectorPaddedBitmapSizeInBytes())
 }
 
 // HasData returns true if the given block has not yet expanded hence contains no data.
-//
 func (b *BlockAllocationTable) HasData(blockIndex uint32) bool {
 	return blockIndex != vhdcore.VhdNoDataInt && b.BAT[blockIndex] != vhdcore.VhdNoDataInt
 }

…dcore/bat/blockAllocationTableFactory.go …dcore/bat/blockAllocationTableFactory.govendor/github.com/Microsoft/azure-vhd-utils/vhdcore/bat/blockAllocationTableFactory.go renamed to pkg/multicloud/azure/vhdcore/bat/blockAllocationTableFactory.go vendor/github.com/Microsoft/azure-vhd-utils/vhdcore/bat/blockAllocationTableFactory.go renamed to pkg/multicloud/azure/vhdcore/bat/blockAllocationTableFactory.go

@@ -1,13 +1,12 @@
 package bat
 
 import (
-	"github.com/Microsoft/azure-vhd-utils/vhdcore/header"
-	"github.com/Microsoft/azure-vhd-utils/vhdcore/reader"
+	"yunion.io/x/cloudmux/pkg/multicloud/azure/vhdcore/header"
+	"yunion.io/x/cloudmux/pkg/multicloud/azure/vhdcore/reader"
 )
 
 // BlockAllocationTableFactory type is used to create BlockAllocationTable instance by reading BAT
 // section of the disk which follows the header
-//
 type BlockAllocationTableFactory struct {
 	vhdReader *reader.VhdReader
 	vhdHeader *header.Header
@@ -17,7 +16,6 @@ type BlockAllocationTableFactory struct {
 // to create BlockAllocationTable instance by reading BAT section of the Vhd.
 // vhdReader is the reader to be used to read the entry, vhdHeader is the header structure representing
 // the disk header.
-//
 func NewBlockAllocationFactory(vhdReader *reader.VhdReader, vhdHeader *header.Header) *BlockAllocationTableFactory {
 	return &BlockAllocationTableFactory{
 		vhdReader: vhdReader,
@@ -27,7 +25,6 @@ func NewBlockAllocationFactory(vhdReader *reader.VhdReader, vhdHeader *header.He
 
 // Create creates a BlockAllocationTable instance by reading the BAT section of the disk.
 // This function return error if any error occurs while reading or parsing the BAT entries.
-//
 func (f *BlockAllocationTableFactory) Create() (*BlockAllocationTable, error) {
 	var err error
 	batEntriesCount := f.vhdHeader.MaxTableEntries

…re/bat/blockAllocationTableParseError.go …re/bat/blockAllocationTableParseError.govendor/github.com/Microsoft/azure-vhd-utils/vhdcore/bat/blockAllocationTableParseError.go renamed to pkg/multicloud/azure/vhdcore/bat/blockAllocationTableParseError.go vendor/github.com/Microsoft/azure-vhd-utils/vhdcore/bat/blockAllocationTableParseError.go renamed to pkg/multicloud/azure/vhdcore/bat/blockAllocationTableParseError.go

@@ -1,12 +1,11 @@
 package bitmap
 
 import (
-	"github.com/Microsoft/azure-vhd-utils/vhdcore/bat"
-	"github.com/Microsoft/azure-vhd-utils/vhdcore/reader"
+	"yunion.io/x/cloudmux/pkg/multicloud/azure/vhdcore/bat"
+	"yunion.io/x/cloudmux/pkg/multicloud/azure/vhdcore/reader"
 )
 
 // Factory type is used to create BitMap instance by reading 'bitmap section' of a block.
-//
 type Factory struct {
 	vhdReader            *reader.VhdReader
 	blockAllocationTable *bat.BlockAllocationTable
@@ -16,15 +15,13 @@ type Factory struct {
 // the 'bitmap section' of a block. vhdReader is the reader to read the disk, blockAllocationTable wraps
 // the disk's BAT table, which has one entry per block, this is used to retrieve the absolute offset to
 // the beginning of the 'bitmap section' of a block and the size of the 'bitmap section'.
-//
 func NewFactory(vhdReader *reader.VhdReader, blockAllocationTable *bat.BlockAllocationTable) *Factory {
 	return &Factory{vhdReader: vhdReader, blockAllocationTable: blockAllocationTable}
 }
 
 // Create creates a BitMap instance by reading block's 'bitmap section', block is the index of the
 // block entry in the BAT whose 'bitmap section' needs to be read.
 // This function return error if any error occurs while reading or parsing the block's bitmap.
-//
 func (f *Factory) Create(blockIndex uint32) (*BitMap, error) {
 	bitmapAbsoluteByteOffset := f.blockAllocationTable.GetBitmapAddress(blockIndex)
 	bitmapSizeInBytes := f.blockAllocationTable.GetBitmapSizeInBytes()