Skip to content
This repository has been archived by the owner on May 6, 2022. It is now read-only.

fix golint errors #2737

Merged
merged 1 commit into from
Oct 28, 2019
Merged

fix golint errors #2737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/upgrade/examiner/internal/readiness/readiness.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (r *readiness) TestEnvironmentIsReady() error {

func (r *readiness) assertServiceCatalogIsReady() error {
klog.Info("Make sure ServiceCatalog ApiServer is up")
if err := r.assertServiceCatalogApiServerIsUp(); err != nil {
if err := r.assertServiceCatalogAPIServerIsUp(); err != nil {
return errors.Wrap(err, "failed during waiting for ServiceCatalog ApiServer")
}
klog.Info("ServiceCatalog ApiServer is ready")
Expand All @@ -81,9 +81,9 @@ func (r *readiness) assertServiceCatalogIsReady() error {
return nil
}

func (r *readiness) assertServiceCatalogApiServerIsUp() error {
func (r *readiness) assertServiceCatalogAPIServerIsUp() error {
return wait.Poll(waitInterval, timeoutInterval, func() (done bool, err error) {
deployment, err := r.client.AppsV1beta1().Deployments(r.cfg.ServiceCatalogNamespace).Get(r.cfg.ServiceCatalogApiServerName, v1.GetOptions{})
deployment, err := r.client.AppsV1beta1().Deployments(r.cfg.ServiceCatalogNamespace).Get(r.cfg.ServiceCatalogAPIServerName, v1.GetOptions{})
if err != nil {
return false, err
}
Expand Down
2 changes: 1 addition & 1 deletion test/upgrade/examiner/internal/readiness/sc_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package readiness

// ServiceCatalogConfig collects all parameters from env variables required to run upgrade tests
type ServiceCatalogConfig struct {
ServiceCatalogApiServerName string `envconfig:"SC_APISERVER"`
ServiceCatalogAPIServerName string `envconfig:"SC_APISERVER"`
ServiceCatalogControllerServerName string `envconfig:"SC_CONTROLLER"`
ServiceCatalogNamespace string `envconfig:"SC_NAMESPACE"`
TestBrokerName string `envconfig:"TB_NAME"`
Expand Down