diff --git a/bolt/bucket.go b/bolt/bucket.go index e6e2030769d..e757f1b5edd 100644 --- a/bolt/bucket.go +++ b/bolt/bucket.go @@ -40,7 +40,7 @@ func (c *Client) setOrganizationOnBucket(ctx context.Context, tx *bolt.Tx, b *pl Err: err, } } - b.Organization = o.Name + b.Org = o.Name return nil } @@ -189,8 +189,8 @@ func (c *Client) FindBucket(ctx context.Context, filter platform.BucketFilter) ( } err = c.db.View(func(tx *bolt.Tx) error { - if filter.Organization != nil { - o, err := c.findOrganizationByName(ctx, tx, *filter.Organization) + if filter.Org != nil { + o, err := c.findOrganizationByName(ctx, tx, *filter.Org) if err != nil { return err } @@ -299,8 +299,8 @@ func (c *Client) findBuckets(ctx context.Context, tx *bolt.Tx, filter platform.B defer span.Finish() bs := []*platform.Bucket{} - if filter.Organization != nil { - o, err := c.findOrganizationByName(ctx, tx, *filter.Organization) + if filter.Org != nil { + o, err := c.findOrganizationByName(ctx, tx, *filter.Org) if err != nil { return nil, &platform.Error{ Err: err, @@ -359,7 +359,7 @@ func (c *Client) CreateBucket(ctx context.Context, b *platform.Bucket) error { } } } else { - o, pe := c.findOrganizationByName(ctx, tx, b.Organization) + o, pe := c.findOrganizationByName(ctx, tx, b.Org) if pe != nil { return &platform.Error{ Err: pe, @@ -442,7 +442,7 @@ func (c *Client) createBucketUserResourceMappings(ctx context.Context, tx *bolt. } func (c *Client) putBucket(ctx context.Context, tx *bolt.Tx, b *platform.Bucket) *platform.Error { - b.Organization = "" + b.Org = "" v, err := json.Marshal(b) if err != nil { return &platform.Error{ diff --git a/bolt/onboarding.go b/bolt/onboarding.go index 65f1da2fb27..a8b06b53e56 100644 --- a/bolt/onboarding.go +++ b/bolt/onboarding.go @@ -102,7 +102,7 @@ func (c *Client) Generate(ctx context.Context, req *platform.OnboardingRequest) } bucket := &platform.Bucket{ Name: req.Bucket, - Organization: o.Name, + Org: o.Name, OrganizationID: o.ID, RetentionPeriod: time.Duration(req.RetentionPeriod) * time.Hour, } diff --git a/bucket.go b/bucket.go index acb08fe27c8..cd3cb41d719 100644 --- a/bucket.go +++ b/bucket.go @@ -22,7 +22,7 @@ const InfiniteRetention = 0 type Bucket struct { ID ID `json:"id,omitempty"` OrganizationID ID `json:"orgID,omitempty"` - Organization string `json:"organization,omitempty"` + Org string `json:"org,omitempty"` Name string `json:"name"` RetentionPolicyName string `json:"rp,omitempty"` // This to support v1 sources RetentionPeriod time.Duration `json:"retentionPeriod"` @@ -73,7 +73,7 @@ type BucketFilter struct { ID *ID Name *string OrganizationID *ID - Organization *string + Org *string } // QueryParams Converts BucketFilter fields to url query params. @@ -91,8 +91,8 @@ func (f BucketFilter) QueryParams() map[string][]string { qp["orgID"] = []string{f.OrganizationID.String()} } - if f.Organization != nil { - qp["org"] = []string{*f.Organization} + if f.Org != nil { + qp["org"] = []string{*f.Org} } return qp @@ -112,8 +112,8 @@ func (f BucketFilter) String() string { if f.OrganizationID != nil { parts = append(parts, "Org ID: "+f.OrganizationID.String()) } - if f.Organization != nil { - parts = append(parts, "Org Name: "+*f.Organization) + if f.Org != nil { + parts = append(parts, "Org Name: "+*f.Org) } return "[" + strings.Join(parts, ", ") + "]" } diff --git a/cmd/influx/bucket.go b/cmd/influx/bucket.go index 4beec59c778..5a4e942a4d8 100644 --- a/cmd/influx/bucket.go +++ b/cmd/influx/bucket.go @@ -76,7 +76,7 @@ func bucketCreateF(cmd *cobra.Command, args []string) error { } if bucketCreateFlags.org != "" { - b.Organization = bucketCreateFlags.org + b.Org = bucketCreateFlags.org } if bucketCreateFlags.orgID != "" { @@ -96,14 +96,14 @@ func bucketCreateF(cmd *cobra.Command, args []string) error { "ID", "Name", "Retention", - "Organization", + "Org", "OrganizationID", ) w.Write(map[string]interface{}{ "ID": b.ID.String(), "Name": b.Name, "Retention": b.RetentionPeriod, - "Organization": b.Organization, + "Org": b.Org, "OrganizationID": b.OrganizationID.String(), }) w.Flush() @@ -168,7 +168,7 @@ func bucketFindF(cmd *cobra.Command, args []string) error { } if bucketFindFlags.org != "" { - filter.Organization = &bucketFindFlags.org + filter.Org = &bucketFindFlags.org } buckets, _, err := s.FindBuckets(context.Background(), filter) @@ -181,7 +181,7 @@ func bucketFindF(cmd *cobra.Command, args []string) error { "ID", "Name", "Retention", - "Organization", + "Org", "OrganizationID", ) for _, b := range buckets { @@ -189,7 +189,7 @@ func bucketFindF(cmd *cobra.Command, args []string) error { "ID": b.ID.String(), "Name": b.Name, "Retention": b.RetentionPeriod, - "Organization": b.Organization, + "Org": b.Org, "OrganizationID": b.OrganizationID.String(), }) } @@ -258,7 +258,7 @@ func bucketUpdateF(cmd *cobra.Command, args []string) error { "ID": b.ID.String(), "Name": b.Name, "Retention": b.RetentionPeriod, - "Organization": b.Organization, + "Org": b.Org, "OrganizationID": b.OrganizationID.String(), }) w.Flush() @@ -307,7 +307,7 @@ func bucketDeleteF(cmd *cobra.Command, args []string) error { "ID": b.ID.String(), "Name": b.Name, "Retention": b.RetentionPeriod, - "Organization": b.Organization, + "Org": b.Org, "OrganizationID": b.OrganizationID.String(), "Deleted": true, }) diff --git a/cmd/influx/write.go b/cmd/influx/write.go index bd1d3eab549..4ac7527ce25 100644 --- a/cmd/influx/write.go +++ b/cmd/influx/write.go @@ -108,7 +108,7 @@ func fluxWriteF(cmd *cobra.Command, args []string) error { } } if writeFlags.Org != "" { - filter.Organization = &writeFlags.Org + filter.Org = &writeFlags.Org } buckets, n, err := bs.FindBuckets(ctx, filter) diff --git a/cmd/influxd/launcher/tasks_test.go b/cmd/influxd/launcher/tasks_test.go index 27a83f56a0d..90eea326672 100644 --- a/cmd/influxd/launcher/tasks_test.go +++ b/cmd/influxd/launcher/tasks_test.go @@ -26,11 +26,11 @@ func TestLauncher_Task(t *testing.T) { now := time.Now().Unix() // Need to track now at the start of the test, for a query later. org := be.Org - bIn := &influxdb.Bucket{OrganizationID: org.ID, Organization: org.Name, Name: "my_bucket_in"} + bIn := &influxdb.Bucket{OrganizationID: org.ID, Org: org.Name, Name: "my_bucket_in"} if err := be.BucketService().CreateBucket(context.Background(), bIn); err != nil { t.Fatal(err) } - bOut := &influxdb.Bucket{OrganizationID: org.ID, Organization: org.Name, Name: "my_bucket_out"} + bOut := &influxdb.Bucket{OrganizationID: org.ID, Org: org.Name, Name: "my_bucket_out"} if err := be.BucketService().CreateBucket(context.Background(), bOut); err != nil { t.Fatal(err) } diff --git a/http/bucket_service.go b/http/bucket_service.go index 957f9fa2125..6d795c689f1 100644 --- a/http/bucket_service.go +++ b/http/bucket_service.go @@ -128,7 +128,7 @@ func NewBucketHandler(b *BucketBackend) *BucketHandler { type bucket struct { ID influxdb.ID `json:"id,omitempty"` OrganizationID influxdb.ID `json:"organizationID,omitempty"` - Organization string `json:"organization,omitempty"` + Org string `json:"org,omitempty"` Name string `json:"name"` RetentionPolicyName string `json:"rp,omitempty"` // This to support v1 sources RetentionRules []retentionRule `json:"retentionRules"` @@ -161,7 +161,7 @@ func (b *bucket) toInfluxDB() (*influxdb.Bucket, error) { return &influxdb.Bucket{ ID: b.ID, OrganizationID: b.OrganizationID, - Organization: b.Organization, + Org: b.Org, Name: b.Name, RetentionPolicyName: b.RetentionPolicyName, RetentionPeriod: d, @@ -185,7 +185,7 @@ func newBucket(pb *influxdb.Bucket) *bucket { return &bucket{ ID: pb.ID, OrganizationID: pb.OrganizationID, - Organization: pb.Organization, + Org: pb.Org, Name: pb.Name, RetentionPolicyName: pb.RetentionPolicyName, RetentionRules: rules, @@ -298,7 +298,7 @@ func (h *BucketHandler) handlePostBucket(w http.ResponseWriter, r *http.Request) if !req.Bucket.OrganizationID.Valid() { // Resolve organization name to ID before create - o, err := h.OrganizationService.FindOrganization(ctx, influxdb.OrganizationFilter{Name: &req.Bucket.Organization}) + o, err := h.OrganizationService.FindOrganization(ctx, influxdb.OrganizationFilter{Name: &req.Bucket.Org}) if err != nil { EncodeError(ctx, err, w) return @@ -322,7 +322,7 @@ type postBucketRequest struct { } func (b postBucketRequest) Validate() error { - if b.Bucket.Organization == "" && !b.Bucket.OrganizationID.Valid() { + if b.Bucket.Org == "" && !b.Bucket.OrganizationID.Valid() { return fmt.Errorf("bucket requires an organization") } return nil @@ -492,7 +492,7 @@ func decodeGetBucketsRequest(ctx context.Context, r *http.Request) (*getBucketsR } if org := qp.Get("org"); org != "" { - req.filter.Organization = &org + req.filter.Org = &org } if name := qp.Get("name"); name != "" { @@ -671,8 +671,8 @@ func (s *BucketService) FindBuckets(ctx context.Context, filter influxdb.BucketF if filter.OrganizationID != nil { query.Add("orgID", filter.OrganizationID.String()) } - if filter.Organization != nil { - query.Add("org", *filter.Organization) + if filter.Org != nil { + query.Add("org", *filter.Org) } if filter.ID != nil { query.Add("id", filter.ID.String()) diff --git a/inmem/bucket_service.go b/inmem/bucket_service.go index 1780ff2aea7..7b203d976bb 100644 --- a/inmem/bucket_service.go +++ b/inmem/bucket_service.go @@ -44,7 +44,7 @@ func (s *Service) setOrganizationNameOnBucket(ctx context.Context, b *platform.B return err } - b.Organization = o.Name + b.Org = o.Name return nil } @@ -185,8 +185,8 @@ func (s *Service) findBuckets(ctx context.Context, filter platform.BucketFilter, return []*platform.Bucket{b}, nil } - if filter.Organization != nil { - o, err := s.findOrganizationByName(ctx, *filter.Organization) + if filter.Org != nil { + o, err := s.findOrganizationByName(ctx, *filter.Org) if err != nil { return nil, &platform.Error{ Err: err, @@ -251,7 +251,7 @@ func (s *Service) CreateBucket(ctx context.Context, b *platform.Bucket) error { } } } else { - o, pe := s.findOrganizationByName(ctx, b.Organization) + o, pe := s.findOrganizationByName(ctx, b.Org) if pe != nil { return &platform.Error{ Err: pe, diff --git a/inmem/onboarding.go b/inmem/onboarding.go index 3e97ffc5e6d..72b509b6ae2 100644 --- a/inmem/onboarding.go +++ b/inmem/onboarding.go @@ -85,7 +85,7 @@ func (s *Service) Generate(ctx context.Context, req *platform.OnboardingRequest) } bucket := &platform.Bucket{ Name: req.Bucket, - Organization: o.Name, + Org: o.Name, OrganizationID: o.ID, RetentionPeriod: time.Duration(req.RetentionPeriod) * time.Hour, } diff --git a/kv/bucket.go b/kv/bucket.go index dc04c18cff3..90262a9131e 100644 --- a/kv/bucket.go +++ b/kv/bucket.go @@ -57,7 +57,7 @@ func (s *Service) setOrganizationOnBucket(ctx context.Context, tx Tx, b *influxd Err: err, } } - b.Organization = o.Name + b.Org = o.Name return nil } @@ -221,8 +221,8 @@ func (s *Service) FindBucket(ctx context.Context, filter influxdb.BucketFilter) } err = s.kv.View(ctx, func(tx Tx) error { - if filter.Organization != nil { - o, err := s.findOrganizationByName(ctx, tx, *filter.Organization) + if filter.Org != nil { + o, err := s.findOrganizationByName(ctx, tx, *filter.Org) if err != nil { return err } @@ -330,8 +330,8 @@ func (s *Service) findBuckets(ctx context.Context, tx Tx, filter influxdb.Bucket defer span.Finish() bs := []*influxdb.Bucket{} - if filter.Organization != nil { - o, err := s.findOrganizationByName(ctx, tx, *filter.Organization) + if filter.Org != nil { + o, err := s.findOrganizationByName(ctx, tx, *filter.Org) if err != nil { return nil, &influxdb.Error{ Err: err, @@ -395,7 +395,7 @@ func (s *Service) createBucket(ctx context.Context, tx Tx, b *influxdb.Bucket) e } } } else { - o, pe := s.findOrganizationByName(ctx, tx, b.Organization) + o, pe := s.findOrganizationByName(ctx, tx, b.Org) if pe != nil { return &influxdb.Error{ Err: pe, @@ -474,7 +474,7 @@ func (s *Service) putBucket(ctx context.Context, tx Tx, b *influxdb.Bucket) erro span, ctx := tracing.StartSpanFromContext(ctx) defer span.Finish() - b.Organization = "" + b.Org = "" v, err := json.Marshal(b) if err != nil { return &influxdb.Error{ diff --git a/kv/onboarding.go b/kv/onboarding.go index 44ce92116c6..60f7df44c7f 100644 --- a/kv/onboarding.go +++ b/kv/onboarding.go @@ -116,7 +116,7 @@ func (s *Service) Generate(ctx context.Context, req *influxdb.OnboardingRequest) o := &influxdb.Organization{Name: req.Org} bucket := &influxdb.Bucket{ Name: req.Bucket, - Organization: o.Name, + Org: o.Name, RetentionPeriod: time.Duration(req.RetentionPeriod) * time.Hour, } mapping := &influxdb.UserResourceMapping{ diff --git a/query/stdlib/influxdata/influxdb/buckets.go b/query/stdlib/influxdata/influxdb/buckets.go index dbbc92a25b3..a79b70c2182 100644 --- a/query/stdlib/influxdata/influxdb/buckets.go +++ b/query/stdlib/influxdata/influxdb/buckets.go @@ -88,7 +88,7 @@ func (bd *BucketsDecoder) Decode() (flux.Table, error) { for _, bucket := range bd.buckets { _ = b.AppendString(0, bucket.Name) _ = b.AppendString(1, bucket.ID.String()) - _ = b.AppendString(2, bucket.Organization) + _ = b.AppendString(2, bucket.Org) _ = b.AppendString(3, bucket.OrganizationID.String()) _ = b.AppendString(4, bucket.RetentionPolicyName) _ = b.AppendInt(5, bucket.RetentionPeriod.Nanoseconds()) diff --git a/query/stdlib/influxdata/influxdb/to.go b/query/stdlib/influxdata/influxdb/to.go index 6d6331ac7f1..840f788511c 100644 --- a/query/stdlib/influxdata/influxdb/to.go +++ b/query/stdlib/influxdata/influxdb/to.go @@ -178,7 +178,7 @@ func (o *ToOpSpec) BucketsAccessed(orgID *platform.ID) (readBuckets, writeBucket bf.Name = &o.Bucket } if o.Org != "" { - bf.Organization = &o.Org + bf.Org = &o.Org } if o.OrgID != "" { id, err := platform.IDFromString(o.OrgID) diff --git a/query/stdlib/influxdata/influxdb/to_test.go b/query/stdlib/influxdata/influxdb/to_test.go index 1826df565c6..4da1dc8e509 100644 --- a/query/stdlib/influxdata/influxdb/to_test.go +++ b/query/stdlib/influxdata/influxdb/to_test.go @@ -96,7 +96,7 @@ func TestToOpSpec_BucketsAccessed(t *testing.T) { Name: "from() with bucket and to with org and bucket", Raw: fmt.Sprintf(`from(bucket:"%s") |> to(bucket:"%s", org:"%s")`, bucketName, bucketName, orgName), WantReadBuckets: &[]platform.BucketFilter{{Name: &bucketName}}, - WantWriteBuckets: &[]platform.BucketFilter{{Name: &bucketName, Organization: &orgName}}, + WantWriteBuckets: &[]platform.BucketFilter{{Name: &bucketName, Org: &orgName}}, }, { Name: "from() with bucket and to with orgID and bucket", diff --git a/query/stdlib/testing/end_to_end_test.go b/query/stdlib/testing/end_to_end_test.go index c1d1267b12f..274b12b5e97 100644 --- a/query/stdlib/testing/end_to_end_test.go +++ b/query/stdlib/testing/end_to_end_test.go @@ -202,7 +202,7 @@ func testFlux(t testing.TB, l *launcher.TestLauncher, pkg *ast.Package) { // Query server to ensure write persists. b := &platform.Bucket{ - Organization: "ORG", + Org: "ORG", Name: t.Name(), RetentionPeriod: 0, } @@ -222,7 +222,7 @@ func testFlux(t testing.TB, l *launcher.TestLauncher, pkg *ast.Package) { orgOpt := &ast.OptionStatement{ Assignment: &ast.VariableAssignment{ ID: &ast.Identifier{Name: "org"}, - Init: &ast.StringLiteral{Value: b.Organization}, + Init: &ast.StringLiteral{Value: b.Org}, }, } options := optionsAST.Copy().(*ast.File) diff --git a/testing/bucket_service.go b/testing/bucket_service.go index ac44a02e97d..dfb93e98e3b 100644 --- a/testing/bucket_service.go +++ b/testing/bucket_service.go @@ -128,7 +128,7 @@ func CreateBucket( Name: "name1", ID: MustIDBase16(bucketOneID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", }, }, }, @@ -170,13 +170,13 @@ func CreateBucket( { ID: MustIDBase16(bucketOneID), Name: "bucket1", - Organization: "theorg", + Org: "theorg", OrganizationID: MustIDBase16(orgOneID), }, { ID: MustIDBase16(bucketTwoID), Name: "bucket2", - Organization: "otherorg", + Org: "otherorg", OrganizationID: MustIDBase16(orgTwoID), }, }, @@ -210,8 +210,8 @@ func CreateBucket( }, args: args{ bucket: &platform.Bucket{ - Name: "bucket2", - Organization: "otherorg", + Name: "bucket2", + Org: "otherorg", }, }, wants: wants{ @@ -219,13 +219,13 @@ func CreateBucket( { ID: MustIDBase16(bucketOneID), Name: "bucket1", - Organization: "theorg", + Org: "theorg", OrganizationID: MustIDBase16(orgOneID), }, { ID: MustIDBase16(bucketTwoID), Name: "bucket2", - Organization: "otherorg", + Org: "otherorg", OrganizationID: MustIDBase16(orgTwoID), }, }, @@ -268,7 +268,7 @@ func CreateBucket( { ID: MustIDBase16(bucketOneID), Name: "bucket1", - Organization: "theorg", + Org: "theorg", OrganizationID: MustIDBase16(orgOneID), }, }, @@ -316,13 +316,13 @@ func CreateBucket( { ID: MustIDBase16(bucketOneID), Name: "bucket1", - Organization: "theorg", + Org: "theorg", OrganizationID: MustIDBase16(orgOneID), }, { ID: MustIDBase16(bucketTwoID), Name: "bucket1", - Organization: "otherorg", + Org: "otherorg", OrganizationID: MustIDBase16(orgTwoID), }, }, @@ -359,8 +359,8 @@ func CreateBucket( }, args: args{ bucket: &platform.Bucket{ - Name: "name1", - Organization: "org1", + Name: "name1", + Org: "org1", }, }, wants: wants{ @@ -446,7 +446,7 @@ func FindBucketByID( bucket: &platform.Bucket{ ID: MustIDBase16(bucketTwoID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "bucket2", }, }, @@ -557,13 +557,13 @@ func FindBuckets( { ID: MustIDBase16(bucketOneID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "abc", }, { ID: MustIDBase16(bucketTwoID), OrganizationID: MustIDBase16(orgTwoID), - Organization: "otherorg", + Org: "otherorg", Name: "xyz", }, }, @@ -607,7 +607,7 @@ func FindBuckets( { ID: MustIDBase16(bucketTwoID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "def", }, }, @@ -651,13 +651,13 @@ func FindBuckets( { ID: MustIDBase16(bucketTwoID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "def", }, { ID: MustIDBase16(bucketOneID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "abc", }, }, @@ -702,13 +702,13 @@ func FindBuckets( { ID: MustIDBase16(bucketOneID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "abc", }, { ID: MustIDBase16(bucketThreeID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "123", }, }, @@ -753,13 +753,13 @@ func FindBuckets( { ID: MustIDBase16(bucketOneID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "abc", }, { ID: MustIDBase16(bucketThreeID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "123", }, }, @@ -795,7 +795,7 @@ func FindBuckets( { ID: MustIDBase16(bucketTwoID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "xyz", }, }, @@ -833,7 +833,7 @@ func FindBuckets( filter.OrganizationID = &tt.args.organizationID } if tt.args.organization != "" { - filter.Organization = &tt.args.organization + filter.Org = &tt.args.organization } if tt.args.name != "" { filter.Name = &tt.args.name @@ -899,7 +899,7 @@ func DeleteBucket( Name: "B", ID: MustIDBase16(bucketThreeID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", }, }, }, @@ -940,13 +940,13 @@ func DeleteBucket( Name: "A", ID: MustIDBase16(bucketOneID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", }, { Name: "B", ID: MustIDBase16(bucketThreeID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", }, }, }, @@ -1024,7 +1024,7 @@ func FindBucket( bucket: &platform.Bucket{ ID: MustIDBase16(bucketOneID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "abc", }, }, @@ -1128,7 +1128,7 @@ func UpdateBucket( bucket: &platform.Bucket{ ID: MustIDBase16(bucketOneID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "changed", }, }, @@ -1196,7 +1196,7 @@ func UpdateBucket( bucket: &platform.Bucket{ ID: MustIDBase16(bucketOneID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "bucket1", RetentionPeriod: 100 * time.Minute, }, @@ -1233,7 +1233,7 @@ func UpdateBucket( bucket: &platform.Bucket{ ID: MustIDBase16(bucketTwoID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "changed", RetentionPeriod: 101 * time.Minute, }, @@ -1270,7 +1270,7 @@ func UpdateBucket( bucket: &platform.Bucket{ ID: MustIDBase16(bucketTwoID), OrganizationID: MustIDBase16(orgOneID), - Organization: "theorg", + Org: "theorg", Name: "bucket2", RetentionPeriod: 101 * time.Minute, }, diff --git a/testing/onboarding.go b/testing/onboarding.go index edf1414d747..f97747de180 100644 --- a/testing/onboarding.go +++ b/testing/onboarding.go @@ -159,7 +159,7 @@ func Generate( Bucket: &platform.Bucket{ ID: MustIDBase16(threeID), Name: "bucket1", - Organization: "org1", + Org: "org1", OrganizationID: MustIDBase16(twoID), RetentionPeriod: time.Hour * 24 * 7, },