Merge pull request #111 from ntnn/code-gen-fixes

✨ Add things for kcp-dev/client-go

Author: kcp-ci-bot

cluster_codegen.sh

@@ -126,6 +126,10 @@ function cluster::codegen::internal::grep() {
 #   --plural-exceptions <string = "">
 #     An optional list of comma separated plural exception definitions in Type:PluralizedType form.
 #
+#   --exclude-group-versions <string = "">
+#     An optional list of comma separate group versions to exclude from
+#     client generation.
+#
 function cluster::codegen::gen_client() {
     local in_dir=""
     local one_input_api=""
@@ -144,6 +148,7 @@ function cluster::codegen::gen_client() {
     local single_cluster_listers_pkg=""
     local watchable="false"
     local plural_exceptions=""
+    local exclude_group_versions=""
     local v="${KUBE_VERBOSE:-0}"
 
     while [ "$#" -gt 0 ]; do
@@ -212,6 +217,10 @@ function cluster::codegen::gen_client() {
                 plural_exceptions="$2"
                 shift 2
                 ;;
+            "--exclude-group-versions")
+                exclude_group_versions="$2"
+                shift 2
+                ;;
             *)
                 if [[ "$1" =~ ^-- ]]; then
                     echo "unknown argument: $1" >&2
@@ -265,7 +274,13 @@ function cluster::codegen::gen_client() {
 
             dir2="$(dirname "${dir}")"
             leaf2="$(basename "${dir2}")"
-            group_versions+=("${leaf2}/${leaf}")
+            gv="${leaf2}/${leaf}"
+
+            if [[ " ${exclude_group_versions} " == *" ${gv} "* ]]; then
+              continue
+            fi
+
+            group_versions+=("${gv}")
         fi
     done < <(
         ( cluster::codegen::internal::grep -l --null \

cmd/cluster-client-gen/generators/client_generator.go

@@ -203,7 +203,7 @@ func targetForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clie
 
 func targetForClientset(args *args.Args, clientsetDir, clientsetPkg string, groupGoNames map[clientgentypes.GroupVersion]string, boilerplate []byte) generator.Target {
 	return &generator.SimpleTarget{
-		PkgName:       "clientset",
+		PkgName:       path.Base(clientsetPkg),
 		PkgPath:       clientsetPkg,
 		PkgDir:        clientsetDir,
 		HeaderComment: boilerplate,

cmd/cluster-client-gen/generators/generator_for_type.go

@@ -144,8 +144,12 @@ func (g *genClientForType) GenerateType(c *generator.Context, t *types.Type, w i
 		sw.Do(nonNamespacedClusterInterfaceImpl, m)
 	}
 
-	if !tags.NoVerbs {
-		sw.Do(clusterInterfaceVerbs, m)
+	if !tags.NoVerbs && tags.HasVerb("list") {
+		sw.Do(listClusterInterfaceImpl, m)
+	}
+
+	if !tags.NoVerbs && tags.HasVerb("watch") {
+		sw.Do(watchClusterInterfaceImpl, m)
 	}
 
 	if !tags.NonNamespaced {
@@ -228,12 +232,14 @@ func (c *$.type|privatePlural$ClusterInterface) Cluster(clusterPath logicalclust
 }
 `
 
-var clusterInterfaceVerbs = `
+var listClusterInterfaceImpl = `
 // List returns the entire collection of all $.type|publicPlural$ across all clusters.
 func (c *$.type|privatePlural$ClusterInterface) List(ctx context.Context, opts $.ListOptions|raw$) (*$.resultType|raw$List, error) {
 	return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).$.type|publicPlural$($if .namespaced$$.NamespaceAll|raw$$end$).List(ctx, opts)
 }
+`
 
+var watchClusterInterfaceImpl = `
 // Watch begins to watch all $.type|publicPlural$ across all clusters.
 func (c *$.type|privatePlural$ClusterInterface) Watch(ctx context.Context, opts $.ListOptions|raw$) (watch.Interface, error) {
 	return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).$.type|publicPlural$($if .namespaced$$.NamespaceAll|raw$$end$).Watch(ctx, opts)