fix existing tests

This commit is contained in:
Jason Haugen 2021-03-16 16:52:10 -05:00
parent d07b067249
commit c8bb48ba81
16 changed files with 242 additions and 2 deletions

View File

@ -67,3 +67,8 @@ func (m *MockAutoscaling) AttachLoadBalancerTargetGroups(request *autoscaling.At
asg.TargetGroupARNs = request.TargetGroupARNs
return &autoscaling.AttachLoadBalancerTargetGroupsOutput{}, nil
}
// todo put somewhere else?
func (m *MockAutoscaling) PutLifecycleHook(input *autoscaling.PutLifecycleHookInput) (*autoscaling.PutLifecycleHookOutput, error) {
panic("Not implemented")
}

View File

@ -0,0 +1,12 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["api.go"],
importpath = "k8s.io/kops/cloudmock/aws/mockeventbridge",
visibility = ["//visibility:public"],
deps = [
"//vendor/github.com/aws/aws-sdk-go/service/eventbridge:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/eventbridge/eventbridgeiface:go_default_library",
],
)

View File

@ -0,0 +1,60 @@
/*
Copyright 2019 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
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.
*/
package mockeventbridge
import (
"github.com/aws/aws-sdk-go/service/eventbridge"
"github.com/aws/aws-sdk-go/service/eventbridge/eventbridgeiface"
"sync"
)
type MockEventBridge struct {
eventbridgeiface.EventBridgeAPI
mutex sync.Mutex
Rules []*eventbridge.Rule
}
var _ eventbridgeiface.EventBridgeAPI = &MockEventBridge{}
func (c *MockEventBridge) ListTargetsByRule(*eventbridge.ListTargetsByRuleInput) (*eventbridge.ListTargetsByRuleOutput, error) {
panic("Not implemented")
}
func (c *MockEventBridge) RemoveTargets(*eventbridge.RemoveTargetsInput) (*eventbridge.RemoveTargetsOutput, error) {
panic("Not implemented")
}
func (c *MockEventBridge) DeleteRule(*eventbridge.DeleteRuleInput) (*eventbridge.DeleteRuleOutput, error) {
panic("Not implemented")
}
func (c *MockEventBridge) ListRules(*eventbridge.ListRulesInput) (*eventbridge.ListRulesOutput, error) {
response := &eventbridge.ListRulesOutput{
Rules: c.Rules,
}
return response, nil
}
func (c *MockEventBridge) PutRule(*eventbridge.PutRuleInput) (*eventbridge.PutRuleOutput, error) {
panic("Not implemented")
}
func (c *MockEventBridge) PutTargets(*eventbridge.PutTargetsInput) (*eventbridge.PutTargetsOutput, error) {
panic("Not implemented")
}

12
cloudmock/aws/mocksqs/BUILD.bazel generated Normal file
View File

@ -0,0 +1,12 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["api.go"],
importpath = "k8s.io/kops/cloudmock/aws/mocksqs",
visibility = ["//visibility:public"],
deps = [
"//vendor/github.com/aws/aws-sdk-go/service/sqs:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/sqs/sqsiface:go_default_library",
],
)

View File

@ -0,0 +1,52 @@
/*
Copyright 2019 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
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.
*/
package mocksqs
import (
"github.com/aws/aws-sdk-go/service/sqs"
"github.com/aws/aws-sdk-go/service/sqs/sqsiface"
"sync"
)
type MockSQS struct {
sqsiface.SQSAPI
mutex sync.Mutex
QueueUrls []*string
}
var _ sqsiface.SQSAPI = &MockSQS{}
func (c *MockSQS) DeleteQueue(*sqs.DeleteQueueInput) (*sqs.DeleteQueueOutput, error) {
panic("Not implemented")
}
func (c *MockSQS) ListQueues(*sqs.ListQueuesInput) (*sqs.ListQueuesOutput, error) {
response := &sqs.ListQueuesOutput{
QueueUrls: c.QueueUrls,
}
return response, nil
}
func (c *MockSQS) ListQueueTags(*sqs.ListQueueTagsInput) (*sqs.ListQueueTagsOutput, error) {
panic("Not implemented")
}
func (c *MockSQS) CreateQueue(*sqs.CreateQueueInput) (*sqs.CreateQueueOutput,error) {
panic("Not implemented")
}

View File

@ -9,6 +9,7 @@ go_library(
"context.go",
"dns.go",
"external_access.go",
"nodeterminationhandler.go",
"oidc_provider.go",
"spotinst.go",
],
@ -26,6 +27,7 @@ go_library(
"//upup/pkg/fi/cloudup/awsup:go_default_library",
"//upup/pkg/fi/cloudup/spotinsttasks:go_default_library",
"//upup/pkg/fi/fitasks:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library",
"//vendor/gopkg.in/square/go-jose.v2:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",

View File

@ -6,10 +6,12 @@ go_library(
"aws.go",
"elasticip.go",
"errors.go",
"eventbridge.go",
"filters.go",
"natgateway.go",
"routetable.go",
"securitygroup.go",
"sqs.go",
"subnet.go",
"tags.go",
"vpc.go",
@ -19,6 +21,7 @@ go_library(
deps = [
"//pkg/dns:go_default_library",
"//pkg/featureflag:go_default_library",
"//pkg/model:go_default_library",
"//pkg/resources:go_default_library",
"//pkg/resources/spotinst:go_default_library",
"//upup/pkg/fi:go_default_library",
@ -29,8 +32,10 @@ go_library(
"//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/elb:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/elbv2:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/eventbridge:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/iam:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/route53:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/sqs:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
],

View File

@ -17,6 +17,7 @@ go_library(
"//cloudmock/aws/mockelbv2:go_default_library",
"//cloudmock/aws/mockiam:go_default_library",
"//cloudmock/aws/mockroute53:go_default_library",
"//cloudmock/aws/mocksqs:go_default_library",
"//cloudmock/openstack/mockblockstorage:go_default_library",
"//cloudmock/openstack/mockcompute:go_default_library",
"//cloudmock/openstack/mockdns:go_default_library",

View File

@ -18,6 +18,8 @@ package testutils
import (
"io/ioutil"
"k8s.io/kops/cloudmock/aws/mockeventbridge"
"k8s.io/kops/cloudmock/aws/mocksqs"
"os"
"path"
"path/filepath"
@ -140,6 +142,10 @@ func (h *IntegrationTestHarness) SetupMockAWS() *awsup.MockAWSCloud {
cloud.MockIAM = mockIAM
mockAutoscaling := &mockautoscaling.MockAutoscaling{}
cloud.MockAutoscaling = mockAutoscaling
mockSQS := &mocksqs.MockSQS{}
cloud.MockSQS = mockSQS
mockEventBridge := &mockeventbridge.MockEventBridge{}
cloud.MockEventBridge = mockEventBridge
mockRoute53.MockCreateZone(&route53.HostedZone{
Id: aws.String("/hostedzone/Z1AFAKE1ZON3YO"),

View File

@ -6,7 +6,7 @@ go_library(
"autoscalinggroup.go",
"autoscalinggroup_fitask.go",
"autoscalinggroup_lifecyclehook.go",
"autoscalinggroup_lifecyclehook_fitask.go",
"autoscalinglifecyclehook_fitask.go",
"block_device_mappings.go",
"classic_load_balancer.go",
"classic_loadbalancer_attributes.go",
@ -103,8 +103,10 @@ go_library(
"//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/elb:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/elbv2:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/eventbridge:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/iam:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/route53:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/sqs:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
],

View File

@ -45,10 +45,14 @@ go_library(
"//vendor/github.com/aws/aws-sdk-go/service/elb/elbiface:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/elbv2:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/elbv2/elbv2iface:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/eventbridge:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/eventbridge/eventbridgeiface:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/iam:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/iam/iamiface:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/route53:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/route53/route53iface:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/sqs:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/sqs/sqsiface:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/sts:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",

View File

@ -275,7 +275,7 @@ func (c *MockAWSCloud) SQS() sqsiface.SQSAPI {
func (c *MockAWSCloud) EventBridge() eventbridgeiface.EventBridgeAPI {
if c.MockEventBridge == nil {
klog.Fatalf("MockSQS not set")
klog.Fatalf("MockEventBridgess not set")
}
return c.MockEventBridge
}

View File

@ -0,0 +1,24 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = [
"api.go",
"doc.go",
"errors.go",
"service.go",
],
importmap = "k8s.io/kops/vendor/github.com/aws/aws-sdk-go/service/eventbridge",
importpath = "github.com/aws/aws-sdk-go/service/eventbridge",
visibility = ["//visibility:public"],
deps = [
"//vendor/github.com/aws/aws-sdk-go/aws:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/awsutil:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/client:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/client/metadata:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/request:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/signer/v4:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/private/protocol:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc:go_default_library",
],
)

View File

@ -0,0 +1,14 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["interface.go"],
importmap = "k8s.io/kops/vendor/github.com/aws/aws-sdk-go/service/eventbridge/eventbridgeiface",
importpath = "github.com/aws/aws-sdk-go/service/eventbridge/eventbridgeiface",
visibility = ["//visibility:public"],
deps = [
"//vendor/github.com/aws/aws-sdk-go/aws:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/request:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/eventbridge:go_default_library",
],
)

View File

@ -0,0 +1,27 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = [
"api.go",
"checksums.go",
"customizations.go",
"doc.go",
"errors.go",
"service.go",
],
importmap = "k8s.io/kops/vendor/github.com/aws/aws-sdk-go/service/sqs",
importpath = "github.com/aws/aws-sdk-go/service/sqs",
visibility = ["//visibility:public"],
deps = [
"//vendor/github.com/aws/aws-sdk-go/aws:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/awserr:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/awsutil:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/client:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/client/metadata:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/request:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/signer/v4:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/private/protocol:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/private/protocol/query:go_default_library",
],
)

View File

@ -0,0 +1,14 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["interface.go"],
importmap = "k8s.io/kops/vendor/github.com/aws/aws-sdk-go/service/sqs/sqsiface",
importpath = "github.com/aws/aws-sdk-go/service/sqs/sqsiface",
visibility = ["//visibility:public"],
deps = [
"//vendor/github.com/aws/aws-sdk-go/aws:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/request:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/sqs:go_default_library",
],
)