diff --git a/plugins/wasm-go/extensions/cache-control/VERSION b/plugins/wasm-go/extensions/cache-control/VERSION index afaf360d3..be0aef560 100644 --- a/plugins/wasm-go/extensions/cache-control/VERSION +++ b/plugins/wasm-go/extensions/cache-control/VERSION @@ -1 +1 @@ -1.0.0 \ No newline at end of file +1.0.0-alpha \ No newline at end of file diff --git a/plugins/wasm-go/extensions/cache-control/main.go b/plugins/wasm-go/extensions/cache-control/main.go index c598e4fa5..7cc651c6d 100644 --- a/plugins/wasm-go/extensions/cache-control/main.go +++ b/plugins/wasm-go/extensions/cache-control/main.go @@ -74,7 +74,7 @@ func onHttpResponseHeaders(ctx wrapper.HttpContext, config CacheControlConfig, l if hit { if config.expires == "max" { proxywasm.AddHttpResponseHeader("Expires", "Thu, 31 Dec 2037 23:55:55 GMT") - proxywasm.AddHttpResponseHeader("Cache-Control", "maxAge=315360000") + proxywasm.AddHttpResponseHeader("Cache-Control", "max-age=315360000") } else if config.expires == "epoch" { proxywasm.AddHttpResponseHeader("Expires", "Thu, 01 Jan 1970 00:00:01 GMT") proxywasm.AddHttpResponseHeader("Cache-Control", "no-cache") @@ -83,7 +83,7 @@ func onHttpResponseHeaders(ctx wrapper.HttpContext, config CacheControlConfig, l currentTime := time.Now() expireTime := currentTime.Add(time.Duration(maxAge) * time.Second) proxywasm.AddHttpResponseHeader("Expires", expireTime.UTC().Format(http.TimeFormat)) - proxywasm.AddHttpResponseHeader("Cache-Control", "maxAge="+strconv.FormatInt(maxAge, 10)) + proxywasm.AddHttpResponseHeader("Cache-Control", "max-age="+strconv.FormatInt(maxAge, 10)) } } return types.ActionContinue diff --git a/plugins/wasm-go/extensions/cache-control/main_test.go b/plugins/wasm-go/extensions/cache-control/main_test.go index a0c1c96ea..c0335e2c1 100644 --- a/plugins/wasm-go/extensions/cache-control/main_test.go +++ b/plugins/wasm-go/extensions/cache-control/main_test.go @@ -234,7 +234,7 @@ func TestOnHttpResponseHeaders(t *testing.T) { // 验证是否添加了缓存控制头 responseHeaders := host.GetResponseHeaders() require.True(t, test.HasHeader(responseHeaders, "expires")) - require.True(t, test.HasHeaderWithValue(responseHeaders, "cache-control", "maxAge=3600")) + require.True(t, test.HasHeaderWithValue(responseHeaders, "cache-control", "max-age=3600")) host.CompleteHttp() }) @@ -264,7 +264,7 @@ func TestOnHttpResponseHeaders(t *testing.T) { // 验证是否添加了缓存控制头 responseHeaders := host.GetResponseHeaders() require.True(t, test.HasHeader(responseHeaders, "expires")) - require.True(t, test.HasHeaderWithValue(responseHeaders, "cache-control", "maxAge=315360000")) + require.True(t, test.HasHeaderWithValue(responseHeaders, "cache-control", "max-age=315360000")) host.CompleteHttp() }) @@ -354,7 +354,7 @@ func TestOnHttpResponseHeaders(t *testing.T) { // 验证是否添加了缓存控制头 responseHeaders := host.GetResponseHeaders() require.True(t, test.HasHeader(responseHeaders, "expires")) - require.True(t, test.HasHeaderWithValue(responseHeaders, "cache-control", "maxAge=7200")) + require.True(t, test.HasHeaderWithValue(responseHeaders, "cache-control", "max-age=7200")) host.CompleteHttp() }) @@ -384,7 +384,7 @@ func TestOnHttpResponseHeaders(t *testing.T) { // 验证是否添加了缓存控制头 responseHeaders := host.GetResponseHeaders() require.True(t, test.HasHeader(responseHeaders, "expires")) - require.True(t, test.HasHeaderWithValue(responseHeaders, "cache-control", "maxAge=1800")) + require.True(t, test.HasHeaderWithValue(responseHeaders, "cache-control", "max-age=1800")) host.CompleteHttp() }) @@ -414,7 +414,7 @@ func TestOnHttpResponseHeaders(t *testing.T) { // 验证是否添加了缓存控制头 responseHeaders := host.GetResponseHeaders() require.True(t, test.HasHeader(responseHeaders, "expires")) - require.True(t, test.HasHeaderWithValue(responseHeaders, "cache-control", "maxAge=3600")) + require.True(t, test.HasHeaderWithValue(responseHeaders, "cache-control", "max-age=3600")) host.CompleteHttp() }) @@ -452,7 +452,7 @@ func TestCompleteFlow(t *testing.T) { // 验证是否添加了必要的缓存控制响应头 require.True(t, test.HasHeader(responseHeaders, "expires")) - require.True(t, test.HasHeaderWithValue(responseHeaders, "cache-control", "maxAge=3600")) + require.True(t, test.HasHeaderWithValue(responseHeaders, "cache-control", "max-age=3600")) host.CompleteHttp() }) diff --git a/test/e2e/conformance/tests/go-wasm-cache-control.go b/test/e2e/conformance/tests/go-wasm-cache-control.go index 68f58b68a..b44246903 100644 --- a/test/e2e/conformance/tests/go-wasm-cache-control.go +++ b/test/e2e/conformance/tests/go-wasm-cache-control.go @@ -49,7 +49,7 @@ var WasmPluginCacheControl = suite.ConformanceTest{ ExpectedResponse: http.Response{ StatusCode: 200, Headers: map[string]string{ - "Cache-Control": "maxAge=3600", + "Cache-Control": "max-age=3600", }, }, }, diff --git a/test/e2e/conformance/tests/go-wasm-cache-control.yaml b/test/e2e/conformance/tests/go-wasm-cache-control.yaml index 4a5b3c536..434519c3c 100644 --- a/test/e2e/conformance/tests/go-wasm-cache-control.yaml +++ b/test/e2e/conformance/tests/go-wasm-cache-control.yaml @@ -45,4 +45,4 @@ spec: configDisable: false ingress: - higress-conformance-infra/wasmplugin-cache-control - url: oci://higress-registry.cn-hangzhou.cr.aliyuncs.com/plugins/cache-control:2.0.0 + url: file:///opt/plugins/wasm-go/extensions/cache-control/plugin.wasm