Moved the init of scheme to main

Signed-off-by: Shiming Zhang <[email protected]>

Author: wzshiming

Makefile

@@ -57,7 +57,7 @@ clean:
 
 generate:
 	go mod vendor
-	rm ./pkg/encoding/scheme.go
-	./hack/gen_scheme.sh > pkg/encoding/scheme.go
+	rm ./pkg/scheme/scheme.go
+	./hack/gen_scheme.sh > pkg/scheme/scheme.go
 
 .PHONY: build test release release-docker-build clean generate

cmd/init_test.go

@@ -0,0 +1,21 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+
+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.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	_ "github.com/etcd-io/auger/pkg/scheme"
+)

hack/gen_scheme.sh

@@ -38,7 +38,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package encoding
+package scheme
 
 // Don't edit this file directly. It is generated by scheme.sh.
 import (

main.go

@@ -19,6 +19,8 @@ import (
 	"fmt"
 	"os"
 
+	_ "github.com/etcd-io/auger/pkg/scheme"
+
 	"github.com/etcd-io/auger/cmd"
 )
 

pkg/data/init_test.go

@@ -0,0 +1,21 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+
+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.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package data
+
+import (
+	_ "github.com/etcd-io/auger/pkg/scheme"
+)

pkg/encoding/init.go

@@ -19,7 +19,7 @@ package encoding
 import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
-	schema "k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 )
 
@@ -28,5 +28,4 @@ var Codecs = serializer.NewCodecFactory(Scheme)
 
 func init() {
 	v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
-	AddToScheme(Scheme)
 }

pkg/scheme/init.go

@@ -0,0 +1,25 @@
+/*
+Copyright The Kubernetes Authors.
+
+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.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package scheme
+
+import (
+	"github.com/etcd-io/auger/pkg/encoding"
+)
+
+func init() {
+	AddToScheme(encoding.Scheme)
+}

pkg/encoding/scheme.go pkg/scheme/scheme.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package encoding
+package scheme
 
 // Don't edit this file directly. It is generated by scheme.sh.
 import (