diff --git a/Makefile b/Makefile index 8908d71cc..194ae9a0b 100644 --- a/Makefile +++ b/Makefile @@ -24,9 +24,9 @@ CRD_DOCS_OUTPUT ?= docs/crd/api.md export KUBECONFIG = /tmp/$(KIND_NAME).kubeconfig # go -VERSYM="github.com/api7/api7-ingress-controller/internal/version._buildVersion" -GITSHASYM="github.com/api7/api7-ingress-controller/internal/version._buildGitRevision" -BUILDOSSYM="github.com/api7/api7-ingress-controller/internal/version._buildOS" +VERSYM="github.com/apache/apisix-ingress-controller/internal/version._buildVersion" +GITSHASYM="github.com/apache/apisix-ingress-controller/internal/version._buildGitRevision" +BUILDOSSYM="github.com/apache/apisix-ingress-controller/internal/version._buildOS" GO_LDFLAGS ?= "-X=$(VERSYM)=$(VERSION) -X=$(GITSHASYM)=$(GITSHA) -X=$(BUILDOSSYM)=$(OSNAME)/$(OSARCH)" # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) diff --git a/PROJECT b/PROJECT index 4685bcc24..aa974e1b4 100644 --- a/PROJECT +++ b/PROJECT @@ -6,7 +6,7 @@ domain: github.com layout: - go.kubebuilder.io/v4 projectName: apisix-ingress-controller -repo: github.com/api7/api7-ingress-controller +repo: github.com/apache/apisix-ingress-controller resources: - api: crdVersion: v1 @@ -15,7 +15,7 @@ resources: domain: github.com group: apisix.apache.org kind: Guestbook - path: github.com/api7/api7-ingress-controller/api/v1alpha1 + path: github.com/apache/apisix-ingress-controller/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -24,7 +24,7 @@ resources: domain: github.com group: apisix.apache.org kind: GatewayProxy - path: github.com/api7/api7-ingress-controller/api/v1alpha1 + path: github.com/apache/apisix-ingress-controller/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -32,6 +32,6 @@ resources: domain: github.com group: apisix.apache.org kind: HTTPRoutePolicy - path: github.com/api7/api7-ingress-controller/api/v1alpha1 + path: github.com/apache/apisix-ingress-controller/api/v1alpha1 version: v1alpha1 version: "3" diff --git a/cmd/main.go b/cmd/main.go index bad97a189..b376988cb 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -15,7 +15,7 @@ package main import ( "github.com/spf13/cobra" - "github.com/api7/api7-ingress-controller/cmd/root" + "github.com/apache/apisix-ingress-controller/cmd/root" ) func main() { diff --git a/cmd/root/root.go b/cmd/root/root.go index a6cad996e..7d6ade457 100644 --- a/cmd/root/root.go +++ b/cmd/root/root.go @@ -30,9 +30,9 @@ import ( // +kubebuilder:scaffold:imports - "github.com/api7/api7-ingress-controller/internal/controller/config" - "github.com/api7/api7-ingress-controller/internal/manager" - "github.com/api7/api7-ingress-controller/internal/version" + "github.com/apache/apisix-ingress-controller/internal/controller/config" + "github.com/apache/apisix-ingress-controller/internal/manager" + "github.com/apache/apisix-ingress-controller/internal/version" "github.com/api7/gopkg/pkg/log" ) diff --git a/go.mod b/go.mod index ed1aa1419..7dc11b838 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/api7/api7-ingress-controller +module github.com/apache/apisix-ingress-controller go 1.22.0 @@ -6,7 +6,6 @@ toolchain go1.22.5 require ( github.com/Masterminds/sprig/v3 v3.2.3 - github.com/apache/apisix-ingress-controller v1.8.2 github.com/api7/gopkg v0.2.1-0.20230601092738-0f3730f9b57a github.com/gavv/httpexpect v2.0.0+incompatible github.com/gavv/httpexpect/v2 v2.16.0 diff --git a/go.sum b/go.sum index bf3046984..7f56c1c04 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,14 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= @@ -15,14 +18,17 @@ github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy86 github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= +github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0= github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM= github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= +github.com/Microsoft/hcsshim v0.11.7/go.mod h1:MV8xMfmECjl5HdO7U/3/hFVnkmSBjAjmA09d4bExKcU= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 h1:ZBbLwSJqkHBuFDA6DUhhse0IGJ7T5bemHyNILUjvOq4= @@ -80,6 +86,7 @@ github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaD github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= github.com/containerd/containerd v1.7.15 h1:afEHXdil9iAm03BmhjzKyXnnEBtjaLJefdU7DV0IFes= github.com/containerd/containerd v1.7.15/go.mod h1:ISzRRTMF8EXNpJlTzyr2XMhN+j9K302C21/+cr3kUnY= +github.com/containerd/containerd v1.7.24/go.mod h1:7QUzfURqZWCZV7RLNEn1XjUCQLEf0bkaK4GjUaZehxw= github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM= github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= @@ -97,6 +104,7 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/cyphar/filepath-securejoin v0.3.6/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI= github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -106,6 +114,7 @@ github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 h1:aB github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2/go.mod h1:WHNsWjnIn2V1LYOrME7e8KxSeKunYHsxEm4am0BUtcI= github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v25.0.1+incompatible h1:mFpqnrS6Hsm3v1k7Wa/BO23oz0k121MTbTO1lpcGSkU= github.com/docker/cli v25.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= @@ -132,6 +141,7 @@ github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0 github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= +github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc= github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 h1:DddqAaWDpywytcG8w/qoQ5sAN8X12d3Z3koB0C3Rxsc= github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= @@ -183,6 +193,7 @@ github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXS github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= @@ -221,6 +232,7 @@ github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= github.com/google/cel-go v0.20.1 h1:nDx9r8S3L4pE61eDdt8igGj8rf5kjYR3ILxWIpWNi84= github.com/google/cel-go v0.20.1/go.mod h1:kWcIzTsPX0zmQ+H3TirHstLLf9ep5QTsZBN9u4dOYLg= +github.com/google/cel-go v0.22.0/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -241,6 +253,7 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k= github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -258,6 +271,7 @@ github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY= github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= github.com/gruntwork-io/go-commons v0.8.0 h1:k/yypwrPqSeYHevLlEDmvmgQzcyTwrlZGRaxEM6G0ro= @@ -288,6 +302,7 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= +github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= @@ -307,6 +322,7 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= +github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -366,6 +382,7 @@ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 h1:ofNAzWCcyTALn2Zv40+8XitdzCgXY6e9qvXwN9W0YXg= github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= @@ -386,6 +403,7 @@ github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/spdystream v0.4.0 h1:Vy79D6mHeJJjiPdFEL2yku1kl0chZpJfZcPpb16BRl8= github.com/moby/spdystream v0.4.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= +github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= @@ -410,8 +428,10 @@ github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo/v2 v2.20.0 h1:PE84V2mHqoT1sglvHc8ZdQtPcwmvvt29WLEEO3xmdZw= github.com/onsi/ginkgo/v2 v2.20.0/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= +github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= +github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= @@ -463,6 +483,7 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rubenv/sql-migrate v1.5.2 h1:bMDqOnrJVV/6JQgQ/MxOpU+AdO8uzYYA/TxFUBzFtS0= github.com/rubenv/sql-migrate v1.5.2/go.mod h1:H38GW8Vqf8F0Su5XignRyaRcbXbJunSWxs+kmzlg0Is= +github.com/rubenv/sql-migrate v1.7.1/go.mod h1:Ob2Psprc0/3ggbM6wCzyYVFFuc6FyZrb2AS+ezLDFb4= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -476,6 +497,7 @@ github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NF github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -489,12 +511,14 @@ github.com/sony/sonyflake v1.1.0/go.mod h1:LORtCywH/cq10ZbyfhKrHYgAUGH7mOBa76enV github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= +github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -510,9 +534,11 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tailscale/depaware v0.0.0-20210622194025-720c4b409502/go.mod h1:p9lPsd+cx33L3H9nNoecRRxPssFKUwwI50I3pZ0yT+8= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= @@ -554,10 +580,13 @@ github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= go.etcd.io/etcd/api/v3 v3.5.15 h1:3KpLJir1ZEBrYuV2v+Twaa/e2MdDCEZ/70H+lzEiwsk= go.etcd.io/etcd/api/v3 v3.5.15/go.mod h1:N9EhGzXq58WuMllgH9ZvnEr7SI9pS0k0+DHZezGp7jM= +go.etcd.io/etcd/api/v3 v3.5.16/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28= go.etcd.io/etcd/client/pkg/v3 v3.5.15 h1:fo0HpWz/KlHGMCC+YejpiCmyWDEuIpnTDzpJLB5fWlA= go.etcd.io/etcd/client/pkg/v3 v3.5.15/go.mod h1:mXDI4NAOwEiszrHCb0aqfAYNCrZP4e9hRca3d1YK8EU= +go.etcd.io/etcd/client/pkg/v3 v3.5.16/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E= go.etcd.io/etcd/client/v3 v3.5.15 h1:23M0eY4Fd/inNv1ZfU3AxrbbOdW79r9V9Rl62Nm6ip4= go.etcd.io/etcd/client/v3 v3.5.15/go.mod h1:CLSJxrYjvLtHsrPKsy7LmZEE+DK2ktfd2bN4RhBMwlU= +go.etcd.io/etcd/client/v3 v3.5.16/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= @@ -600,6 +629,7 @@ golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= @@ -612,6 +642,7 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -630,9 +661,12 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -642,6 +676,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -669,6 +704,7 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -676,6 +712,7 @@ golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -683,8 +720,10 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -698,6 +737,7 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -711,8 +751,10 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 h1:+rdxYoE3E5htTEWIe15GlN6IfvbURM//Jt0mmkmm6ZU= google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117/go.mod h1:OimBR/bc1wPO9iV4NC2bpyjy3VnAwZh5EBPQdtaE5oo= +google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -730,6 +772,7 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -761,30 +804,41 @@ gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= helm.sh/helm/v3 v3.15.4 h1:UFHd6oZ1IN3FsUZ7XNhOQDyQ2QYknBNWRHH57e9cbHY= helm.sh/helm/v3 v3.15.4/go.mod h1:phOwlxqGSgppCY/ysWBNRhG3MtnpsttOzxaTK+Mt40E= +helm.sh/helm/v3 v3.17.3/go.mod h1:+uJKMH/UiMzZQOALR3XUf3BLIoczI2RKKD6bMhPh4G8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= +k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y= k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40= k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ= +k8s.io/apiextensions-apiserver v0.32.2/go.mod h1:GPwf8sph7YlJT3H6aKUWtd0E+oyShk/YHWQHf/OOgCA= k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= k8s.io/apiserver v0.31.1 h1:Sars5ejQDCRBY5f7R3QFHdqN3s61nhkpaX8/k1iEw1c= k8s.io/apiserver v0.31.1/go.mod h1:lzDhpeToamVZJmmFlaLwdYZwd7zB+WYRYIboqA1kGxM= +k8s.io/apiserver v0.32.2/go.mod h1:PEwREHiHNU2oFdte7BjzA1ZyjWjuckORLIK/wLV5goM= k8s.io/cli-runtime v0.30.3 h1:aG69oRzJuP2Q4o8dm+f5WJIX4ZBEwrvdID0+MXyUY6k= k8s.io/cli-runtime v0.30.3/go.mod h1:hwrrRdd9P84CXSKzhHxrOivAR9BRnkMt0OeP5mj7X30= +k8s.io/cli-runtime v0.32.2/go.mod h1:a/JpeMztz3xDa7GCyyShcwe55p8pbcCVQxvqZnIwXN8= k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= +k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94= k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8= k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w= +k8s.io/component-base v0.32.2/go.mod h1:PXJ61Vx9Lg+P5mS8TLd7bCIr+eMJRQTyXe8KvkrvJq0= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f h1:0LQagt0gDpKqvIkAMPaRGcXawNMouPECM1+F9BVxEaM= k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f/go.mod h1:S9tOR0FxgyusSNR+MboCuiDpVWkAifZvaYI1Q2ubgro= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= k8s.io/kubectl v0.30.3 h1:YIBBvMdTW0xcDpmrOBzcpUVsn+zOgjMYIu7kAq+yqiI= k8s.io/kubectl v0.30.3/go.mod h1:IcR0I9RN2+zzTRUa1BzZCm4oM0NLOawE6RzlDvd1Fpo= +k8s.io/kubectl v0.32.2/go.mod h1:+h/NQFSPxiDZYX/WZaWw9fwYezGLISP0ud8nQKg+3g8= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= moul.io/http2curl/v2 v2.3.0 h1:9r3JfDzWPcbIklMOs2TnIFzDYvfAZvjeavG6EzP7jYs= moul.io/http2curl/v2 v2.3.0/go.mod h1:RW4hyBjTWSYDOxapodpNEtX0g5Eb16sxklBqmd2RHcE= oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo= @@ -792,17 +846,22 @@ oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q= sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= sigs.k8s.io/gateway-api v1.2.0 h1:LrToiFwtqKTKZcZtoQPTuo3FxhrrhTgzQG0Te+YGSo8= sigs.k8s.io/gateway-api v1.2.0/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= sigs.k8s.io/kustomize/api v0.17.2 h1:E7/Fjk7V5fboiuijoZHgs4aHuexi5Y2loXlVOAVAG5g= sigs.k8s.io/kustomize/api v0.17.2/go.mod h1:UWTz9Ct+MvoeQsHcJ5e+vziRRkwimm3HytpZgIYqye0= +sigs.k8s.io/kustomize/api v0.18.0/go.mod h1:f8isXnX+8b+SGLHQ6yO4JG1rdkZlvhaCf/uZbLVMb0U= sigs.k8s.io/kustomize/kyaml v0.17.1 h1:TnxYQxFXzbmNG6gOINgGWQt09GghzgTP6mIurOgrLCQ= sigs.k8s.io/kustomize/kyaml v0.17.1/go.mod h1:9V0mCjIEYjlXuCdYsSXvyoy2BTsLESH7TlGV81S282U= +sigs.k8s.io/kustomize/kyaml v0.18.1/go.mod h1:C3L2BFVU1jgcddNBE1TxuVLgS46TjObMwW5FT9FcjYo= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/internal/controller/config/config.go b/internal/controller/config/config.go index bf4efbbde..e0543bb4e 100644 --- a/internal/controller/config/config.go +++ b/internal/controller/config/config.go @@ -23,7 +23,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/api7/api7-ingress-controller/internal/types" + "github.com/apache/apisix-ingress-controller/internal/types" ) var ( diff --git a/internal/controller/config/types.go b/internal/controller/config/types.go index d0a0c5821..9a55629da 100644 --- a/internal/controller/config/types.go +++ b/internal/controller/config/types.go @@ -13,7 +13,7 @@ package config import ( - "github.com/api7/api7-ingress-controller/internal/types" + "github.com/apache/apisix-ingress-controller/internal/types" ) const ( diff --git a/internal/controller/consumer_controller.go b/internal/controller/consumer_controller.go index 51377f3f3..ae5fbd222 100644 --- a/internal/controller/consumer_controller.go +++ b/internal/controller/consumer_controller.go @@ -30,9 +30,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/api7/api7-ingress-controller/api/v1alpha1" - "github.com/api7/api7-ingress-controller/internal/controller/indexer" - "github.com/api7/api7-ingress-controller/internal/provider" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/internal/controller/indexer" + "github.com/apache/apisix-ingress-controller/internal/provider" ) // ConsumerReconciler reconciles a Gateway object. diff --git a/internal/controller/gateway_controller.go b/internal/controller/gateway_controller.go index ed0cc7e71..77e9f10b4 100644 --- a/internal/controller/gateway_controller.go +++ b/internal/controller/gateway_controller.go @@ -32,9 +32,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/api7/api7-ingress-controller/api/v1alpha1" - "github.com/api7/api7-ingress-controller/internal/controller/indexer" - "github.com/api7/api7-ingress-controller/internal/provider" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/internal/controller/indexer" + "github.com/apache/apisix-ingress-controller/internal/provider" ) // GatewayReconciler reconciles a Gateway object. diff --git a/internal/controller/gatewayclass_congroller.go b/internal/controller/gatewayclass_congroller.go index b1d8d25cb..0b5f0a3ed 100644 --- a/internal/controller/gatewayclass_congroller.go +++ b/internal/controller/gatewayclass_congroller.go @@ -28,8 +28,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/api7/api7-ingress-controller/internal/controller/config" - "github.com/api7/api7-ingress-controller/internal/controller/indexer" + "github.com/apache/apisix-ingress-controller/internal/controller/config" + "github.com/apache/apisix-ingress-controller/internal/controller/indexer" ) const ( diff --git a/internal/controller/httproute_controller.go b/internal/controller/httproute_controller.go index 93ef4b870..61c904948 100644 --- a/internal/controller/httproute_controller.go +++ b/internal/controller/httproute_controller.go @@ -37,9 +37,9 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/api7/api7-ingress-controller/api/v1alpha1" - "github.com/api7/api7-ingress-controller/internal/controller/indexer" - "github.com/api7/api7-ingress-controller/internal/provider" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/internal/controller/indexer" + "github.com/apache/apisix-ingress-controller/internal/provider" ) // HTTPRouteReconciler reconciles a GatewayClass object. diff --git a/internal/controller/httproutepolicy.go b/internal/controller/httproutepolicy.go index a3bf3c44d..9dd688354 100644 --- a/internal/controller/httproutepolicy.go +++ b/internal/controller/httproutepolicy.go @@ -25,9 +25,9 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/api7/api7-ingress-controller/api/v1alpha1" - "github.com/api7/api7-ingress-controller/internal/controller/indexer" - "github.com/api7/api7-ingress-controller/internal/provider" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/internal/controller/indexer" + "github.com/apache/apisix-ingress-controller/internal/provider" ) func (r *HTTPRouteReconciler) processHTTPRoutePolicies(tctx *provider.TranslateContext, httpRoute *gatewayv1.HTTPRoute) error { diff --git a/internal/controller/indexer/indexer.go b/internal/controller/indexer/indexer.go index 475efedb7..d53f36150 100644 --- a/internal/controller/indexer/indexer.go +++ b/internal/controller/indexer/indexer.go @@ -22,7 +22,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/api7/api7-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" ) const ( diff --git a/internal/controller/ingress_controller.go b/internal/controller/ingress_controller.go index 41ec239ba..10368eaa0 100644 --- a/internal/controller/ingress_controller.go +++ b/internal/controller/ingress_controller.go @@ -38,10 +38,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/api7/api7-ingress-controller/api/v1alpha1" - "github.com/api7/api7-ingress-controller/internal/controller/config" - "github.com/api7/api7-ingress-controller/internal/controller/indexer" - "github.com/api7/api7-ingress-controller/internal/provider" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/internal/controller/config" + "github.com/apache/apisix-ingress-controller/internal/controller/indexer" + "github.com/apache/apisix-ingress-controller/internal/provider" ) // IngressReconciler reconciles a Ingress object. diff --git a/internal/controller/ingressclass_controller.go b/internal/controller/ingressclass_controller.go index 08f23bd50..6fd9e6682 100644 --- a/internal/controller/ingressclass_controller.go +++ b/internal/controller/ingressclass_controller.go @@ -29,9 +29,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/api7/api7-ingress-controller/api/v1alpha1" - "github.com/api7/api7-ingress-controller/internal/controller/indexer" - "github.com/api7/api7-ingress-controller/internal/provider" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/internal/controller/indexer" + "github.com/apache/apisix-ingress-controller/internal/provider" ) // IngressClassReconciler reconciles a IngressClass object. diff --git a/internal/controller/label/label.go b/internal/controller/label/label.go index 25c30aa06..16ae5a3b9 100644 --- a/internal/controller/label/label.go +++ b/internal/controller/label/label.go @@ -15,7 +15,7 @@ package label import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/api7/api7-ingress-controller/internal/controller/config" + "github.com/apache/apisix-ingress-controller/internal/controller/config" ) type Label map[string]string diff --git a/internal/controller/policies.go b/internal/controller/policies.go index 2ac022636..66387f297 100644 --- a/internal/controller/policies.go +++ b/internal/controller/policies.go @@ -27,10 +27,10 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/api7/api7-ingress-controller/api/v1alpha1" - "github.com/api7/api7-ingress-controller/internal/controller/config" - "github.com/api7/api7-ingress-controller/internal/controller/indexer" - "github.com/api7/api7-ingress-controller/internal/provider" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/internal/controller/config" + "github.com/apache/apisix-ingress-controller/internal/controller/indexer" + "github.com/apache/apisix-ingress-controller/internal/provider" ) type PolicyTargetKey struct { diff --git a/internal/controller/status.go b/internal/controller/status.go index b77e8546c..21c576d73 100644 --- a/internal/controller/status.go +++ b/internal/controller/status.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/api7/api7-ingress-controller/internal/provider" + "github.com/apache/apisix-ingress-controller/internal/provider" ) const ( diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go index 2e1c54be8..489629690 100644 --- a/internal/controller/suite_test.go +++ b/internal/controller/suite_test.go @@ -27,7 +27,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - gatewayapisixiov1alpha1 "github.com/api7/api7-ingress-controller/api/v1alpha1" + gatewayapisixiov1alpha1 "github.com/apache/apisix-ingress-controller/api/v1alpha1" ) // These tests use Ginkgo (BDD-style Go testing framework). Refer to diff --git a/internal/controller/utils.go b/internal/controller/utils.go index b342b6388..43e97debb 100644 --- a/internal/controller/utils.go +++ b/internal/controller/utils.go @@ -31,9 +31,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/api7/api7-ingress-controller/api/v1alpha1" - "github.com/api7/api7-ingress-controller/internal/controller/config" - "github.com/api7/api7-ingress-controller/internal/provider" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/internal/controller/config" + "github.com/apache/apisix-ingress-controller/internal/provider" ) const ( diff --git a/internal/manager/controllers.go b/internal/manager/controllers.go index b6ef17b1c..398e7b3b2 100644 --- a/internal/manager/controllers.go +++ b/internal/manager/controllers.go @@ -18,9 +18,9 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/api7/api7-ingress-controller/internal/controller" - "github.com/api7/api7-ingress-controller/internal/controller/indexer" - "github.com/api7/api7-ingress-controller/internal/provider" + "github.com/apache/apisix-ingress-controller/internal/controller" + "github.com/apache/apisix-ingress-controller/internal/controller/indexer" + "github.com/apache/apisix-ingress-controller/internal/provider" ) // K8s diff --git a/internal/manager/run.go b/internal/manager/run.go index 8a592192d..769cd4f83 100644 --- a/internal/manager/run.go +++ b/internal/manager/run.go @@ -30,9 +30,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/api7/api7-ingress-controller/api/v1alpha1" - "github.com/api7/api7-ingress-controller/internal/controller/config" - "github.com/api7/api7-ingress-controller/internal/provider/adc" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/internal/controller/config" + "github.com/apache/apisix-ingress-controller/internal/provider/adc" ) var ( diff --git a/internal/provider/adc/adc.go b/internal/provider/adc/adc.go index ea6ea6092..aa1b3f6f5 100644 --- a/internal/provider/adc/adc.go +++ b/internal/provider/adc/adc.go @@ -28,12 +28,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - adctypes "github.com/api7/api7-ingress-controller/api/adc" - "github.com/api7/api7-ingress-controller/api/v1alpha1" - "github.com/api7/api7-ingress-controller/internal/controller/config" - "github.com/api7/api7-ingress-controller/internal/controller/label" - "github.com/api7/api7-ingress-controller/internal/provider" - "github.com/api7/api7-ingress-controller/internal/provider/adc/translator" + adctypes "github.com/apache/apisix-ingress-controller/api/adc" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/internal/controller/config" + "github.com/apache/apisix-ingress-controller/internal/controller/label" + "github.com/apache/apisix-ingress-controller/internal/provider" + "github.com/apache/apisix-ingress-controller/internal/provider/adc/translator" ) type adcConfig struct { diff --git a/internal/provider/adc/cache/cache.go b/internal/provider/adc/cache/cache.go index edfbf4ad9..7f133b150 100644 --- a/internal/provider/adc/cache/cache.go +++ b/internal/provider/adc/cache/cache.go @@ -13,7 +13,7 @@ package cache import ( - types "github.com/api7/api7-ingress-controller/api/adc" + types "github.com/apache/apisix-ingress-controller/api/adc" ) type Cache interface { diff --git a/internal/provider/adc/cache/indexer.go b/internal/provider/adc/cache/indexer.go index dc530e61f..c64210b40 100644 --- a/internal/provider/adc/cache/indexer.go +++ b/internal/provider/adc/cache/indexer.go @@ -16,8 +16,8 @@ import ( "fmt" "strings" - "github.com/api7/api7-ingress-controller/api/adc" - "github.com/api7/api7-ingress-controller/internal/controller/label" + "github.com/apache/apisix-ingress-controller/api/adc" + "github.com/apache/apisix-ingress-controller/internal/controller/label" ) const ( diff --git a/internal/provider/adc/cache/memdb.go b/internal/provider/adc/cache/memdb.go index f18b9e51d..5819bf74f 100644 --- a/internal/provider/adc/cache/memdb.go +++ b/internal/provider/adc/cache/memdb.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/go-memdb" "go.uber.org/zap" - types "github.com/api7/api7-ingress-controller/api/adc" + types "github.com/apache/apisix-ingress-controller/api/adc" ) var ( diff --git a/internal/provider/adc/cache/noop_db.go b/internal/provider/adc/cache/noop_db.go index 8636b0d7a..298653a3b 100644 --- a/internal/provider/adc/cache/noop_db.go +++ b/internal/provider/adc/cache/noop_db.go @@ -13,7 +13,7 @@ package cache import ( - types "github.com/api7/api7-ingress-controller/api/adc" + types "github.com/apache/apisix-ingress-controller/api/adc" ) type noopCache struct { diff --git a/internal/provider/adc/config.go b/internal/provider/adc/config.go index 049ff4d82..6c56d2f03 100644 --- a/internal/provider/adc/config.go +++ b/internal/provider/adc/config.go @@ -20,8 +20,8 @@ import ( "go.uber.org/zap" "k8s.io/apimachinery/pkg/types" - "github.com/api7/api7-ingress-controller/api/v1alpha1" - "github.com/api7/api7-ingress-controller/internal/provider" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/internal/provider" ) func (d *adcClient) getConfigsForGatewayProxy(tctx *provider.TranslateContext, gatewayProxy *v1alpha1.GatewayProxy) (*adcConfig, error) { diff --git a/internal/provider/adc/store.go b/internal/provider/adc/store.go index 57694a6ac..a9dfab884 100644 --- a/internal/provider/adc/store.go +++ b/internal/provider/adc/store.go @@ -17,9 +17,9 @@ import ( "github.com/api7/gopkg/pkg/log" - adctypes "github.com/api7/api7-ingress-controller/api/adc" - "github.com/api7/api7-ingress-controller/internal/controller/label" - "github.com/api7/api7-ingress-controller/internal/provider/adc/cache" + adctypes "github.com/apache/apisix-ingress-controller/api/adc" + "github.com/apache/apisix-ingress-controller/internal/controller/label" + "github.com/apache/apisix-ingress-controller/internal/provider/adc/cache" ) type Store struct { diff --git a/internal/provider/adc/translator/consumer.go b/internal/provider/adc/translator/consumer.go index 8eff5b9b9..2b5cb9641 100644 --- a/internal/provider/adc/translator/consumer.go +++ b/internal/provider/adc/translator/consumer.go @@ -17,9 +17,9 @@ import ( "k8s.io/apimachinery/pkg/types" - adctypes "github.com/api7/api7-ingress-controller/api/adc" - "github.com/api7/api7-ingress-controller/api/v1alpha1" - "github.com/api7/api7-ingress-controller/internal/provider" + adctypes "github.com/apache/apisix-ingress-controller/api/adc" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/internal/provider" ) func (t *Translator) TranslateConsumerV1alpha1(tctx *provider.TranslateContext, consumerV *v1alpha1.Consumer) (*TranslateResult, error) { diff --git a/internal/provider/adc/translator/gateway.go b/internal/provider/adc/translator/gateway.go index 355aef94a..8d4225e10 100644 --- a/internal/provider/adc/translator/gateway.go +++ b/internal/provider/adc/translator/gateway.go @@ -25,11 +25,11 @@ import ( "k8s.io/apimachinery/pkg/types" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - adctypes "github.com/api7/api7-ingress-controller/api/adc" - "github.com/api7/api7-ingress-controller/api/v1alpha1" - "github.com/api7/api7-ingress-controller/internal/controller/label" - "github.com/api7/api7-ingress-controller/internal/id" - "github.com/api7/api7-ingress-controller/internal/provider" + adctypes "github.com/apache/apisix-ingress-controller/api/adc" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/internal/controller/label" + "github.com/apache/apisix-ingress-controller/internal/id" + "github.com/apache/apisix-ingress-controller/internal/provider" ) func (t *Translator) TranslateGateway(tctx *provider.TranslateContext, obj *gatewayv1.Gateway) (*TranslateResult, error) { diff --git a/internal/provider/adc/translator/httproute.go b/internal/provider/adc/translator/httproute.go index bef514332..7e86c2b0c 100644 --- a/internal/provider/adc/translator/httproute.go +++ b/internal/provider/adc/translator/httproute.go @@ -26,11 +26,11 @@ import ( "k8s.io/utils/ptr" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - adctypes "github.com/api7/api7-ingress-controller/api/adc" - "github.com/api7/api7-ingress-controller/api/v1alpha1" - "github.com/api7/api7-ingress-controller/internal/controller/label" - "github.com/api7/api7-ingress-controller/internal/id" - "github.com/api7/api7-ingress-controller/internal/provider" + adctypes "github.com/apache/apisix-ingress-controller/api/adc" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/internal/controller/label" + "github.com/apache/apisix-ingress-controller/internal/id" + "github.com/apache/apisix-ingress-controller/internal/provider" ) func (t *Translator) fillPluginsFromHTTPRouteFilters( diff --git a/internal/provider/adc/translator/ingress.go b/internal/provider/adc/translator/ingress.go index 82a0a5af8..bfb82595f 100644 --- a/internal/provider/adc/translator/ingress.go +++ b/internal/provider/adc/translator/ingress.go @@ -21,10 +21,10 @@ import ( networkingv1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/types" - adctypes "github.com/api7/api7-ingress-controller/api/adc" - "github.com/api7/api7-ingress-controller/internal/controller/label" - "github.com/api7/api7-ingress-controller/internal/id" - "github.com/api7/api7-ingress-controller/internal/provider" + adctypes "github.com/apache/apisix-ingress-controller/api/adc" + "github.com/apache/apisix-ingress-controller/internal/controller/label" + "github.com/apache/apisix-ingress-controller/internal/id" + "github.com/apache/apisix-ingress-controller/internal/provider" ) func (t *Translator) translateIngressTLS(ingressTLS *networkingv1.IngressTLS, secret *corev1.Secret, labels map[string]string) (*adctypes.SSL, error) { diff --git a/internal/provider/adc/translator/ingressclass.go b/internal/provider/adc/translator/ingressclass.go index 8f1fd38d1..8c2416408 100644 --- a/internal/provider/adc/translator/ingressclass.go +++ b/internal/provider/adc/translator/ingressclass.go @@ -17,8 +17,8 @@ import ( "go.uber.org/zap" networkingv1 "k8s.io/api/networking/v1" - adctypes "github.com/api7/api7-ingress-controller/api/adc" - "github.com/api7/api7-ingress-controller/internal/provider" + adctypes "github.com/apache/apisix-ingress-controller/api/adc" + "github.com/apache/apisix-ingress-controller/internal/provider" ) func (t *Translator) TranslateIngressClass(tctx *provider.TranslateContext, obj *networkingv1.IngressClass) (*TranslateResult, error) { diff --git a/internal/provider/adc/translator/policies.go b/internal/provider/adc/translator/policies.go index 788d35519..bf08bdd61 100644 --- a/internal/provider/adc/translator/policies.go +++ b/internal/provider/adc/translator/policies.go @@ -17,8 +17,8 @@ import ( "k8s.io/utils/ptr" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - adctypes "github.com/api7/api7-ingress-controller/api/adc" - "github.com/api7/api7-ingress-controller/api/v1alpha1" + adctypes "github.com/apache/apisix-ingress-controller/api/adc" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" ) func convertBackendRef(namespace, name, kind string) gatewayv1.BackendRef { diff --git a/internal/provider/adc/translator/translator.go b/internal/provider/adc/translator/translator.go index a00b63c20..4257dd562 100644 --- a/internal/provider/adc/translator/translator.go +++ b/internal/provider/adc/translator/translator.go @@ -15,7 +15,7 @@ package translator import ( "github.com/go-logr/logr" - adctypes "github.com/api7/api7-ingress-controller/api/adc" + adctypes "github.com/apache/apisix-ingress-controller/api/adc" ) type Translator struct { diff --git a/internal/provider/controlplane/controlplane.go b/internal/provider/controlplane/controlplane.go index 0704429b8..16d9f36aa 100644 --- a/internal/provider/controlplane/controlplane.go +++ b/internal/provider/controlplane/controlplane.go @@ -20,10 +20,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/api7/api7-ingress-controller/internal/controller/config" - "github.com/api7/api7-ingress-controller/internal/provider" - "github.com/api7/api7-ingress-controller/internal/provider/controlplane/translator" - "github.com/api7/api7-ingress-controller/pkg/dashboard" + "github.com/apache/apisix-ingress-controller/internal/controller/config" + "github.com/apache/apisix-ingress-controller/internal/provider" + "github.com/apache/apisix-ingress-controller/internal/provider/controlplane/translator" + "github.com/apache/apisix-ingress-controller/pkg/dashboard" ) type dashboardProvider struct { diff --git a/internal/provider/controlplane/translator/gateway.go b/internal/provider/controlplane/translator/gateway.go index d00a8f614..7aed6acd9 100644 --- a/internal/provider/controlplane/translator/gateway.go +++ b/internal/provider/controlplane/translator/gateway.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/types" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" - "github.com/api7/api7-ingress-controller/internal/controller/label" - "github.com/api7/api7-ingress-controller/internal/id" - "github.com/api7/api7-ingress-controller/internal/provider" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" + "github.com/apache/apisix-ingress-controller/internal/controller/label" + "github.com/apache/apisix-ingress-controller/internal/id" + "github.com/apache/apisix-ingress-controller/internal/provider" ) func (t *Translator) TranslateGateway(tctx *provider.TranslateContext, obj *gatewayv1.Gateway) (*TranslateResult, error) { diff --git a/internal/provider/controlplane/translator/httproute.go b/internal/provider/controlplane/translator/httproute.go index a31436751..80d4e4d54 100644 --- a/internal/provider/controlplane/translator/httproute.go +++ b/internal/provider/controlplane/translator/httproute.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/types" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" - "github.com/api7/api7-ingress-controller/internal/controller/label" - "github.com/api7/api7-ingress-controller/internal/id" - "github.com/api7/api7-ingress-controller/internal/provider" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" + "github.com/apache/apisix-ingress-controller/internal/controller/label" + "github.com/apache/apisix-ingress-controller/internal/id" + "github.com/apache/apisix-ingress-controller/internal/provider" ) func (t *Translator) fillPluginsFromHTTPRouteFilters( diff --git a/internal/provider/controlplane/translator/translator.go b/internal/provider/controlplane/translator/translator.go index 877a0b3c6..31bb67167 100644 --- a/internal/provider/controlplane/translator/translator.go +++ b/internal/provider/controlplane/translator/translator.go @@ -19,8 +19,8 @@ import ( "k8s.io/apimachinery/pkg/types" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" - "github.com/api7/api7-ingress-controller/api/v1alpha1" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" ) type Translator struct { diff --git a/internal/provider/provider.go b/internal/provider/provider.go index 562fbe9d6..8cff0ca11 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -21,7 +21,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/api7/api7-ingress-controller/api/v1alpha1" + "github.com/apache/apisix-ingress-controller/api/v1alpha1" ) type Provider interface { diff --git a/pkg/dashboard/cache/cache.go b/pkg/dashboard/cache/cache.go index 83870e136..b34786d4b 100644 --- a/pkg/dashboard/cache/cache.go +++ b/pkg/dashboard/cache/cache.go @@ -12,7 +12,7 @@ package cache -import v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" +import v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" // Cache defines the necessary behaviors that the cache object should have. // Note this interface is for APISIX, not for generic purpose, it supports diff --git a/pkg/dashboard/cache/memdb.go b/pkg/dashboard/cache/memdb.go index 8b1beec3e..34ce7a111 100644 --- a/pkg/dashboard/cache/memdb.go +++ b/pkg/dashboard/cache/memdb.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/go-memdb" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" ) var ( diff --git a/pkg/dashboard/cache/memdb_test.go b/pkg/dashboard/cache/memdb_test.go index 40a22271c..a4c86252e 100644 --- a/pkg/dashboard/cache/memdb_test.go +++ b/pkg/dashboard/cache/memdb_test.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/go-memdb" "github.com/stretchr/testify/assert" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" ) func TestMemDBCacheRoute(t *testing.T) { diff --git a/pkg/dashboard/cache/noop_db.go b/pkg/dashboard/cache/noop_db.go index 135ff6715..b0bbb7dad 100644 --- a/pkg/dashboard/cache/noop_db.go +++ b/pkg/dashboard/cache/noop_db.go @@ -13,7 +13,7 @@ package cache import ( - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" ) type noopCache struct { diff --git a/pkg/dashboard/cache/schema.go b/pkg/dashboard/cache/schema.go index 71aef15d4..0d8eb75a3 100644 --- a/pkg/dashboard/cache/schema.go +++ b/pkg/dashboard/cache/schema.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/go-memdb" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" ) var ( diff --git a/pkg/dashboard/cluster.go b/pkg/dashboard/cluster.go index f0507ff0a..50dea4ab2 100644 --- a/pkg/dashboard/cluster.go +++ b/pkg/dashboard/cluster.go @@ -32,8 +32,8 @@ import ( "go.uber.org/zap" "k8s.io/apimachinery/pkg/util/wait" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" - "github.com/api7/api7-ingress-controller/pkg/dashboard/cache" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" + "github.com/apache/apisix-ingress-controller/pkg/dashboard/cache" ) const ( diff --git a/pkg/dashboard/consumer.go b/pkg/dashboard/consumer.go index 5c64b696c..254cae2d9 100644 --- a/pkg/dashboard/consumer.go +++ b/pkg/dashboard/consumer.go @@ -16,12 +16,12 @@ import ( "context" "encoding/json" - "github.com/apache/apisix-ingress-controller/pkg/id" "github.com/api7/gopkg/pkg/log" "go.uber.org/zap" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" - "github.com/api7/api7-ingress-controller/pkg/dashboard/cache" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" + "github.com/apache/apisix-ingress-controller/pkg/dashboard/cache" + "github.com/apache/apisix-ingress-controller/pkg/id" ) type consumerClient struct { diff --git a/pkg/dashboard/consumer_test.go b/pkg/dashboard/consumer_test.go index cb40adff1..d068525ab 100644 --- a/pkg/dashboard/consumer_test.go +++ b/pkg/dashboard/consumer_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/net/nettest" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" ) type fakeAPISIXConsumerSrv struct { diff --git a/pkg/dashboard/dashboard.go b/pkg/dashboard/dashboard.go index 65eb8fde3..7baa26268 100644 --- a/pkg/dashboard/dashboard.go +++ b/pkg/dashboard/dashboard.go @@ -16,7 +16,7 @@ import ( "context" "sync" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" ) type Dashboard interface { diff --git a/pkg/dashboard/global_rule.go b/pkg/dashboard/global_rule.go index dec757b34..04d58550d 100644 --- a/pkg/dashboard/global_rule.go +++ b/pkg/dashboard/global_rule.go @@ -20,8 +20,8 @@ import ( "github.com/api7/gopkg/pkg/log" "go.uber.org/zap" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" - "github.com/api7/api7-ingress-controller/pkg/dashboard/cache" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" + "github.com/apache/apisix-ingress-controller/pkg/dashboard/cache" ) type globalRuleClient struct { diff --git a/pkg/dashboard/nonexistentclient.go b/pkg/dashboard/nonexistentclient.go index 22af5e104..002be24a2 100644 --- a/pkg/dashboard/nonexistentclient.go +++ b/pkg/dashboard/nonexistentclient.go @@ -15,8 +15,8 @@ package dashboard import ( "context" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" - "github.com/api7/api7-ingress-controller/pkg/dashboard/cache" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" + "github.com/apache/apisix-ingress-controller/pkg/dashboard/cache" ) type nonExistentCluster struct { diff --git a/pkg/dashboard/noop.go b/pkg/dashboard/noop.go index d69fa7854..be91ca895 100644 --- a/pkg/dashboard/noop.go +++ b/pkg/dashboard/noop.go @@ -15,7 +15,7 @@ package dashboard import ( "context" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" ) var ( diff --git a/pkg/dashboard/plugin_metadata.go b/pkg/dashboard/plugin_metadata.go index 4c79098ee..4124971f8 100644 --- a/pkg/dashboard/plugin_metadata.go +++ b/pkg/dashboard/plugin_metadata.go @@ -19,7 +19,7 @@ import ( "github.com/api7/gopkg/pkg/log" "go.uber.org/zap" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" ) type pluginMetadataClient struct { diff --git a/pkg/dashboard/pluginconfig.go b/pkg/dashboard/pluginconfig.go index 331290922..f3a8410e6 100644 --- a/pkg/dashboard/pluginconfig.go +++ b/pkg/dashboard/pluginconfig.go @@ -16,12 +16,12 @@ import ( "context" "encoding/json" - "github.com/apache/apisix-ingress-controller/pkg/id" "github.com/api7/gopkg/pkg/log" "go.uber.org/zap" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" - "github.com/api7/api7-ingress-controller/pkg/dashboard/cache" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" + "github.com/apache/apisix-ingress-controller/pkg/dashboard/cache" + "github.com/apache/apisix-ingress-controller/pkg/id" ) type pluginConfigClient struct { diff --git a/pkg/dashboard/resource.go b/pkg/dashboard/resource.go index ec3dd9488..43eb0fa46 100644 --- a/pkg/dashboard/resource.go +++ b/pkg/dashboard/resource.go @@ -17,7 +17,7 @@ import ( "strconv" "strings" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" ) type getResponse struct { diff --git a/pkg/dashboard/route.go b/pkg/dashboard/route.go index 7daa37280..cdb1cb8b0 100644 --- a/pkg/dashboard/route.go +++ b/pkg/dashboard/route.go @@ -16,12 +16,12 @@ import ( "context" "encoding/json" - "github.com/apache/apisix-ingress-controller/pkg/id" "github.com/api7/gopkg/pkg/log" "go.uber.org/zap" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" - "github.com/api7/api7-ingress-controller/pkg/dashboard/cache" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" + "github.com/apache/apisix-ingress-controller/pkg/dashboard/cache" + "github.com/apache/apisix-ingress-controller/pkg/id" ) type routeClient struct { diff --git a/pkg/dashboard/schema.go b/pkg/dashboard/schema.go index b468d5f0f..f8e85ecd5 100644 --- a/pkg/dashboard/schema.go +++ b/pkg/dashboard/schema.go @@ -16,12 +16,12 @@ import ( "context" "strings" - "github.com/apache/apisix-ingress-controller/pkg/id" "github.com/api7/gopkg/pkg/log" "go.uber.org/zap" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" - "github.com/api7/api7-ingress-controller/pkg/dashboard/cache" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" + "github.com/apache/apisix-ingress-controller/pkg/dashboard/cache" + "github.com/apache/apisix-ingress-controller/pkg/id" ) type schemaClient struct { diff --git a/pkg/dashboard/service.go b/pkg/dashboard/service.go index ad50845b5..293ccc256 100644 --- a/pkg/dashboard/service.go +++ b/pkg/dashboard/service.go @@ -16,12 +16,12 @@ import ( "context" "encoding/json" - "github.com/apache/apisix-ingress-controller/pkg/id" "github.com/api7/gopkg/pkg/log" "go.uber.org/zap" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" - "github.com/api7/api7-ingress-controller/pkg/dashboard/cache" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" + "github.com/apache/apisix-ingress-controller/pkg/dashboard/cache" + "github.com/apache/apisix-ingress-controller/pkg/id" ) type serviceClient struct { diff --git a/pkg/dashboard/ssl.go b/pkg/dashboard/ssl.go index 2a2006010..d6030fee5 100644 --- a/pkg/dashboard/ssl.go +++ b/pkg/dashboard/ssl.go @@ -16,12 +16,12 @@ import ( "context" "encoding/json" - "github.com/apache/apisix-ingress-controller/pkg/id" "github.com/api7/gopkg/pkg/log" "go.uber.org/zap" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" - "github.com/api7/api7-ingress-controller/pkg/dashboard/cache" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" + "github.com/apache/apisix-ingress-controller/pkg/dashboard/cache" + "github.com/apache/apisix-ingress-controller/pkg/id" ) type sslClient struct { diff --git a/pkg/dashboard/stream_route.go b/pkg/dashboard/stream_route.go index f79da69a6..b69623bfc 100644 --- a/pkg/dashboard/stream_route.go +++ b/pkg/dashboard/stream_route.go @@ -16,12 +16,12 @@ import ( "context" "encoding/json" - "github.com/apache/apisix-ingress-controller/pkg/id" "github.com/api7/gopkg/pkg/log" "go.uber.org/zap" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" - "github.com/api7/api7-ingress-controller/pkg/dashboard/cache" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" + "github.com/apache/apisix-ingress-controller/pkg/dashboard/cache" + "github.com/apache/apisix-ingress-controller/pkg/id" ) type streamRouteClient struct { diff --git a/pkg/dashboard/utils.go b/pkg/dashboard/utils.go index 2d62f6811..0c1605c76 100644 --- a/pkg/dashboard/utils.go +++ b/pkg/dashboard/utils.go @@ -19,7 +19,7 @@ import ( "encoding/base64" "errors" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" ) var ( diff --git a/pkg/dashboard/validator.go b/pkg/dashboard/validator.go index a114be3c9..cf1dbfc7a 100644 --- a/pkg/dashboard/validator.go +++ b/pkg/dashboard/validator.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/xeipuuv/gojsonschema" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" ) type APISIXSchema struct { diff --git a/pkg/id/idgen.go b/pkg/id/idgen.go index eb1d2bc23..bbe497c00 100644 --- a/pkg/id/idgen.go +++ b/pkg/id/idgen.go @@ -16,7 +16,7 @@ import ( "fmt" "hash/crc32" - "github.com/api7/api7-ingress-controller/pkg/utils" + "github.com/apache/apisix-ingress-controller/pkg/utils" ) // GenID generates an ID according to the raw material. diff --git a/scripts/goimports-reviser.sh b/scripts/goimports-reviser.sh index 9c2a83a91..16a5eccc1 100755 --- a/scripts/goimports-reviser.sh +++ b/scripts/goimports-reviser.sh @@ -4,7 +4,7 @@ set -e go install github.com/incu6us/goimports-reviser/v3@latest -PROJECT_NAME=github.com/api7/api7-ingress-controller +PROJECT_NAME=github.com/apache/apisix-ingress-controller find . -name '*.go' -print0 | while IFS= read -r -d '' file; do if [ "$file" != "./cmd/root/root.go" ]; then diff --git a/test/conformance/conformance_test.go b/test/conformance/conformance_test.go index 9d180893e..8382ea276 100644 --- a/test/conformance/conformance_test.go +++ b/test/conformance/conformance_test.go @@ -69,7 +69,7 @@ func TestGatewayAPIConformance(t *testing.T) { opts.Implementation = conformancev1.Implementation{ Organization: "APISIX", Project: "apisix-ingress-controller", - URL: "https://github.com/api7/api7-ingress-controller.git", + URL: "https://github.com/apache/apisix-ingress-controller.git", Version: "v2.0.0", } opts.ConformanceProfiles = sets.New(suite.GatewayHTTPConformanceProfileName) diff --git a/test/conformance/suite_test.go b/test/conformance/suite_test.go index 87e07bb9a..c692a24e1 100644 --- a/test/conformance/suite_test.go +++ b/test/conformance/suite_test.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/api7/api7-ingress-controller/test/e2e/framework" + "github.com/apache/apisix-ingress-controller/test/e2e/framework" ) var gatewayClassName = "apisix" diff --git a/test/e2e/adminapi/dashboard_api.go b/test/e2e/adminapi/dashboard_api.go index e831036fc..a937ea440 100644 --- a/test/e2e/adminapi/dashboard_api.go +++ b/test/e2e/adminapi/dashboard_api.go @@ -19,8 +19,8 @@ import ( . "github.com/onsi/ginkgo/v2" //nolint:staticcheck . "github.com/onsi/gomega" //nolint:staticcheck - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" - "github.com/api7/api7-ingress-controller/test/e2e/scaffold" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" + "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" ) var _ = PDescribe("Test Dashboard admin-api sdk", func() { diff --git a/test/e2e/crds/backendtrafficpolicy.go b/test/e2e/crds/backendtrafficpolicy.go index da3a7f4e9..9adb51ed7 100644 --- a/test/e2e/crds/backendtrafficpolicy.go +++ b/test/e2e/crds/backendtrafficpolicy.go @@ -19,8 +19,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/api7/api7-ingress-controller/test/e2e/framework" - "github.com/api7/api7-ingress-controller/test/e2e/scaffold" + "github.com/apache/apisix-ingress-controller/test/e2e/framework" + "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" ) var _ = Describe("Test BackendTrafficPolicy base on HTTPRoute", func() { diff --git a/test/e2e/crds/consumer.go b/test/e2e/crds/consumer.go index 1d0868e81..2666a0570 100644 --- a/test/e2e/crds/consumer.go +++ b/test/e2e/crds/consumer.go @@ -20,8 +20,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/api7/api7-ingress-controller/test/e2e/framework" - "github.com/api7/api7-ingress-controller/test/e2e/scaffold" + "github.com/apache/apisix-ingress-controller/test/e2e/framework" + "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" ) var _ = Describe("Test Consumer", func() { diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index ce8126d5e..6d80833c6 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -19,11 +19,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - _ "github.com/api7/api7-ingress-controller/test/e2e/adminapi" - _ "github.com/api7/api7-ingress-controller/test/e2e/crds" - "github.com/api7/api7-ingress-controller/test/e2e/framework" - _ "github.com/api7/api7-ingress-controller/test/e2e/gatewayapi" - _ "github.com/api7/api7-ingress-controller/test/e2e/ingress" + _ "github.com/apache/apisix-ingress-controller/test/e2e/adminapi" + _ "github.com/apache/apisix-ingress-controller/test/e2e/crds" + "github.com/apache/apisix-ingress-controller/test/e2e/framework" + _ "github.com/apache/apisix-ingress-controller/test/e2e/gatewayapi" + _ "github.com/apache/apisix-ingress-controller/test/e2e/ingress" ) // Run e2e tests using the Ginkgo runner. diff --git a/test/e2e/framework/dashboard.go b/test/e2e/framework/dashboard.go index 89b04b58b..d3006a6da 100644 --- a/test/e2e/framework/dashboard.go +++ b/test/e2e/framework/dashboard.go @@ -31,7 +31,7 @@ import ( "helm.sh/helm/v3/pkg/kube" "k8s.io/apimachinery/pkg/util/yaml" - v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1" + v1 "github.com/apache/apisix-ingress-controller/api/dashboard/v1" ) var ( diff --git a/test/e2e/gatewayapi/controller.go b/test/e2e/gatewayapi/controller.go index cbbb1c2d7..5ded0be5a 100644 --- a/test/e2e/gatewayapi/controller.go +++ b/test/e2e/gatewayapi/controller.go @@ -20,8 +20,8 @@ import ( . "github.com/onsi/gomega" "github.com/stretchr/testify/assert" - "github.com/api7/api7-ingress-controller/test/e2e/framework" - "github.com/api7/api7-ingress-controller/test/e2e/scaffold" + "github.com/apache/apisix-ingress-controller/test/e2e/framework" + "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" ) var _ = Describe("Check if controller cache gets synced with correct resources", func() { diff --git a/test/e2e/gatewayapi/gateway.go b/test/e2e/gatewayapi/gateway.go index dc9218741..39137eed9 100644 --- a/test/e2e/gatewayapi/gateway.go +++ b/test/e2e/gatewayapi/gateway.go @@ -22,8 +22,8 @@ import ( . "github.com/onsi/gomega" "github.com/stretchr/testify/assert" - "github.com/api7/api7-ingress-controller/test/e2e/framework" - "github.com/api7/api7-ingress-controller/test/e2e/scaffold" + "github.com/apache/apisix-ingress-controller/test/e2e/framework" + "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" ) const _secretName = "test-apisix-tls" diff --git a/test/e2e/gatewayapi/gatewayclass.go b/test/e2e/gatewayapi/gatewayclass.go index 70f2f4d0a..803fb0fa8 100644 --- a/test/e2e/gatewayapi/gatewayclass.go +++ b/test/e2e/gatewayapi/gatewayclass.go @@ -18,7 +18,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/api7/api7-ingress-controller/test/e2e/scaffold" + "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" ) var _ = Describe("Test GatewayClass", func() { diff --git a/test/e2e/gatewayapi/gatewayproxy.go b/test/e2e/gatewayapi/gatewayproxy.go index 4b5921cc9..2cbdcf977 100644 --- a/test/e2e/gatewayapi/gatewayproxy.go +++ b/test/e2e/gatewayapi/gatewayproxy.go @@ -20,8 +20,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/api7/api7-ingress-controller/test/e2e/framework" - "github.com/api7/api7-ingress-controller/test/e2e/scaffold" + "github.com/apache/apisix-ingress-controller/test/e2e/framework" + "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" ) var _ = Describe("Test GatewayProxy", func() { diff --git a/test/e2e/gatewayapi/httproute.go b/test/e2e/gatewayapi/httproute.go index 06a0a3838..7062ae9b6 100644 --- a/test/e2e/gatewayapi/httproute.go +++ b/test/e2e/gatewayapi/httproute.go @@ -24,8 +24,8 @@ import ( . "github.com/onsi/gomega" "github.com/pkg/errors" - "github.com/api7/api7-ingress-controller/test/e2e/framework" - "github.com/api7/api7-ingress-controller/test/e2e/scaffold" + "github.com/apache/apisix-ingress-controller/test/e2e/framework" + "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" ) var _ = Describe("Test HTTPRoute", func() { diff --git a/test/e2e/ingress/ingress.go b/test/e2e/ingress/ingress.go index 0eec0f723..8f571f0e1 100644 --- a/test/e2e/ingress/ingress.go +++ b/test/e2e/ingress/ingress.go @@ -24,8 +24,8 @@ import ( . "github.com/onsi/gomega" "github.com/stretchr/testify/assert" - "github.com/api7/api7-ingress-controller/test/e2e/framework" - "github.com/api7/api7-ingress-controller/test/e2e/scaffold" + "github.com/apache/apisix-ingress-controller/test/e2e/framework" + "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" ) const _secretName = "test-ingress-tls" diff --git a/test/e2e/scaffold/dp.go b/test/e2e/scaffold/dp.go index f93afc6ff..3cd39bb78 100644 --- a/test/e2e/scaffold/dp.go +++ b/test/e2e/scaffold/dp.go @@ -15,7 +15,7 @@ package scaffold import ( . "github.com/onsi/gomega" - "github.com/api7/api7-ingress-controller/test/e2e/framework" + "github.com/apache/apisix-ingress-controller/test/e2e/framework" ) func (s *Scaffold) deployDataplane() { diff --git a/test/e2e/scaffold/ingress.go b/test/e2e/scaffold/ingress.go index 4baeac550..248c0e26b 100644 --- a/test/e2e/scaffold/ingress.go +++ b/test/e2e/scaffold/ingress.go @@ -13,7 +13,7 @@ package scaffold import ( - "github.com/api7/api7-ingress-controller/test/e2e/framework" + "github.com/apache/apisix-ingress-controller/test/e2e/framework" ) func (s *Scaffold) deployIngress() { diff --git a/test/e2e/scaffold/k8s.go b/test/e2e/scaffold/k8s.go index 2e1136f04..eb29bd259 100644 --- a/test/e2e/scaffold/k8s.go +++ b/test/e2e/scaffold/k8s.go @@ -29,8 +29,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/api7/api7-ingress-controller/pkg/dashboard" - "github.com/api7/api7-ingress-controller/test/e2e/framework" + "github.com/apache/apisix-ingress-controller/pkg/dashboard" + "github.com/apache/apisix-ingress-controller/test/e2e/framework" ) // CreateResourceFromString creates resource from a loaded yaml string. diff --git a/test/e2e/scaffold/scaffold.go b/test/e2e/scaffold/scaffold.go index cad786b13..9d7f72ea3 100644 --- a/test/e2e/scaffold/scaffold.go +++ b/test/e2e/scaffold/scaffold.go @@ -35,9 +35,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - "github.com/api7/api7-ingress-controller/pkg/dashboard" - "github.com/api7/api7-ingress-controller/pkg/utils" - "github.com/api7/api7-ingress-controller/test/e2e/framework" + "github.com/apache/apisix-ingress-controller/pkg/dashboard" + "github.com/apache/apisix-ingress-controller/pkg/utils" + "github.com/apache/apisix-ingress-controller/test/e2e/framework" ) const (