mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-30 22:22:25 -05:00 
			
		
		
		
	[chore]: Bump github.com/minio/minio-go/v7 from 7.0.61 to 7.0.62 (#2141)
This commit is contained in:
		
					parent
					
						
							
								36dceac56c
							
						
					
				
			
			
				commit
				
					
						59b5ed6638
					
				
			
		
					 5 changed files with 60 additions and 29 deletions
				
			
		
							
								
								
									
										2
									
								
								go.mod
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								go.mod
									
										
									
									
									
								
							|  | @ -36,7 +36,7 @@ require ( | ||||||
| 	github.com/jackc/pgx/v5 v5.4.3 | 	github.com/jackc/pgx/v5 v5.4.3 | ||||||
| 	github.com/microcosm-cc/bluemonday v1.0.25 | 	github.com/microcosm-cc/bluemonday v1.0.25 | ||||||
| 	github.com/miekg/dns v1.1.55 | 	github.com/miekg/dns v1.1.55 | ||||||
| 	github.com/minio/minio-go/v7 v7.0.61 | 	github.com/minio/minio-go/v7 v7.0.62 | ||||||
| 	github.com/mitchellh/mapstructure v1.5.0 | 	github.com/mitchellh/mapstructure v1.5.0 | ||||||
| 	github.com/oklog/ulid v1.3.1 | 	github.com/oklog/ulid v1.3.1 | ||||||
| 	github.com/spf13/cobra v1.7.0 | 	github.com/spf13/cobra v1.7.0 | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								go.sum
									
										
									
									
									
								
							
							
						
						
									
										4
									
								
								go.sum
									
										
									
									
									
								
							|  | @ -451,8 +451,8 @@ github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo= | ||||||
| github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY= | github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY= | ||||||
| github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= | github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= | ||||||
| github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= | github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= | ||||||
| github.com/minio/minio-go/v7 v7.0.61 h1:87c+x8J3jxQ5VUGimV9oHdpjsAvy3fhneEBKuoKEVUI= | github.com/minio/minio-go/v7 v7.0.62 h1:qNYsFZHEzl+NfH8UxW4jpmlKav1qUAgfY30YNRneVhc= | ||||||
| github.com/minio/minio-go/v7 v7.0.61/go.mod h1:BTu8FcrEw+HidY0zd/0eny43QnVNkXRPXrLXFuQBHXg= | github.com/minio/minio-go/v7 v7.0.62/go.mod h1:Q6X7Qjb7WMhvG65qKf4gUgA5XaiSox74kR1uAEjxRS4= | ||||||
| github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM= | github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM= | ||||||
| github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= | github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= | ||||||
| github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4= | github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4= | ||||||
|  |  | ||||||
							
								
								
									
										6
									
								
								vendor/github.com/minio/minio-go/v7/api.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								vendor/github.com/minio/minio-go/v7/api.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -127,7 +127,7 @@ type Options struct { | ||||||
| // Global constants. | // Global constants. | ||||||
| const ( | const ( | ||||||
| 	libraryName    = "minio-go" | 	libraryName    = "minio-go" | ||||||
| 	libraryVersion = "v7.0.61" | 	libraryVersion = "v7.0.62" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // User Agent should always following the below style. | // User Agent should always following the below style. | ||||||
|  | @ -158,10 +158,6 @@ func New(endpoint string, opts *Options) (*Client, error) { | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return nil, err | 		return nil, err | ||||||
| 	} | 	} | ||||||
| 	// Google cloud storage should be set to signature V2, force it if not. |  | ||||||
| 	if s3utils.IsGoogleEndpoint(*clnt.endpointURL) { |  | ||||||
| 		clnt.overrideSignerType = credentials.SignatureV2 |  | ||||||
| 	} |  | ||||||
| 	// If Amazon S3 set to signature v4. | 	// If Amazon S3 set to signature v4. | ||||||
| 	if s3utils.IsAmazonEndpoint(*clnt.endpointURL) { | 	if s3utils.IsAmazonEndpoint(*clnt.endpointURL) { | ||||||
| 		clnt.overrideSignerType = credentials.SignatureV4 | 		clnt.overrideSignerType = credentials.SignatureV4 | ||||||
|  |  | ||||||
							
								
								
									
										67
									
								
								vendor/github.com/minio/minio-go/v7/pkg/replication/replication.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										67
									
								
								vendor/github.com/minio/minio-go/v7/pkg/replication/replication.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -690,40 +690,44 @@ func (e ExistingObjectReplication) Validate() error { | ||||||
| // such as pending, failed and completed bytes in total for a bucket remote target | // such as pending, failed and completed bytes in total for a bucket remote target | ||||||
| type TargetMetrics struct { | type TargetMetrics struct { | ||||||
| 	// Pending size in bytes | 	// Pending size in bytes | ||||||
| 	PendingSize uint64 `json:"pendingReplicationSize"` | 	PendingSize uint64 `json:"pendingReplicationSize,omitempty"` | ||||||
| 	// Completed size in bytes | 	// Completed size in bytes | ||||||
| 	ReplicatedSize uint64 `json:"completedReplicationSize"` | 	ReplicatedSize uint64 `json:"completedReplicationSize,omitempty"` | ||||||
| 	// Total Replica size in bytes | 	// Total Replica size in bytes | ||||||
| 	ReplicaSize uint64 `json:"replicaSize"` | 	ReplicaSize uint64 `json:"replicaSize,omitempty"` | ||||||
| 	// Failed size in bytes | 	// Failed size in bytes | ||||||
| 	FailedSize uint64 `json:"failedReplicationSize"` | 	FailedSize uint64 `json:"failedReplicationSize,omitempty"` | ||||||
| 	// Total number of pending operations including metadata updates | 	// Total number of pending operations including metadata updates | ||||||
| 	PendingCount uint64 `json:"pendingReplicationCount"` | 	PendingCount uint64 `json:"pendingReplicationCount,omitempty"` | ||||||
| 	// Total number of failed operations including metadata updates | 	// Total number of failed operations including metadata updates | ||||||
| 	FailedCount uint64 `json:"failedReplicationCount"` | 	FailedCount uint64 `json:"failedReplicationCount,omitempty"` | ||||||
| 	// Bandwidth limit in bytes/sec for this target | 	// Bandwidth limit in bytes/sec for this target | ||||||
| 	BandWidthLimitInBytesPerSecond int64 `json:"limitInBits"` | 	BandWidthLimitInBytesPerSecond int64 `json:"limitInBits,omitempty"` | ||||||
| 	// Current bandwidth used in bytes/sec for this target | 	// Current bandwidth used in bytes/sec for this target | ||||||
| 	CurrentBandwidthInBytesPerSecond float64 `json:"currentBandwidth"` | 	CurrentBandwidthInBytesPerSecond float64 `json:"currentBandwidth,omitempty"` | ||||||
| 	// Completed count | 	// Completed count | ||||||
| 	ReplicatedCount uint64 `json:"replicationCount"` | 	ReplicatedCount uint64 `json:"replicationCount,omitempty"` | ||||||
|  | 	// transfer rate for large uploads | ||||||
|  | 	XferRateLrg XferStats `json:"largeTransferRate"` | ||||||
|  | 	// transfer rate for small uploads | ||||||
|  | 	XferRateSml XferStats `json:"smallTransferRate"` | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // Metrics represents inline replication metrics for a bucket. | // Metrics represents inline replication metrics for a bucket. | ||||||
| type Metrics struct { | type Metrics struct { | ||||||
| 	Stats map[string]TargetMetrics | 	Stats map[string]TargetMetrics | ||||||
| 	// Total Pending size in bytes across targets | 	// Total Pending size in bytes across targets | ||||||
| 	PendingSize uint64 `json:"pendingReplicationSize"` | 	PendingSize uint64 `json:"pendingReplicationSize,omitempty"` | ||||||
| 	// Completed size in bytes  across targets | 	// Completed size in bytes  across targets | ||||||
| 	ReplicatedSize uint64 `json:"completedReplicationSize"` | 	ReplicatedSize uint64 `json:"completedReplicationSize,omitempty"` | ||||||
| 	// Total Replica size in bytes  across targets | 	// Total Replica size in bytes  across targets | ||||||
| 	ReplicaSize uint64 `json:"replicaSize"` | 	ReplicaSize uint64 `json:"replicaSize,omitempty"` | ||||||
| 	// Failed size in bytes  across targets | 	// Failed size in bytes  across targets | ||||||
| 	FailedSize uint64 `json:"failedReplicationSize"` | 	FailedSize uint64 `json:"failedReplicationSize,omitempty"` | ||||||
| 	// Total number of pending operations including metadata updates across targets | 	// Total number of pending operations including metadata updates across targets | ||||||
| 	PendingCount uint64 `json:"pendingReplicationCount"` | 	PendingCount uint64 `json:"pendingReplicationCount,omitempty"` | ||||||
| 	// Total number of failed operations including metadata updates across targets | 	// Total number of failed operations including metadata updates across targets | ||||||
| 	FailedCount uint64 `json:"failedReplicationCount"` | 	FailedCount uint64 `json:"failedReplicationCount,omitempty"` | ||||||
| 	// Total Replica counts | 	// Total Replica counts | ||||||
| 	ReplicaCount int64 `json:"replicaCount,omitempty"` | 	ReplicaCount int64 `json:"replicaCount,omitempty"` | ||||||
| 	// Total Replicated count | 	// Total Replicated count | ||||||
|  | @ -788,6 +792,8 @@ type ReplQNodeStats struct { | ||||||
| 	ActiveWorkers int32  `json:"activeWorkers"` | 	ActiveWorkers int32  `json:"activeWorkers"` | ||||||
| 
 | 
 | ||||||
| 	XferStats    map[MetricName]XferStats            `json:"xferStats"` | 	XferStats    map[MetricName]XferStats            `json:"xferStats"` | ||||||
|  | 	TgtXferStats map[string]map[MetricName]XferStats `json:"tgtXferStats"` | ||||||
|  | 
 | ||||||
| 	QStats map[MetricName]InQueueStats `json:"qStats"` | 	QStats map[MetricName]InQueueStats `json:"qStats"` | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -811,6 +817,8 @@ type ReplQStats struct { | ||||||
| 	Workers int64 `json:"workers"` | 	Workers int64 `json:"workers"` | ||||||
| 
 | 
 | ||||||
| 	XferStats    map[MetricName]XferStats            `json:"xferStats"` | 	XferStats    map[MetricName]XferStats            `json:"xferStats"` | ||||||
|  | 	TgtXferStats map[string]map[MetricName]XferStats `json:"tgtXferStats"` | ||||||
|  | 
 | ||||||
| 	QStats map[MetricName]InQueueStats `json:"qStats"` | 	QStats map[MetricName]InQueueStats `json:"qStats"` | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | @ -818,8 +826,29 @@ type ReplQStats struct { | ||||||
| func (q ReplQueueStats) QStats() (r ReplQStats) { | func (q ReplQueueStats) QStats() (r ReplQStats) { | ||||||
| 	r.QStats = make(map[MetricName]InQueueStats) | 	r.QStats = make(map[MetricName]InQueueStats) | ||||||
| 	r.XferStats = make(map[MetricName]XferStats) | 	r.XferStats = make(map[MetricName]XferStats) | ||||||
|  | 	r.TgtXferStats = make(map[string]map[MetricName]XferStats) | ||||||
|  | 
 | ||||||
| 	for _, node := range q.Nodes { | 	for _, node := range q.Nodes { | ||||||
| 		r.Workers += int64(node.ActiveWorkers) | 		r.Workers += int64(node.ActiveWorkers) | ||||||
|  | 		for arn := range node.TgtXferStats { | ||||||
|  | 			xmap, ok := node.TgtXferStats[arn] | ||||||
|  | 			if !ok { | ||||||
|  | 				xmap = make(map[MetricName]XferStats) | ||||||
|  | 			} | ||||||
|  | 			for m, v := range xmap { | ||||||
|  | 				st, ok := r.XferStats[m] | ||||||
|  | 				if !ok { | ||||||
|  | 					st = XferStats{} | ||||||
|  | 				} | ||||||
|  | 				st.AvgRate += v.AvgRate | ||||||
|  | 				st.CurrRate += v.CurrRate | ||||||
|  | 				st.PeakRate = math.Max(st.PeakRate, v.PeakRate) | ||||||
|  | 				if _, ok := r.TgtXferStats[arn]; !ok { | ||||||
|  | 					r.TgtXferStats[arn] = make(map[MetricName]XferStats) | ||||||
|  | 				} | ||||||
|  | 				r.TgtXferStats[arn][m] = st | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
| 		for k, v := range node.XferStats { | 		for k, v := range node.XferStats { | ||||||
| 			st, ok := r.XferStats[k] | 			st, ok := r.XferStats[k] | ||||||
| 			if !ok { | 			if !ok { | ||||||
|  | @ -848,6 +877,13 @@ func (q ReplQueueStats) QStats() (r ReplQStats) { | ||||||
| 			st.CurrRate /= float64(len(q.Nodes)) | 			st.CurrRate /= float64(len(q.Nodes)) | ||||||
| 			r.XferStats[k] = st | 			r.XferStats[k] = st | ||||||
| 		} | 		} | ||||||
|  | 		for arn := range r.TgtXferStats { | ||||||
|  | 			for m, v := range r.TgtXferStats[arn] { | ||||||
|  | 				v.AvgRate /= float64(len(q.Nodes)) | ||||||
|  | 				v.CurrRate /= float64(len(q.Nodes)) | ||||||
|  | 				r.TgtXferStats[arn][m] = v | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
| 		r.Uptime /= int64(len(q.Nodes)) // average uptime | 		r.Uptime /= int64(len(q.Nodes)) // average uptime | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -856,7 +892,6 @@ func (q ReplQueueStats) QStats() (r ReplQStats) { | ||||||
| 
 | 
 | ||||||
| // MetricsV2 represents replication metrics for a bucket. | // MetricsV2 represents replication metrics for a bucket. | ||||||
| type MetricsV2 struct { | type MetricsV2 struct { | ||||||
| 	History      Metrics        `json:"history"` |  | ||||||
| 	CurrentStats Metrics        `json:"currStats"` | 	CurrentStats Metrics        `json:"currStats"` | ||||||
| 	QueueStats   ReplQueueStats `json:"queueStats"` | 	QueueStats   ReplQueueStats `json:"queueStats"` | ||||||
| } | } | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								vendor/modules.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/modules.txt
									
										
									
									
										vendored
									
									
								
							|  | @ -390,7 +390,7 @@ github.com/miekg/dns | ||||||
| # github.com/minio/md5-simd v1.1.2 | # github.com/minio/md5-simd v1.1.2 | ||||||
| ## explicit; go 1.14 | ## explicit; go 1.14 | ||||||
| github.com/minio/md5-simd | github.com/minio/md5-simd | ||||||
| # github.com/minio/minio-go/v7 v7.0.61 | # github.com/minio/minio-go/v7 v7.0.62 | ||||||
| ## explicit; go 1.17 | ## explicit; go 1.17 | ||||||
| github.com/minio/minio-go/v7 | github.com/minio/minio-go/v7 | ||||||
| github.com/minio/minio-go/v7/pkg/credentials | github.com/minio/minio-go/v7/pkg/credentials | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue