Remove versionPrefix parameter from the conversion graph

Author: theunrepentantgeek

v2/tools/generator/internal/codegen/code_generator.go

@@ -223,11 +223,11 @@ func createAllPipelineStages(
 		// TODO: For now only used for ARM
 		pipeline.InjectOriginalVersionFunction(idFactory).UsedFor(pipeline.ARMTarget),
 		pipeline.CreateStorageTypes().UsedFor(pipeline.ARMTarget),
-		pipeline.CreateConversionGraph(configuration, astmodel.GeneratorVersion).UsedFor(pipeline.ARMTarget),
+		pipeline.CreateConversionGraph(configuration).UsedFor(pipeline.ARMTarget),
 		pipeline.RepairSkippingProperties(configuration.ObjectModelConfiguration, log).UsedFor(pipeline.ARMTarget),
 
 		// Need to regenerate the conversion graph in case our repairs for Skipping properties changed things
-		pipeline.CreateConversionGraph(configuration, astmodel.GeneratorVersion).UsedFor(pipeline.ARMTarget),
+		pipeline.CreateConversionGraph(configuration).UsedFor(pipeline.ARMTarget),
 
 		pipeline.InjectOriginalVersionProperty().UsedFor(pipeline.ARMTarget),
 		pipeline.InjectPropertyAssignmentFunctions(configuration, idFactory, log).UsedFor(pipeline.ARMTarget),

v2/tools/generator/internal/codegen/pipeline/create_conversion_graph.go

@@ -26,7 +26,6 @@ const CreateConversionGraphStageID = "createConversionGraph"
 // convert resources to/from the designated storage (or hub) version
 func CreateConversionGraph(
 	configuration *config.Configuration,
-	generatorPrefix string,
 ) *Stage {
 	stage := NewStage(
 		CreateConversionGraphStageID,
@@ -48,8 +47,7 @@ func CreateConversionGraph(
 				allNames.Add(def.Name())
 			}
 
-			builder := storage.NewConversionGraphBuilder(
-				configuration.ObjectModelConfiguration, generatorPrefix)
+			builder := storage.NewConversionGraphBuilder(configuration.ObjectModelConfiguration)
 			builder.AddAll(allNames)
 			graph, err := builder.Build()
 			if err != nil {

v2/tools/generator/internal/codegen/pipeline/create_conversion_graph_test.go

@@ -36,7 +36,7 @@ func TestCreateConversionGraph(t *testing.T) {
 
 	finalState, err := RunTestPipeline(
 		initialState,
-		CreateConversionGraph(cfg, "v"))
+		CreateConversionGraph(cfg))
 	g.Expect(err).To(Succeed())
 
 	g.Expect(finalState.Definitions()).To(HaveLen(6))

v2/tools/generator/internal/codegen/pipeline/resource_registration_file.go

@@ -150,7 +150,9 @@ func (r *ResourceRegistrationFile) AsAst() (*dst.File, error) {
 	return result, nil
 }
 
-func (r *ResourceRegistrationFile) getStorageVersionToVersionsMap(codeGenerationContext *astmodel.CodeGenerationContext) map[astmodel.InternalTypeName][]astmodel.InternalTypeName {
+func (r *ResourceRegistrationFile) getStorageVersionToVersionsMap(
+	codeGenerationContext *astmodel.CodeGenerationContext,
+) map[astmodel.InternalTypeName][]astmodel.InternalTypeName {
 	result := make(map[astmodel.InternalTypeName][]astmodel.InternalTypeName, len(r.storageVersionResources))
 
 	for _, storageVersion := range r.storageVersionResources {

v2/tools/generator/internal/codegen/storage/conversion_graph_builder.go

@@ -16,18 +16,15 @@ import (
 // the storage variants of the packages. It uses a separate GroupConversionGraphBuilder for each distinct group
 type ConversionGraphBuilder struct {
 	configuration *config.ObjectModelConfiguration
-	versionPrefix string
 	subBuilders   map[string]*GroupConversionGraphBuilder
 }
 
 // NewConversionGraphBuilder creates a new builder for all our required conversion graphs
 func NewConversionGraphBuilder(
 	configuration *config.ObjectModelConfiguration,
-	versionPrefix string,
 ) *ConversionGraphBuilder {
 	return &ConversionGraphBuilder{
 		configuration: configuration,
-		versionPrefix: versionPrefix,
 		subBuilders:   make(map[string]*GroupConversionGraphBuilder),
 	}
 }
@@ -73,7 +70,7 @@ func (b *ConversionGraphBuilder) getSubBuilder(name astmodel.InternalTypeName) *
 	group := name.InternalPackageReference().Group()
 	subBuilder, ok := b.subBuilders[group]
 	if !ok {
-		subBuilder = NewGroupConversionGraphBuilder(group, b.configuration, b.versionPrefix)
+		subBuilder = NewGroupConversionGraphBuilder(group, b.configuration)
 		b.subBuilders[group] = subBuilder
 	}
 

v2/tools/generator/internal/codegen/storage/group_conversion_graph_builder.go

@@ -16,9 +16,8 @@ import (
 // GroupConversionGraphBuilder is used to construct a conversion graph with all the required conversions to/from/between
 // the storage variants of the packages. It uses a separate ResourceConversionGraphBuilder for each distinct resource/type
 type GroupConversionGraphBuilder struct {
-	group           string                           // Common group of the resources needing conversions
-	configuration   *config.ObjectModelConfiguration // Configuration used to look up renames
-	versionPrefix   string
+	group           string                                     // Common group of the resources needing conversions
+	configuration   *config.ObjectModelConfiguration           // Configuration used to look up renames
 	subBuilders     map[string]*ResourceConversionGraphBuilder // Nested builders, one for each resource, keyed by resource name
 	storagePackages *astmodel.PackageReferenceSet              // Set of all storage packages in this group
 }
@@ -27,12 +26,10 @@ type GroupConversionGraphBuilder struct {
 func NewGroupConversionGraphBuilder(
 	group string,
 	configuration *config.ObjectModelConfiguration,
-	versionPrefix string,
 ) *GroupConversionGraphBuilder {
 	return &GroupConversionGraphBuilder{
 		group:           group,
 		configuration:   configuration,
-		versionPrefix:   versionPrefix,
 		subBuilders:     make(map[string]*ResourceConversionGraphBuilder),
 		storagePackages: astmodel.NewPackageReferenceSet(),
 	}
@@ -96,7 +93,7 @@ func (b *GroupConversionGraphBuilder) getSubBuilder(name astmodel.TypeName) *Res
 	n := name.Name()
 	subBuilder, ok := b.subBuilders[n]
 	if !ok {
-		subBuilder = NewResourceConversionGraphBuilder(n, b.versionPrefix)
+		subBuilder = NewResourceConversionGraphBuilder(n)
 		b.subBuilders[n] = subBuilder
 	}
 

v2/tools/generator/internal/codegen/storage/resource_conversion_graph_builder.go

@@ -17,19 +17,17 @@ import (
 // ResourceConversionGraphBuilder is used to construct a group conversion graph with all the required conversions
 // to/from/between storage variants of the packages
 type ResourceConversionGraphBuilder struct {
-	name          string                       // Name of the resources needing conversions
-	versionPrefix string                       // Prefix expected on core LocalPackageReferences
-	references    astmodel.InternalTypeNameSet // Set of all Type Names that make up this group
-	links         astmodel.TypeAssociation     // A collection of links that make up the graph
+	name       string                       // Name of the resources needing conversions
+	references astmodel.InternalTypeNameSet // Set of all Type Names that make up this group
+	links      astmodel.TypeAssociation     // A collection of links that make up the graph
 }
 
 // NewResourceConversionGraphBuilder creates a new builder for a specific resource/type
-func NewResourceConversionGraphBuilder(name string, versionPrefix string) *ResourceConversionGraphBuilder {
+func NewResourceConversionGraphBuilder(name string) *ResourceConversionGraphBuilder {
 	return &ResourceConversionGraphBuilder{
-		name:          name,
-		versionPrefix: versionPrefix,
-		references:    astmodel.NewInternalTypeNameSet(),
-		links:         make(astmodel.TypeAssociation),
+		name:       name,
+		references: astmodel.NewInternalTypeNameSet(),
+		links:      make(astmodel.TypeAssociation),
 	}
 }
 
@@ -157,7 +155,7 @@ func (b *ResourceConversionGraphBuilder) isCompatibilityPackage(ref astmodel.Pac
 	case astmodel.ExternalPackageReference:
 		return false
 	case astmodel.LocalPackageReference:
-		return !r.HasVersionPrefix(b.versionPrefix)
+		return r.HasVersionPrefix("v1api")
 	case astmodel.SubPackageReference:
 		return b.isCompatibilityPackage(r.Parent())
 	default: