From 971ef4f1980dabadbd5094b00e46e5ff3294bf05 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Thu, 15 Mar 2018 19:49:24 -0700
Subject: [PATCH] issuer/route53: remove unused integ test

I'm convinced this test was never run and also did not provide any
significant value in this project.
---
 .../dns/route53/route53_integration_test.go   | 70 -------------------
 pkg/issuer/acme/dns/route53/route53_test.go   |  6 +-
 2 files changed, 3 insertions(+), 73 deletions(-)
 delete mode 100644 pkg/issuer/acme/dns/route53/route53_integration_test.go

diff --git a/pkg/issuer/acme/dns/route53/route53_integration_test.go b/pkg/issuer/acme/dns/route53/route53_integration_test.go
deleted file mode 100644
index 0861b0f7c..000000000
--- a/pkg/issuer/acme/dns/route53/route53_integration_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package route53
-
-import (
-	"fmt"
-	"os"
-	"testing"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/route53"
-)
-
-func TestRoute53TTL(t *testing.T) {
-
-	m, err := testGetAndPreCheck()
-	if err != nil {
-		t.Skip(err.Error())
-	}
-
-	provider, err := NewDNSProviderAccessKey("", "", "", "")
-	if err != nil {
-		t.Fatalf("Fatal: %s", err.Error())
-	}
-
-	err = provider.Present(m["route53Domain"], "foo", "bar")
-	if err != nil {
-		t.Fatalf("Fatal: %s", err.Error())
-	}
-	// we need a separate R53 client here as the one in the DNS provider is
-	// unexported.
-	fqdn := "_acme-challenge." + m["route53Domain"] + "."
-	svc := route53.New(session.New())
-	zoneID, err := provider.getHostedZoneID(fqdn)
-	if err != nil {
-		provider.CleanUp(m["route53Domain"], "foo", "bar")
-		t.Fatalf("Fatal: %s", err.Error())
-	}
-	params := &route53.ListResourceRecordSetsInput{
-		HostedZoneId: aws.String(zoneID),
-	}
-	resp, err := svc.ListResourceRecordSets(params)
-	if err != nil {
-		provider.CleanUp(m["route53Domain"], "foo", "bar")
-		t.Fatalf("Fatal: %s", err.Error())
-	}
-
-	for _, v := range resp.ResourceRecordSets {
-		if *v.Name == fqdn && *v.Type == "TXT" && *v.TTL == 10 {
-			provider.CleanUp(m["route53Domain"], "foo", "bar")
-			return
-		}
-	}
-	provider.CleanUp(m["route53Domain"], "foo", "bar")
-	t.Fatalf("Could not find a TXT record for _acme-challenge.%s with a TTL of 10", m["route53Domain"])
-}
-
-func testGetAndPreCheck() (map[string]string, error) {
-	m := map[string]string{
-		"route53Key":    os.Getenv("AWS_ACCESS_KEY_ID"),
-		"route53Secret": os.Getenv("AWS_SECRET_ACCESS_KEY"),
-		"route53Region": os.Getenv("AWS_REGION"),
-		"route53Domain": os.Getenv("R53_DOMAIN"),
-	}
-	for _, v := range m {
-		if v == "" {
-			return nil, fmt.Errorf("AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION, and R53_DOMAIN are needed to run this test")
-		}
-	}
-	return m, nil
-}
diff --git a/pkg/issuer/acme/dns/route53/route53_test.go b/pkg/issuer/acme/dns/route53/route53_test.go
index 4f56c7dca..fec83a7db 100644
--- a/pkg/issuer/acme/dns/route53/route53_test.go
+++ b/pkg/issuer/acme/dns/route53/route53_test.go
@@ -49,7 +49,7 @@ func TestAmbientCredentialsFromEnv(t *testing.T) {
 	os.Setenv("AWS_REGION", "us-east-1")
 	defer restoreRoute53Env()
 
-	provider, err := NewDNSProviderAmbient("", "", "", "")
+	provider, err := NewDNSProvider("", "", "", "", true)
 	assert.NoError(t, err, "Expected no error constructing DNSProvider")
 
 	_, err = provider.client.Config.Credentials.Get()
@@ -62,7 +62,7 @@ func TestNoCredentialsFromEnv(t *testing.T) {
 	os.Setenv("AWS_REGION", "us-east-1")
 	defer restoreRoute53Env()
 
-	_, err := NewDNSProviderAccessKey("", "", "", "")
+	_, err := NewDNSProvider("", "", "", "", false)
 	assert.Error(t, err, "Expected error constructing DNSProvider with no credentials and not ambient")
 }
 
@@ -70,7 +70,7 @@ func TestAmbientRegionFromEnv(t *testing.T) {
 	os.Setenv("AWS_REGION", "us-east-1")
 	defer restoreRoute53Env()
 
-	provider, err := NewDNSProviderAmbient("", "", "", "")
+	provider, err := NewDNSProvider("", "", "", "", true)
 	assert.NoError(t, err, "Expected no error constructing DNSProvider")
 
 	assert.Equal(t, "us-east-1", *provider.client.Config.Region, "Expected Region to be set from environment")