Skip to content

Commit

Permalink
Merge pull request #3297 from aramase/forcesslredirect-e2e-test
Browse files Browse the repository at this point in the history
Add e2e test for force-ssl-redirect
  • Loading branch information
k8s-ci-robot authored Oct 26, 2018
2 parents abeb176 + 04e6f7b commit 4393f8c
Showing 1 changed file with 75 additions and 0 deletions.
75 changes: 75 additions & 0 deletions test/e2e/annotations/forcesslredirect.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/*
Copyright 2018 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 annotations

import (
"fmt"
"net/http"
"time"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/parnurzeal/gorequest"
"k8s.io/ingress-nginx/test/e2e/framework"
)

var _ = framework.IngressNginxDescribe("Annotations - Forcesslredirect", func() {
f := framework.NewDefaultFramework("forcesslredirect")

BeforeEach(func() {
err := f.NewEchoDeploymentWithReplicas(2)
Expect(err).NotTo(HaveOccurred())
})

AfterEach(func() {
})

It("should redirect to https", func() {
host := "forcesslredirect.bar.com"

annotations := map[string]string{
"nginx.ingress.kubernetes.io/force-ssl-redirect": "true",
}

ing := framework.NewSingleIngress(host, "/", host, f.IngressController.Namespace, "http-svc", 80, &annotations)
_, err := f.EnsureIngress(ing)

Expect(err).NotTo(HaveOccurred())
Expect(ing).NotTo(BeNil())

err = f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring(`if ($redirect_to_https) {`)) &&
Expect(server).Should(ContainSubstring(`return 308 https://$best_http_host$request_uri;`))
})
Expect(err).NotTo(HaveOccurred())

_, _, errs := gorequest.New().
Get(f.IngressController.HTTPURL).
Retry(10, 1*time.Second, http.StatusNotFound).
Set("Host", host).
End()

Expect(errs[0].Error()).Should(ContainSubstring(`https://forcesslredirect.bar.com/`))

log, err := f.NginxLogs()
Expect(err).ToNot(HaveOccurred())
Expect(log).ToNot(BeEmpty())

Expect(log).To(ContainSubstring(fmt.Sprintf(` "GET / HTTP/1.1" 308 171 "-" "Go-http-client/1.1"`)))
})
})

0 comments on commit 4393f8c

Please sign in to comment.