From ae37efa7b7bf3e92856c9dc9796515aa1be6d792 Mon Sep 17 00:00:00 2001
From: James Munnelly <james.munnelly@jetstack.io>
Date: Thu, 7 Jun 2018 15:21:53 +0100
Subject: [PATCH] Add selfsigned issuer e2e test

---
 test/e2e/certificate/certificate_ca.go        |  2 +-
 .../e2e/certificate/certificate_selfsigned.go | 49 +++++++++++++++++++
 test/util/util.go                             | 15 +++++-
 3 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 test/e2e/certificate/certificate_selfsigned.go

diff --git a/test/e2e/certificate/certificate_ca.go b/test/e2e/certificate/certificate_ca.go
index 00afc355a..bd47a2913 100644
--- a/test/e2e/certificate/certificate_ca.go
+++ b/test/e2e/certificate/certificate_ca.go
@@ -54,7 +54,7 @@ var _ = framework.CertManagerDescribe("CA Certificate", func() {
 			})
 		Expect(err).NotTo(HaveOccurred())
 		By("Creating a Certificate")
-		cert, err := f.CertManagerClientSet.CertmanagerV1alpha1().Certificates(f.Namespace.Name).Create(util.NewCertManagerCACertificate(certificateName, certificateSecretName, issuerName, v1alpha1.IssuerKind))
+		cert, err := f.CertManagerClientSet.CertmanagerV1alpha1().Certificates(f.Namespace.Name).Create(util.NewCertManagerBasicCertificate(certificateName, certificateSecretName, issuerName, v1alpha1.IssuerKind))
 		Expect(err).NotTo(HaveOccurred())
 		f.WaitCertificateIssuedValid(cert)
 	})
diff --git a/test/e2e/certificate/certificate_selfsigned.go b/test/e2e/certificate/certificate_selfsigned.go
new file mode 100644
index 000000000..9c6cd3b82
--- /dev/null
+++ b/test/e2e/certificate/certificate_selfsigned.go
@@ -0,0 +1,49 @@
+/*
+Copyright 2017 Jetstack Ltd.
+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 certificate
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1"
+	"github.com/jetstack/cert-manager/test/e2e/framework"
+	"github.com/jetstack/cert-manager/test/util"
+)
+
+var _ = framework.CertManagerDescribe("Self Signed Certificate", func() {
+	f := framework.NewDefaultFramework("create-selfsigned-certificate")
+
+	issuerName := "test-selfsigned-issuer"
+	certificateName := "test-selfsigned-certificate"
+	certificateSecretName := "test-selfsigned-certificate"
+
+	It("should generate a signed keypair", func() {
+		By("Creating an Issuer")
+		_, err := f.CertManagerClientSet.CertmanagerV1alpha1().Issuers(f.Namespace.Name).Create(util.NewCertManagerSelfSignedIssuer(issuerName))
+		Expect(err).NotTo(HaveOccurred())
+		By("Waiting for Issuer to become Ready")
+		err = util.WaitForIssuerCondition(f.CertManagerClientSet.CertmanagerV1alpha1().Issuers(f.Namespace.Name),
+			issuerName,
+			v1alpha1.IssuerCondition{
+				Type:   v1alpha1.IssuerConditionReady,
+				Status: v1alpha1.ConditionTrue,
+			})
+		Expect(err).NotTo(HaveOccurred())
+		By("Creating a Certificate")
+		cert, err := f.CertManagerClientSet.CertmanagerV1alpha1().Certificates(f.Namespace.Name).Create(util.NewCertManagerBasicCertificate(certificateName, certificateSecretName, issuerName, v1alpha1.IssuerKind))
+		Expect(err).NotTo(HaveOccurred())
+		f.WaitCertificateIssuedValid(cert)
+	})
+})
diff --git a/test/util/util.go b/test/util/util.go
index 00bc8a131..74c3df834 100644
--- a/test/util/util.go
+++ b/test/util/util.go
@@ -242,7 +242,7 @@ func NewCertManagerCAClusterIssuer(name, secretName string) *v1alpha1.ClusterIss
 	}
 }
 
-func NewCertManagerCACertificate(name, secretName, issuerName string, issuerKind string) *v1alpha1.Certificate {
+func NewCertManagerBasicCertificate(name, secretName, issuerName string, issuerKind string) *v1alpha1.Certificate {
 	return &v1alpha1.Certificate{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: name,
@@ -376,6 +376,19 @@ func NewCertManagerCAIssuer(name, secretName string) *v1alpha1.Issuer {
 	}
 }
 
+func NewCertManagerSelfSignedIssuer(name string) *v1alpha1.Issuer {
+	return &v1alpha1.Issuer{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: name,
+		},
+		Spec: v1alpha1.IssuerSpec{
+			IssuerConfig: v1alpha1.IssuerConfig{
+				SelfSigned: &v1alpha1.SelfSignedIssuer{},
+			},
+		},
+	}
+}
+
 func NewCertManagerVaultIssuerToken(name, vaultURL, vaultPath, vaultSecretToken string) *v1alpha1.Issuer {
 	return &v1alpha1.Issuer{
 		ObjectMeta: metav1.ObjectMeta{