hcq/influx-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: refactor influxid.ID, cleanup organization checking (#326)

Browse Source
This commit is contained in:
Dane Strandboge
2021-11-10 15:12:59 -06:00
committed by GitHub
parent 99791bafd3
commit adc58b8441
63 changed files with 699 additions and 1259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
clients/bucket_schema/create_test.go
View File

@ -16,7 +16,6 @@ import (
"github.com/influxdata/influx-cli/v2/clients/bucket_schema"
"github.com/influxdata/influx-cli/v2/internal/mock"
"github.com/influxdata/influx-cli/v2/internal/testutils"
"github.com/influxdata/influx-cli/v2/pkg/influxid"
"github.com/stretchr/testify/assert"
tmock "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
@ -26,9 +25,9 @@ func TestClient_Create(t *testing.T) {
t.Parallel()
var (
orgID = influxid.MustIDFromString("deadf00dbaadf00d")
bucketID = influxid.MustIDFromString("f00ddeadf00dbaad")
measurementID = influxid.MustIDFromString("1010f00ddeedfeed")
orgID = "deadf00dbaadf00d"
bucketID = "f00ddeadf00dbaad"
measurementID = "1010f00ddeedfeed"
createdAt = time.Date(2004, 4, 9, 2, 15, 0, 0, time.UTC)
)
@ -45,9 +44,9 @@ func TestClient_Create(t *testing.T) {
type args struct {
OrgName string
OrgID influxid.ID
OrgID string
BucketName string
BucketID influxid.ID
BucketID string
Name string
ColumnsFile string
ExtendedOutput bool
@ -80,8 +79,8 @@ func TestClient_Create(t *testing.T) {
var buckets []api.Bucket
if len(n) == 1 {
bucket := api.NewBucket(n[0], nil)
bucket.SetOrgID(orgID.String())
bucket.SetId(bucketID.String())
bucket.SetOrgID(orgID)
bucket.SetId(bucketID)
bucket.SetName(n[0])
buckets = []api.Bucket{*bucket}
}
@ -95,9 +94,9 @@ func TestClient_Create(t *testing.T) {
a.buckets.EXPECT().
GetBucketsExecute(tmock.MatchedBy(func(in api.ApiGetBucketsRequest) bool {
matchOrg := (in.GetOrg() != nil && *in.GetOrg() == a.params.OrgName) ||
(in.GetOrgID() != nil && a.params.OrgID.Valid() && *in.GetOrgID() == a.params.OrgID.String())
(in.GetOrgID() != nil && *in.GetOrgID() == a.params.OrgID)
matchBucket := (in.GetName() != nil && *in.GetName() == a.params.BucketName) ||
(in.GetId() != nil && a.params.BucketID.Valid() && *in.GetId() == a.params.BucketID.String())
(in.GetId() != nil && *in.GetId() == a.params.BucketID)
return matchOrg && matchBucket
})).
Return(api.Buckets{Buckets: &buckets}, nil)
@ -122,19 +121,19 @@ func TestClient_Create(t *testing.T) {
return func(t *testing.T, a *setupArgs) {
t.Helper()
req := api.ApiCreateMeasurementSchemaRequest{ApiService: a.schemas}.BucketID(bucketID.String())
req := api.ApiCreateMeasurementSchemaRequest{ApiService: a.schemas}.BucketID(bucketID)
a.schemas.EXPECT().
CreateMeasurementSchema(gomock.Any(), bucketID.String()).
CreateMeasurementSchema(gomock.Any(), bucketID).
Return(req)
a.schemas.EXPECT().
CreateMeasurementSchemaExecute(tmock.MatchedBy(func(in api.ApiCreateMeasurementSchemaRequest) bool {
orgIDPtr := orgID.String()
return assert.Equal(t, in.GetOrgID(), &orgIDPtr) && assert.Equal(t, in.GetBucketID(), bucketID.String())
orgIDPtr := orgID
return assert.Equal(t, in.GetOrgID(), &orgIDPtr) && assert.Equal(t, in.GetBucketID(), bucketID)
})).
Return(api.MeasurementSchema{
Id: measurementID.String(),
Id: measurementID,
Name: a.params.Name,
Columns: a.cols,
CreatedAt: createdAt,