Skip to content

K
k3s
Commit 7ebc34fe authored by Bowei Du's avatar Bowei Du
Browse files
Options

Remove op field as it is no longer needed

Key is used instead
parent c9c69013
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 24 deletions
pkg/cloudprovider/providers/gce/cloud/op.go
View file @ 7ebc34fe
...@@ -41,7 +41,6 @@ type operation interface { ...@@ -41,7 +41,6 @@ type operation interface {
type gaOperation struct { type gaOperation struct {
s *Service s *Service
op *ga.Operation
projectID string projectID string
key *meta.Key key *meta.Key
} }
...@@ -58,14 +57,14 @@ func (o *gaOperation) isDone(ctx context.Context) (bool, error) { ...@@ -58,14 +57,14 @@ func (o *gaOperation) isDone(ctx context.Context) (bool, error) {
switch o.key.Type() { switch o.key.Type() {
case meta.Regional: case meta.Regional:
op, err = o.s.GA.RegionOperations.Get(o.projectID, o.key.Region, o.op.Name).Context(ctx).Do() op, err = o.s.GA.RegionOperations.Get(o.projectID, o.key.Region, o.key.Name).Context(ctx).Do()
glog.V(5).Infof("GA.RegionOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Region, o.op.Name, op, err, ctx) glog.V(5).Infof("GA.RegionOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Region, o.key.Name, op, err, ctx)
case meta.Zonal: case meta.Zonal:
op, err = o.s.GA.ZoneOperations.Get(o.projectID, o.key.Zone, o.op.Name).Context(ctx).Do() op, err = o.s.GA.ZoneOperations.Get(o.projectID, o.key.Zone, o.key.Name).Context(ctx).Do()
glog.V(5).Infof("GA.ZoneOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Zone, o.op.Name, op, err, ctx) glog.V(5).Infof("GA.ZoneOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Zone, o.key.Name, op, err, ctx)
case meta.Global: case meta.Global:
op, err = o.s.GA.GlobalOperations.Get(o.projectID, o.op.Name).Context(ctx).Do() op, err = o.s.GA.GlobalOperations.Get(o.projectID, o.key.Name).Context(ctx).Do()
glog.V(5).Infof("GA.GlobalOperations.Get(%v, %v) = %+v, %v; ctx = %v", o.projectID, o.op.Name, op, err, ctx) glog.V(5).Infof("GA.GlobalOperations.Get(%v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Name, op, err, ctx)
default: default:
return false, fmt.Errorf("invalid key type: %#v", o.key) return false, fmt.Errorf("invalid key type: %#v", o.key)
} }
...@@ -86,7 +85,6 @@ func (o *gaOperation) rateLimitKey() *RateLimitKey { ...@@ -86,7 +85,6 @@ func (o *gaOperation) rateLimitKey() *RateLimitKey {
type alphaOperation struct { type alphaOperation struct {
s *Service s *Service
op *alpha.Operation
projectID string projectID string
key *meta.Key key *meta.Key
} }
...@@ -103,14 +101,14 @@ func (o *alphaOperation) isDone(ctx context.Context) (bool, error) { ...@@ -103,14 +101,14 @@ func (o *alphaOperation) isDone(ctx context.Context) (bool, error) {
switch o.key.Type() { switch o.key.Type() {
case meta.Regional: case meta.Regional:
op, err = o.s.Alpha.RegionOperations.Get(o.projectID, o.key.Region, o.op.Name).Context(ctx).Do() op, err = o.s.Alpha.RegionOperations.Get(o.projectID, o.key.Region, o.key.Name).Context(ctx).Do()
glog.V(5).Infof("Alpha.RegionOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Region, o.op.Name, op, err, ctx) glog.V(5).Infof("Alpha.RegionOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Region, o.key.Name, op, err, ctx)
case meta.Zonal: case meta.Zonal:
op, err = o.s.Alpha.ZoneOperations.Get(o.projectID, o.key.Zone, o.op.Name).Context(ctx).Do() op, err = o.s.Alpha.ZoneOperations.Get(o.projectID, o.key.Zone, o.key.Name).Context(ctx).Do()
glog.V(5).Infof("Alpha.ZoneOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Zone, o.op.Name, op, err, ctx) glog.V(5).Infof("Alpha.ZoneOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Zone, o.key.Name, op, err, ctx)
case meta.Global: case meta.Global:
op, err = o.s.Alpha.GlobalOperations.Get(o.projectID, o.op.Name).Context(ctx).Do() op, err = o.s.Alpha.GlobalOperations.Get(o.projectID, o.key.Name).Context(ctx).Do()
glog.V(5).Infof("Alpha.GlobalOperations.Get(%v, %v) = %+v, %v; ctx = %v", o.projectID, o.op.Name, op, err, ctx) glog.V(5).Infof("Alpha.GlobalOperations.Get(%v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Name, op, err, ctx)
default: default:
return false, fmt.Errorf("invalid key type: %#v", o.key) return false, fmt.Errorf("invalid key type: %#v", o.key)
} }
...@@ -131,7 +129,6 @@ func (o *alphaOperation) rateLimitKey() *RateLimitKey { ...@@ -131,7 +129,6 @@ func (o *alphaOperation) rateLimitKey() *RateLimitKey {
type betaOperation struct { type betaOperation struct {
s *Service s *Service
op *beta.Operation
projectID string projectID string
key *meta.Key key *meta.Key
} }
...@@ -148,14 +145,14 @@ func (o *betaOperation) isDone(ctx context.Context) (bool, error) { ...@@ -148,14 +145,14 @@ func (o *betaOperation) isDone(ctx context.Context) (bool, error) {
switch o.key.Type() { switch o.key.Type() {
case meta.Regional: case meta.Regional:
op, err = o.s.Beta.RegionOperations.Get(o.projectID, o.key.Region, o.op.Name).Context(ctx).Do() op, err = o.s.Beta.RegionOperations.Get(o.projectID, o.key.Region, o.key.Name).Context(ctx).Do()
glog.V(5).Infof("Beta.RegionOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Region, o.op.Name, op, err, ctx) glog.V(5).Infof("Beta.RegionOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Region, o.key.Name, op, err, ctx)
case meta.Zonal: case meta.Zonal:
op, err = o.s.Beta.ZoneOperations.Get(o.projectID, o.key.Zone, o.op.Name).Context(ctx).Do() op, err = o.s.Beta.ZoneOperations.Get(o.projectID, o.key.Zone, o.key.Name).Context(ctx).Do()
glog.V(5).Infof("Beta.ZoneOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Zone, o.op.Name, op, err, ctx) glog.V(5).Infof("Beta.ZoneOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Zone, o.key.Name, op, err, ctx)
case meta.Global: case meta.Global:
op, err = o.s.Beta.GlobalOperations.Get(o.projectID, o.op.Name).Context(ctx).Do() op, err = o.s.Beta.GlobalOperations.Get(o.projectID, o.key.Name).Context(ctx).Do()
glog.V(5).Infof("Beta.GlobalOperations.Get(%v, %v) = %+v, %v; ctx = %v", o.projectID, o.op.Name, op, err, ctx) glog.V(5).Infof("Beta.GlobalOperations.Get(%v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Name, op, err, ctx)
default: default:
return false, fmt.Errorf("invalid key type: %#v", o.key) return false, fmt.Errorf("invalid key type: %#v", o.key)
} }
......
pkg/cloudprovider/providers/gce/cloud/service.go
View file @ 7ebc34fe
...@@ -45,19 +45,19 @@ func (s *Service) wrapOperation(anyOp interface{}) (operation, error) { ...@@ -45,19 +45,19 @@ func (s *Service) wrapOperation(anyOp interface{}) (operation, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &gaOperation{s, o, r.ProjectID, r.Key}, nil return &gaOperation{s, r.ProjectID, r.Key}, nil
case *alpha.Operation: case *alpha.Operation:
r, err := ParseResourceURL(o.SelfLink) r, err := ParseResourceURL(o.SelfLink)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &alphaOperation{s, o, r.ProjectID, r.Key}, nil return &alphaOperation{s, r.ProjectID, r.Key}, nil
case *beta.Operation: case *beta.Operation:
r, err := ParseResourceURL(o.SelfLink) r, err := ParseResourceURL(o.SelfLink)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &betaOperation{s, o, r.ProjectID, r.Key}, nil return &betaOperation{s, r.ProjectID, r.Key}, nil
default: default:
return nil, fmt.Errorf("invalid type %T", anyOp) return nil, fmt.Errorf("invalid type %T", anyOp)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment