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

fix disableOnEtagHeader can't work in configmap gzip envoyfiler #731

Merged
merged 1 commit into from
Dec 25, 2023
Merged

fix disableOnEtagHeader can't work in configmap gzip envoyfiler #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions pkg/ingress/kube/configmap/gzip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
package configmap

import (
"encoding/json"
"errors"
"fmt"
"reflect"
Expand Down Expand Up @@ -130,12 +129,17 @@ func compareGzip(old *Gzip, new *Gzip) (Result, error) {

func deepCopyGzip(gzip *Gzip) (*Gzip, error) {
newGzip := NewDefaultGzip()
bytes, err := json.Marshal(gzip)
if err != nil {
return nil, err
}
err = json.Unmarshal(bytes, newGzip)
return newGzip, err
newGzip.Enable = gzip.Enable
newGzip.MinContentLength = gzip.MinContentLength
newGzip.ContentType = make([]string, 0, len(gzip.ContentType))
newGzip.ContentType = append(newGzip.ContentType, gzip.ContentType...)
newGzip.DisableOnEtagHeader = gzip.DisableOnEtagHeader
newGzip.MemoryLevel = gzip.MemoryLevel
newGzip.WindowBits = gzip.WindowBits
newGzip.ChunkSize = gzip.ChunkSize
newGzip.CompressionLevel = gzip.CompressionLevel
newGzip.CompressionStrategy = gzip.CompressionStrategy
return newGzip, nil
}

func NewDefaultGzip() *Gzip {
Expand Down Expand Up @@ -305,9 +309,9 @@ func (g *GzipController) constructGzipStruct(gzip *Gzip, namespace string) strin
"response_direction_config": {
"common_config": {
"min_content_length": %d,
"content_type": [%s],
"disable_on_etag_header": %t
}
"content_type": [%s]
},
"disable_on_etag_header": %t
},
"request_direction_config": {
"common_config": {
Expand Down
51 changes: 39 additions & 12 deletions pkg/ingress/kube/configmap/gzip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,27 +277,54 @@ func Test_deepCopyGzip(t *testing.T) {
wantErr error
}{
{
name: "deep copy",
name: "deep copy case 1",
gzip: &Gzip{
Enable: false,
MinContentLength: 1024,
ContentType: []string{"text/html", "text/css", "text/plain", "text/xml", "application/json", "application/javascript", "application/xhtml+xml", "image/svg+xml"},
DisableOnEtagHeader: true,
MemoryLevel: 5,
WindowBits: 12,
MinContentLength: 102,
ContentType: []string{"text/css", "text/plain", "text/xml", "application/json", "application/javascript", "application/xhtml+xml", "image/svg+xml"},
DisableOnEtagHeader: false,
MemoryLevel: 6,
WindowBits: 11,
ChunkSize: 4096,
CompressionLevel: "BEST_COMPRESSION",
CompressionLevel: "BEST_SPEED",
CompressionStrategy: "DEFAULT_STRATEGY",
},
wantGzip: &Gzip{
Enable: false,
MinContentLength: 1024,
ContentType: []string{"text/html", "text/css", "text/plain", "text/xml", "application/json", "application/javascript", "application/xhtml+xml", "image/svg+xml"},
MinContentLength: 102,
ContentType: []string{"text/css", "text/plain", "text/xml", "application/json", "application/javascript", "application/xhtml+xml", "image/svg+xml"},
DisableOnEtagHeader: false,
MemoryLevel: 6,
WindowBits: 11,
ChunkSize: 4096,
CompressionLevel: "BEST_SPEED",
CompressionStrategy: "DEFAULT_STRATEGY",
},
wantErr: nil,
},

{
name: "deep copy case 2",
gzip: &Gzip{
Enable: true,
MinContentLength: 102,
ContentType: []string{"text/css", "text/plain", "text/xml", "application/json", "application/javascript", "application/xhtml+xml", "image/svg+xml"},
DisableOnEtagHeader: true,
MemoryLevel: 5,
WindowBits: 12,
MemoryLevel: 6,
WindowBits: 11,
ChunkSize: 4096,
CompressionLevel: "BEST_COMPRESSION",
CompressionLevel: "BEST_SPEED",
CompressionStrategy: "DEFAULT_STRATEGY",
},
wantGzip: &Gzip{
Enable: true,
MinContentLength: 102,
ContentType: []string{"text/css", "text/plain", "text/xml", "application/json", "application/javascript", "application/xhtml+xml", "image/svg+xml"},
DisableOnEtagHeader: true,
MemoryLevel: 6,
WindowBits: 11,
ChunkSize: 4096,
CompressionLevel: "BEST_SPEED",
CompressionStrategy: "DEFAULT_STRATEGY",
},
wantErr: nil,
Expand Down
Loading