Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1828428 - Return false from GetDisableSSL if the S3 url is empty #515

Merged
merged 2 commits into from
Apr 29, 2020
Merged

Bug 1828428 - Return false from GetDisableSSL if the S3 url is empty #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
247c6e4
Return false from DisableSSL if the S3 url is empty
mansam Apr 27, 2020
7a47d33
Add a test for GetDisableSSL
mansam Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/cloudprovider/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,9 @@ func (p *AWSProvider) GetRegion() string {
// Check the scheme on the configured URL. If a URL is not specified, return
// false
func (p *AWSProvider) GetDisableSSL() bool {
if p.GetURL() == "" {
return false
}
s3Url, err := url.Parse(p.GetURL())
if err != nil {
return false
Expand Down
26 changes: 26 additions & 0 deletions pkg/cloudprovider/aws_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package cloudprovider

import (
"github.com/onsi/gomega"
"testing"
)

func TestGetDisableSSL(t *testing.T) {
g := gomega.NewGomegaWithT(t)

p := AWSProvider{S3URL: ""}
p.GetDisableSSL()
g.Expect(p.GetDisableSSL()).To(gomega.BeFalse())

p.S3URL = "https://example.com"
p.GetDisableSSL()
g.Expect(p.GetDisableSSL()).To(gomega.BeFalse())

p.S3URL = "example.com"
p.GetDisableSSL()
g.Expect(p.GetDisableSSL()).To(gomega.BeTrue())

p.S3URL = "http://example.com"
p.GetDisableSSL()
g.Expect(p.GetDisableSSL()).To(gomega.BeTrue())
}