hanzoai/ingress
2
0
Fork 0
mirror of https://github.com/hanzoai/ingress.git synced 2026-10-20 15:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: reset module path to hanzoai/ingress v1 (was v3)

Browse Source
This commit is contained in:
zeekay
2026-04-12 13:00:48 -07:00
parent 7369aa7ad8
commit 40e03ce48f
453 changed files with 1285 additions and 1285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/configuration.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"time"
ptypes "github.com/hanzoai/ingress-parser/types"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/pkg/config/static"
)
// IngressCmdConfiguration wraps the static configuration and extra parameters.
cmd/healthcheck/healthcheck.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"time"
"github.com/hanzoai/ingress-parser/cli"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/pkg/config/static"
)
// NewCmd builds a new HealthCheck command.
cmd/internal/gen/main.go
+11 -11
View File
@@ -11,7 +11,7 @@ import (
"strings"
)
const rootPkg = "github.com/hanzoai/ingress/v3/pkg/config/dynamic"
const rootPkg = "github.com/hanzoai/ingress/pkg/config/dynamic"
const (
destModuleName = "github.com/hanzoai/genconf"
@@ -57,8 +57,8 @@ func run(dest string) error {
}
centrifuge.IncludedImports = []string{
"github.com/hanzoai/ingress/v3/pkg/tls",
"github.com/hanzoai/ingress/v3/pkg/types",
"github.com/hanzoai/ingress/pkg/tls",
"github.com/hanzoai/ingress/pkg/types",
}
centrifuge.ExcludedTypes = []string{
@@ -71,8 +71,8 @@ func run(dest string) error {
}
centrifuge.ExcludedFiles = []string{
"github.com/hanzoai/ingress/v3/pkg/types/logs.go",
"github.com/hanzoai/ingress/v3/pkg/types/metrics.go",
"github.com/hanzoai/ingress/pkg/types/logs.go",
"github.com/hanzoai/ingress/pkg/types/metrics.go",
}
centrifuge.TypeCleaner = cleanType
@@ -87,11 +87,11 @@ func run(dest string) error {
}
func cleanType(typ types.Type, base string) string {
if typ.String() == "github.com/hanzoai/ingress/v3/pkg/types.FileOrContent" {
if typ.String() == "github.com/hanzoai/ingress/pkg/types.FileOrContent" {
return "string"
}
if typ.String() == "[]github.com/hanzoai/ingress/v3/pkg/types.FileOrContent" {
if typ.String() == "[]github.com/hanzoai/ingress/pkg/types.FileOrContent" {
return "[]string"
}
@@ -103,8 +103,8 @@ func cleanType(typ types.Type, base string) string {
return strings.ReplaceAll(typ.String(), base+".", "")
}
if strings.Contains(typ.String(), "github.com/hanzoai/ingress/v3/pkg/") {
return strings.ReplaceAll(typ.String(), "github.com/hanzoai/ingress/v3/pkg/", "")
if strings.Contains(typ.String(), "github.com/hanzoai/ingress/pkg/") {
return strings.ReplaceAll(typ.String(), "github.com/hanzoai/ingress/pkg/", "")
}
return typ.String()
@@ -114,9 +114,9 @@ func cleanPackage(src string) string {
switch src {
case "github.com/hanzoai/ingress-parser/types":
return ""
case "github.com/hanzoai/ingress/v3/pkg/tls":
case "github.com/hanzoai/ingress/pkg/tls":
return path.Join(destModuleName, destPkg, "tls")
case "github.com/hanzoai/ingress/v3/pkg/types":
case "github.com/hanzoai/ingress/pkg/types":
return path.Join(destModuleName, destPkg, "types")
default:
return src
cmd/traefik/logger.go
+2 -2
View File
@@ -13,8 +13,8 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/sirupsen/logrus"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/v3/pkg/observability/logs"
"github.com/hanzoai/ingress/pkg/config/static"
"github.com/hanzoai/ingress/pkg/observability/logs"
"gopkg.in/natefinch/lumberjack.v2"
)
cmd/traefik/plugins.go
+3 -3
View File
@@ -8,9 +8,9 @@ import (
"github.com/hashicorp/go-retryablehttp"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/v3/pkg/observability/logs"
"github.com/hanzoai/ingress/v3/pkg/plugins"
"github.com/hanzoai/ingress/pkg/config/static"
"github.com/hanzoai/ingress/pkg/observability/logs"
"github.com/hanzoai/ingress/pkg/plugins"
)
const outputDir = "./plugins-storage/"
cmd/traefik/traefik.go
+27 -27
View File
@@ -22,33 +22,33 @@ import (
"github.com/sirupsen/logrus"
"github.com/spiffe/go-spiffe/v2/workloadapi"
"github.com/hanzoai/ingress-parser/cli"
"github.com/hanzoai/ingress/v3/cmd"
"github.com/hanzoai/ingress/v3/cmd/healthcheck"
cmdVersion "github.com/hanzoai/ingress/v3/cmd/version"
tcli "github.com/hanzoai/ingress/v3/pkg/cli"
"github.com/hanzoai/ingress/v3/pkg/collector"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/v3/pkg/middlewares/accesslog"
"github.com/hanzoai/ingress/v3/pkg/observability/logs"
"github.com/hanzoai/ingress/v3/pkg/observability/metrics"
"github.com/hanzoai/ingress/v3/pkg/observability/tracing"
otypes "github.com/hanzoai/ingress/v3/pkg/observability/types"
"github.com/hanzoai/ingress/v3/pkg/provider/acme"
"github.com/hanzoai/ingress/v3/pkg/provider/aggregator"
"github.com/hanzoai/ingress/v3/pkg/provider/tailscale"
"github.com/hanzoai/ingress/v3/pkg/provider/builtins"
"github.com/hanzoai/ingress/v3/pkg/proxy"
"github.com/hanzoai/ingress/v3/pkg/proxy/httputil"
"github.com/hanzoai/ingress/v3/pkg/redactor"
"github.com/hanzoai/ingress/v3/pkg/safe"
"github.com/hanzoai/ingress/v3/pkg/server"
"github.com/hanzoai/ingress/v3/pkg/server/middleware"
"github.com/hanzoai/ingress/v3/pkg/server/service"
"github.com/hanzoai/ingress/v3/pkg/tcp"
ingresstls "github.com/hanzoai/ingress/v3/pkg/tls"
"github.com/hanzoai/ingress/v3/pkg/version"
"github.com/hanzoai/ingress/cmd"
"github.com/hanzoai/ingress/cmd/healthcheck"
cmdVersion "github.com/hanzoai/ingress/cmd/version"
tcli "github.com/hanzoai/ingress/pkg/cli"
"github.com/hanzoai/ingress/pkg/collector"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/static"
"github.com/hanzoai/ingress/pkg/middlewares/accesslog"
"github.com/hanzoai/ingress/pkg/observability/logs"
"github.com/hanzoai/ingress/pkg/observability/metrics"
"github.com/hanzoai/ingress/pkg/observability/tracing"
otypes "github.com/hanzoai/ingress/pkg/observability/types"
"github.com/hanzoai/ingress/pkg/provider/acme"
"github.com/hanzoai/ingress/pkg/provider/aggregator"
"github.com/hanzoai/ingress/pkg/provider/tailscale"
"github.com/hanzoai/ingress/pkg/provider/builtins"
"github.com/hanzoai/ingress/pkg/proxy"
"github.com/hanzoai/ingress/pkg/proxy/httputil"
"github.com/hanzoai/ingress/pkg/redactor"
"github.com/hanzoai/ingress/pkg/safe"
"github.com/hanzoai/ingress/pkg/server"
"github.com/hanzoai/ingress/pkg/server/middleware"
"github.com/hanzoai/ingress/pkg/server/service"
"github.com/hanzoai/ingress/pkg/tcp"
ingresstls "github.com/hanzoai/ingress/pkg/tls"
"github.com/hanzoai/ingress/pkg/version"
)
func main() {
cmd/traefik/traefik_test.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/go-kit/kit/metrics"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/pkg/config/static"
)
// FooCert is a PEM-encoded TLS cert.
cmd/version/version.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"text/template"
"github.com/hanzoai/ingress-parser/cli"
"github.com/hanzoai/ingress/v3/pkg/version"
"github.com/hanzoai/ingress/pkg/version"
)
var versionTemplate = `Version: {{.Version}}
go.mod
+1 -1
View File
@@ -1,4 +1,4 @@
module github.com/hanzoai/ingress/v3
module github.com/hanzoai/ingress
go 1.26.1
integration/access_log_test.go
+2 -2
View File
@@ -18,8 +18,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/middlewares/accesslog"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/middlewares/accesslog"
)
const (
integration/acme_test.go
+5 -5
View File
@@ -16,11 +16,11 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/v3/pkg/provider/acme"
"github.com/hanzoai/ingress/v3/pkg/testhelpers"
"github.com/hanzoai/ingress/v3/pkg/types"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/config/static"
"github.com/hanzoai/ingress/pkg/provider/acme"
"github.com/hanzoai/ingress/pkg/testhelpers"
"github.com/hanzoai/ingress/pkg/types"
"k8s.io/utils/strings/slices"
)
integration/conf_throttling_test.go
+2 -2
View File
@@ -14,8 +14,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/config/dynamic"
)
type ThrottlingSuite struct{ BaseSuite }
integration/consul_catalog_test.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
type ConsulCatalogSuite struct {
integration/consul_test.go
+2 -2
View File
@@ -18,8 +18,8 @@ import (
"github.com/pmezard/go-difflib/difflib"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/api"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/api"
)
// Consul test suites.
integration/docker_compose_test.go
+3 -3
View File
@@ -10,9 +10,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/api"
"github.com/hanzoai/ingress/v3/pkg/testhelpers"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/api"
"github.com/hanzoai/ingress/pkg/testhelpers"
)
// Docker tests suite.
integration/docker_test.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
// Docker tests suite.
integration/error_pages_test.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
// ErrorPagesSuite test suites.
integration/etcd_test.go
+2 -2
View File
@@ -16,8 +16,8 @@ import (
"github.com/pmezard/go-difflib/difflib"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/api"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/api"
)
// etcd test suites.
integration/file_test.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
// File tests suite.
integration/gateway_api_conformance_test.go
+2 -2
View File
@@ -18,8 +18,8 @@ import (
"github.com/testcontainers/testcontainers-go"
"github.com/testcontainers/testcontainers-go/modules/k3s"
"github.com/testcontainers/testcontainers-go/network"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/provider/kubernetes/gateway"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/provider/kubernetes/gateway"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/util/sets"
kclientset "k8s.io/client-go/kubernetes"
integration/grpc_test.go
+2 -2
View File
@@ -14,8 +14,8 @@ import (
"github.com/rs/zerolog/log"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/helloworld"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/helloworld"
"github.com/hanzoai/ingress/integration/try"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"
integration/headers_test.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
// Headers tests suite.
integration/healthcheck_test.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
// HealthCheck test suites.
integration/hostresolver_test.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
type HostResolverSuite struct{ BaseSuite }
integration/http_test.go
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/config/dynamic"
)
type HTTPSuite struct{ BaseSuite }
integration/https_test.go
+4 -4
View File
@@ -16,10 +16,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
ingresstls "github.com/hanzoai/ingress/v3/pkg/tls"
"github.com/hanzoai/ingress/v3/pkg/types"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/config/dynamic"
ingresstls "github.com/hanzoai/ingress/pkg/tls"
"github.com/hanzoai/ingress/pkg/types"
"golang.org/x/net/http2"
)
integration/integration_test.go
+1 -1
View File
@@ -31,7 +31,7 @@ import (
"github.com/stretchr/testify/suite"
"github.com/testcontainers/testcontainers-go"
"github.com/testcontainers/testcontainers-go/network"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
"gopkg.in/yaml.v3"
)
integration/k8s_test.go
+2 -2
View File
@@ -20,8 +20,8 @@ import (
"github.com/rs/zerolog/log"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/api"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/api"
)
var updateExpected = flag.Bool("update_expected", false, "Update expected files in testdata")
integration/keepalive_test.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/rs/zerolog/log"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
type KeepAliveSuite struct {
integration/knative_conformance_test.go
+1 -1
View File
@@ -18,7 +18,7 @@ import (
"github.com/testcontainers/testcontainers-go"
"github.com/testcontainers/testcontainers-go/modules/k3s"
"github.com/testcontainers/testcontainers-go/network"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
"knative.dev/networking/test/conformance/ingress"
klog "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
integration/log_rotation_test.go
+1 -1
View File
@@ -15,7 +15,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
const ingressTestAccessLogFileRotated = ingressTestAccessLogFile + ".rotated"
integration/proxy_protocol_test.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
type ProxyProtocolSuite struct {
integration/ratelimit_test.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
type RateLimitSuite struct {
integration/redis_sentinel_test.go
+2 -2
View File
@@ -21,8 +21,8 @@ import (
"github.com/rs/zerolog/log"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/api"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/api"
)
// Redis test suites.
integration/redis_test.go
+2 -2
View File
@@ -17,8 +17,8 @@ import (
"github.com/pmezard/go-difflib/difflib"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/api"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/api"
)
// Redis test suites.
integration/rest_test.go
+2 -2
View File
@@ -12,8 +12,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/config/dynamic"
)
type RestSuite struct {
integration/retry_test.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
type RetrySuite struct {
integration/routing_test.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
// RoutingSuite tests multi-layer routing with authentication middleware.
integration/simple_test.go
+2 -2
View File
@@ -24,8 +24,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"golang.org/x/crypto/ocsp"
)
integration/tcp_healthcheck_test.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
// TCPHealthCheckSuite test suite for TCP health checks.
integration/tcp_test.go
+1 -1
View File
@@ -16,7 +16,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
type TCPSuite struct{ BaseSuite }
integration/timeout_test.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
type TimeoutSuite struct{ BaseSuite }
integration/tls_client_headers_test.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
const (
integration/tracing_test.go
+1 -1
View File
@@ -16,7 +16,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/tidwall/gjson"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
type TracingSuite struct {
integration/udp_test.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
)
type UDPSuite struct{ BaseSuite }
integration/websocket_test.go
+1 -1
View File
@@ -15,7 +15,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/integration/try"
"golang.org/x/net/http2"
"golang.org/x/net/websocket"
)
integration/zk_test.go
+2 -2
View File
@@ -17,8 +17,8 @@ import (
"github.com/rs/zerolog/log"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/hanzoai/ingress/v3/integration/try"
"github.com/hanzoai/ingress/v3/pkg/api"
"github.com/hanzoai/ingress/integration/try"
"github.com/hanzoai/ingress/pkg/api"
)
// Zk test suites.
internal/gendoc.go
+3 -3
View File
@@ -13,9 +13,9 @@ import (
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress-parser/flag"
"github.com/hanzoai/ingress-parser/generator"
"github.com/hanzoai/ingress/v3/cmd"
"github.com/hanzoai/ingress/v3/pkg/collector/hydratation"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/cmd"
"github.com/hanzoai/ingress/pkg/collector/hydratation"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"gopkg.in/yaml.v3"
)
pkg/api/dashboard/dashboard.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/gorilla/mux"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/webui"
"github.com/hanzoai/ingress/webui"
)
type indexTemplateData struct {
pkg/api/handler.go
+4 -4
View File
@@ -8,10 +8,10 @@ import (
"github.com/gorilla/mux"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/v3/pkg/version"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/static"
"github.com/hanzoai/ingress/pkg/version"
)
type apiError struct {
pkg/api/handler_entrypoint.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/gorilla/mux"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/pkg/config/static"
)
type entryPointRepresentation struct {
pkg/api/handler_entrypoint_test.go
+2 -2
View File
@@ -13,8 +13,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/static"
)
func TestHandler_EntryPoints(t *testing.T) {
pkg/api/handler_http.go
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"github.com/gorilla/mux"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/v3/pkg/tls"
"github.com/hanzoai/ingress/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/tls"
)
type routerRepresentation struct {
pkg/api/handler_http_test.go
+3 -3
View File
@@ -13,9 +13,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/static"
)
func pointer[T any](v T) *T { return &v }
pkg/api/handler_overview.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"reflect"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/static"
)
type schemeOverview struct {
pkg/api/handler_overview_test.go
+9 -9
View File
@@ -10,15 +10,15 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/v3/pkg/config/static"
otypes "github.com/hanzoai/ingress/v3/pkg/observability/types"
"github.com/hanzoai/ingress/v3/pkg/provider/docker"
"github.com/hanzoai/ingress/v3/pkg/provider/file"
"github.com/hanzoai/ingress/v3/pkg/provider/kubernetes/crd"
"github.com/hanzoai/ingress/v3/pkg/provider/kubernetes/ingress"
"github.com/hanzoai/ingress/v3/pkg/provider/rest"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/static"
otypes "github.com/hanzoai/ingress/pkg/observability/types"
"github.com/hanzoai/ingress/pkg/provider/docker"
"github.com/hanzoai/ingress/pkg/provider/file"
"github.com/hanzoai/ingress/pkg/provider/kubernetes/crd"
"github.com/hanzoai/ingress/pkg/provider/kubernetes/ingress"
"github.com/hanzoai/ingress/pkg/provider/rest"
)
func TestHandler_Overview(t *testing.T) {
pkg/api/handler_support_dump.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"time"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/redactor"
"github.com/hanzoai/ingress/v3/pkg/version"
"github.com/hanzoai/ingress/pkg/redactor"
"github.com/hanzoai/ingress/pkg/version"
)
func (h Handler) getSupportDump(rw http.ResponseWriter, req *http.Request) {
pkg/api/handler_support_dump_test.go
+3 -3
View File
@@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/static"
)
func TestHandler_SupportDump(t *testing.T) {
pkg/api/handler_tcp.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/gorilla/mux"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/runtime"
)
type tcpRouterRepresentation struct {
pkg/api/handler_tcp_test.go
+3 -3
View File
@@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/static"
)
func TestHandler_TCP(t *testing.T) {
pkg/api/handler_test.go
+3 -3
View File
@@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/static"
)
var updateExpected = flag.Bool("update_expected", false, "Update expected files in testdata")
pkg/api/handler_udp.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/gorilla/mux"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/runtime"
)
type udpRouterRepresentation struct {
pkg/api/handler_udp_test.go
+3 -3
View File
@@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/static"
)
func TestHandler_UDP(t *testing.T) {
pkg/api/sort_test.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/runtime"
)
func TestSortRouters(t *testing.T) {
pkg/cli/deprecation_test.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/ingress-parser/cli"
"github.com/hanzoai/ingress/v3/cmd"
"github.com/hanzoai/ingress/cmd"
)
func ptr[T any](t T) *T {
pkg/collector/collector.go
+3 -3
View File
@@ -11,9 +11,9 @@ import (
"github.com/mitchellh/hashstructure"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/v3/pkg/redactor"
"github.com/hanzoai/ingress/v3/pkg/version"
"github.com/hanzoai/ingress/pkg/config/static"
"github.com/hanzoai/ingress/pkg/redactor"
"github.com/hanzoai/ingress/pkg/version"
)
// collectorURL URL where the stats are sent.
pkg/collector/collector_test.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/ingress/v3/pkg/collector/hydratation"
"github.com/hanzoai/ingress/v3/pkg/config/static"
"github.com/hanzoai/ingress/pkg/collector/hydratation"
"github.com/hanzoai/ingress/pkg/config/static"
)
func Test_createBody(t *testing.T) {
pkg/config/dynamic/config.go
+1 -1
View File
@@ -1,7 +1,7 @@
package dynamic
import (
"github.com/hanzoai/ingress/v3/pkg/tls"
"github.com/hanzoai/ingress/pkg/tls"
)
// +k8s:deepcopy-gen=true
pkg/config/dynamic/http_config.go
+3 -3
View File
@@ -6,9 +6,9 @@ import (
ptypes "github.com/hanzoai/ingress-parser/types"
"github.com/hanzoai/ingress/dynamic/ext"
otypes "github.com/hanzoai/ingress/v3/pkg/observability/types"
ingresstls "github.com/hanzoai/ingress/v3/pkg/tls"
"github.com/hanzoai/ingress/v3/pkg/types"
otypes "github.com/hanzoai/ingress/pkg/observability/types"
ingresstls "github.com/hanzoai/ingress/pkg/tls"
"github.com/hanzoai/ingress/pkg/types"
"google.golang.org/grpc/codes"
"k8s.io/utils/ptr"
)
pkg/config/dynamic/middlewares.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"time"
ptypes "github.com/hanzoai/ingress-parser/types"
"github.com/hanzoai/ingress/v3/pkg/ip"
"github.com/hanzoai/ingress/v3/pkg/types"
"github.com/hanzoai/ingress/pkg/ip"
"github.com/hanzoai/ingress/pkg/types"
)
const (
pkg/config/dynamic/tcp_config.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"time"
ptypes "github.com/hanzoai/ingress-parser/types"
ingresstls "github.com/hanzoai/ingress/v3/pkg/tls"
"github.com/hanzoai/ingress/v3/pkg/types"
ingresstls "github.com/hanzoai/ingress/pkg/tls"
"github.com/hanzoai/ingress/pkg/types"
)
// +k8s:deepcopy-gen=true
pkg/config/dynamic/zz_generated.deepcopy.go
+2 -2
View File
@@ -31,8 +31,8 @@ package dynamic
import (
paersertypes "github.com/hanzoai/ingress-parser/types"
tls "github.com/hanzoai/ingress/v3/pkg/tls"
types "github.com/hanzoai/ingress/v3/pkg/types"
tls "github.com/hanzoai/ingress/pkg/tls"
types "github.com/hanzoai/ingress/pkg/types"
)
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
pkg/config/label/label.go
+1 -1
View File
@@ -3,7 +3,7 @@ package label
import (
"github.com/hanzoai/ingress-parser/parser"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/dynamic"
)
// RootName is the root name used as prefix for labels and configuration keys.
pkg/config/label/label_test.go
+3 -3
View File
@@ -8,9 +8,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
ptypes "github.com/hanzoai/ingress-parser/types"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/tls"
"github.com/hanzoai/ingress/v3/pkg/types"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/tls"
"github.com/hanzoai/ingress/pkg/types"
)
func pointer[T any](v T) *T { return &v }
pkg/config/runtime/runtime.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"strings"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/observability/logs"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/observability/logs"
)
// Status of the router/service.
pkg/config/runtime/runtime_http.go
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"sync"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/observability/logs"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/observability/logs"
)
// GetRoutersByEntryPoints returns all the http routers by entry points name and routers name.
pkg/config/runtime/runtime_http_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/dynamic"
)
func TestGetRoutersByEntryPoints(t *testing.T) {
pkg/config/runtime/runtime_tcp.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"sync"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/observability/logs"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/observability/logs"
)
// GetTCPRoutersByEntryPoints returns all the tcp routers by entry points name and routers name.
pkg/config/runtime/runtime_tcp_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/dynamic"
)
func TestGetTCPRoutersByEntryPoints(t *testing.T) {
pkg/config/runtime/runtime_test.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
ptypes "github.com/hanzoai/ingress-parser/types"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/runtime"
)
// all the Routers/Middlewares/Services are considered fully qualified.
pkg/config/runtime/runtime_udp.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"slices"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/observability/logs"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/observability/logs"
)
// GetUDPRoutersByEntryPoints returns all the UDP routers by entry points name and routers name.
pkg/config/runtime/runtime_udp_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/dynamic"
)
func TestGetUDPRoutersByEntryPoints(t *testing.T) {
pkg/config/static/entrypoints.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"strings"
ptypes "github.com/hanzoai/ingress-parser/types"
otypes "github.com/hanzoai/ingress/v3/pkg/observability/types"
"github.com/hanzoai/ingress/v3/pkg/types"
otypes "github.com/hanzoai/ingress/pkg/observability/types"
"github.com/hanzoai/ingress/pkg/types"
"k8s.io/utils/ptr"
)
pkg/config/static/experimental.go
+1 -1
View File
@@ -1,6 +1,6 @@
package static
import "github.com/hanzoai/ingress/v3/pkg/plugins"
import "github.com/hanzoai/ingress/pkg/plugins"
// Experimental experimental Ingress features.
type Experimental struct {
pkg/config/static/static_config.go
+22 -22
View File
@@ -11,28 +11,28 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
ptypes "github.com/hanzoai/ingress-parser/types"
"github.com/hanzoai/ingress/v3/pkg/observability/logs"
otypes "github.com/hanzoai/ingress/v3/pkg/observability/types"
"github.com/hanzoai/ingress/v3/pkg/ping"
acmeprovider "github.com/hanzoai/ingress/v3/pkg/provider/acme"
"github.com/hanzoai/ingress/v3/pkg/provider/consulcatalog"
"github.com/hanzoai/ingress/v3/pkg/provider/docker"
"github.com/hanzoai/ingress/v3/pkg/provider/ecs"
"github.com/hanzoai/ingress/v3/pkg/provider/file"
"github.com/hanzoai/ingress/v3/pkg/provider/http"
"github.com/hanzoai/ingress/v3/pkg/provider/kubernetes/crd"
"github.com/hanzoai/ingress/v3/pkg/provider/kubernetes/gateway"
"github.com/hanzoai/ingress/v3/pkg/provider/kubernetes/ingress"
ingressnginx "github.com/hanzoai/ingress/v3/pkg/provider/kubernetes/ingress-nginx"
"github.com/hanzoai/ingress/v3/pkg/provider/kubernetes/knative"
"github.com/hanzoai/ingress/v3/pkg/provider/kv/consul"
"github.com/hanzoai/ingress/v3/pkg/provider/kv/etcd"
"github.com/hanzoai/ingress/v3/pkg/provider/kv/redis"
"github.com/hanzoai/ingress/v3/pkg/provider/kv/zk"
"github.com/hanzoai/ingress/v3/pkg/provider/nomad"
"github.com/hanzoai/ingress/v3/pkg/provider/rest"
"github.com/hanzoai/ingress/v3/pkg/tls"
"github.com/hanzoai/ingress/v3/pkg/types"
"github.com/hanzoai/ingress/pkg/observability/logs"
otypes "github.com/hanzoai/ingress/pkg/observability/types"
"github.com/hanzoai/ingress/pkg/ping"
acmeprovider "github.com/hanzoai/ingress/pkg/provider/acme"
"github.com/hanzoai/ingress/pkg/provider/consulcatalog"
"github.com/hanzoai/ingress/pkg/provider/docker"
"github.com/hanzoai/ingress/pkg/provider/ecs"
"github.com/hanzoai/ingress/pkg/provider/file"
"github.com/hanzoai/ingress/pkg/provider/http"
"github.com/hanzoai/ingress/pkg/provider/kubernetes/crd"
"github.com/hanzoai/ingress/pkg/provider/kubernetes/gateway"
"github.com/hanzoai/ingress/pkg/provider/kubernetes/ingress"
ingressnginx "github.com/hanzoai/ingress/pkg/provider/kubernetes/ingress-nginx"
"github.com/hanzoai/ingress/pkg/provider/kubernetes/knative"
"github.com/hanzoai/ingress/pkg/provider/kv/consul"
"github.com/hanzoai/ingress/pkg/provider/kv/etcd"
"github.com/hanzoai/ingress/pkg/provider/kv/redis"
"github.com/hanzoai/ingress/pkg/provider/kv/zk"
"github.com/hanzoai/ingress/pkg/provider/nomad"
"github.com/hanzoai/ingress/pkg/provider/rest"
"github.com/hanzoai/ingress/pkg/tls"
"github.com/hanzoai/ingress/pkg/types"
)
const (
pkg/config/static/static_config_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/hanzoai/ingress/v3/pkg/provider/acme"
"github.com/hanzoai/ingress/pkg/provider/acme"
)
func pointer[T any](v T) *T { return &v }
pkg/healthcheck/healthcheck.go
+2 -2
View File
@@ -16,8 +16,8 @@ import (
gokitmetrics "github.com/go-kit/kit/metrics"
"github.com/rs/zerolog/log"
ptypes "github.com/hanzoai/ingress-parser/types"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/runtime"
"golang.org/x/sync/singleflight"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
pkg/healthcheck/healthcheck_tcp.go
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"time"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/v3/pkg/tcp"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/tcp"
)
// maxPayloadSize is the maximum payload size that can be sent during health checks.
pkg/healthcheck/healthcheck_tcp_test.go
+3 -3
View File
@@ -14,9 +14,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
ptypes "github.com/hanzoai/ingress-parser/types"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
truntime "github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/v3/pkg/tcp"
"github.com/hanzoai/ingress/pkg/config/dynamic"
truntime "github.com/hanzoai/ingress/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/tcp"
)
var localhostCert = []byte(`-----BEGIN CERTIFICATE-----
pkg/healthcheck/healthcheck_test.go
+3 -3
View File
@@ -12,9 +12,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
ptypes "github.com/hanzoai/ingress-parser/types"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/config/runtime"
"github.com/hanzoai/ingress/v3/pkg/testhelpers"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/config/runtime"
"github.com/hanzoai/ingress/pkg/testhelpers"
healthpb "google.golang.org/grpc/health/grpc_health_v1"
)
pkg/healthcheck/mock_test.go
+2 -2
View File
@@ -12,8 +12,8 @@ import (
gokitmetrics "github.com/go-kit/kit/metrics"
"github.com/stretchr/testify/assert"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/testhelpers"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/testhelpers"
"google.golang.org/grpc"
healthpb "google.golang.org/grpc/health/grpc_health_v1"
)
pkg/middlewares/accesslog/field_middleware.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"time"
"github.com/rs/zerolog/log"
"github.com/hanzoai/ingress/v3/pkg/middlewares/capture"
"github.com/hanzoai/ingress/v3/pkg/observability/logs"
"github.com/hanzoai/ingress/pkg/middlewares/capture"
"github.com/hanzoai/ingress/pkg/observability/logs"
"github.com/vulcand/oxy/v2/utils"
)
pkg/middlewares/accesslog/logger.go
+6 -6
View File
@@ -19,12 +19,12 @@ import (
"github.com/rs/zerolog/log"
"github.com/sirupsen/logrus"
ptypes "github.com/hanzoai/ingress-parser/types"
"github.com/hanzoai/ingress/v3/pkg/middlewares/capture"
"github.com/hanzoai/ingress/v3/pkg/middlewares/observability"
"github.com/hanzoai/ingress/v3/pkg/observability/logs"
otypes "github.com/hanzoai/ingress/v3/pkg/observability/types"
ingresstls "github.com/hanzoai/ingress/v3/pkg/tls"
"github.com/hanzoai/ingress/v3/pkg/types"
"github.com/hanzoai/ingress/pkg/middlewares/capture"
"github.com/hanzoai/ingress/pkg/middlewares/observability"
"github.com/hanzoai/ingress/pkg/observability/logs"
otypes "github.com/hanzoai/ingress/pkg/observability/types"
ingresstls "github.com/hanzoai/ingress/pkg/tls"
"github.com/hanzoai/ingress/pkg/types"
"go.opentelemetry.io/contrib/bridges/otellogrus"
"go.opentelemetry.io/otel/trace"
)
pkg/middlewares/accesslog/logger_test.go
+3 -3
View File
@@ -25,9 +25,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
ptypes "github.com/hanzoai/ingress-parser/types"
"github.com/hanzoai/ingress/v3/pkg/middlewares/capture"
"github.com/hanzoai/ingress/v3/pkg/middlewares/observability"
otypes "github.com/hanzoai/ingress/v3/pkg/observability/types"
"github.com/hanzoai/ingress/pkg/middlewares/capture"
"github.com/hanzoai/ingress/pkg/middlewares/observability"
otypes "github.com/hanzoai/ingress/pkg/observability/types"
"go.opentelemetry.io/collector/pdata/plog/plogotlp"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
pkg/middlewares/addprefix/add_prefix.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"errors"
"net/http"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/middlewares"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/middlewares"
)
const (
pkg/middlewares/addprefix/add_prefix_test.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/testhelpers"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/testhelpers"
)
func TestNewAddPrefix(t *testing.T) {
pkg/middlewares/auth/basic_auth.go
+4 -4
View File
@@ -8,10 +8,10 @@ import (
"strings"
goauth "github.com/abbot/go-http-auth"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/middlewares"
"github.com/hanzoai/ingress/v3/pkg/middlewares/accesslog"
"github.com/hanzoai/ingress/v3/pkg/middlewares/observability"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/middlewares"
"github.com/hanzoai/ingress/pkg/middlewares/accesslog"
"github.com/hanzoai/ingress/pkg/middlewares/observability"
"golang.org/x/sync/singleflight"
)
pkg/middlewares/auth/basic_auth_test.go
+2 -2
View File
@@ -12,8 +12,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/testhelpers"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/testhelpers"
)
func TestBasicAuthFail(t *testing.T) {
pkg/middlewares/auth/digest_auth.go
+4 -4
View File
@@ -8,10 +8,10 @@ import (
"strings"
goauth "github.com/abbot/go-http-auth"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/middlewares"
"github.com/hanzoai/ingress/v3/pkg/middlewares/accesslog"
"github.com/hanzoai/ingress/v3/pkg/middlewares/observability"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/middlewares"
"github.com/hanzoai/ingress/pkg/middlewares/accesslog"
"github.com/hanzoai/ingress/pkg/middlewares/observability"
)
const (
pkg/middlewares/auth/digest_auth_test.go
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/hanzoai/ingress/v3/pkg/config/dynamic"
"github.com/hanzoai/ingress/v3/pkg/testhelpers"
"github.com/hanzoai/ingress/pkg/config/dynamic"
"github.com/hanzoai/ingress/pkg/testhelpers"
)
func TestDigestAuthError(t *testing.T) {

Some files were not shown because too many files have changed in this diff Show More