Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/apisix-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
if: ${{ env.ADC_VERSION == 'dev' }}
run: |
docker create --name adc-temp ghcr.io/api7/adc:dev
docker cp adc-temp:main.js adc.js
docker cp adc-temp:main.cjs adc.js
docker rm adc-temp
node $(pwd)/adc.js -v
echo "ADC_BIN=node $(pwd)/adc.js" >> $GITHUB_ENV
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
if: ${{ env.ADC_VERSION == 'dev' }}
run: |
docker create --name adc-temp ghcr.io/api7/adc:dev
docker cp adc-temp:main.js adc.js
docker cp adc-temp:main.cjs adc.js
docker rm adc-temp
node $(pwd)/adc.js -v
echo "ADC_BIN=node $(pwd)/adc.js" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/benchmark-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
if: ${{ env.ADC_VERSION == 'dev' }}
run: |
docker create --name adc-temp ghcr.io/api7/adc:dev
docker cp adc-temp:main.js adc.js
docker cp adc-temp:main.cjs adc.js
docker rm adc-temp
node $(pwd)/adc.js -v
echo "ADC_BIN=node $(pwd)/adc.js" >> $GITHUB_ENV
Expand Down
1 change: 0 additions & 1 deletion internal/adc/translator/apisixroute.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ func (t *Translator) buildRoute(ar *apiv2.ApisixRoute, service *adc.Service, rul
route.EnableWebsocket = *enableWebsocket
}
route.FilterFunc = rule.Match.FilterFunc
route.Hosts = rule.Match.Hosts
route.Methods = rule.Match.Methods
route.Plugins = plugins
route.Priority = ptr.To(int64(rule.Priority))
Expand Down
84 changes: 84 additions & 0 deletions internal/adc/translator/apisixroute_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you 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 translator

import (
"testing"

"github.com/go-logr/logr"
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

adc "github.com/apache/apisix-ingress-controller/api/adc"
apiv2 "github.com/apache/apisix-ingress-controller/api/v2"
)

func TestBuildRoute_HostsNotSet(t *testing.T) {
translator := NewTranslator(logr.Discard())

ar := &apiv2.ApisixRoute{
ObjectMeta: metav1.ObjectMeta{
Name: "test-route",
Namespace: "default",
},
}

service := &adc.Service{}
rule := apiv2.ApisixRouteHTTP{
Name: "rule1",
Match: apiv2.ApisixRouteHTTPMatch{
Hosts: []string{"example.com", "foo.com"},
Paths: []string{"/api/*"},
},
}

var enableWebsocket *bool
translator.buildRoute(ar, service, rule, nil, nil, nil, &enableWebsocket)

assert.Len(t, service.Routes, 1)
route := service.Routes[0]
// route.Hosts should NOT be set — hosts belong on Service, not Route.
// Setting hosts on Route causes false diffs in backends that don't
// support route-level hosts, triggering unnecessary PUT requests.
assert.Nil(t, route.Hosts, "route.Hosts should not be set; hosts should only be on Service")
assert.Equal(t, []string{"/api/*"}, route.Uris)
}

func TestBuildService_HostsSet(t *testing.T) {
translator := NewTranslator(logr.Discard())

ar := &apiv2.ApisixRoute{
ObjectMeta: metav1.ObjectMeta{
Name: "test-route",
Namespace: "default",
},
}

rule := apiv2.ApisixRouteHTTP{
Name: "rule1",
Match: apiv2.ApisixRouteHTTPMatch{
Hosts: []string{"example.com", "foo.com"},
Paths: []string{"/api/*"},
},
}

service := translator.buildService(ar, rule, 0)

// service.Hosts SHOULD be set — this is the canonical location for hosts.
assert.Equal(t, []string{"example.com", "foo.com"}, service.Hosts)
}
14 changes: 9 additions & 5 deletions test/e2e/crds/v2/route.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ spec:
applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"},
&apisixRoute, fmt.Sprintf(apisixRouteSpec, s.Namespace(), s.Namespace(), "/headers"))
Eventually(request).WithArguments("/get").WithTimeout(20 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusNotFound))
s.NewAPISIXClient().GET("/headers").WithHost("httpbin").Expect().Status(http.StatusOK)
Eventually(request).WithArguments("/headers").WithTimeout(20 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusOK))

By("delete ApisixRoute")
err := s.DeleteResource("ApisixRoute", "default")
Expand Down Expand Up @@ -1347,7 +1347,6 @@ spec:
&apisixRouteWithoutWS,
fmt.Sprintf(apisixRouteSpec2, s.Namespace(), s.Namespace()),
)
time.Sleep(12 * time.Second)

By("verify WebSocket connection fails without WebSocket enabled")
u := url.URL{
Expand All @@ -1356,9 +1355,14 @@ spec:
Path: "/echo",
}
headers := http.Header{"Host": []string{"httpbin.org"}}
_, resp, _ := websocket.DefaultDialer.Dial(u.String(), headers)
// should receive 200 instead of 101
Expect(resp.StatusCode).Should(Equal(http.StatusOK))
// In standalone mode, config application is async — retry until the route is active
Eventually(func() int {
_, resp, _ := websocket.DefaultDialer.Dial(u.String(), headers)
if resp == nil {
return 0
}
return resp.StatusCode
}).WithTimeout(20 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusOK))
By("apply ApisixRoute for WebSocket")
var apisixRoute apiv2.ApisixRoute
applier.MustApplyAPIv2(
Expand Down
Loading