diff --git a/pkg/cloudprovider/providers/gce/BUILD b/pkg/cloudprovider/providers/gce/BUILD index 5c04c174800..769974b7b91 100644 --- a/pkg/cloudprovider/providers/gce/BUILD +++ b/pkg/cloudprovider/providers/gce/BUILD @@ -101,14 +101,18 @@ go_test( "gce_disks_test.go", "gce_healthchecks_test.go", "gce_loadbalancer_external_test.go", + "gce_loadbalancer_internal_test.go", + "gce_loadbalancer_utils_test.go", "gce_test.go", "gce_util_test.go", "metrics_test.go", ], embed = [":go_default_library"], deps = [ + "//pkg/api/v1/service:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/cloudprovider/providers/gce/cloud:go_default_library", + "//pkg/cloudprovider/providers/gce/cloud/meta:go_default_library", "//pkg/cloudprovider/providers/gce/cloud/mock:go_default_library", "//pkg/kubelet/apis:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", diff --git a/pkg/cloudprovider/providers/gce/cloud/mock/BUILD b/pkg/cloudprovider/providers/gce/cloud/mock/BUILD index bceb2e84739..e6e359278c4 100644 --- a/pkg/cloudprovider/providers/gce/cloud/mock/BUILD +++ b/pkg/cloudprovider/providers/gce/cloud/mock/BUILD @@ -7,6 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/cloudprovider/providers/gce/cloud:go_default_library", + "//pkg/cloudprovider/providers/gce/cloud/filter:go_default_library", "//pkg/cloudprovider/providers/gce/cloud/meta:go_default_library", "//vendor/google.golang.org/api/compute/v0.alpha:go_default_library", "//vendor/google.golang.org/api/compute/v0.beta:go_default_library", diff --git a/pkg/cloudprovider/providers/gce/cloud/mock/mock.go b/pkg/cloudprovider/providers/gce/cloud/mock/mock.go index 3938aa068a0..c2c772d1431 100644 --- a/pkg/cloudprovider/providers/gce/cloud/mock/mock.go +++ b/pkg/cloudprovider/providers/gce/cloud/mock/mock.go @@ -233,6 +233,7 @@ type instanceGroupAttributes struct { instanceMap map[meta.Key][]*ga.InstanceWithNamedPorts } +// AddInstancesHook mocks adding instances from an InstanceGroup func AddInstancesHook(ctx context.Context, key *meta.Key, req *ga.InstanceGroupsAddInstancesRequest, m *cloud.MockInstanceGroups) error { _, err := m.Get(ctx, key) if err != nil { @@ -269,6 +270,7 @@ func AddInstancesHook(ctx context.Context, key *meta.Key, req *ga.InstanceGroups return nil } +// ListInstancesHook mocks listing instances from an InstanceGroup func ListInstancesHook(ctx context.Context, key *meta.Key, req *ga.InstanceGroupsListInstancesRequest, filter *filter.F, m *cloud.MockInstanceGroups) ([]*ga.InstanceWithNamedPorts, error) { _, err := m.Get(ctx, key) if err != nil { @@ -293,6 +295,7 @@ func ListInstancesHook(ctx context.Context, key *meta.Key, req *ga.InstanceGroup return instances, nil } +// RemoveInstancesHook mocks removing instances from an InstanceGroup func RemoveInstancesHook(ctx context.Context, key *meta.Key, req *ga.InstanceGroupsRemoveInstancesRequest, m *cloud.MockInstanceGroups) error { _, err := m.Get(ctx, key) if err != nil { @@ -347,7 +350,7 @@ func UpdateFirewallHook(ctx context.Context, key *meta.Key, obj *ga.Firewall, m projectID := m.ProjectRouter.ProjectID(ctx, "ga", "firewalls") obj.SelfLink = cloud.SelfLink(meta.VersionGA, projectID, "firewalls", key) - m.Objects[*key] = &cloud.MockFirewallsObj{obj} + m.Objects[*key] = &cloud.MockFirewallsObj{Obj: obj} return nil } @@ -366,7 +369,7 @@ func UpdateHealthCheckHook(ctx context.Context, key *meta.Key, obj *ga.HealthChe projectID := m.ProjectRouter.ProjectID(ctx, "ga", "healthChecks") obj.SelfLink = cloud.SelfLink(meta.VersionGA, projectID, "healthChecks", key) - m.Objects[*key] = &cloud.MockHealthChecksObj{obj} + m.Objects[*key] = &cloud.MockHealthChecksObj{Obj: obj} return nil } @@ -386,6 +389,6 @@ func UpdateRegionBackendServiceHook(ctx context.Context, key *meta.Key, obj *ga. projectID := m.ProjectRouter.ProjectID(ctx, "ga", "backendServices") obj.SelfLink = cloud.SelfLink(meta.VersionGA, projectID, "backendServices", key) - m.Objects[*key] = &cloud.MockRegionBackendServicesObj{obj} + m.Objects[*key] = &cloud.MockRegionBackendServicesObj{Obj: obj} return nil } diff --git a/pkg/cloudprovider/providers/gce/gce_loadbalancer_test_utils.go b/pkg/cloudprovider/providers/gce/gce_loadbalancer_utils_test.go similarity index 94% rename from pkg/cloudprovider/providers/gce/gce_loadbalancer_test_utils.go rename to pkg/cloudprovider/providers/gce/gce_loadbalancer_utils_test.go index c960abdb04f..65b7900163a 100644 --- a/pkg/cloudprovider/providers/gce/gce_loadbalancer_test_utils.go +++ b/pkg/cloudprovider/providers/gce/gce_loadbalancer_utils_test.go @@ -12,12 +12,12 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -This file contains shared functions and variables to set up for tests for -ExternalLoadBalancer and InternalLoadBalancers. It currently cannot live in a -separate package from GCE because then it would cause a circular import. */ +// This file contains shared functions and variables to set up for tests for +// ExternalLoadBalancer and InternalLoadBalancers. It currently cannot live in a +// separate package from GCE because then it would cause a circular import. + package gce import (