Generated code for gce_disks refactor

This commit is contained in:
Cheng Xing 2018-05-23 15:35:13 -07:00
parent d33c1e3ba8
commit 47f7672e2e
2 changed files with 207 additions and 519 deletions

View File

@ -48,8 +48,7 @@ type Cloud interface {
RegionBackendServices() RegionBackendServices RegionBackendServices() RegionBackendServices
AlphaRegionBackendServices() AlphaRegionBackendServices AlphaRegionBackendServices() AlphaRegionBackendServices
Disks() Disks Disks() Disks
AlphaDisks() AlphaDisks BetaRegionDisks() BetaRegionDisks
AlphaRegionDisks() AlphaRegionDisks
Firewalls() Firewalls Firewalls() Firewalls
ForwardingRules() ForwardingRules ForwardingRules() ForwardingRules
AlphaForwardingRules() AlphaForwardingRules AlphaForwardingRules() AlphaForwardingRules
@ -88,8 +87,7 @@ func NewGCE(s *Service) *GCE {
gceRegionBackendServices: &GCERegionBackendServices{s}, gceRegionBackendServices: &GCERegionBackendServices{s},
gceAlphaRegionBackendServices: &GCEAlphaRegionBackendServices{s}, gceAlphaRegionBackendServices: &GCEAlphaRegionBackendServices{s},
gceDisks: &GCEDisks{s}, gceDisks: &GCEDisks{s},
gceAlphaDisks: &GCEAlphaDisks{s}, gceBetaRegionDisks: &GCEBetaRegionDisks{s},
gceAlphaRegionDisks: &GCEAlphaRegionDisks{s},
gceFirewalls: &GCEFirewalls{s}, gceFirewalls: &GCEFirewalls{s},
gceForwardingRules: &GCEForwardingRules{s}, gceForwardingRules: &GCEForwardingRules{s},
gceAlphaForwardingRules: &GCEAlphaForwardingRules{s}, gceAlphaForwardingRules: &GCEAlphaForwardingRules{s},
@ -132,8 +130,7 @@ type GCE struct {
gceRegionBackendServices *GCERegionBackendServices gceRegionBackendServices *GCERegionBackendServices
gceAlphaRegionBackendServices *GCEAlphaRegionBackendServices gceAlphaRegionBackendServices *GCEAlphaRegionBackendServices
gceDisks *GCEDisks gceDisks *GCEDisks
gceAlphaDisks *GCEAlphaDisks gceBetaRegionDisks *GCEBetaRegionDisks
gceAlphaRegionDisks *GCEAlphaRegionDisks
gceFirewalls *GCEFirewalls gceFirewalls *GCEFirewalls
gceForwardingRules *GCEForwardingRules gceForwardingRules *GCEForwardingRules
gceAlphaForwardingRules *GCEAlphaForwardingRules gceAlphaForwardingRules *GCEAlphaForwardingRules
@ -209,14 +206,9 @@ func (gce *GCE) Disks() Disks {
return gce.gceDisks return gce.gceDisks
} }
// AlphaDisks returns the interface for the alpha Disks. // BetaRegionDisks returns the interface for the beta RegionDisks.
func (gce *GCE) AlphaDisks() AlphaDisks { func (gce *GCE) BetaRegionDisks() BetaRegionDisks {
return gce.gceAlphaDisks return gce.gceBetaRegionDisks
}
// AlphaRegionDisks returns the interface for the alpha RegionDisks.
func (gce *GCE) AlphaRegionDisks() AlphaRegionDisks {
return gce.gceAlphaRegionDisks
} }
// Firewalls returns the interface for the ga Firewalls. // Firewalls returns the interface for the ga Firewalls.
@ -373,8 +365,7 @@ func NewMockGCE(projectRouter ProjectRouter) *MockGCE {
MockRegionBackendServices: NewMockRegionBackendServices(projectRouter, mockRegionBackendServicesObjs), MockRegionBackendServices: NewMockRegionBackendServices(projectRouter, mockRegionBackendServicesObjs),
MockAlphaRegionBackendServices: NewMockAlphaRegionBackendServices(projectRouter, mockRegionBackendServicesObjs), MockAlphaRegionBackendServices: NewMockAlphaRegionBackendServices(projectRouter, mockRegionBackendServicesObjs),
MockDisks: NewMockDisks(projectRouter, mockDisksObjs), MockDisks: NewMockDisks(projectRouter, mockDisksObjs),
MockAlphaDisks: NewMockAlphaDisks(projectRouter, mockDisksObjs), MockBetaRegionDisks: NewMockBetaRegionDisks(projectRouter, mockRegionDisksObjs),
MockAlphaRegionDisks: NewMockAlphaRegionDisks(projectRouter, mockRegionDisksObjs),
MockFirewalls: NewMockFirewalls(projectRouter, mockFirewallsObjs), MockFirewalls: NewMockFirewalls(projectRouter, mockFirewallsObjs),
MockForwardingRules: NewMockForwardingRules(projectRouter, mockForwardingRulesObjs), MockForwardingRules: NewMockForwardingRules(projectRouter, mockForwardingRulesObjs),
MockAlphaForwardingRules: NewMockAlphaForwardingRules(projectRouter, mockForwardingRulesObjs), MockAlphaForwardingRules: NewMockAlphaForwardingRules(projectRouter, mockForwardingRulesObjs),
@ -417,8 +408,7 @@ type MockGCE struct {
MockRegionBackendServices *MockRegionBackendServices MockRegionBackendServices *MockRegionBackendServices
MockAlphaRegionBackendServices *MockAlphaRegionBackendServices MockAlphaRegionBackendServices *MockAlphaRegionBackendServices
MockDisks *MockDisks MockDisks *MockDisks
MockAlphaDisks *MockAlphaDisks MockBetaRegionDisks *MockBetaRegionDisks
MockAlphaRegionDisks *MockAlphaRegionDisks
MockFirewalls *MockFirewalls MockFirewalls *MockFirewalls
MockForwardingRules *MockForwardingRules MockForwardingRules *MockForwardingRules
MockAlphaForwardingRules *MockAlphaForwardingRules MockAlphaForwardingRules *MockAlphaForwardingRules
@ -494,14 +484,9 @@ func (mock *MockGCE) Disks() Disks {
return mock.MockDisks return mock.MockDisks
} }
// AlphaDisks returns the interface for the alpha Disks. // BetaRegionDisks returns the interface for the beta RegionDisks.
func (mock *MockGCE) AlphaDisks() AlphaDisks { func (mock *MockGCE) BetaRegionDisks() BetaRegionDisks {
return mock.MockAlphaDisks return mock.MockBetaRegionDisks
}
// AlphaRegionDisks returns the interface for the alpha RegionDisks.
func (mock *MockGCE) AlphaRegionDisks() AlphaRegionDisks {
return mock.MockAlphaRegionDisks
} }
// Firewalls returns the interface for the ga Firewalls. // Firewalls returns the interface for the ga Firewalls.
@ -718,19 +703,6 @@ type MockDisksObj struct {
Obj interface{} Obj interface{}
} }
// ToAlpha retrieves the given version of the object.
func (m *MockDisksObj) ToAlpha() *alpha.Disk {
if ret, ok := m.Obj.(*alpha.Disk); ok {
return ret
}
// Convert the object via JSON copying to the type that was requested.
ret := &alpha.Disk{}
if err := copyViaJSON(ret, m.Obj); err != nil {
glog.Errorf("Could not convert %T to *alpha.Disk via JSON: %v", m.Obj, err)
}
return ret
}
// ToGA retrieves the given version of the object. // ToGA retrieves the given version of the object.
func (m *MockDisksObj) ToGA() *ga.Disk { func (m *MockDisksObj) ToGA() *ga.Disk {
if ret, ok := m.Obj.(*ga.Disk); ok { if ret, ok := m.Obj.(*ga.Disk); ok {
@ -1056,15 +1028,15 @@ type MockRegionDisksObj struct {
Obj interface{} Obj interface{}
} }
// ToAlpha retrieves the given version of the object. // ToBeta retrieves the given version of the object.
func (m *MockRegionDisksObj) ToAlpha() *alpha.Disk { func (m *MockRegionDisksObj) ToBeta() *beta.Disk {
if ret, ok := m.Obj.(*alpha.Disk); ok { if ret, ok := m.Obj.(*beta.Disk); ok {
return ret return ret
} }
// Convert the object via JSON copying to the type that was requested. // Convert the object via JSON copying to the type that was requested.
ret := &alpha.Disk{} ret := &beta.Disk{}
if err := copyViaJSON(ret, m.Obj); err != nil { if err := copyViaJSON(ret, m.Obj); err != nil {
glog.Errorf("Could not convert %T to *alpha.Disk via JSON: %v", m.Obj, err) glog.Errorf("Could not convert %T to *beta.Disk via JSON: %v", m.Obj, err)
} }
return ret return ret
} }
@ -4668,6 +4640,7 @@ type Disks interface {
List(ctx context.Context, zone string, fl *filter.F) ([]*ga.Disk, error) List(ctx context.Context, zone string, fl *filter.F) ([]*ga.Disk, error)
Insert(ctx context.Context, key *meta.Key, obj *ga.Disk) error Insert(ctx context.Context, key *meta.Key, obj *ga.Disk) error
Delete(ctx context.Context, key *meta.Key) error Delete(ctx context.Context, key *meta.Key) error
Resize(context.Context, *meta.Key, *ga.DisksResizeRequest) error
} }
// NewMockDisks returns a new mock for Disks. // NewMockDisks returns a new mock for Disks.
@ -4707,6 +4680,7 @@ type MockDisks struct {
ListHook func(ctx context.Context, zone string, fl *filter.F, m *MockDisks) (bool, []*ga.Disk, error) ListHook func(ctx context.Context, zone string, fl *filter.F, m *MockDisks) (bool, []*ga.Disk, error)
InsertHook func(ctx context.Context, key *meta.Key, obj *ga.Disk, m *MockDisks) (bool, error) InsertHook func(ctx context.Context, key *meta.Key, obj *ga.Disk, m *MockDisks) (bool, error)
DeleteHook func(ctx context.Context, key *meta.Key, m *MockDisks) (bool, error) DeleteHook func(ctx context.Context, key *meta.Key, m *MockDisks) (bool, error)
ResizeHook func(context.Context, *meta.Key, *ga.DisksResizeRequest, *MockDisks) error
// X is extra state that can be used as part of the mock. Generated code // X is extra state that can be used as part of the mock. Generated code
// will not use this field. // will not use this field.
@ -4855,6 +4829,14 @@ func (m *MockDisks) Obj(o *ga.Disk) *MockDisksObj {
return &MockDisksObj{o} return &MockDisksObj{o}
} }
// Resize is a mock for the corresponding method.
func (m *MockDisks) Resize(ctx context.Context, key *meta.Key, arg0 *ga.DisksResizeRequest) error {
if m.ResizeHook != nil {
return m.ResizeHook(ctx, key, arg0, m)
}
return nil
}
// GCEDisks is a simplifying adapter for the GCE Disks. // GCEDisks is a simplifying adapter for the GCE Disks.
type GCEDisks struct { type GCEDisks struct {
s *Service s *Service
@ -4996,17 +4978,51 @@ func (g *GCEDisks) Delete(ctx context.Context, key *meta.Key) error {
return err return err
} }
// AlphaDisks is an interface that allows for mocking of Disks. // Resize is a method on GCEDisks.
type AlphaDisks interface { func (g *GCEDisks) Resize(ctx context.Context, key *meta.Key, arg0 *ga.DisksResizeRequest) error {
Get(ctx context.Context, key *meta.Key) (*alpha.Disk, error) glog.V(5).Infof("GCEDisks.Resize(%v, %v, ...): called", ctx, key)
List(ctx context.Context, zone string, fl *filter.F) ([]*alpha.Disk, error)
Insert(ctx context.Context, key *meta.Key, obj *alpha.Disk) error if !key.Valid() {
Delete(ctx context.Context, key *meta.Key) error glog.V(2).Infof("GCEDisks.Resize(%v, %v, ...): key is invalid (%#v)", ctx, key, key)
return fmt.Errorf("invalid GCE key (%+v)", key)
}
projectID := g.s.ProjectRouter.ProjectID(ctx, "ga", "Disks")
rk := &RateLimitKey{
ProjectID: projectID,
Operation: "Resize",
Version: meta.Version("ga"),
Service: "Disks",
}
glog.V(5).Infof("GCEDisks.Resize(%v, %v, ...): projectID = %v, rk = %+v", ctx, key, projectID, rk)
if err := g.s.RateLimiter.Accept(ctx, rk); err != nil {
glog.V(4).Infof("GCEDisks.Resize(%v, %v, ...): RateLimiter error: %v", ctx, key, err)
return err
}
call := g.s.GA.Disks.Resize(projectID, key.Zone, key.Name, arg0)
call.Context(ctx)
op, err := call.Do()
if err != nil {
glog.V(4).Infof("GCEDisks.Resize(%v, %v, ...) = %+v", ctx, key, err)
return err
}
err = g.s.WaitForCompletion(ctx, op)
glog.V(4).Infof("GCEDisks.Resize(%v, %v, ...) = %+v", ctx, key, err)
return err
} }
// NewMockAlphaDisks returns a new mock for Disks. // BetaRegionDisks is an interface that allows for mocking of RegionDisks.
func NewMockAlphaDisks(pr ProjectRouter, objs map[meta.Key]*MockDisksObj) *MockAlphaDisks { type BetaRegionDisks interface {
mock := &MockAlphaDisks{ Get(ctx context.Context, key *meta.Key) (*beta.Disk, error)
List(ctx context.Context, region string, fl *filter.F) ([]*beta.Disk, error)
Insert(ctx context.Context, key *meta.Key, obj *beta.Disk) error
Delete(ctx context.Context, key *meta.Key) error
Resize(context.Context, *meta.Key, *beta.RegionDisksResizeRequest) error
}
// NewMockBetaRegionDisks returns a new mock for RegionDisks.
func NewMockBetaRegionDisks(pr ProjectRouter, objs map[meta.Key]*MockRegionDisksObj) *MockBetaRegionDisks {
mock := &MockBetaRegionDisks{
ProjectRouter: pr, ProjectRouter: pr,
Objects: objs, Objects: objs,
@ -5017,342 +5033,8 @@ func NewMockAlphaDisks(pr ProjectRouter, objs map[meta.Key]*MockDisksObj) *MockA
return mock return mock
} }
// MockAlphaDisks is the mock for Disks. // MockBetaRegionDisks is the mock for RegionDisks.
type MockAlphaDisks struct { type MockBetaRegionDisks struct {
Lock sync.Mutex
ProjectRouter ProjectRouter
// Objects maintained by the mock.
Objects map[meta.Key]*MockDisksObj
// If an entry exists for the given key and operation, then the error
// will be returned instead of the operation.
GetError map[meta.Key]error
ListError *error
InsertError map[meta.Key]error
DeleteError map[meta.Key]error
// xxxHook allow you to intercept the standard processing of the mock in
// order to add your own logic. Return (true, _, _) to prevent the normal
// execution flow of the mock. Return (false, nil, nil) to continue with
// normal mock behavior/ after the hook function executes.
GetHook func(ctx context.Context, key *meta.Key, m *MockAlphaDisks) (bool, *alpha.Disk, error)
ListHook func(ctx context.Context, zone string, fl *filter.F, m *MockAlphaDisks) (bool, []*alpha.Disk, error)
InsertHook func(ctx context.Context, key *meta.Key, obj *alpha.Disk, m *MockAlphaDisks) (bool, error)
DeleteHook func(ctx context.Context, key *meta.Key, m *MockAlphaDisks) (bool, error)
// X is extra state that can be used as part of the mock. Generated code
// will not use this field.
X interface{}
}
// Get returns the object from the mock.
func (m *MockAlphaDisks) Get(ctx context.Context, key *meta.Key) (*alpha.Disk, error) {
if m.GetHook != nil {
if intercept, obj, err := m.GetHook(ctx, key, m); intercept {
glog.V(5).Infof("MockAlphaDisks.Get(%v, %s) = %+v, %v", ctx, key, obj, err)
return obj, err
}
}
if !key.Valid() {
return nil, fmt.Errorf("invalid GCE key (%+v)", key)
}
m.Lock.Lock()
defer m.Lock.Unlock()
if err, ok := m.GetError[*key]; ok {
glog.V(5).Infof("MockAlphaDisks.Get(%v, %s) = nil, %v", ctx, key, err)
return nil, err
}
if obj, ok := m.Objects[*key]; ok {
typedObj := obj.ToAlpha()
glog.V(5).Infof("MockAlphaDisks.Get(%v, %s) = %+v, nil", ctx, key, typedObj)
return typedObj, nil
}
err := &googleapi.Error{
Code: http.StatusNotFound,
Message: fmt.Sprintf("MockAlphaDisks %v not found", key),
}
glog.V(5).Infof("MockAlphaDisks.Get(%v, %s) = nil, %v", ctx, key, err)
return nil, err
}
// List all of the objects in the mock in the given zone.
func (m *MockAlphaDisks) List(ctx context.Context, zone string, fl *filter.F) ([]*alpha.Disk, error) {
if m.ListHook != nil {
if intercept, objs, err := m.ListHook(ctx, zone, fl, m); intercept {
glog.V(5).Infof("MockAlphaDisks.List(%v, %q, %v) = [%v items], %v", ctx, zone, fl, len(objs), err)
return objs, err
}
}
m.Lock.Lock()
defer m.Lock.Unlock()
if m.ListError != nil {
err := *m.ListError
glog.V(5).Infof("MockAlphaDisks.List(%v, %q, %v) = nil, %v", ctx, zone, fl, err)
return nil, *m.ListError
}
var objs []*alpha.Disk
for key, obj := range m.Objects {
if key.Zone != zone {
continue
}
if !fl.Match(obj.ToAlpha()) {
continue
}
objs = append(objs, obj.ToAlpha())
}
glog.V(5).Infof("MockAlphaDisks.List(%v, %q, %v) = [%v items], nil", ctx, zone, fl, len(objs))
return objs, nil
}
// Insert is a mock for inserting/creating a new object.
func (m *MockAlphaDisks) Insert(ctx context.Context, key *meta.Key, obj *alpha.Disk) error {
if m.InsertHook != nil {
if intercept, err := m.InsertHook(ctx, key, obj, m); intercept {
glog.V(5).Infof("MockAlphaDisks.Insert(%v, %v, %+v) = %v", ctx, key, obj, err)
return err
}
}
if !key.Valid() {
return fmt.Errorf("invalid GCE key (%+v)", key)
}
m.Lock.Lock()
defer m.Lock.Unlock()
if err, ok := m.InsertError[*key]; ok {
glog.V(5).Infof("MockAlphaDisks.Insert(%v, %v, %+v) = %v", ctx, key, obj, err)
return err
}
if _, ok := m.Objects[*key]; ok {
err := &googleapi.Error{
Code: http.StatusConflict,
Message: fmt.Sprintf("MockAlphaDisks %v exists", key),
}
glog.V(5).Infof("MockAlphaDisks.Insert(%v, %v, %+v) = %v", ctx, key, obj, err)
return err
}
obj.Name = key.Name
projectID := m.ProjectRouter.ProjectID(ctx, "alpha", "disks")
obj.SelfLink = SelfLink(meta.VersionAlpha, projectID, "disks", key)
m.Objects[*key] = &MockDisksObj{obj}
glog.V(5).Infof("MockAlphaDisks.Insert(%v, %v, %+v) = nil", ctx, key, obj)
return nil
}
// Delete is a mock for deleting the object.
func (m *MockAlphaDisks) Delete(ctx context.Context, key *meta.Key) error {
if m.DeleteHook != nil {
if intercept, err := m.DeleteHook(ctx, key, m); intercept {
glog.V(5).Infof("MockAlphaDisks.Delete(%v, %v) = %v", ctx, key, err)
return err
}
}
if !key.Valid() {
return fmt.Errorf("invalid GCE key (%+v)", key)
}
m.Lock.Lock()
defer m.Lock.Unlock()
if err, ok := m.DeleteError[*key]; ok {
glog.V(5).Infof("MockAlphaDisks.Delete(%v, %v) = %v", ctx, key, err)
return err
}
if _, ok := m.Objects[*key]; !ok {
err := &googleapi.Error{
Code: http.StatusNotFound,
Message: fmt.Sprintf("MockAlphaDisks %v not found", key),
}
glog.V(5).Infof("MockAlphaDisks.Delete(%v, %v) = %v", ctx, key, err)
return err
}
delete(m.Objects, *key)
glog.V(5).Infof("MockAlphaDisks.Delete(%v, %v) = nil", ctx, key)
return nil
}
// Obj wraps the object for use in the mock.
func (m *MockAlphaDisks) Obj(o *alpha.Disk) *MockDisksObj {
return &MockDisksObj{o}
}
// GCEAlphaDisks is a simplifying adapter for the GCE Disks.
type GCEAlphaDisks struct {
s *Service
}
// Get the Disk named by key.
func (g *GCEAlphaDisks) Get(ctx context.Context, key *meta.Key) (*alpha.Disk, error) {
glog.V(5).Infof("GCEAlphaDisks.Get(%v, %v): called", ctx, key)
if !key.Valid() {
glog.V(2).Infof("GCEAlphaDisks.Get(%v, %v): key is invalid (%#v)", ctx, key, key)
return nil, fmt.Errorf("invalid GCE key (%#v)", key)
}
projectID := g.s.ProjectRouter.ProjectID(ctx, "alpha", "Disks")
rk := &RateLimitKey{
ProjectID: projectID,
Operation: "Get",
Version: meta.Version("alpha"),
Service: "Disks",
}
glog.V(5).Infof("GCEAlphaDisks.Get(%v, %v): projectID = %v, rk = %+v", ctx, key, projectID, rk)
if err := g.s.RateLimiter.Accept(ctx, rk); err != nil {
glog.V(4).Infof("GCEAlphaDisks.Get(%v, %v): RateLimiter error: %v", ctx, key, err)
return nil, err
}
call := g.s.Alpha.Disks.Get(projectID, key.Zone, key.Name)
call.Context(ctx)
v, err := call.Do()
glog.V(4).Infof("GCEAlphaDisks.Get(%v, %v) = %+v, %v", ctx, key, v, err)
return v, err
}
// List all Disk objects.
func (g *GCEAlphaDisks) List(ctx context.Context, zone string, fl *filter.F) ([]*alpha.Disk, error) {
glog.V(5).Infof("GCEAlphaDisks.List(%v, %v, %v) called", ctx, zone, fl)
projectID := g.s.ProjectRouter.ProjectID(ctx, "alpha", "Disks")
rk := &RateLimitKey{
ProjectID: projectID,
Operation: "List",
Version: meta.Version("alpha"),
Service: "Disks",
}
if err := g.s.RateLimiter.Accept(ctx, rk); err != nil {
return nil, err
}
glog.V(5).Infof("GCEAlphaDisks.List(%v, %v, %v): projectID = %v, rk = %+v", ctx, zone, fl, projectID, rk)
call := g.s.Alpha.Disks.List(projectID, zone)
if fl != filter.None {
call.Filter(fl.String())
}
var all []*alpha.Disk
f := func(l *alpha.DiskList) error {
glog.V(5).Infof("GCEAlphaDisks.List(%v, ..., %v): page %+v", ctx, fl, l)
all = append(all, l.Items...)
return nil
}
if err := call.Pages(ctx, f); err != nil {
glog.V(4).Infof("GCEAlphaDisks.List(%v, ..., %v) = %v, %v", ctx, fl, nil, err)
return nil, err
}
if glog.V(4) {
glog.V(4).Infof("GCEAlphaDisks.List(%v, ..., %v) = [%v items], %v", ctx, fl, len(all), nil)
} else if glog.V(5) {
var asStr []string
for _, o := range all {
asStr = append(asStr, fmt.Sprintf("%+v", o))
}
glog.V(5).Infof("GCEAlphaDisks.List(%v, ..., %v) = %v, %v", ctx, fl, asStr, nil)
}
return all, nil
}
// Insert Disk with key of value obj.
func (g *GCEAlphaDisks) Insert(ctx context.Context, key *meta.Key, obj *alpha.Disk) error {
glog.V(5).Infof("GCEAlphaDisks.Insert(%v, %v, %+v): called", ctx, key, obj)
if !key.Valid() {
glog.V(2).Infof("GCEAlphaDisks.Insert(%v, %v, ...): key is invalid (%#v)", ctx, key, key)
return fmt.Errorf("invalid GCE key (%+v)", key)
}
projectID := g.s.ProjectRouter.ProjectID(ctx, "alpha", "Disks")
rk := &RateLimitKey{
ProjectID: projectID,
Operation: "Insert",
Version: meta.Version("alpha"),
Service: "Disks",
}
glog.V(5).Infof("GCEAlphaDisks.Insert(%v, %v, ...): projectID = %v, rk = %+v", ctx, key, projectID, rk)
if err := g.s.RateLimiter.Accept(ctx, rk); err != nil {
glog.V(4).Infof("GCEAlphaDisks.Insert(%v, %v, ...): RateLimiter error: %v", ctx, key, err)
return err
}
obj.Name = key.Name
call := g.s.Alpha.Disks.Insert(projectID, key.Zone, obj)
call.Context(ctx)
op, err := call.Do()
if err != nil {
glog.V(4).Infof("GCEAlphaDisks.Insert(%v, %v, ...) = %+v", ctx, key, err)
return err
}
err = g.s.WaitForCompletion(ctx, op)
glog.V(4).Infof("GCEAlphaDisks.Insert(%v, %v, %+v) = %+v", ctx, key, obj, err)
return err
}
// Delete the Disk referenced by key.
func (g *GCEAlphaDisks) Delete(ctx context.Context, key *meta.Key) error {
glog.V(5).Infof("GCEAlphaDisks.Delete(%v, %v): called", ctx, key)
if !key.Valid() {
glog.V(2).Infof("GCEAlphaDisks.Delete(%v, %v): key is invalid (%#v)", ctx, key, key)
return fmt.Errorf("invalid GCE key (%+v)", key)
}
projectID := g.s.ProjectRouter.ProjectID(ctx, "alpha", "Disks")
rk := &RateLimitKey{
ProjectID: projectID,
Operation: "Delete",
Version: meta.Version("alpha"),
Service: "Disks",
}
glog.V(5).Infof("GCEAlphaDisks.Delete(%v, %v): projectID = %v, rk = %+v", ctx, key, projectID, rk)
if err := g.s.RateLimiter.Accept(ctx, rk); err != nil {
glog.V(4).Infof("GCEAlphaDisks.Delete(%v, %v): RateLimiter error: %v", ctx, key, err)
return err
}
call := g.s.Alpha.Disks.Delete(projectID, key.Zone, key.Name)
call.Context(ctx)
op, err := call.Do()
if err != nil {
glog.V(4).Infof("GCEAlphaDisks.Delete(%v, %v) = %v", ctx, key, err)
return err
}
err = g.s.WaitForCompletion(ctx, op)
glog.V(4).Infof("GCEAlphaDisks.Delete(%v, %v) = %v", ctx, key, err)
return err
}
// AlphaRegionDisks is an interface that allows for mocking of RegionDisks.
type AlphaRegionDisks interface {
Get(ctx context.Context, key *meta.Key) (*alpha.Disk, error)
List(ctx context.Context, region string, fl *filter.F) ([]*alpha.Disk, error)
Insert(ctx context.Context, key *meta.Key, obj *alpha.Disk) error
Delete(ctx context.Context, key *meta.Key) error
}
// NewMockAlphaRegionDisks returns a new mock for RegionDisks.
func NewMockAlphaRegionDisks(pr ProjectRouter, objs map[meta.Key]*MockRegionDisksObj) *MockAlphaRegionDisks {
mock := &MockAlphaRegionDisks{
ProjectRouter: pr,
Objects: objs,
GetError: map[meta.Key]error{},
InsertError: map[meta.Key]error{},
DeleteError: map[meta.Key]error{},
}
return mock
}
// MockAlphaRegionDisks is the mock for RegionDisks.
type MockAlphaRegionDisks struct {
Lock sync.Mutex Lock sync.Mutex
ProjectRouter ProjectRouter ProjectRouter ProjectRouter
@ -5371,10 +5053,11 @@ type MockAlphaRegionDisks struct {
// order to add your own logic. Return (true, _, _) to prevent the normal // order to add your own logic. Return (true, _, _) to prevent the normal
// execution flow of the mock. Return (false, nil, nil) to continue with // execution flow of the mock. Return (false, nil, nil) to continue with
// normal mock behavior/ after the hook function executes. // normal mock behavior/ after the hook function executes.
GetHook func(ctx context.Context, key *meta.Key, m *MockAlphaRegionDisks) (bool, *alpha.Disk, error) GetHook func(ctx context.Context, key *meta.Key, m *MockBetaRegionDisks) (bool, *beta.Disk, error)
ListHook func(ctx context.Context, region string, fl *filter.F, m *MockAlphaRegionDisks) (bool, []*alpha.Disk, error) ListHook func(ctx context.Context, region string, fl *filter.F, m *MockBetaRegionDisks) (bool, []*beta.Disk, error)
InsertHook func(ctx context.Context, key *meta.Key, obj *alpha.Disk, m *MockAlphaRegionDisks) (bool, error) InsertHook func(ctx context.Context, key *meta.Key, obj *beta.Disk, m *MockBetaRegionDisks) (bool, error)
DeleteHook func(ctx context.Context, key *meta.Key, m *MockAlphaRegionDisks) (bool, error) DeleteHook func(ctx context.Context, key *meta.Key, m *MockBetaRegionDisks) (bool, error)
ResizeHook func(context.Context, *meta.Key, *beta.RegionDisksResizeRequest, *MockBetaRegionDisks) error
// X is extra state that can be used as part of the mock. Generated code // X is extra state that can be used as part of the mock. Generated code
// will not use this field. // will not use this field.
@ -5382,10 +5065,10 @@ type MockAlphaRegionDisks struct {
} }
// Get returns the object from the mock. // Get returns the object from the mock.
func (m *MockAlphaRegionDisks) Get(ctx context.Context, key *meta.Key) (*alpha.Disk, error) { func (m *MockBetaRegionDisks) Get(ctx context.Context, key *meta.Key) (*beta.Disk, error) {
if m.GetHook != nil { if m.GetHook != nil {
if intercept, obj, err := m.GetHook(ctx, key, m); intercept { if intercept, obj, err := m.GetHook(ctx, key, m); intercept {
glog.V(5).Infof("MockAlphaRegionDisks.Get(%v, %s) = %+v, %v", ctx, key, obj, err) glog.V(5).Infof("MockBetaRegionDisks.Get(%v, %s) = %+v, %v", ctx, key, obj, err)
return obj, err return obj, err
} }
} }
@ -5397,28 +5080,28 @@ func (m *MockAlphaRegionDisks) Get(ctx context.Context, key *meta.Key) (*alpha.D
defer m.Lock.Unlock() defer m.Lock.Unlock()
if err, ok := m.GetError[*key]; ok { if err, ok := m.GetError[*key]; ok {
glog.V(5).Infof("MockAlphaRegionDisks.Get(%v, %s) = nil, %v", ctx, key, err) glog.V(5).Infof("MockBetaRegionDisks.Get(%v, %s) = nil, %v", ctx, key, err)
return nil, err return nil, err
} }
if obj, ok := m.Objects[*key]; ok { if obj, ok := m.Objects[*key]; ok {
typedObj := obj.ToAlpha() typedObj := obj.ToBeta()
glog.V(5).Infof("MockAlphaRegionDisks.Get(%v, %s) = %+v, nil", ctx, key, typedObj) glog.V(5).Infof("MockBetaRegionDisks.Get(%v, %s) = %+v, nil", ctx, key, typedObj)
return typedObj, nil return typedObj, nil
} }
err := &googleapi.Error{ err := &googleapi.Error{
Code: http.StatusNotFound, Code: http.StatusNotFound,
Message: fmt.Sprintf("MockAlphaRegionDisks %v not found", key), Message: fmt.Sprintf("MockBetaRegionDisks %v not found", key),
} }
glog.V(5).Infof("MockAlphaRegionDisks.Get(%v, %s) = nil, %v", ctx, key, err) glog.V(5).Infof("MockBetaRegionDisks.Get(%v, %s) = nil, %v", ctx, key, err)
return nil, err return nil, err
} }
// List all of the objects in the mock in the given region. // List all of the objects in the mock in the given region.
func (m *MockAlphaRegionDisks) List(ctx context.Context, region string, fl *filter.F) ([]*alpha.Disk, error) { func (m *MockBetaRegionDisks) List(ctx context.Context, region string, fl *filter.F) ([]*beta.Disk, error) {
if m.ListHook != nil { if m.ListHook != nil {
if intercept, objs, err := m.ListHook(ctx, region, fl, m); intercept { if intercept, objs, err := m.ListHook(ctx, region, fl, m); intercept {
glog.V(5).Infof("MockAlphaRegionDisks.List(%v, %q, %v) = [%v items], %v", ctx, region, fl, len(objs), err) glog.V(5).Infof("MockBetaRegionDisks.List(%v, %q, %v) = [%v items], %v", ctx, region, fl, len(objs), err)
return objs, err return objs, err
} }
} }
@ -5428,31 +5111,31 @@ func (m *MockAlphaRegionDisks) List(ctx context.Context, region string, fl *filt
if m.ListError != nil { if m.ListError != nil {
err := *m.ListError err := *m.ListError
glog.V(5).Infof("MockAlphaRegionDisks.List(%v, %q, %v) = nil, %v", ctx, region, fl, err) glog.V(5).Infof("MockBetaRegionDisks.List(%v, %q, %v) = nil, %v", ctx, region, fl, err)
return nil, *m.ListError return nil, *m.ListError
} }
var objs []*alpha.Disk var objs []*beta.Disk
for key, obj := range m.Objects { for key, obj := range m.Objects {
if key.Region != region { if key.Region != region {
continue continue
} }
if !fl.Match(obj.ToAlpha()) { if !fl.Match(obj.ToBeta()) {
continue continue
} }
objs = append(objs, obj.ToAlpha()) objs = append(objs, obj.ToBeta())
} }
glog.V(5).Infof("MockAlphaRegionDisks.List(%v, %q, %v) = [%v items], nil", ctx, region, fl, len(objs)) glog.V(5).Infof("MockBetaRegionDisks.List(%v, %q, %v) = [%v items], nil", ctx, region, fl, len(objs))
return objs, nil return objs, nil
} }
// Insert is a mock for inserting/creating a new object. // Insert is a mock for inserting/creating a new object.
func (m *MockAlphaRegionDisks) Insert(ctx context.Context, key *meta.Key, obj *alpha.Disk) error { func (m *MockBetaRegionDisks) Insert(ctx context.Context, key *meta.Key, obj *beta.Disk) error {
if m.InsertHook != nil { if m.InsertHook != nil {
if intercept, err := m.InsertHook(ctx, key, obj, m); intercept { if intercept, err := m.InsertHook(ctx, key, obj, m); intercept {
glog.V(5).Infof("MockAlphaRegionDisks.Insert(%v, %v, %+v) = %v", ctx, key, obj, err) glog.V(5).Infof("MockBetaRegionDisks.Insert(%v, %v, %+v) = %v", ctx, key, obj, err)
return err return err
} }
} }
@ -5464,32 +5147,32 @@ func (m *MockAlphaRegionDisks) Insert(ctx context.Context, key *meta.Key, obj *a
defer m.Lock.Unlock() defer m.Lock.Unlock()
if err, ok := m.InsertError[*key]; ok { if err, ok := m.InsertError[*key]; ok {
glog.V(5).Infof("MockAlphaRegionDisks.Insert(%v, %v, %+v) = %v", ctx, key, obj, err) glog.V(5).Infof("MockBetaRegionDisks.Insert(%v, %v, %+v) = %v", ctx, key, obj, err)
return err return err
} }
if _, ok := m.Objects[*key]; ok { if _, ok := m.Objects[*key]; ok {
err := &googleapi.Error{ err := &googleapi.Error{
Code: http.StatusConflict, Code: http.StatusConflict,
Message: fmt.Sprintf("MockAlphaRegionDisks %v exists", key), Message: fmt.Sprintf("MockBetaRegionDisks %v exists", key),
} }
glog.V(5).Infof("MockAlphaRegionDisks.Insert(%v, %v, %+v) = %v", ctx, key, obj, err) glog.V(5).Infof("MockBetaRegionDisks.Insert(%v, %v, %+v) = %v", ctx, key, obj, err)
return err return err
} }
obj.Name = key.Name obj.Name = key.Name
projectID := m.ProjectRouter.ProjectID(ctx, "alpha", "disks") projectID := m.ProjectRouter.ProjectID(ctx, "beta", "disks")
obj.SelfLink = SelfLink(meta.VersionAlpha, projectID, "disks", key) obj.SelfLink = SelfLink(meta.VersionBeta, projectID, "disks", key)
m.Objects[*key] = &MockRegionDisksObj{obj} m.Objects[*key] = &MockRegionDisksObj{obj}
glog.V(5).Infof("MockAlphaRegionDisks.Insert(%v, %v, %+v) = nil", ctx, key, obj) glog.V(5).Infof("MockBetaRegionDisks.Insert(%v, %v, %+v) = nil", ctx, key, obj)
return nil return nil
} }
// Delete is a mock for deleting the object. // Delete is a mock for deleting the object.
func (m *MockAlphaRegionDisks) Delete(ctx context.Context, key *meta.Key) error { func (m *MockBetaRegionDisks) Delete(ctx context.Context, key *meta.Key) error {
if m.DeleteHook != nil { if m.DeleteHook != nil {
if intercept, err := m.DeleteHook(ctx, key, m); intercept { if intercept, err := m.DeleteHook(ctx, key, m); intercept {
glog.V(5).Infof("MockAlphaRegionDisks.Delete(%v, %v) = %v", ctx, key, err) glog.V(5).Infof("MockBetaRegionDisks.Delete(%v, %v) = %v", ctx, key, err)
return err return err
} }
} }
@ -5501,166 +5184,207 @@ func (m *MockAlphaRegionDisks) Delete(ctx context.Context, key *meta.Key) error
defer m.Lock.Unlock() defer m.Lock.Unlock()
if err, ok := m.DeleteError[*key]; ok { if err, ok := m.DeleteError[*key]; ok {
glog.V(5).Infof("MockAlphaRegionDisks.Delete(%v, %v) = %v", ctx, key, err) glog.V(5).Infof("MockBetaRegionDisks.Delete(%v, %v) = %v", ctx, key, err)
return err return err
} }
if _, ok := m.Objects[*key]; !ok { if _, ok := m.Objects[*key]; !ok {
err := &googleapi.Error{ err := &googleapi.Error{
Code: http.StatusNotFound, Code: http.StatusNotFound,
Message: fmt.Sprintf("MockAlphaRegionDisks %v not found", key), Message: fmt.Sprintf("MockBetaRegionDisks %v not found", key),
} }
glog.V(5).Infof("MockAlphaRegionDisks.Delete(%v, %v) = %v", ctx, key, err) glog.V(5).Infof("MockBetaRegionDisks.Delete(%v, %v) = %v", ctx, key, err)
return err return err
} }
delete(m.Objects, *key) delete(m.Objects, *key)
glog.V(5).Infof("MockAlphaRegionDisks.Delete(%v, %v) = nil", ctx, key) glog.V(5).Infof("MockBetaRegionDisks.Delete(%v, %v) = nil", ctx, key)
return nil return nil
} }
// Obj wraps the object for use in the mock. // Obj wraps the object for use in the mock.
func (m *MockAlphaRegionDisks) Obj(o *alpha.Disk) *MockRegionDisksObj { func (m *MockBetaRegionDisks) Obj(o *beta.Disk) *MockRegionDisksObj {
return &MockRegionDisksObj{o} return &MockRegionDisksObj{o}
} }
// GCEAlphaRegionDisks is a simplifying adapter for the GCE RegionDisks. // Resize is a mock for the corresponding method.
type GCEAlphaRegionDisks struct { func (m *MockBetaRegionDisks) Resize(ctx context.Context, key *meta.Key, arg0 *beta.RegionDisksResizeRequest) error {
if m.ResizeHook != nil {
return m.ResizeHook(ctx, key, arg0, m)
}
return nil
}
// GCEBetaRegionDisks is a simplifying adapter for the GCE RegionDisks.
type GCEBetaRegionDisks struct {
s *Service s *Service
} }
// Get the Disk named by key. // Get the Disk named by key.
func (g *GCEAlphaRegionDisks) Get(ctx context.Context, key *meta.Key) (*alpha.Disk, error) { func (g *GCEBetaRegionDisks) Get(ctx context.Context, key *meta.Key) (*beta.Disk, error) {
glog.V(5).Infof("GCEAlphaRegionDisks.Get(%v, %v): called", ctx, key) glog.V(5).Infof("GCEBetaRegionDisks.Get(%v, %v): called", ctx, key)
if !key.Valid() { if !key.Valid() {
glog.V(2).Infof("GCEAlphaRegionDisks.Get(%v, %v): key is invalid (%#v)", ctx, key, key) glog.V(2).Infof("GCEBetaRegionDisks.Get(%v, %v): key is invalid (%#v)", ctx, key, key)
return nil, fmt.Errorf("invalid GCE key (%#v)", key) return nil, fmt.Errorf("invalid GCE key (%#v)", key)
} }
projectID := g.s.ProjectRouter.ProjectID(ctx, "alpha", "RegionDisks") projectID := g.s.ProjectRouter.ProjectID(ctx, "beta", "RegionDisks")
rk := &RateLimitKey{ rk := &RateLimitKey{
ProjectID: projectID, ProjectID: projectID,
Operation: "Get", Operation: "Get",
Version: meta.Version("alpha"), Version: meta.Version("beta"),
Service: "RegionDisks", Service: "RegionDisks",
} }
glog.V(5).Infof("GCEAlphaRegionDisks.Get(%v, %v): projectID = %v, rk = %+v", ctx, key, projectID, rk) glog.V(5).Infof("GCEBetaRegionDisks.Get(%v, %v): projectID = %v, rk = %+v", ctx, key, projectID, rk)
if err := g.s.RateLimiter.Accept(ctx, rk); err != nil { if err := g.s.RateLimiter.Accept(ctx, rk); err != nil {
glog.V(4).Infof("GCEAlphaRegionDisks.Get(%v, %v): RateLimiter error: %v", ctx, key, err) glog.V(4).Infof("GCEBetaRegionDisks.Get(%v, %v): RateLimiter error: %v", ctx, key, err)
return nil, err return nil, err
} }
call := g.s.Alpha.RegionDisks.Get(projectID, key.Region, key.Name) call := g.s.Beta.RegionDisks.Get(projectID, key.Region, key.Name)
call.Context(ctx) call.Context(ctx)
v, err := call.Do() v, err := call.Do()
glog.V(4).Infof("GCEAlphaRegionDisks.Get(%v, %v) = %+v, %v", ctx, key, v, err) glog.V(4).Infof("GCEBetaRegionDisks.Get(%v, %v) = %+v, %v", ctx, key, v, err)
return v, err return v, err
} }
// List all Disk objects. // List all Disk objects.
func (g *GCEAlphaRegionDisks) List(ctx context.Context, region string, fl *filter.F) ([]*alpha.Disk, error) { func (g *GCEBetaRegionDisks) List(ctx context.Context, region string, fl *filter.F) ([]*beta.Disk, error) {
glog.V(5).Infof("GCEAlphaRegionDisks.List(%v, %v, %v) called", ctx, region, fl) glog.V(5).Infof("GCEBetaRegionDisks.List(%v, %v, %v) called", ctx, region, fl)
projectID := g.s.ProjectRouter.ProjectID(ctx, "alpha", "RegionDisks") projectID := g.s.ProjectRouter.ProjectID(ctx, "beta", "RegionDisks")
rk := &RateLimitKey{ rk := &RateLimitKey{
ProjectID: projectID, ProjectID: projectID,
Operation: "List", Operation: "List",
Version: meta.Version("alpha"), Version: meta.Version("beta"),
Service: "RegionDisks", Service: "RegionDisks",
} }
if err := g.s.RateLimiter.Accept(ctx, rk); err != nil { if err := g.s.RateLimiter.Accept(ctx, rk); err != nil {
return nil, err return nil, err
} }
glog.V(5).Infof("GCEAlphaRegionDisks.List(%v, %v, %v): projectID = %v, rk = %+v", ctx, region, fl, projectID, rk) glog.V(5).Infof("GCEBetaRegionDisks.List(%v, %v, %v): projectID = %v, rk = %+v", ctx, region, fl, projectID, rk)
call := g.s.Alpha.RegionDisks.List(projectID, region) call := g.s.Beta.RegionDisks.List(projectID, region)
if fl != filter.None { if fl != filter.None {
call.Filter(fl.String()) call.Filter(fl.String())
} }
var all []*alpha.Disk var all []*beta.Disk
f := func(l *alpha.DiskList) error { f := func(l *beta.DiskList) error {
glog.V(5).Infof("GCEAlphaRegionDisks.List(%v, ..., %v): page %+v", ctx, fl, l) glog.V(5).Infof("GCEBetaRegionDisks.List(%v, ..., %v): page %+v", ctx, fl, l)
all = append(all, l.Items...) all = append(all, l.Items...)
return nil return nil
} }
if err := call.Pages(ctx, f); err != nil { if err := call.Pages(ctx, f); err != nil {
glog.V(4).Infof("GCEAlphaRegionDisks.List(%v, ..., %v) = %v, %v", ctx, fl, nil, err) glog.V(4).Infof("GCEBetaRegionDisks.List(%v, ..., %v) = %v, %v", ctx, fl, nil, err)
return nil, err return nil, err
} }
if glog.V(4) { if glog.V(4) {
glog.V(4).Infof("GCEAlphaRegionDisks.List(%v, ..., %v) = [%v items], %v", ctx, fl, len(all), nil) glog.V(4).Infof("GCEBetaRegionDisks.List(%v, ..., %v) = [%v items], %v", ctx, fl, len(all), nil)
} else if glog.V(5) { } else if glog.V(5) {
var asStr []string var asStr []string
for _, o := range all { for _, o := range all {
asStr = append(asStr, fmt.Sprintf("%+v", o)) asStr = append(asStr, fmt.Sprintf("%+v", o))
} }
glog.V(5).Infof("GCEAlphaRegionDisks.List(%v, ..., %v) = %v, %v", ctx, fl, asStr, nil) glog.V(5).Infof("GCEBetaRegionDisks.List(%v, ..., %v) = %v, %v", ctx, fl, asStr, nil)
} }
return all, nil return all, nil
} }
// Insert Disk with key of value obj. // Insert Disk with key of value obj.
func (g *GCEAlphaRegionDisks) Insert(ctx context.Context, key *meta.Key, obj *alpha.Disk) error { func (g *GCEBetaRegionDisks) Insert(ctx context.Context, key *meta.Key, obj *beta.Disk) error {
glog.V(5).Infof("GCEAlphaRegionDisks.Insert(%v, %v, %+v): called", ctx, key, obj) glog.V(5).Infof("GCEBetaRegionDisks.Insert(%v, %v, %+v): called", ctx, key, obj)
if !key.Valid() { if !key.Valid() {
glog.V(2).Infof("GCEAlphaRegionDisks.Insert(%v, %v, ...): key is invalid (%#v)", ctx, key, key) glog.V(2).Infof("GCEBetaRegionDisks.Insert(%v, %v, ...): key is invalid (%#v)", ctx, key, key)
return fmt.Errorf("invalid GCE key (%+v)", key) return fmt.Errorf("invalid GCE key (%+v)", key)
} }
projectID := g.s.ProjectRouter.ProjectID(ctx, "alpha", "RegionDisks") projectID := g.s.ProjectRouter.ProjectID(ctx, "beta", "RegionDisks")
rk := &RateLimitKey{ rk := &RateLimitKey{
ProjectID: projectID, ProjectID: projectID,
Operation: "Insert", Operation: "Insert",
Version: meta.Version("alpha"), Version: meta.Version("beta"),
Service: "RegionDisks", Service: "RegionDisks",
} }
glog.V(5).Infof("GCEAlphaRegionDisks.Insert(%v, %v, ...): projectID = %v, rk = %+v", ctx, key, projectID, rk) glog.V(5).Infof("GCEBetaRegionDisks.Insert(%v, %v, ...): projectID = %v, rk = %+v", ctx, key, projectID, rk)
if err := g.s.RateLimiter.Accept(ctx, rk); err != nil { if err := g.s.RateLimiter.Accept(ctx, rk); err != nil {
glog.V(4).Infof("GCEAlphaRegionDisks.Insert(%v, %v, ...): RateLimiter error: %v", ctx, key, err) glog.V(4).Infof("GCEBetaRegionDisks.Insert(%v, %v, ...): RateLimiter error: %v", ctx, key, err)
return err return err
} }
obj.Name = key.Name obj.Name = key.Name
call := g.s.Alpha.RegionDisks.Insert(projectID, key.Region, obj) call := g.s.Beta.RegionDisks.Insert(projectID, key.Region, obj)
call.Context(ctx) call.Context(ctx)
op, err := call.Do() op, err := call.Do()
if err != nil { if err != nil {
glog.V(4).Infof("GCEAlphaRegionDisks.Insert(%v, %v, ...) = %+v", ctx, key, err) glog.V(4).Infof("GCEBetaRegionDisks.Insert(%v, %v, ...) = %+v", ctx, key, err)
return err return err
} }
err = g.s.WaitForCompletion(ctx, op) err = g.s.WaitForCompletion(ctx, op)
glog.V(4).Infof("GCEAlphaRegionDisks.Insert(%v, %v, %+v) = %+v", ctx, key, obj, err) glog.V(4).Infof("GCEBetaRegionDisks.Insert(%v, %v, %+v) = %+v", ctx, key, obj, err)
return err return err
} }
// Delete the Disk referenced by key. // Delete the Disk referenced by key.
func (g *GCEAlphaRegionDisks) Delete(ctx context.Context, key *meta.Key) error { func (g *GCEBetaRegionDisks) Delete(ctx context.Context, key *meta.Key) error {
glog.V(5).Infof("GCEAlphaRegionDisks.Delete(%v, %v): called", ctx, key) glog.V(5).Infof("GCEBetaRegionDisks.Delete(%v, %v): called", ctx, key)
if !key.Valid() { if !key.Valid() {
glog.V(2).Infof("GCEAlphaRegionDisks.Delete(%v, %v): key is invalid (%#v)", ctx, key, key) glog.V(2).Infof("GCEBetaRegionDisks.Delete(%v, %v): key is invalid (%#v)", ctx, key, key)
return fmt.Errorf("invalid GCE key (%+v)", key) return fmt.Errorf("invalid GCE key (%+v)", key)
} }
projectID := g.s.ProjectRouter.ProjectID(ctx, "alpha", "RegionDisks") projectID := g.s.ProjectRouter.ProjectID(ctx, "beta", "RegionDisks")
rk := &RateLimitKey{ rk := &RateLimitKey{
ProjectID: projectID, ProjectID: projectID,
Operation: "Delete", Operation: "Delete",
Version: meta.Version("alpha"), Version: meta.Version("beta"),
Service: "RegionDisks", Service: "RegionDisks",
} }
glog.V(5).Infof("GCEAlphaRegionDisks.Delete(%v, %v): projectID = %v, rk = %+v", ctx, key, projectID, rk) glog.V(5).Infof("GCEBetaRegionDisks.Delete(%v, %v): projectID = %v, rk = %+v", ctx, key, projectID, rk)
if err := g.s.RateLimiter.Accept(ctx, rk); err != nil { if err := g.s.RateLimiter.Accept(ctx, rk); err != nil {
glog.V(4).Infof("GCEAlphaRegionDisks.Delete(%v, %v): RateLimiter error: %v", ctx, key, err) glog.V(4).Infof("GCEBetaRegionDisks.Delete(%v, %v): RateLimiter error: %v", ctx, key, err)
return err return err
} }
call := g.s.Alpha.RegionDisks.Delete(projectID, key.Region, key.Name) call := g.s.Beta.RegionDisks.Delete(projectID, key.Region, key.Name)
call.Context(ctx) call.Context(ctx)
op, err := call.Do() op, err := call.Do()
if err != nil { if err != nil {
glog.V(4).Infof("GCEAlphaRegionDisks.Delete(%v, %v) = %v", ctx, key, err) glog.V(4).Infof("GCEBetaRegionDisks.Delete(%v, %v) = %v", ctx, key, err)
return err return err
} }
err = g.s.WaitForCompletion(ctx, op) err = g.s.WaitForCompletion(ctx, op)
glog.V(4).Infof("GCEAlphaRegionDisks.Delete(%v, %v) = %v", ctx, key, err) glog.V(4).Infof("GCEBetaRegionDisks.Delete(%v, %v) = %v", ctx, key, err)
return err
}
// Resize is a method on GCEBetaRegionDisks.
func (g *GCEBetaRegionDisks) Resize(ctx context.Context, key *meta.Key, arg0 *beta.RegionDisksResizeRequest) error {
glog.V(5).Infof("GCEBetaRegionDisks.Resize(%v, %v, ...): called", ctx, key)
if !key.Valid() {
glog.V(2).Infof("GCEBetaRegionDisks.Resize(%v, %v, ...): key is invalid (%#v)", ctx, key, key)
return fmt.Errorf("invalid GCE key (%+v)", key)
}
projectID := g.s.ProjectRouter.ProjectID(ctx, "beta", "RegionDisks")
rk := &RateLimitKey{
ProjectID: projectID,
Operation: "Resize",
Version: meta.Version("beta"),
Service: "RegionDisks",
}
glog.V(5).Infof("GCEBetaRegionDisks.Resize(%v, %v, ...): projectID = %v, rk = %+v", ctx, key, projectID, rk)
if err := g.s.RateLimiter.Accept(ctx, rk); err != nil {
glog.V(4).Infof("GCEBetaRegionDisks.Resize(%v, %v, ...): RateLimiter error: %v", ctx, key, err)
return err
}
call := g.s.Beta.RegionDisks.Resize(projectID, key.Region, key.Name, arg0)
call.Context(ctx)
op, err := call.Do()
if err != nil {
glog.V(4).Infof("GCEBetaRegionDisks.Resize(%v, %v, ...) = %+v", ctx, key, err)
return err
}
err = g.s.WaitForCompletion(ctx, op)
glog.V(4).Infof("GCEBetaRegionDisks.Resize(%v, %v, ...) = %+v", ctx, key, err)
return err return err
} }

View File

@ -312,28 +312,17 @@ func TestDisksGroup(t *testing.T) {
mock := NewMockGCE(pr) mock := NewMockGCE(pr)
var key *meta.Key var key *meta.Key
keyAlpha := meta.ZonalKey("key-alpha", "location")
key = keyAlpha
keyGA := meta.ZonalKey("key-ga", "location") keyGA := meta.ZonalKey("key-ga", "location")
key = keyGA key = keyGA
// Ignore unused variables. // Ignore unused variables.
_, _, _ = ctx, mock, key _, _, _ = ctx, mock, key
// Get not found. // Get not found.
if _, err := mock.AlphaDisks().Get(ctx, key); err == nil {
t.Errorf("AlphaDisks().Get(%v, %v) = _, nil; want error", ctx, key)
}
if _, err := mock.Disks().Get(ctx, key); err == nil { if _, err := mock.Disks().Get(ctx, key); err == nil {
t.Errorf("Disks().Get(%v, %v) = _, nil; want error", ctx, key) t.Errorf("Disks().Get(%v, %v) = _, nil; want error", ctx, key)
} }
// Insert. // Insert.
{
obj := &alpha.Disk{}
if err := mock.AlphaDisks().Insert(ctx, keyAlpha, obj); err != nil {
t.Errorf("AlphaDisks().Insert(%v, %v, %v) = %v; want nil", ctx, keyAlpha, obj, err)
}
}
{ {
obj := &ga.Disk{} obj := &ga.Disk{}
if err := mock.Disks().Insert(ctx, keyGA, obj); err != nil { if err := mock.Disks().Insert(ctx, keyGA, obj); err != nil {
@ -342,35 +331,16 @@ func TestDisksGroup(t *testing.T) {
} }
// Get across versions. // Get across versions.
if obj, err := mock.AlphaDisks().Get(ctx, key); err != nil {
t.Errorf("AlphaDisks().Get(%v, %v) = %v, %v; want nil", ctx, key, obj, err)
}
if obj, err := mock.Disks().Get(ctx, key); err != nil { if obj, err := mock.Disks().Get(ctx, key); err != nil {
t.Errorf("Disks().Get(%v, %v) = %v, %v; want nil", ctx, key, obj, err) t.Errorf("Disks().Get(%v, %v) = %v, %v; want nil", ctx, key, obj, err)
} }
// List. // List.
mock.MockAlphaDisks.Objects[*keyAlpha] = mock.MockAlphaDisks.Obj(&alpha.Disk{Name: keyAlpha.Name})
mock.MockDisks.Objects[*keyGA] = mock.MockDisks.Obj(&ga.Disk{Name: keyGA.Name}) mock.MockDisks.Objects[*keyGA] = mock.MockDisks.Obj(&ga.Disk{Name: keyGA.Name})
want := map[string]bool{ want := map[string]bool{
"key-alpha": true,
"key-ga": true, "key-ga": true,
} }
_ = want // ignore unused variables. _ = want // ignore unused variables.
{
objs, err := mock.AlphaDisks().List(ctx, location, filter.None)
if err != nil {
t.Errorf("AlphaDisks().List(%v, %v, %v) = %v, %v; want _, nil", ctx, location, filter.None, objs, err)
} else {
got := map[string]bool{}
for _, obj := range objs {
got[obj.Name] = true
}
if !reflect.DeepEqual(got, want) {
t.Errorf("AlphaDisks().List(); got %+v, want %+v", got, want)
}
}
}
{ {
objs, err := mock.Disks().List(ctx, location, filter.None) objs, err := mock.Disks().List(ctx, location, filter.None)
if err != nil { if err != nil {
@ -387,17 +357,11 @@ func TestDisksGroup(t *testing.T) {
} }
// Delete across versions. // Delete across versions.
if err := mock.AlphaDisks().Delete(ctx, keyAlpha); err != nil {
t.Errorf("AlphaDisks().Delete(%v, %v) = %v; want nil", ctx, keyAlpha, err)
}
if err := mock.Disks().Delete(ctx, keyGA); err != nil { if err := mock.Disks().Delete(ctx, keyGA); err != nil {
t.Errorf("Disks().Delete(%v, %v) = %v; want nil", ctx, keyGA, err) t.Errorf("Disks().Delete(%v, %v) = %v; want nil", ctx, keyGA, err)
} }
// Delete not found. // Delete not found.
if err := mock.AlphaDisks().Delete(ctx, keyAlpha); err == nil {
t.Errorf("AlphaDisks().Delete(%v, %v) = nil; want error", ctx, keyAlpha)
}
if err := mock.Disks().Delete(ctx, keyGA); err == nil { if err := mock.Disks().Delete(ctx, keyGA); err == nil {
t.Errorf("Disks().Delete(%v, %v) = nil; want error", ctx, keyGA) t.Errorf("Disks().Delete(%v, %v) = nil; want error", ctx, keyGA)
} }
@ -1315,39 +1279,39 @@ func TestRegionDisksGroup(t *testing.T) {
mock := NewMockGCE(pr) mock := NewMockGCE(pr)
var key *meta.Key var key *meta.Key
keyAlpha := meta.RegionalKey("key-alpha", "location") keyBeta := meta.RegionalKey("key-beta", "location")
key = keyAlpha key = keyBeta
// Ignore unused variables. // Ignore unused variables.
_, _, _ = ctx, mock, key _, _, _ = ctx, mock, key
// Get not found. // Get not found.
if _, err := mock.AlphaRegionDisks().Get(ctx, key); err == nil { if _, err := mock.BetaRegionDisks().Get(ctx, key); err == nil {
t.Errorf("AlphaRegionDisks().Get(%v, %v) = _, nil; want error", ctx, key) t.Errorf("BetaRegionDisks().Get(%v, %v) = _, nil; want error", ctx, key)
} }
// Insert. // Insert.
{ {
obj := &alpha.Disk{} obj := &beta.Disk{}
if err := mock.AlphaRegionDisks().Insert(ctx, keyAlpha, obj); err != nil { if err := mock.BetaRegionDisks().Insert(ctx, keyBeta, obj); err != nil {
t.Errorf("AlphaRegionDisks().Insert(%v, %v, %v) = %v; want nil", ctx, keyAlpha, obj, err) t.Errorf("BetaRegionDisks().Insert(%v, %v, %v) = %v; want nil", ctx, keyBeta, obj, err)
} }
} }
// Get across versions. // Get across versions.
if obj, err := mock.AlphaRegionDisks().Get(ctx, key); err != nil { if obj, err := mock.BetaRegionDisks().Get(ctx, key); err != nil {
t.Errorf("AlphaRegionDisks().Get(%v, %v) = %v, %v; want nil", ctx, key, obj, err) t.Errorf("BetaRegionDisks().Get(%v, %v) = %v, %v; want nil", ctx, key, obj, err)
} }
// List. // List.
mock.MockAlphaRegionDisks.Objects[*keyAlpha] = mock.MockAlphaRegionDisks.Obj(&alpha.Disk{Name: keyAlpha.Name}) mock.MockBetaRegionDisks.Objects[*keyBeta] = mock.MockBetaRegionDisks.Obj(&beta.Disk{Name: keyBeta.Name})
want := map[string]bool{ want := map[string]bool{
"key-alpha": true, "key-beta": true,
} }
_ = want // ignore unused variables. _ = want // ignore unused variables.
{ {
objs, err := mock.AlphaRegionDisks().List(ctx, location, filter.None) objs, err := mock.BetaRegionDisks().List(ctx, location, filter.None)
if err != nil { if err != nil {
t.Errorf("AlphaRegionDisks().List(%v, %v, %v) = %v, %v; want _, nil", ctx, location, filter.None, objs, err) t.Errorf("BetaRegionDisks().List(%v, %v, %v) = %v, %v; want _, nil", ctx, location, filter.None, objs, err)
} else { } else {
got := map[string]bool{} got := map[string]bool{}
for _, obj := range objs { for _, obj := range objs {
@ -1360,13 +1324,13 @@ func TestRegionDisksGroup(t *testing.T) {
} }
// Delete across versions. // Delete across versions.
if err := mock.AlphaRegionDisks().Delete(ctx, keyAlpha); err != nil { if err := mock.BetaRegionDisks().Delete(ctx, keyBeta); err != nil {
t.Errorf("AlphaRegionDisks().Delete(%v, %v) = %v; want nil", ctx, keyAlpha, err) t.Errorf("BetaRegionDisks().Delete(%v, %v) = %v; want nil", ctx, keyBeta, err)
} }
// Delete not found. // Delete not found.
if err := mock.AlphaRegionDisks().Delete(ctx, keyAlpha); err == nil { if err := mock.BetaRegionDisks().Delete(ctx, keyBeta); err == nil {
t.Errorf("AlphaRegionDisks().Delete(%v, %v) = nil; want error", ctx, keyAlpha) t.Errorf("BetaRegionDisks().Delete(%v, %v) = nil; want error", ctx, keyBeta)
} }
} }