Skip to content

Commit

Permalink
rename go.mod module (#10518)
Browse files Browse the repository at this point in the history
  • Loading branch information
lgadban authored Jan 27, 2025
1 parent 7fbfc2e commit 8769382
Show file tree
Hide file tree
Showing 466 changed files with 2,330 additions and 2,333 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nightly-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ jobs:
# runs-on: ubuntu-22.04
# timeout-minutes: 60
# # Previously, there was an environment variable, RELEASED_VERSION="LATEST" set. This made use of some internal code:
# # https://github.com/solo-io/gloo/blob/main/test/kube2e/util.go#L229-L241
# # https://github.com/kgateway-dev/kgateway/blob/main/test/kube2e/util.go#L229-L241
# # which modified our testing process to pull the latest beta release.
# #
# # NOW, however, running this job is the same as normal CI. (building a local chart, then using it)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stalebot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
It will be closed in the next ${{ env.DAYS_BEFORE_ISSUE_CLOSE }} days unless it is tagged "no stalebot" or other activity occurs.
close-issue-message: >
This issue has been closed due to no activity in the last 12 months.
stale-issue-label: 'stale' # https://github.com/solo-io/gloo/labels/stale
exempt-issue-labels: 'no stalebot' # https://github.com/solo-io/gloo/labels/no%20stalebot
stale-issue-label: 'stale' # https://github.com/kgateway-dev/kgateway/labels/stale
exempt-issue-labels: 'no stalebot' # https://github.com/kgateway-dev/kgateway/labels/no%20stalebot
enable-statistics: true
operations-per-run: 1000
ascending: true # asc means oldest first
Expand Down
3 changes: 0 additions & 3 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ linters:
# Given that we have not had linting enabled in this repository, it would be a large change to turn on all linters immediately.
# We are aiming to progressively enable linters.
# If you see a linter that can be added, please do so.
# See: https://github.com/solo-io/gloo-mesh-enterprise/blob/main/.golangci.yaml for a reference
- bodyclose
- ginkgolinter
- goimports
Expand All @@ -35,8 +34,6 @@ linters-settings:
alias: metav1
- pkg: k8s.io/api/batch/v1
alias: batchv1
- pkg: github.com/solo-io/gloo/test/kubernetes/testutils/clients
alias: kubetestclients
nakedret:
# The team consensus is that naked returns hinder the readability of the code.
# However, named return values can still be useful as documentation for certain scenarios.
Expand Down
8 changes: 4 additions & 4 deletions .trivyignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CVE-2022-1996
# Also Helm module is used in testing, which has no impact on exploitation.
# Gloo-Edge data and control planes are not impacted at all by the helm module.
# Glooctl is not a long running program, and does not affect future uses of Glooctl.
# https://github.com/solo-io/gloo/issues/7598
# https://github.com/kgateway-dev/kgateway/issues/7598
# https://github.com/helm/helm/security/advisories/GHSA-6rx9-889q-vv2r
CVE-2022-23524
# https://github.com/helm/helm/security/advisories/GHSA-53c4-hhmh-vw5q
Expand All @@ -32,9 +32,9 @@ CVE-2023-2253
# and can be easily resolved by removing the misconfigured / malicious plugin
# The helm bump will require bumping the k8s dependencies by +2 minor versions that can cause issues.
# https://github.com/advisories/GHSA-r53h-jv2g-vpx6
# https://github.com/solo-io/gloo/issues/9186
# https://github.com/solo-io/gloo/issues/9187
# https://github.com/solo-io/gloo/issues/9189
# https://github.com/kgateway-dev/kgateway/issues/9186
# https://github.com/kgateway-dev/kgateway/issues/9187
# https://github.com/kgateway-dev/kgateway/issues/9189
CVE-2024-26147

# Ignore a few istio.io/istio vulnerabilities. These CVEs are from very old versions of istio for which patches have already been merged - these come up as false positives from trivy because we pin the dependencies and trivy is unable to determine that the pinned versions already have the fix. This is due to istio's tags not following go's strict semver and therefore falling back to a go pseudo version.
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ SOURCES := $(shell find . -name "*.go" | grep -v test.go)
# universal header validation has been enabled and if so, we expect
# failures in `test/e2e/header_validation_test.go`.
export ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:1.31.2-patch3
export LDFLAGS := -X 'github.com/solo-io/gloo/pkg/version.Version=$(VERSION)'
export LDFLAGS := -X 'github.com/kgateway-dev/kgateway/pkg/version.Version=$(VERSION)'
export GCFLAGS ?=

UNAME_M := $(shell uname -m)
Expand Down Expand Up @@ -143,7 +143,7 @@ fmt:
# Formats code and imports
.PHONY: fmt-v2
fmt-v2:
go run golang.org/x/tools/cmd/goimports -local "github.com/solo-io/gloo/" -w $(shell ls -d */ | grep -v vendor)
go run golang.org/x/tools/cmd/goimports -local "github.com/kgateway-dev/kgateway/" -w $(shell ls -d */ | grep -v vendor)

.PHONY: fmt-changed
fmt-changed:
Expand Down Expand Up @@ -681,14 +681,14 @@ else
# example: 1.16.0-beta4-{TEST_ASSET_ID}
VERSION = $(shell echo $(git_tag) | cut -c 2-)-$(TEST_ASSET_ID)
endif
LDFLAGS := "-X github.com/solo-io/gloo/pkg/version.Version=$(VERSION)"
LDFLAGS := "-X github.com/kgateway-dev/kgateway/pkg/version.Version=$(VERSION)"
endif

# TODO: delete this logic block when we have a github actions-managed release
ifneq (,$(TAGGED_VERSION))
PUBLISH_CONTEXT := RELEASE
VERSION := $(shell echo $(TAGGED_VERSION) | cut -c 2-)
LDFLAGS := "-X github.com/solo-io/gloo/pkg/version.Version=$(VERSION)"
LDFLAGS := "-X github.com/kgateway-dev/kgateway/pkg/version.Version=$(VERSION)"
endif

export VERSION
Expand Down
2 changes: 1 addition & 1 deletion ci/github-actions/go-test-summary/go_test_summary.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"flag"

"github.com/solo-io/gloo/ci/github-actions/go-test-summary/summary"
"github.com/kgateway-dev/kgateway/ci/github-actions/go-test-summary/summary"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion docs/cmd/generate_docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (

"github.com/Masterminds/semver/v3"
"github.com/google/go-github/v32/github"
. "github.com/kgateway-dev/kgateway/docs/cmd/securityscanutils"
"github.com/rotisserie/eris"
. "github.com/solo-io/gloo/docs/cmd/securityscanutils"
changelogdocutils "github.com/solo-io/go-utils/changeloggenutils"
"github.com/solo-io/go-utils/githubutils"
"github.com/solo-io/go-utils/versionutils"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package securityscanutils_test

import (
. "github.com/kgateway-dev/kgateway/docs/cmd/securityscanutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/solo-io/gloo/docs/cmd/securityscanutils"
)

var _ = Describe("generate security scan docgen", func() {
Expand Down
4 changes: 2 additions & 2 deletions docs/content/crds/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"

"github.com/hashicorp/go-multierror"
"github.com/kgateway-dev/kgateway/pkg/utils/cmdutils"
"github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1"
"github.com/rotisserie/eris"
"github.com/solo-io/gloo/pkg/utils/cmdutils"
"github.com/solo-io/gloo/projects/gateway2/api/v1alpha1"
"github.com/stoewer/go-strcase"
"k8s.io/apimachinery/pkg/runtime/schema"
)
Expand Down
4 changes: 2 additions & 2 deletions docs/content/guides/dev/example-proxy-controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"os"
"time"

v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1"
matchers "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers"
v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1"
matchers "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/core/matchers"
"github.com/solo-io/k8s-utils/kubeutils"
"github.com/solo-io/solo-kit/pkg/api/v1/clients"
"github.com/solo-io/solo-kit/pkg/api/v1/clients/factory"
Expand Down
6 changes: 3 additions & 3 deletions docs/content/guides/dev/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"time"

cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1"
"github.com/solo-io/gloo/projects/gloo/pkg/discovery"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins"
v1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/discovery"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins"
"github.com/solo-io/solo-kit/pkg/api/v1/clients"
"github.com/solo-io/solo-kit/pkg/api/v1/resources/core"

Expand Down
40 changes: 20 additions & 20 deletions docs/content/guides/dev/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,28 @@ package docs_demo
// package registry

import (
"github.com/solo-io/gloo/projects/gloo/pkg/bootstrap"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/aws"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/azure"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/basicroute"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/consul"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/cors"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/faultinjection"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/bootstrap"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/aws"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/azure"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/basicroute"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/consul"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/cors"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/faultinjection"

// add our plugin's import here:
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/gce"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/grpc"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/hcm"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/kubernetes"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/linkerd"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/loadbalancer"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/rest"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/static"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/stats"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/transformation"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/upstreamconn"
"github.com/solo-io/gloo/projects/gloo/pkg/plugins/upstreamssl"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/gce"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/grpc"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/hcm"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/kubernetes"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/linkerd"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/loadbalancer"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/rest"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/static"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/stats"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/transformation"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/upstreamconn"
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/plugins/upstreamssl"
)

type registry struct {
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/http-passthrough-auth/main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
v1 "github.com/solo-io/gloo/examples/http-passthrough-auth/pkg/auth/v1"
v1 "github.com/kgateway-dev/kgateway/examples/http-passthrough-auth/pkg/auth/v1"
)

func main() {
Expand Down
8 changes: 4 additions & 4 deletions generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func main() {
generateOptions := cmd.GenerateOptions{
SkipGenMocks: true,
CustomCompileProtos: []string{
"github.com/solo-io/gloo/projects/gloo/api/grpc",
"github.com/kgateway-dev/kgateway/projects/gloo/api/grpc",
},
SkipGeneratedTests: true,
// helps to cut down on time spent searching for imports, not strictly necessary
Expand All @@ -57,7 +57,7 @@ func main() {
},
RenderOptions: &options.RenderOptions{
SkipLinksForPathPrefixes: []string{
"github.com/solo-io/gloo/projects/gloo/api/external",
"github.com/kgateway-dev/kgateway/projects/gloo/api/external",
},
},
},
Expand All @@ -76,7 +76,7 @@ func main() {

// These messages are part of our internal API, and therefore aren't required
// Also they are quite large and can cause the Proxy CRD to become too large,
// resulting in: https://github.com/solo-io/gloo/issues/4789
// resulting in: https://github.com/kgateway-dev/kgateway/issues/4789
"gloo.solo.io.HttpListener",
"gloo.solo.io.TcpListener",
"gloo.solo.io.HybridListener",
Expand All @@ -98,6 +98,6 @@ func main() {
}

func removeExternalApiDocs() error {
const externalApiDocsPath = "docs/content/reference/api/github.com/solo-io/gloo/projects/gloo/api/external"
const externalApiDocsPath = "docs/content/reference/api/github.com/kgateway-dev/kgateway/projects/gloo/api/external"
return os.RemoveAll(externalApiDocsPath)
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/solo-io/gloo
module github.com/kgateway-dev/kgateway

go 1.23.3

Expand Down
2 changes: 1 addition & 1 deletion install/helm/gloo/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"

"github.com/ghodss/yaml"
"github.com/kgateway-dev/kgateway/install/helm/gloo/generate"
errors "github.com/rotisserie/eris"
"github.com/solo-io/gloo/install/helm/gloo/generate"
"github.com/solo-io/go-utils/log"
"github.com/solo-io/k8s-utils/installutils/helmchart"
)
Expand Down
Loading

0 comments on commit 8769382

Please sign in to comment.