diff --git a/pkg/healthchecksl4/healthchecksl4.go b/pkg/healthchecksl4/healthchecksl4.go index 9d6f7cf869..7df47cc70c 100644 --- a/pkg/healthchecksl4/healthchecksl4.go +++ b/pkg/healthchecksl4/healthchecksl4.go @@ -57,7 +57,7 @@ type l4HealthChecks struct { // sharedResourceLock serializes operations on the healthcheck and firewall // resources shared across multiple Services. sharedResourcesLock sync.Mutex - hcProvider HealthChecksProvider + hcProvider healthChecksProvider cloud *gce.Cloud recorderFactory events.RecorderProducer } @@ -105,7 +105,6 @@ func GetInstance() *l4HealthChecks { // Firewall rules are always created at in the Global scope (vs // Regional). This means that one Firewall rule is created for // Services of different scope (Global vs Regional). - func (l4hc *l4HealthChecks) EnsureHealthCheck(svc *corev1.Service, namer namer.L4ResourcesNamer, sharedHC bool, scope meta.KeyType, l4Type utils.L4LBType, nodeNames []string) *EnsureL4HealthCheckResult { namespacedName := types.NamespacedName{Name: svc.Name, Namespace: svc.Namespace} diff --git a/pkg/healthchecksl4/interfaces.go b/pkg/healthchecksl4/interfaces.go index bb4c925a34..a2380480d3 100644 --- a/pkg/healthchecksl4/interfaces.go +++ b/pkg/healthchecksl4/interfaces.go @@ -24,7 +24,7 @@ type EnsureL4HealthCheckResult struct { Err error } -type HealthChecksProvider interface { +type healthChecksProvider interface { Get(name string, scope meta.KeyType) (*composite.HealthCheck, error) Create(healthCheck *composite.HealthCheck) error Update(name string, scope meta.KeyType, updatedHealthCheck *composite.HealthCheck) error diff --git a/pkg/healthchecksprovider/healthchecksprovider.go b/pkg/healthchecksprovider/healthchecksprovider.go index f9adef8c68..de96c0b1fe 100644 --- a/pkg/healthchecksprovider/healthchecksprovider.go +++ b/pkg/healthchecksprovider/healthchecksprovider.go @@ -22,10 +22,6 @@ func NewHealthChecks(cloud *gce.Cloud, version meta.Version) *HealthChecks { } } -func (hc *HealthChecks) createKey(name string, scope meta.KeyType) (*meta.Key, error) { - return composite.CreateKey(hc.cloud, name, scope) -} - func (hc *HealthChecks) Get(name string, scope meta.KeyType) (*composite.HealthCheck, error) { key, err := hc.createKey(name, scope) if err != nil { @@ -84,3 +80,7 @@ func (hc *HealthChecks) SelfLink(name string, scope meta.KeyType) (string, error return cloudprovider.SelfLink(meta.VersionGA, hc.cloud.ProjectID(), "healthChecks", key), nil } + +func (hc *HealthChecks) createKey(name string, scope meta.KeyType) (*meta.Key, error) { + return composite.CreateKey(hc.cloud, name, scope) +} diff --git a/pkg/healthchecksprovider/healthchecksprovider_test.go b/pkg/healthchecksprovider/healthchecksprovider_test.go index d27e91d56a..48dd4b5399 100644 --- a/pkg/healthchecksprovider/healthchecksprovider_test.go +++ b/pkg/healthchecksprovider/healthchecksprovider_test.go @@ -18,14 +18,14 @@ func TestCreateHealthCheck(t *testing.T) { desc string }{ { - desc: "Test creating regional health check", + desc: "Create regional health check", healthCheck: &composite.HealthCheck{ Name: "regional-hc", Scope: meta.Regional, }, }, { - desc: "Test creating global health check", + desc: "Create global health check", healthCheck: &composite.HealthCheck{ Name: "global-hc", Scope: meta.Global, @@ -71,42 +71,42 @@ func TestGetHealthCheck(t *testing.T) { desc string }{ { - desc: "Test getting regional health check", + desc: "Get regional health check", existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, getHCName: regionalHealthCheck.Name, getHCScope: regionalHealthCheck.Scope, expectedHealthCheck: regionalHealthCheck, }, { - desc: "Test getting global health check", + desc: "Get global health check", existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, getHCName: globalHealthCheck.Name, getHCScope: globalHealthCheck.Scope, expectedHealthCheck: globalHealthCheck, }, { - desc: "Test getting non existent global health check", + desc: "Get non existent global health check", existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, getHCName: "non-existent-hc", getHCScope: meta.Global, expectedHealthCheck: nil, }, { - desc: "Test getting non existent regional health check", + desc: "Get non existent regional health check", existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, getHCName: "non-existent-hc", getHCScope: meta.Regional, expectedHealthCheck: nil, }, { - desc: "Test getting existent regional health check, but providing global scope", + desc: "Get existent regional health check, but providing global scope", existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, getHCName: regionalHealthCheck.Name, getHCScope: meta.Global, expectedHealthCheck: nil, }, { - desc: "Test getting existent global health check, but providing regional scope", + desc: "Get existent global health check, but providing regional scope", existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, getHCName: globalHealthCheck.Name, getHCScope: meta.Regional, @@ -148,46 +148,46 @@ func TestDeleteHealthCheck(t *testing.T) { } testCases := []struct { - existingHealthChecks []*composite.HealthCheck - deleteHCName string - deleteHCScope meta.KeyType - shouldExistHealthChecks []*composite.HealthCheck - desc string + existingHealthChecks []*composite.HealthCheck + deleteHCName string + deleteHCScope meta.KeyType + shouldNotDeleteHealthChecks []*composite.HealthCheck + desc string }{ { - desc: "Delete regional health check", - existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, - deleteHCName: regionalHealthCheck.Name, - deleteHCScope: regionalHealthCheck.Scope, - shouldExistHealthChecks: []*composite.HealthCheck{globalHealthCheck}, + desc: "Delete regional health check", + existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, + deleteHCName: regionalHealthCheck.Name, + deleteHCScope: regionalHealthCheck.Scope, + shouldNotDeleteHealthChecks: []*composite.HealthCheck{globalHealthCheck}, }, { - desc: "Delete global health check", - existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, - deleteHCName: globalHealthCheck.Name, - deleteHCScope: globalHealthCheck.Scope, - shouldExistHealthChecks: []*composite.HealthCheck{regionalHealthCheck}, + desc: "Delete global health check", + existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, + deleteHCName: globalHealthCheck.Name, + deleteHCScope: globalHealthCheck.Scope, + shouldNotDeleteHealthChecks: []*composite.HealthCheck{regionalHealthCheck}, }, { - desc: "Delete non existent healthCheck", - existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, - deleteHCName: "non-existent", - deleteHCScope: meta.Regional, - shouldExistHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, + desc: "Delete non existent healthCheck", + existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, + deleteHCName: "non-existent", + deleteHCScope: meta.Regional, + shouldNotDeleteHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, }, { - desc: "Delete global health check name, but using regional scope", - existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, - deleteHCName: globalHealthCheck.Name, - deleteHCScope: meta.Regional, - shouldExistHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, + desc: "Delete global health check name, but using regional scope", + existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, + deleteHCName: globalHealthCheck.Name, + deleteHCScope: meta.Regional, + shouldNotDeleteHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, }, { - desc: "Delete regional health check name, but using global scope", - existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, - deleteHCName: regionalHealthCheck.Name, - deleteHCScope: meta.Global, - shouldExistHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, + desc: "Delete regional health check name, but using global scope", + existingHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, + deleteHCName: regionalHealthCheck.Name, + deleteHCScope: meta.Global, + shouldNotDeleteHealthChecks: []*composite.HealthCheck{regionalHealthCheck, globalHealthCheck}, }, } @@ -206,7 +206,7 @@ func TestDeleteHealthCheck(t *testing.T) { if err != nil { t.Errorf("verifyHealthCheckNotExists(_, %s, %s) returned error %v", tc.deleteHCName, tc.deleteHCScope, err) } - for _, hc := range tc.shouldExistHealthChecks { + for _, hc := range tc.shouldNotDeleteHealthChecks { err = verifyHealthCheckExists(fakeGCE, hc.Name, hc.Scope) if err != nil { t.Errorf("verifyHealthCheckExists(_, %s, %s) returned error %v", hc.Name, hc.Scope, err)