Merge pull request #1145 from cbandy/alias-deepcopy

🐛 Handle pointer to alias in DeepCopy

Author: k8s-ci-robot

pkg/crd/testdata/cronjob_types.go

@@ -340,7 +340,8 @@ type CronJobSpec struct {
 	AliasFromPackage corev1.IPFamilyPolicyType `json:"aliasFromPackage,omitempty"`
 
 	// This tests that string alias is handled correctly.
-	StringAlias StringAlias `json:"stringAlias,omitempty"`
+	StringAlias    StringAlias  `json:"stringAlias,omitempty"`
+	StringAliasPtr *StringAlias `json:"stringAliasPtr,omitempty"`
 
 	// This tests that validation on a string alias type is handled correctly.
 	// +kubebuilder:validation:MinLength=1

pkg/crd/testdata/testdata.kubebuilder.io_cronjobs.yaml

@@ -9012,6 +9012,8 @@ spec:
                 maxLength: 255
                 minLength: 1
                 type: string
+              stringAliasPtr:
+                type: string
               stringPair:
                 description: This tests string slice validation.
                 items:

pkg/deepcopy/testdata/cronjob_types.go

@@ -156,6 +156,9 @@ type SpecificCases struct {
 
 	// Case: kubernetes-sigs/controller-tools#813
 	StringAlias StringAlias `json:"stringAlias,omitempty"`
+
+	// Case: kubernetes-sigs/controller-tools#1136
+	StringAliasPtr *StringAlias `json:"stringAliasPtr,omitempty"`
 }
 
 type StringAlias = string

pkg/deepcopy/testdata/zz_generated.deepcopy.go

@@ -173,18 +173,12 @@ func (n *namingInfo) Syntax(basePkg *loader.Package, imports *importsList) strin
 
 	// NB(directxman12): typeInfo.String gets us most of the way there,
 	// but fails (for us) on named imports, since it uses the full package path.
+	var typeName *types.TypeName
 	switch typeInfo := n.typeInfo.(type) {
+	case *types.Alias:
+		typeName = typeInfo.Obj()
 	case *types.Named:
-		// register that we need an import for this type,
-		// so we can get the appropriate alias to use.
-		typeName := typeInfo.Obj()
-		otherPkg := typeName.Pkg()
-		if otherPkg == basePkg.Types {
-			// local import
-			return typeName.Name()
-		}
-		alias := imports.NeedImport(loader.NonVendorPath(otherPkg.Path()))
-		return alias + "." + typeName.Name()
+		typeName = typeInfo.Obj()
 	case *types.Basic:
 		return typeInfo.String()
 	case *types.Pointer:
@@ -200,6 +194,16 @@ func (n *namingInfo) Syntax(basePkg *loader.Package, imports *importsList) strin
 		basePkg.AddError(fmt.Errorf("name requested for invalid type: %s", typeInfo))
 		return typeInfo.String()
 	}
+
+	// register that we need an import for this type,
+	// so we can get the appropriate alias to use.
+	otherPkg := typeName.Pkg()
+	if otherPkg == basePkg.Types {
+		// local import
+		return typeName.Name()
+	}
+	alias := imports.NeedImport(loader.NonVendorPath(otherPkg.Path()))
+	return alias + "." + typeName.Name()
 }
 
 // copyMethodMakers makes DeepCopy (and related) methods for Go types,