run code-gen

Author: varshaprasad96

bin/code-generator

@@ -429,7 +429,7 @@ func (g *Generator) generateSubInterfaces(ctx *genall.GenerationContext) error {
 
 				namespaceScoped := info.Markers.Get(nonNamespacedMarker.Name) == nil
 				noVerbs := info.Markers.Get(noVerbsMarker.Name) != nil
-				hasStatus := info.Markers.Get(noStatusMarker.Name) == nil
+				hasStatus := hasStatusSubresource(info)
 				readOnly := info.Markers.Get(readOnlyMarker.Name) != nil
 				sVerbs := info.Markers.Get(skipVerbsMarker.Name)
 				if sVerbs != nil {
@@ -621,3 +621,21 @@ func writeMethods(out io.Writer, byType map[string][]byte) error {
 	}
 	return nil
 }
+
+// hasStatusSubresource verifies if updateStatus verb is to be scaffolded.
+// if `noStatus` marker is present is returns false. Else it checks if
+// the type has Status field.
+func hasStatusSubresource(info *markers.TypeInfo) bool {
+	if info.Markers.Get(noStatusMarker.Name) != nil {
+		return false
+	}
+
+	hasStatusField := false
+	for _, f := range info.Fields {
+		if f.Name == "Status" {
+			hasStatusField = true
+			break
+		}
+	}
+	return hasStatusField
+}

examples/pkg/clusterclient/clientset.go

@@ -326,7 +326,7 @@ func (a *api) WriteContent() error {
 				if *extension.Verb == "apply" {
 					_, gvString := codegenutil.ParsePathGroupVersion(pkg)
 					*a.importList = append(*a.importList, util.ImportFormat(fmt.Sprintf("%sapplyconfig", strings.ToLower(name)), fmt.Sprintf("%s/%s", a.ApplyConfigurationPackage, gvString)))
-					a.InputType = fmt.Sprintf("%sapplyconfig.%sApplyConfiguration", strings.ToLower(name), name)
+					a.InputType = fmt.Sprintf("*%sapplyconfig.%sApplyConfiguration", strings.ToLower(name), name)
 				}
 			} else {
 				a.InputType = fmt.Sprintf("*%sapi%s.%s", a.PkgName, a.Version, name)
@@ -346,23 +346,23 @@ func (a *api) WriteContent() error {
 
 		if *extension.Verb == "create" {
 			a.Method = *extension.Method
-			adjTemplate := adjustTemplate(createTemplate)
+			adjTemplate := adjustTemplate(createTemplate, "create")
 			if err := templateExecute(adjTemplate, *a); err != nil {
 				return err
 			}
 		}
 
 		if *extension.Verb == "update" {
 			a.Method = *extension.Method
-			adjTemplate := adjustTemplate(updateTemplate)
+			adjTemplate := adjustTemplate(updateTemplate, "update")
 			if err := templateExecute(adjTemplate, *a); err != nil {
 				return err
 			}
 		}
 
 		if *extension.Verb == "apply" {
 			a.Method = *extension.Method
-			adjTemplate := adjustTemplate(applyTemplate)
+			adjTemplate := adjustTemplate(applyTemplate, "apply")
 			if err := templateExecute(adjTemplate, *a); err != nil {
 				return err
 			}
@@ -414,7 +414,14 @@ func (p *packages) appendGenericImports(importList []string) []string {
 		util.ImportFormat(fmt.Sprintf("%s%s", p.Name, p.Version), fmt.Sprintf("%s/typed/%s/%s", p.ClientPath, p.Name, p.Version)))
 }
 
-func adjustTemplate(template string) string {
+func adjustTemplate(template, verb string) string {
 	index := strings.Index(template, "ctx context.Context,") + len("ctx context.Context,")
-	return string(template[:index]) + " name string," + string(template[index:])
+	newTemplate := string(template[:index]) + " name string," + string(template[index:])
+	return adjReturnValueInTemplate(newTemplate, verb)
+}
+
+func adjReturnValueInTemplate(template, verb string) string {
+	s := fmt.Sprintf("w.delegate.{{value .Method \"%s\"}}(ctx,", upperFirst(verb))
+	index := strings.Index(template, s) + len(s)
+	return string(template[:index]) + " name, " + string(template[index:])
 }