Remove deprecated tests to drop dependencies

Author: enxebre

Makefile

@@ -92,28 +92,6 @@ check-pkg:
 unit: # Run unit test
 	$(DOCKER_CMD) go test -race -cover ./cmd/... ./pkg/...
 
-.PHONY: integration
-integration: ## Run integration test
-	$(DOCKER_CMD) go test -v sigs.k8s.io/cluster-api-provider-aws/test/integration
-
-.PHONY: build-e2e
-build-e2e:
-	go test -c -o bin/e2e.test sigs.k8s.io/cluster-api-provider-aws/test/machines
-
-.PHONY: k8s-e2e
-k8s-e2e: ## Run k8s specific e2e test
-	# KUBECONFIG and SSH_PK dirs needs to be mounted inside a container if tests are run in containers
-	go test -timeout 30m \
-		-v sigs.k8s.io/cluster-api-provider-aws/test/machines \
-		-kubeconfig $${KUBECONFIG:-~/.kube/config} \
-		-ssh-key $${SSH_PK:-~/.ssh/id_rsa} \
-		-machine-controller-image $${ACTUATOR_IMAGE:-gcr.io/k8s-cluster-api/aws-machine-controller:0.0.1} \
-		-machine-manager-image $${ACTUATOR_IMAGE:-gcr.io/k8s-cluster-api/aws-machine-controller:0.0.1} \
-		-nodelink-controller-image $$(docker run registry.svc.ci.openshift.org/origin/release:4.2 image machine-api-operator) \
-		-cluster-id $${ENVIRONMENT_ID:-""} \
-		-ginkgo.v \
-		-args -v 5 -logtostderr true
-
 .PHONY: test-e2e
 test-e2e: ## Run e2e tests
 	hack/e2e.sh

pkg/actuators/machine/stubs.go

@@ -2,21 +2,20 @@ package machine
 
 import (
 	"fmt"
+	"os"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/elbv2"
-
-	apiv1 "k8s.io/api/core/v1"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	clusterv1 "github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1"
 	machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	machinecontroller "github.com/openshift/cluster-api/pkg/controller/machine"
+	apiv1 "k8s.io/api/core/v1"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	providerconfigv1 "sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1"
-	"sigs.k8s.io/cluster-api-provider-aws/test/utils"
+	awsclient "sigs.k8s.io/cluster-api-provider-aws/pkg/client"
 )
 
 const (
@@ -159,7 +158,21 @@ func stubUserDataSecret() *corev1.Secret {
 }
 
 func stubAwsCredentialsSecret() *corev1.Secret {
-	return utils.GenerateAwsCredentialsSecretFromEnv(awsCredentialsSecretName, defaultNamespace)
+	return GenerateAwsCredentialsSecretFromEnv(awsCredentialsSecretName, defaultNamespace)
+}
+
+// GenerateAwsCredentialsSecretFromEnv generates secret with AWS credentials
+func GenerateAwsCredentialsSecretFromEnv(secretName, namespace string) *apiv1.Secret {
+	return &apiv1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      secretName,
+			Namespace: namespace,
+		},
+		Data: map[string][]byte{
+			awsclient.AwsCredsSecretIDKey:     []byte(os.Getenv("AWS_ACCESS_KEY_ID")),
+			awsclient.AwsCredsSecretAccessKey: []byte(os.Getenv("AWS_SECRET_ACCESS_KEY")),
+		},
+	}
 }
 
 func stubInstance(imageID, instanceID string) *ec2.Instance {