Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export BASE_VERSION ?= $(HIGRESS_BASE_VERSION)

export CHARTS ?= higress-registry.cn-hangzhou.cr.aliyuncs.com/charts

VERSION_PACKAGE := github.com/alibaba/higress/pkg/cmd/lversion
VERSION_PACKAGE := github.com/alibaba/higress/v2/pkg/cmd/lversion

GIT_COMMIT:=$(shell git rev-parse HEAD)

Expand Down
2 changes: 1 addition & 1 deletion api/cue.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Cuelang configuration to generate OpenAPI schema for Higress configs.

module: github.com/alibaba/higress/api
module: github.com/alibaba/higress/v2/api

openapi:
selfContained: true
Expand Down
2 changes: 1 addition & 1 deletion api/extensions/v1alpha1/wasmplugin.proto
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import "google/protobuf/struct.proto";

package higress.extensions.v1alpha1;

option go_package="github.com/alibaba/higress/api/extensions/v1alpha1";
option go_package="github.com/alibaba/higress/v2/api/extensions/v1alpha1";

// <!-- crd generation tags
// +cue-gen:WasmPlugin:groupName:extensions.higress.io
Expand Down
2 changes: 1 addition & 1 deletion api/gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ buf generate \
--path networking \
--path extensions

# Generate CRDs
# Generate CRDs
cue-gen -verbose -f=./cue.yaml -crd=true
8 changes: 4 additions & 4 deletions api/networking/v1/http_2_rpc.proto
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright (c) 2022 Alibaba Group Holding Ltd.
//
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -23,7 +23,7 @@ import "google/api/field_behavior.proto";

package higress.networking.v1;

option go_package = "github.com/alibaba/higress/api/networking/v1";
option go_package = "github.com/alibaba/higress/v2/api/networking/v1";

// <!-- crd generation tags
// +cue-gen:Http2Rpc:groupName:networking.higress.io
Expand Down
10 changes: 5 additions & 5 deletions api/networking/v1/mcp_bridge.proto
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright (c) 2022 Alibaba Group Holding Ltd.
//
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -25,7 +25,7 @@ import "google/protobuf/struct.proto";

package higress.networking.v1;

option go_package = "github.com/alibaba/higress/api/networking/v1";
option go_package = "github.com/alibaba/higress/v2/api/networking/v1";

// <!-- crd generation tags
// +cue-gen:McpBridge:groupName:networking.higress.io
Expand All @@ -50,7 +50,7 @@ message McpBridge {
}

message RegistryConfig {
string type = 1 [(google.api.field_behavior) = REQUIRED];
string type = 1 [(google.api.field_behavior) = REQUIRED];
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为 RegistryConfig 消息的 type 字段添加了必需的字段行为注解。

🟢 Minor | 🧹 Code Smells

📋 问题详情

在 RegistryConfig 消息中,type 字段被标记为必需,但缺少 google.api.field_behavior 注解。这可能导致生成的代码或文档不完整,影响 API 的清晰度和正确使用。

💡 解决方案

确保所有必需字段都包含适当的注解,以提高 API 的可读性和正确性。

-  string type = 1;
+  string type = 1 [(google.api.field_behavior) = REQUIRED];

您的反馈对我们很重要!(建议右键在新标签页中打开以下链接)

有用意见👍无用意见👎错误意见❌

string name = 2;
string domain = 3 [(google.api.field_behavior) = REQUIRED];
uint32 port = 4 [(google.api.field_behavior) = REQUIRED];
Expand Down
8 changes: 4 additions & 4 deletions client/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ comma := ,

# source packages to scan for kubetype-gen tags
kube_source_packages = $(subst $(space),$(empty), \
github.com/alibaba/higress/api/networking/v1, \
github.com/alibaba/higress/api/extensions/v1alpha1 \
github.com/alibaba/higress/v2/api/networking/v1, \
github.com/alibaba/higress/v2/api/extensions/v1alpha1 \
)

# base output package for generated files
kube_base_output_package = github.com/alibaba/higress/client/pkg
kube_base_output_package = github.com/alibaba/higress/v2/client/pkg
# base output package for kubernetes types, register, etc...
kube_api_base_package = $(kube_base_output_package)/apis
# source packages to scan for kubernetes generator tags, e.g. deepcopy-gen, client-gen, etc.
Expand Down Expand Up @@ -72,7 +72,7 @@ else
endif

rename_generated_files=\
find $(subst github.com/alibaba/higress/client/, $(empty), $(subst $(comma), $(space), $(kube_api_packages)) $(kube_clientset_package) $(kube_listers_package) $(kube_informers_package)) \
find $(subst github.com/alibaba/higress/v2/client/, $(empty), $(subst $(comma), $(space), $(kube_api_packages)) $(kube_clientset_package) $(kube_listers_package) $(kube_informers_package)) \
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

修正了 rename_generated_files 中的路径替换逻辑。

🟠 Critical | 🐞 Bugs

📋 问题详情

rename_generated_files 中的路径替换逻辑不正确,可能导致生成的文件重命名失败。具体来说,$(subst github.com/alibaba/higress/v2/client/, $(empty), ...) 中的逗号和空格处理可能不正确,导致路径替换失败。

💡 解决方案

修正路径替换逻辑,确保生成的文件能够正确重命名。

-	find $(subst github.com/alibaba/higress/v2/client/, $(empty), $(subst $(comma), $(space), $(kube_api_packages)) $(kube_clientset_package) $(kube_listers_package) $(kube_informers_package)) \\
-	-name '*.go' -and -not -name 'doc.go' -and -not -name '*.gen.go' -type f -exec sh -c 'mv "$$1" "$${1%.go}".gen.go' - '{}' \;
+	find $(subst github.com/alibaba/higress/v2/client/, , $(subst $(comma), $(space), $(kube_api_packages)) $(kube_clientset_package) $(kube_listers_package) $(kube_informers_package)) \\
+	-name '*.go' -and -not -name 'doc.go' -and -not -name '*.gen.go' -type f -exec sh -c 'mv "$$1" "$${1%.go}".gen.go' - '{}' \;

您的反馈对我们很重要!(建议右键在新标签页中打开以下链接)

有用意见👍无用意见👎错误意见❌

-name '*.go' -and -not -name 'doc.go' -and -not -name '*.gen.go' -type f -exec sh -c 'mv "$$1" "$${1%.go}".gen.go' - '{}' \;

.PHONY: generate-k8s-client
Expand Down
2 changes: 1 addition & 1 deletion client/pkg/apis/extensions/v1alpha1/types.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/pkg/apis/networking/v1/types.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions client/pkg/applyconfiguration/networking/v1/http2rpc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions client/pkg/applyconfiguration/networking/v1/mcpbridge.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions client/pkg/applyconfiguration/utils.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions client/pkg/clientset/versioned/clientset.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions client/pkg/clientset/versioned/fake/clientset_generated.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions client/pkg/clientset/versioned/fake/register.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 11 additions & 9 deletions client/pkg/clientset/versioned/scheme/register.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading