Integrate into the pipeline

hack/generator/pkg/codegen/code_generator.go

@@ -158,6 +158,7 @@ func createAllPipelineStages(idFactory astmodel.IdentifierFactory, configuration
 
 		// Create Storage types
 		//TODO: For now only used for ARM
+		pipeline.CreateConversionGraph(graph).UsedFor(pipeline.ARMTarget),
 		pipeline.InjectOriginalVersionFunction(idFactory).UsedFor(pipeline.ARMTarget),
 		pipeline.CreateStorageTypes(graph).UsedFor(pipeline.ARMTarget),
 		pipeline.InjectOriginalVersionProperty().UsedFor(pipeline.ARMTarget),

hack/generator/pkg/codegen/pipeline/create_storage_types.go

@@ -40,7 +40,7 @@ func CreateStorageTypes(conversionGraph *storage.ConversionGraph) Stage {
 			typesToConvert := types.Where(isPropertyContainer).Where(isNotARMType)
 
 			storageTypes := make(astmodel.Types)
-			typeConverter := storage.NewTypeConverter(types)
+			typeConverter := storage.NewTypeConverter(types, conversionGraph)
 
 			// Create storage variants
 			for name, def := range typesToConvert {
@@ -50,14 +50,13 @@ func CreateStorageTypes(conversionGraph *storage.ConversionGraph) Stage {
 				}
 
 				storageTypes.Add(storageDef)
-				conversionGraph.AddLink(name.PackageReference, storageDef.Name().PackageReference)
 			}
 
 			result := types.Copy()
 			result.AddTypes(storageTypes)
 			return result, nil
 		})
 
-	result.RequiresPrerequisiteStages(injectOriginalVersionFunctionStageId)
+	result.RequiresPrerequisiteStages(InjectOriginalVersionFunctionStageId, CreateConversionGraphStageId)
 	return result
 }

hack/generator/pkg/codegen/pipeline/inject_original_gvk_function.go

@@ -50,6 +50,6 @@ func InjectOriginalGVKFunction(idFactory astmodel.IdentifierFactory) Stage {
 			return result, nil
 		})
 
-	stage.RequiresPrerequisiteStages(injectOriginalVersionFunctionStageId)
+	stage.RequiresPrerequisiteStages(InjectOriginalVersionFunctionStageId)
 	return stage
 }

hack/generator/pkg/codegen/pipeline/inject_original_version_function.go

@@ -15,8 +15,8 @@ import (
 	"github.com/Azure/azure-service-operator/hack/generator/pkg/functions"
 )
 
-// injectOriginalVersionFunctionStageId is the unique identifier for this pipeline stage
-const injectOriginalVersionFunctionStageId = "injectOriginalVersionFunction"
+// InjectOriginalVersionFunctionStageId is the unique identifier for this pipeline stage
+const InjectOriginalVersionFunctionStageId = "injectOriginalVersionFunction"
 
 // InjectOriginalVersionFunction injects the function OriginalVersion() into each Spec type
 // This function allows us to recover the original version used to create each custom resource, giving the operator the
@@ -25,7 +25,7 @@ const injectOriginalVersionFunctionStageId = "injectOriginalVersionFunction"
 func InjectOriginalVersionFunction(idFactory astmodel.IdentifierFactory) Stage {
 
 	stage := MakeStage(
-		injectOriginalVersionFunctionStageId,
+		InjectOriginalVersionFunctionStageId,
 		"Inject the function OriginalVersion() into each Spec type",
 		func(ctx context.Context, types astmodel.Types) (astmodel.Types, error) {
 			injector := storage.NewFunctionInjector()

hack/generator/pkg/codegen/pipeline/inject_original_version_property.go

@@ -56,6 +56,6 @@ func InjectOriginalVersionProperty() Stage {
 			return result, nil
 		})
 
-	stage.RequiresPrerequisiteStages(injectOriginalVersionFunctionStageId)
+	stage.RequiresPrerequisiteStages(InjectOriginalVersionFunctionStageId)
 	return stage
 }

hack/generator/pkg/codegen/pipeline/inject_property_assignment_functions.go

@@ -17,16 +17,16 @@ import (
 	"github.com/Azure/azure-service-operator/hack/generator/pkg/functions"
 )
 
-// injectPropertyAssignmentFunctionsStageId is the unique identifier for this pipeline stage
-const injectPropertyAssignmentFunctionsStageId = "injectPropertyAssignmentFunctions"
+// InjectPropertyAssignmentFunctionsStageId is the unique identifier for this pipeline stage
+const InjectPropertyAssignmentFunctionsStageId = "injectPropertyAssignmentFunctions"
 
 // InjectPropertyAssignmentFunctions injects property assignment functions AssignTo*() and AssignFrom*() into both
 // resources and object types. These functions do the heavy lifting of the conversions between versions of each type and
 // are the building blocks of the main CovertTo*() and ConvertFrom*() methods.
 func InjectPropertyAssignmentFunctions(graph *storage.ConversionGraph, idFactory astmodel.IdentifierFactory) Stage {
 
 	stage := MakeStage(
-		injectPropertyAssignmentFunctionsStageId,
+		InjectPropertyAssignmentFunctionsStageId,
 		"Inject property assignment functions AssignFrom() and AssignTo() into resources and objects",
 		func(ctx context.Context, types astmodel.Types) (astmodel.Types, error) {
 

hack/generator/pkg/codegen/storage/type_converter.go

@@ -20,14 +20,19 @@ type TypeConverter struct {
 	visitor astmodel.TypeVisitor
 	// types contains all the types for this group
 	types astmodel.Types
+	// conversionGraph is the map of package conversions we use
+	conversionGraph *ConversionGraph
 	// propertyConverter is used to modify properties
 	propertyConverter *PropertyConverter
 }
 
 // NewTypeConverter creates a new instance of the utility type
-func NewTypeConverter(types astmodel.Types) *TypeConverter {
+func NewTypeConverter(
+	types astmodel.Types,
+	conversionGraph *ConversionGraph) *TypeConverter {
 	result := &TypeConverter{
 		types:             types,
+		conversionGraph:   conversionGraph,
 		propertyConverter: NewPropertyConverter(types),
 	}
 
@@ -129,15 +134,14 @@ func (t *TypeConverter) stripAllFlags(
 	return astmodel.IdentityVisitOfFlaggedType(tv, flaggedType, ctx)
 }
 
-func (_ *TypeConverter) tryConvertToStoragePackage(name astmodel.TypeName) (astmodel.TypeName, bool) {
+func (t *TypeConverter) tryConvertToStoragePackage(name astmodel.TypeName) (astmodel.TypeName, bool) {
 	// Map the type name into our storage package
-	localRef, ok := name.PackageReference.AsLocalPackage()
+	ref, ok := t.conversionGraph.LookupTransition(name.PackageReference)
 	if !ok {
 		return astmodel.TypeName{}, false
 	}
 
-	storageRef := astmodel.MakeStoragePackageReference(localRef)
-	visitedName := astmodel.MakeTypeName(storageRef, name.Name())
+	visitedName := astmodel.MakeTypeName(ref, name.Name())
 	return visitedName, true
 }