Include resources from previous default version

Before considering the resources marked for removal, if the resource version was in the previous default version, ensure we include it.

Only enable this for the v3 release because it will add a lot more explicit versions.

provider/pkg/versioning/gen.go

@@ -42,6 +42,16 @@ func (v VersionMetadata) ShouldInclude(provider string, version openapi.ApiVersi
 			}
 		}
 	}
+	// Keep any resources in the previous version lock for easier migration
+	if v.MajorVersion >= 3 {
+		if resources, ok := v.PreviousLock[provider]; ok {
+			if previousDefaultResourceVersion, ok := resources[typeName]; ok {
+				if previousDefaultResourceVersion == version {
+					return true
+				}
+			}
+		}
+	}
 	// Exclude versions from removed versions
 	if versions, ok := v.RemovedVersions[provider]; ok {
 		for _, removedVersion := range versions {
@@ -130,11 +140,12 @@ type VersionSources struct {
 	MajorVersion              int
 	ProviderList              providerlist.ProviderList
 	requiredExplicitResources []string
-	PreviousLock              openapi.DefaultVersionLock
-	RemovedVersions           openapi.ProviderVersionList
-	Spec                      Spec
-	Config                    Curations
-	ConfigPath                string
+	// map[ProviderName]map[DefinitionName]ApiVersion
+	PreviousLock    openapi.DefaultVersionLock
+	RemovedVersions openapi.ProviderVersionList
+	Spec            Spec
+	Config          Curations
+	ConfigPath      string
 	// provider->version->[]resource
 	AllResourcesByVersion ProvidersVersionResources
 	// map[TokenToRemove]TokenReplacedWith