Skip to content

Commit feaa330

Browse files
mahmut-Abimahmut-Abi
committed
refactor(gateway): rename multi-word Go packages to single-word convention
2 parents b4421db + 7646eef commit feaa330

175 files changed

Lines changed: 930 additions & 930 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/gateway-api-support/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"k8s.io/apimachinery/pkg/util/sets"
1313

14-
"github.com/nantian-gw/gateway/internal/gatewayapi"
14+
"github.com/nantian-gw/gateway/internal/gwapi"
1515
gatewayfeatures "sigs.k8s.io/gateway-api/pkg/features"
1616
)
1717

@@ -37,7 +37,7 @@ func main() {
3737
format := flag.String("format", markdownFormat, "output format: markdown, json, names, or audit")
3838
flag.Parse()
3939

40-
features := gatewayapi.SupportedFeatureNames()
40+
features := gwapi.SupportedFeatureNames()
4141
names := make([]string, 0, len(features))
4242
for _, feature := range features {
4343
names = append(names, string(feature))

‎cmd/manager/app.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import (
2121
"github.com/nantian-gw/gateway/internal/admin"
2222
"github.com/nantian-gw/gateway/internal/config"
2323
"github.com/nantian-gw/gateway/internal/controller"
24-
"github.com/nantian-gw/gateway/internal/grpcserver"
24+
"github.com/nantian-gw/gateway/internal/xds"
2525
"github.com/nantian-gw/gateway/internal/infrastructure"
2626
"github.com/nantian-gw/gateway/internal/ir"
2727
"github.com/nantian-gw/gateway/internal/lifecycle"
28-
"github.com/nantian-gw/gateway/internal/nodestatus"
28+
"github.com/nantian-gw/gateway/internal/nodeinfo"
2929
"github.com/nantian-gw/gateway/internal/observability"
3030
"github.com/nantian-gw/gateway/internal/status"
3131
"github.com/nantian-gw/gateway/internal/translator"
@@ -129,18 +129,18 @@ func run(configPath string) error {
129129
metrics.XDSSnapshotFanoutCoalescedTotal.Add(float64(replaced))
130130
},
131131
})
132-
nodeRepository := nodestatus.NewLeaseRepository(
132+
nodeRepository := nodeinfo.NewLeaseRepository(
133133
mgr.GetAPIReader(),
134134
mgr.GetClient(),
135135
cfg.NodeStatus.Namespace,
136136
cfg.NodeStatus.LeasePrefix,
137137
logger,
138138
)
139-
nodes := nodestatus.NewRegistry(
139+
nodes := nodeinfo.NewRegistry(
140140
ir.NewNodeStatusStore(),
141141
nodeRepository,
142142
logger,
143-
nodestatus.Options{
143+
nodeinfo.Options{
144144
BaseContext: ctx,
145145
PersistTimeout: cfg.NodeStatusPersistTimeout(),
146146
PersistDebounce: cfg.NodeStatusPersistDebounce(),
@@ -350,7 +350,7 @@ func run(configPath string) error {
350350
logger.Info("configured dataplane admin aggregation", "service", dpCfg.ServiceName, "namespace", namespace)
351351
}
352352

353-
grpcServer, err := grpcserver.New(cfg.GRPCAddr, cfg.GRPCTLS, cfg.GRPCRuntime, store, nodes, logger, metrics)
353+
grpcServer, err := xds.New(cfg.GRPCAddr, cfg.GRPCTLS, cfg.GRPCRuntime, store, nodes, logger, metrics)
354354
if err != nil {
355355
return fmt.Errorf("configure grpc server: %w", err)
356356
}

‎cmd/manager/app_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"k8s.io/apimachinery/pkg/runtime/schema"
1212

1313
"github.com/nantian-gw/gateway/internal/config"
14-
backendlbv1alpha2 "github.com/nantian-gw/gateway/internal/gatewayapiexperimental/backendlbv1alpha2"
14+
backendlb "github.com/nantian-gw/gateway/internal/gwexp/backendlb"
1515
"github.com/nantian-gw/gateway/internal/observability"
1616
)
1717

@@ -27,11 +27,11 @@ func TestBuildSchemeIncludesBackendLBPolicy(t *testing.T) {
2727
}
2828

2929
want := schema.GroupVersionKind{
30-
Group: backendlbv1alpha2.GroupVersion.Group,
31-
Version: backendlbv1alpha2.GroupVersion.Version,
30+
Group: backendlb.GroupVersion.Group,
31+
Version: backendlb.GroupVersion.Version,
3232
Kind: "BackendLBPolicy",
3333
}
34-
gvks, _, err := scheme.ObjectKinds(&backendlbv1alpha2.BackendLBPolicy{})
34+
gvks, _, err := scheme.ObjectKinds(&backendlb.BackendLBPolicy{})
3535
if err != nil {
3636
t.Fatalf("BackendLBPolicy is not registered in the manager scheme: %v", err)
3737
}
@@ -156,7 +156,7 @@ func TestBuildSchemeFeaturesDisabled(t *testing.T) {
156156
}
157157

158158
// BackendLBPolicy should NOT be registered when feature is disabled
159-
_, _, err = scheme.ObjectKinds(&backendlbv1alpha2.BackendLBPolicy{})
159+
_, _, err = scheme.ObjectKinds(&backendlb.BackendLBPolicy{})
160160
if err == nil {
161161
t.Fatal("BackendLBPolicy should not be registered when enableExperimentalGateway is false")
162162
}
@@ -176,7 +176,7 @@ func TestBuildSchemeFeatureFlagsGated(t *testing.T) {
176176
}
177177

178178
// BackendLBPolicy should be registered
179-
_, _, err = scheme.ObjectKinds(&backendlbv1alpha2.BackendLBPolicy{})
179+
_, _, err = scheme.ObjectKinds(&backendlb.BackendLBPolicy{})
180180
if err != nil {
181181
t.Fatalf("BackendLBPolicy should be registered: %v", err)
182182
}

‎cmd/manager/components.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
ctrl "sigs.k8s.io/controller-runtime"
1313

14-
"github.com/nantian-gw/gateway/internal/grpcserver"
14+
"github.com/nantian-gw/gateway/internal/xds"
1515
"github.com/nantian-gw/gateway/internal/lifecycle"
1616
)
1717

@@ -131,7 +131,7 @@ func newHTTPComponent(
131131
}
132132
}
133133

134-
func newGRPCComponent(name, addr string, server *grpcserver.Server) lifecycle.Component {
134+
func newGRPCComponent(name, addr string, server *xds.Server) lifecycle.Component {
135135
return lifecycle.Component{
136136
Name: name,
137137
Run: func(ctx context.Context, markStarted func()) error {

‎cmd/manager/scheme.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import (
1616
mcsv1alpha1 "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1"
1717

1818
"github.com/nantian-gw/gateway/internal/config"
19-
aiservicev1alpha1 "github.com/nantian-gw/gateway/internal/gatewayapiexperimental/aiservicev1alpha1"
20-
backendlbv1alpha2 "github.com/nantian-gw/gateway/internal/gatewayapiexperimental/backendlbv1alpha2"
21-
tokenpolicyv1alpha1 "github.com/nantian-gw/gateway/internal/gatewayapiexperimental/tokenpolicyv1alpha1"
22-
wasmpluginv1alpha1 "github.com/nantian-gw/gateway/internal/gatewayapiexperimental/wasmpluginv1alpha1"
19+
aiservice "github.com/nantian-gw/gateway/internal/gwexp/aiservice"
20+
backendlb "github.com/nantian-gw/gateway/internal/gwexp/backendlb"
21+
tokenpolicy "github.com/nantian-gw/gateway/internal/gwexp/tokenpolicy"
22+
wasmplugin "github.com/nantian-gw/gateway/internal/gwexp/wasmplugin"
2323
)
2424

2525
func buildScheme(cfg *config.Config) (*runtime.Scheme, error) {
@@ -46,9 +46,9 @@ func buildScheme(cfg *config.Config) (*runtime.Scheme, error) {
4646
name string
4747
fn func(*runtime.Scheme) error
4848
}{
49-
{name: "gateway.experimental/v1alpha2", fn: backendlbv1alpha2.Install},
50-
{name: "wasmplugin/v1alpha1", fn: wasmpluginv1alpha1.AddToScheme},
51-
{name: "tokenpolicy/v1alpha1", fn: tokenpolicyv1alpha1.AddToScheme},
49+
{name: "gateway.experimental/v1alpha2", fn: backendlb.Install},
50+
{name: "wasmplugin/v1alpha1", fn: wasmplugin.AddToScheme},
51+
{name: "tokenpolicy/v1alpha1", fn: tokenpolicy.AddToScheme},
5252
}...,
5353
)
5454
}
@@ -58,7 +58,7 @@ func buildScheme(cfg *config.Config) (*runtime.Scheme, error) {
5858
struct {
5959
name string
6060
fn func(*runtime.Scheme) error
61-
}{name: "aiservice/v1alpha1", fn: aiservicev1alpha1.AddToScheme},
61+
}{name: "aiservice/v1alpha1", fn: aiservice.AddToScheme},
6262
)
6363
}
6464

‎cmd/proto-compat-check/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"google.golang.org/protobuf/proto"
1414
"google.golang.org/protobuf/types/descriptorpb"
1515

16-
"github.com/nantian-gw/gateway/internal/protocompat"
16+
"github.com/nantian-gw/gateway/internal/compat"
1717
)
1818

1919
const (
@@ -97,7 +97,7 @@ func main() {
9797
fatalf("find base target descriptor: %v", err)
9898
}
9999

100-
result := protocompat.CompareFiles(baseFile, currentFile)
100+
result := compat.CompareFiles(baseFile, currentFile)
101101
if !result.OK() {
102102
fmt.Println("Backward-incompatible changes detected:")
103103
for _, f := range result.Errors {

‎conformance/conformance_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
conformancesuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
1616
"sigs.k8s.io/yaml"
1717

18-
"github.com/nantian-gw/gateway/internal/gatewayapi"
18+
"github.com/nantian-gw/gateway/internal/gwapi"
1919
)
2020

2121
const (
@@ -67,7 +67,7 @@ func patchAllFeatures(options conformancesuite.ConformanceOptions) (conformances
6767
return options, false
6868
}
6969

70-
options.SupportedFeatures = gatewayapi.SupportedFeatureNameSet()
70+
options.SupportedFeatures = gwapi.SupportedFeatureNameSet()
7171
options.EnableAllSupportedFeatures = false
7272
return options, true
7373
}

‎internal/admin/chatbot/validator.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ corev1 "k8s.io/api/core/v1"
2222
gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
2323
mcsv1alpha1 "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1"
2424

25-
backendlbv1alpha2 "github.com/nantian-gw/gateway/internal/gatewayapiexperimental/backendlbv1alpha2"
25+
backendlb "github.com/nantian-gw/gateway/internal/gwexp/backendlb"
2626
"github.com/nantian-gw/gateway/internal/ir"
2727
"github.com/nantian-gw/gateway/internal/translator"
2828
)
@@ -40,7 +40,7 @@ func validatorScheme() *runtime.Scheme {
4040
utilruntime.Must(gatewayv1alpha3.Install(scheme))
4141
utilruntime.Must(corev1.AddToScheme(scheme))
4242
utilruntime.Must(discoveryv1.AddToScheme(scheme))
43-
utilruntime.Must(backendlbv1alpha2.Install(scheme))
43+
utilruntime.Must(backendlb.Install(scheme))
4444
utilruntime.Must(mcsv1alpha1.Install(scheme))
4545
return scheme
4646
}

‎internal/admin/node_source.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"sigs.k8s.io/controller-runtime/pkg/client"
1111

1212
"github.com/nantian-gw/gateway/internal/ir"
13-
"github.com/nantian-gw/gateway/internal/nodestatus"
13+
"github.com/nantian-gw/gateway/internal/nodeinfo"
1414
)
1515

1616
const (
@@ -34,7 +34,7 @@ func (s *Server) currentNodes(ctx context.Context, snapshot *ir.Snapshot) []ir.N
3434
return visibleNodes(snapshot, nodes)
3535
}
3636

37-
return visibleNodes(snapshot, nodestatus.FilterStale(nodestatus.Merge(nodes, shared), time.Now().UTC()))
37+
return visibleNodes(snapshot, nodeinfo.FilterStale(nodeinfo.Merge(nodes, shared), time.Now().UTC()))
3838
}
3939

4040
func (m *ResourceManager) ListNodeStatuses(ctx context.Context) ([]ir.NodeStatus, error) {

‎internal/admin/resource_api_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
2727
mcsv1alpha1 "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1"
2828

29-
backendlbv1alpha2 "github.com/nantian-gw/gateway/internal/gatewayapiexperimental/backendlbv1alpha2"
29+
backendlb "github.com/nantian-gw/gateway/internal/gwexp/backendlb"
3030
"github.com/nantian-gw/gateway/internal/ir"
31-
"github.com/nantian-gw/gateway/internal/nodestatus"
31+
"github.com/nantian-gw/gateway/internal/nodeinfo"
3232
)
3333

3434
func newTestServerWithResourceManager(t *testing.T, resources *ResourceManager) *Server {
@@ -57,11 +57,11 @@ func newTestServerWithResourceManagerAndLoggerAndOptions(
5757
t.Helper()
5858

5959
store := ir.NewSnapshotStore(logger)
60-
nodes := nodestatus.NewRegistry(
60+
nodes := nodeinfo.NewRegistry(
6161
ir.NewNodeStatusStore(),
6262
nil,
6363
logger,
64-
nodestatus.Options{PersistTimeout: time.Second},
64+
nodeinfo.Options{PersistTimeout: time.Second},
6565
)
6666
server := NewServer(":0", store, nodes, resources, logger, opts)
6767

@@ -115,7 +115,7 @@ func resourceManagerForTestWithLogger(t *testing.T, logger *slog.Logger) *Resour
115115
if err := gatewayv1alpha2.Install(scheme); err != nil {
116116
t.Fatalf("install gateway v1alpha2 scheme: %v", err)
117117
}
118-
if err := backendlbv1alpha2.Install(scheme); err != nil {
118+
if err := backendlb.Install(scheme); err != nil {
119119
t.Fatalf("install backendlb v1alpha2 scheme: %v", err)
120120
}
121121
if err := gatewayv1alpha3.Install(scheme); err != nil {
@@ -203,7 +203,7 @@ type noMatchListClient struct {
203203

204204
func (c noMatchListClient) List(ctx context.Context, list client.ObjectList, opts ...client.ListOption) error {
205205
switch list.(type) {
206-
case *backendlbv1alpha2.BackendLBPolicyList:
206+
case *backendlb.BackendLBPolicyList:
207207
return &meta.NoKindMatchError{
208208
GroupKind: schema.GroupKind{Group: gatewayv1.GroupName, Kind: "BackendLBPolicy"},
209209
SearchedVersions: []string{"v1alpha2"},

0 commit comments

Comments
 (0)