Merge branch 'feature/migrate-batch' of https://github.com/Azure/azure-service-operator into feature/migrate-batch

Author: theunrepentantgeek

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

@@ -8,11 +8,9 @@ package pipeline
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"github.com/rotisserie/eris"
 
-	"github.com/Azure/azure-service-operator/v2/internal/set"
 	"github.com/Azure/azure-service-operator/v2/tools/generator/internal/astmodel"
 	"github.com/Azure/azure-service-operator/v2/tools/generator/internal/config"
 )
@@ -56,17 +54,14 @@ func newVersionMigrationFactory(
 	return &versionMigrationFactory{
 		configuration:     configuration,
 		definitions:       definitions,
-		lastLegacyVersion: "v2.16.0",
+		lastLegacyVersion: "v2.16.0", //!! Change to v2.16.0 once hybrid mode is in place
 	}
 }
 
 func (p *versionMigrationFactory) Process(ctx context.Context) (astmodel.TypeDefinitionSet, error) {
 	// Find all the resources currently using legacy mode
 	// versioning that need to be moved to use new style versioning
-	toMove, err := p.findLegacyModeResourcesToMove()
-	if err != nil {
-		return nil, eris.Wrap(err, "finding resources for version migration")
-	}
+	toMove := p.findLegacyModeResourcesToMove()
 
 	moved, err := p.moveResources(toMove, "v")
 	if err != nil {
@@ -88,19 +83,9 @@ func (p *versionMigrationFactory) Process(ctx context.Context) (astmodel.TypeDef
 // moved to new packages using new (simpler) versioning.
 // We scan all definitions looking for resources in groups configured for Legacy mode versioning
 // that are noted in configuration as being introduced in ASO version 2.17 or later.
-func (p *versionMigrationFactory) findLegacyModeResourcesToMove() (astmodel.TypeDefinitionSet, error) {
+func (p *versionMigrationFactory) findLegacyModeResourcesToMove() astmodel.TypeDefinitionSet {
 	result := make(astmodel.TypeDefinitionSet)
 
-	// For legacy mode groups, we need to ensure that we find at least one resource introduced
-	// prior to v2.17 - this is to catch cases where someone incorrectly configures legacy mode
-	// for a new group. We can't just look for all legacy mode groups, because unit tests focus
-	// on just selected groups.
-	// Instead, we track which legacy mode groups we encounter during our search, and verify
-	// that the set of groups used by newer types is a strict subset of the groups used by
-	// older types.
-	legacyModeGroupsContainingOlderResources := set.Make[string]()
-	legacyModeGroupsContainingNewerResources := set.Make[string]()
-
 	for _, def := range p.definitions {
 		_, ok := astmodel.AsResourceType(def.Type())
 		if !ok {
@@ -110,38 +95,22 @@ func (p *versionMigrationFactory) findLegacyModeResourcesToMove() (astmodel.Type
 		pkg := def.Name().InternalPackageReference()
 		group := pkg.Group()
 
-		// If the group is not using legacy mode versioning, skip it
 		mode := astmodel.VersionMigrationModeForGroup(group)
 		if mode != astmodel.VersionMigrationModeLegacy {
 			continue
 		}
 
-		// Look up which version of ASO this resource was introduced in.
-		// (This might be missing during testing, so it's not an error if we don't find it)
 		introducedIn, ok := p.configuration.SupportedFrom.Lookup(def.Name())
 		if !ok {
 			continue
 		}
 
 		if astmodel.ComparePathAndVersion(introducedIn, p.lastLegacyVersion) > 0 {
-			// This resource was introduced after the last legacy version, it needs to be moved
 			result.Add(def)
-			legacyModeGroupsContainingNewerResources.Add(group)
-		} else {
-			// Found at least one resource introduced prior to v2.17 in this group
-			legacyModeGroupsContainingOlderResources.Add(group)
 		}
 	}
 
-	// Check to see if any of the legacy mode groups failed to contain older resources
-	legacyGroups := legacyModeGroupsContainingNewerResources.Except(legacyModeGroupsContainingOlderResources)
-	if len(legacyGroups) > 0 {
-		return nil, eris.Errorf(
-			"expected to find resources introduced prior to ASO version 2.17 in group(s) %s but none were found",
-			strings.Join(set.AsSortedSlice(legacyGroups), ", "))
-	}
-
-	return result, nil
+	return result
 }
 
 // findHybridModeResourcesToCopy identifies resources using hybrid mode versioning that need to be

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

@@ -81,7 +81,7 @@ func (b *ResourceConversionGraphBuilder) Build() (*ResourceConversionGraph, erro
 	return result, nil
 }
 
-// compatibilityReferencesConvertToOriginalPackage links any compatibility references to the original if present
+// compatibilityReferencesConvertToOriginalPackage linkes any compatibility references to the original if present
 func (b *ResourceConversionGraphBuilder) compatibilityReferencesConvertToOriginalPackage(names []astmodel.InternalTypeName) {
 	for i, name := range names {
 		// Last package can't be linked forward