mirror of
https://github.com/hanzoai/team.git
synced 2026-09-30 01:57:35 +00:00
Jesse HallamandGitHub
edf2075381
* MM-68149: upgrade to Go 1.26.2 Update go directive in go.mod and .go-version. * MM-68149: replace pointer helpers with Go 1.26 new() Go 1.26 extends the built-in new() to accept an initial value expression, making typed-pointer helpers like model.NewPointer(x), bToP(x), and boolPtr(x) redundant. Replace every call site with new(x) and remove the now-unused helper functions and their //go:fix inline directives. * MM-68149: apply go fix for reflect API and format-string changes - reflect.Ptr → reflect.Pointer (renamed in Go 1.18, deprecated alias removed in 1.26) - reflect range-over-struct: for i := 0; i < t.NumField(); i++ → for field := range t.Fields() and the equivalent for Methods() and interface types - Fix format-string concatenation and variadic-arg mismatches flagged by go vet * MM-68149: update JPEG fixtures and test infrastructure for Go 1.26 encoder Go 1.26 ships a new image/jpeg encoder that produces slightly different output. Regenerate all JPEG fixture files and switch the comparison helpers from byte-equality to pixel-level comparison with a small per-channel tolerance, so minor encoder drift across patch versions is handled automatically. Add -update-fixtures flag to make it easy to regenerate fixtures after future major Go upgrades. Document the update procedure in tests/README.md. * MM-68149: CI check that go fix ./... produces no changes * Fix real bugs flagged by CodeRabbit review - group.go: set newGroup.MemberCount not group.MemberCount (member count was populated on the wrong variable and lost before publish/return) - file_test.go: guard compareImage(GetFilePreview) on the preview slice length, not the thumbnail slice length (copy-paste error) - config_test.go: remove duplicate MinimumLength assignment * fixup! Fix real bugs flagged by CodeRabbit review
147 lines
4.7 KiB
Go
147 lines
4.7 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package awsmeter
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/aws/aws-sdk-go-v2/service/marketplacemetering"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/mattermost/mattermost/server/public/model"
|
|
"github.com/mattermost/mattermost/server/public/plugin/plugintest/mock"
|
|
"github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks"
|
|
)
|
|
|
|
type mockMarketplaceMeteringClient struct {
|
|
MeteringService
|
|
}
|
|
|
|
func (m *mockMarketplaceMeteringClient) MeterUsage(ctx context.Context, input *marketplacemetering.MeterUsageInput, optFns ...func(*marketplacemetering.Options)) (*marketplacemetering.MeterUsageOutput, error) {
|
|
return &marketplacemetering.MeterUsageOutput{
|
|
MeteringRecordId: new("1"),
|
|
}, nil
|
|
}
|
|
|
|
type mockMarketplaceMeteringClientWithError struct {
|
|
MeteringService
|
|
}
|
|
|
|
func (m *mockMarketplaceMeteringClientWithError) MeterUsage(ctx context.Context, input *marketplacemetering.MeterUsageInput, optFns ...func(*marketplacemetering.Options)) (*marketplacemetering.MeterUsageOutput, error) {
|
|
return nil, errors.New("error")
|
|
}
|
|
|
|
func TestAwsMeterUsage(t *testing.T) {
|
|
startTime := time.Now()
|
|
endTime := time.Now()
|
|
dimensions := []string{model.AwsMeteringDimensionUsageHrs}
|
|
|
|
userStoreMock := mocks.UserStore{}
|
|
userStoreMock.On("AnalyticsActiveCountForPeriod", model.GetMillisForTime(startTime), model.GetMillisForTime(endTime), mock.AnythingOfType("model.UserCountOptions")).Return(int32(2), nil)
|
|
|
|
storeMock := mocks.Store{}
|
|
storeMock.On("User").Return(&userStoreMock)
|
|
|
|
reports := make([]*AWSMeterReport, 1)
|
|
reports[0] = &AWSMeterReport{
|
|
Dimension: model.AwsMeteringDimensionUsageHrs,
|
|
Value: 2,
|
|
Timestamp: startTime,
|
|
}
|
|
|
|
// Define a mock struct to be used in your unit tests of myFunc.
|
|
svc := &AWSMeterService{
|
|
AwsDryRun: false,
|
|
AwsProductCode: "12345",
|
|
AwsMeteringSvc: &mockMarketplaceMeteringClient{},
|
|
}
|
|
|
|
config := &model.Config{}
|
|
config.SetDefaults()
|
|
|
|
awsmeter := &AwsMeter{
|
|
store: &storeMock,
|
|
service: svc,
|
|
config: config,
|
|
}
|
|
|
|
t.Run("Send report for one usage category", func(t *testing.T) {
|
|
resultReports := awsmeter.GetUserCategoryUsage(dimensions, startTime, endTime)
|
|
require.NotNil(t, resultReports)
|
|
assert.Equal(t, 1, len(resultReports))
|
|
assert.Equal(t, reports[0].Dimension, resultReports[0].Dimension)
|
|
assert.Equal(t, reports[0].Value, resultReports[0].Value)
|
|
assert.Equal(t, reports[0].Timestamp, resultReports[0].Timestamp)
|
|
|
|
err := awsmeter.ReportUserCategoryUsage(context.Background(), resultReports)
|
|
require.NoError(t, err)
|
|
})
|
|
|
|
t.Run("Error in AWS service call", func(t *testing.T) {
|
|
awsmeter.service.AwsMeteringSvc = &mockMarketplaceMeteringClientWithError{}
|
|
resultReports := awsmeter.GetUserCategoryUsage(dimensions, startTime, endTime)
|
|
require.NotNil(t, resultReports)
|
|
assert.Equal(t, 1, len(resultReports))
|
|
err := awsmeter.ReportUserCategoryUsage(context.Background(), resultReports)
|
|
require.Error(t, err)
|
|
})
|
|
|
|
t.Run("Invalid dimension", func(t *testing.T) {
|
|
awsmeter.service.AwsMeteringSvc = &mockMarketplaceMeteringClient{}
|
|
dimensions = []string{"invalid dimension"}
|
|
resultReports := awsmeter.GetUserCategoryUsage(dimensions, startTime, endTime)
|
|
require.NotNil(t, resultReports)
|
|
assert.Equal(t, 0, len(resultReports))
|
|
err := awsmeter.ReportUserCategoryUsage(context.Background(), resultReports)
|
|
require.NoError(t, err)
|
|
})
|
|
}
|
|
|
|
func TestAwsMeterUsageWithDBError(t *testing.T) {
|
|
startTime := time.Now()
|
|
endTime := time.Now()
|
|
dimensions := []string{model.AwsMeteringDimensionUsageHrs}
|
|
|
|
userStoreMock := mocks.UserStore{}
|
|
userStoreMock.On("AnalyticsActiveCountForPeriod", model.GetMillisForTime(startTime), model.GetMillisForTime(endTime), mock.AnythingOfType("model.UserCountOptions")).Return(int32(0), errors.New("error"))
|
|
|
|
storeMock := mocks.Store{}
|
|
storeMock.On("User").Return(&userStoreMock)
|
|
|
|
reports := make([]*AWSMeterReport, 1)
|
|
reports[0] = &AWSMeterReport{
|
|
Dimension: model.AwsMeteringDimensionUsageHrs,
|
|
Value: 2,
|
|
Timestamp: startTime,
|
|
}
|
|
|
|
// Define a mock struct to be used in your unit tests of myFunc.
|
|
svc := &AWSMeterService{
|
|
AwsDryRun: false,
|
|
AwsProductCode: "12345",
|
|
AwsMeteringSvc: &mockMarketplaceMeteringClient{},
|
|
}
|
|
|
|
config := &model.Config{}
|
|
config.SetDefaults()
|
|
|
|
awsmeter := &AwsMeter{
|
|
store: &storeMock,
|
|
service: svc,
|
|
config: config,
|
|
}
|
|
|
|
t.Run("Error in DB query", func(t *testing.T) {
|
|
resultReports := awsmeter.GetUserCategoryUsage(dimensions, startTime, endTime)
|
|
require.NotNil(t, resultReports)
|
|
assert.Equal(t, 0, len(resultReports))
|
|
err := awsmeter.ReportUserCategoryUsage(context.Background(), resultReports)
|
|
require.NoError(t, err)
|
|
})
|
|
}
|