From cae11a137932496538c65b26b1ac19b7f638bb3c Mon Sep 17 00:00:00 2001 From: Pavithra Ramesh Date: Thu, 29 Aug 2019 17:04:07 -0700 Subject: [PATCH] fixed golint error exported func ToForwardingRuleComposite returns unexported type *gce.forwardingRuleComposite, which can be annoying to use --- .../gce/gce_loadbalancer_internal.go | 10 +++++----- .../gce/gce_loadbalancer_internal_test.go | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go index bff823c6e69..31a8beb488d 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go @@ -768,8 +768,8 @@ func (f *forwardingRuleComposite) Equal(other *forwardingRuleComposite) bool { f.allowGlobalAccess == other.allowGlobalAccess } -// ToForwardingRuleComposite converts a compute beta or GA ForwardingRule into the composite type -func ToForwardingRuleComposite(rule interface{}) (frc *forwardingRuleComposite, err error) { +// toForwardingRuleComposite converts a compute beta or GA ForwardingRule into the composite type +func toForwardingRuleComposite(rule interface{}) (frc *forwardingRuleComposite, err error) { switch fr := rule.(type) { case *compute.ForwardingRule: frc = &forwardingRuleComposite{ @@ -895,12 +895,12 @@ func (g *Cloud) ensureInternalForwardingRule(existingFwdRule *compute.Forwarding if err != nil { return err } - oldFRC, err = ToForwardingRuleComposite(betaRule) + oldFRC, err = toForwardingRuleComposite(betaRule) case meta.VersionGA: - oldFRC, err = ToForwardingRuleComposite(existingFwdRule) + oldFRC, err = toForwardingRuleComposite(existingFwdRule) default: klog.Errorf("invalid version string for %s, assuming GA", existingFwdRule.Name) - oldFRC, err = ToForwardingRuleComposite(existingFwdRule) + oldFRC, err = toForwardingRuleComposite(existingFwdRule) } if err != nil { return err diff --git a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go index 67fb1455021..d1918401fbb 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go @@ -1204,15 +1204,15 @@ func TestForwardingRuleCompositeEqual(t *testing.T) { if err != nil { t.Errorf("Unexpected error %v", err) } - frcGA, err := ToForwardingRuleComposite(gaRule) + frcGA, err := toForwardingRuleComposite(gaRule) if err != nil { t.Errorf("Unexpected error %v", err) } - frcBeta, err := ToForwardingRuleComposite(betaRule) + frcBeta, err := toForwardingRuleComposite(betaRule) if err != nil { t.Errorf("Unexpected error %v", err) } - frcBetaGlobalAccess, err := ToForwardingRuleComposite(betaRuleGlobalAccess) + frcBetaGlobalAccess, err := toForwardingRuleComposite(betaRuleGlobalAccess) if err != nil { t.Errorf("Unexpected error %v", err) }