Skip to content

Commit

Permalink
Update to use rr.Redirect.Protocol
Browse files Browse the repository at this point in the history
Signed-off-by: jack1902 <39212456+jack1902@users.noreply.github.com>
  • Loading branch information
jack1902 committed May 5, 2021
1 parent 1da2a69 commit 23a2d11
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions pkg/controller/s3/bucket/websiteConfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,18 +147,16 @@ func GenerateWebsiteConfiguration(config *v1beta1.WebsiteConfiguration) *awss3.W
if config.RoutingRules != nil {
wi.RoutingRules = make([]awss3.RoutingRule, len(config.RoutingRules))
for i, rule := range config.RoutingRules {
redirect := &awss3.Redirect{
HostName: rule.Redirect.HostName,
HttpRedirectCode: rule.Redirect.HTTPRedirectCode,
ReplaceKeyPrefixWith: rule.Redirect.ReplaceKeyPrefixWith,
ReplaceKeyWith: rule.Redirect.ReplaceKeyWith,
rr := awss3.RoutingRule{
Redirect: &awss3.Redirect{
HostName: rule.Redirect.HostName,
HttpRedirectCode: rule.Redirect.HTTPRedirectCode,
ReplaceKeyPrefixWith: rule.Redirect.ReplaceKeyPrefixWith,
ReplaceKeyWith: rule.Redirect.ReplaceKeyWith,
},
}

if rule.Redirect.Protocol != "" {
redirect.Protocol = awss3.Protocol(rule.Redirect.Protocol)
}
rr := awss3.RoutingRule{
Redirect: redirect,
rr.Redirect.Protocol = awss3.Protocol(rule.Redirect.Protocol)
}
if rule.Condition != nil {
rr.Condition = &awss3.Condition{
Expand Down

0 comments on commit 23a2d11

Please sign in to comment.