github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

fixed golint error

Browse Source 
exported func ToForwardingRuleComposite returns unexported type *gce.forwardingRuleComposite, which can be annoying to use
This commit is contained in:
Pavithra Ramesh 2019-08-29 17:04:07 -07:00
parent c09c8abc3c
commit cae11a1379
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go
View File

@ -768,8 +768,8 @@ func (f *forwardingRuleComposite) Equal(other *forwardingRuleComposite) bool {
f.allowGlobalAccess == other.allowGlobalAccess f.allowGlobalAccess == other.allowGlobalAccess
} }
// ToForwardingRuleComposite converts a compute beta or GA ForwardingRule into the composite type // toForwardingRuleComposite converts a compute beta or GA ForwardingRule into the composite type
func ToForwardingRuleComposite(rule interface{}) (frc *forwardingRuleComposite, err error) { func toForwardingRuleComposite(rule interface{}) (frc *forwardingRuleComposite, err error) {
switch fr := rule.(type) { switch fr := rule.(type) {
case *compute.ForwardingRule: case *compute.ForwardingRule:
frc = &forwardingRuleComposite{ frc = &forwardingRuleComposite{
@ -895,12 +895,12 @@ func (g *Cloud) ensureInternalForwardingRule(existingFwdRule *compute.Forwarding
if err != nil { if err != nil {
return err return err
} }
oldFRC, err = ToForwardingRuleComposite(betaRule) oldFRC, err = toForwardingRuleComposite(betaRule)
case meta.VersionGA: case meta.VersionGA:
oldFRC, err = ToForwardingRuleComposite(existingFwdRule) oldFRC, err = toForwardingRuleComposite(existingFwdRule)
default: default:
klog.Errorf("invalid version string for %s, assuming GA", existingFwdRule.Name) klog.Errorf("invalid version string for %s, assuming GA", existingFwdRule.Name)
oldFRC, err = ToForwardingRuleComposite(existingFwdRule) oldFRC, err = toForwardingRuleComposite(existingFwdRule)
} }
if err != nil { if err != nil {
return err return err

6
staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go
View File

@ -1204,15 +1204,15 @@ func TestForwardingRuleCompositeEqual(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Unexpected error %v", err) t.Errorf("Unexpected error %v", err)
} }
frcGA, err := ToForwardingRuleComposite(gaRule) frcGA, err := toForwardingRuleComposite(gaRule)
if err != nil { if err != nil {
t.Errorf("Unexpected error %v", err) t.Errorf("Unexpected error %v", err)
} }
frcBeta, err := ToForwardingRuleComposite(betaRule) frcBeta, err := toForwardingRuleComposite(betaRule)
if err != nil { if err != nil {
t.Errorf("Unexpected error %v", err) t.Errorf("Unexpected error %v", err)
} }
frcBetaGlobalAccess, err := ToForwardingRuleComposite(betaRuleGlobalAccess) frcBetaGlobalAccess, err := toForwardingRuleComposite(betaRuleGlobalAccess)
if err != nil { if err != nil {
t.Errorf("Unexpected error %v", err) t.Errorf("Unexpected error %v", err)
} }