Fix active version lookup

- Use the original Azure resource provider namespace rather that our adjusted module names which might not match.

provider/pkg/providerlist/providerlist.go

@@ -68,17 +68,17 @@ func ReadProviderList(providerListPath string) (*ProviderList, error) {
 }
 
 type ActiveVersionChecker interface {
-	HasProviderVersion(providerName string, version openapi.ApiVersion) bool
+	HasProviderVersion(namespace string, version openapi.ApiVersion) bool
 }
 
 type providerListIndex struct {
 	providerResourceVersionLookup ProviderPathVersions
 	providerVersions              map[LoweredProviderName]ApiVersions
 }
 
-func (index *providerListIndex) HasProviderVersion(providerName string, version openapi.ApiVersion) bool {
-	providerName = strings.ToLower(providerName)
-	versions, ok := index.providerVersions[providerName]
+func (index *providerListIndex) HasProviderVersion(namespace string, version openapi.ApiVersion) bool {
+	namespace = strings.ToLower(namespace)
+	versions, ok := index.providerVersions[namespace]
 	if !ok {
 		return false
 	}
@@ -97,7 +97,6 @@ func (providers ProviderList) Index() *providerListIndex {
 		if !strings.HasPrefix(namespace, "microsoft.") {
 			continue
 		}
-		providerName := strings.TrimPrefix(namespace, "microsoft.")
 
 		pathVersions := map[ResourcePath]ApiVersions{}
 		allVersions := codegen.NewStringSet()
@@ -112,8 +111,8 @@ func (providers ProviderList) Index() *providerListIndex {
 		}
 
 		pathVersions[""] = allVersions
-		providerVersions[providerName] = allVersions
-		providerLiveVersions[providerName] = pathVersions
+		providerVersions[namespace] = allVersions
+		providerLiveVersions[namespace] = pathVersions
 	}
 
 	return &providerListIndex{

provider/pkg/versioning/defaultVersion.go

@@ -116,8 +116,7 @@ func FindInactiveDefaultVersions(defaultVersions openapi.DefaultVersions, active
 	for moduleName, versions := range defaultVersions {
 		inactiveVersions := collections.NewOrderableSet[openapi.ApiVersion]()
 		for _, version := range versions {
-			// TODO: Use the original AZ namespace rather that our adjusted module name
-			if !activeVersions.HasProviderVersion(string(moduleName), version.ApiVersion) {
+			if !activeVersions.HasProviderVersion(version.RpNamespace, version.ApiVersion) {
 				inactiveVersions.Add(version.ApiVersion)
 			}
 		}
@@ -230,6 +229,7 @@ func (b moduleSpecBuilder) buildSpec(versions VersionResources, curations Curati
 			continue
 		}
 		for _, definitionName := range util.SortedKeys(definitions) {
+			definition := definitions[definitionName]
 			isExcluded, exclusionErr := moduleCuration.IsExcluded(definitionName, apiVersion)
 			if exclusionErr != nil {
 				exclusionErrors = append(exclusionErrors, ExclusionError{
@@ -245,8 +245,7 @@ func (b moduleSpecBuilder) buildSpec(versions VersionResources, curations Curati
 				additions[definitionName] = existingVersion
 				continue
 			}
-			// TODO: Use the original AZ namespace rather that our adjusted module name
-			if !b.activeVersionChecker.HasProviderVersion(string(b.moduleName), apiVersion) {
+			if !b.activeVersionChecker.HasProviderVersion(definition.RpNamespace, apiVersion) {
 				// Don't add if not marked as live
 				continue
 			}
@@ -332,8 +331,9 @@ func (b moduleSpecBuilder) filterCandidateVersions(versions VersionResources, pr
 	openapi.SortApiVersions(orderedVersions)
 	liveOrderedVersions := []openapi.ApiVersion{}
 	for _, version := range orderedVersions {
-		// TODO: Use the original AZ namespace rather that our adjusted module name
-		if b.activeVersionChecker.HasProviderVersion(string(b.moduleName), version) {
+		definitions := versions[version]
+		firstDefinition := definitions[util.SortedKeys(definitions)[0]]
+		if b.activeVersionChecker.HasProviderVersion(firstDefinition.RpNamespace, version) {
 			liveOrderedVersions = append(liveOrderedVersions, version)
 		}
 	}

reports/inactiveDefaultVersions.json

@@ -88,7 +88,9 @@
     "2023-01-01"
   ],
   "Network": [
-    "2021-03-01-preview"
+    "2018-05-01",
+    "2021-03-01-preview",
+    "2023-02-01"
   ],
   "NetworkAnalytics": [
     "2023-11-15"
@@ -134,10 +136,6 @@
   "VisualStudio": [
     "2017-11-01-preview"
   ],
-  "WebPubSub": [
-    "2023-02-01",
-    "2023-03-01-preview"
-  ],
   "WindowsESU": [
     "2019-09-16-preview"
   ],