bugfixing

Signed-off-by: Markus Blaschke <[email protected]>

Author: mblaschke

metrics_azurerm_resources.go

@@ -44,11 +44,11 @@ func (m *MetricsCollectorAzureRmResources) Reset() {
 }
 
 func (m *MetricsCollectorAzureRmResources) Collect(ctx context.Context, logger *log.Entry, callback chan<- func(), subscription subscriptions.Subscription) {
-	client := resources.NewGroupsClientWithBaseURI(azureEnvironment.ResourceManagerEndpoint, *subscription.SubscriptionID)
+	client := resources.NewClientWithBaseURI(azureEnvironment.ResourceManagerEndpoint, *subscription.SubscriptionID)
 	client.Authorizer = AzureAuthorizer
 	client.ResponseInspector = azureResponseInspector(&subscription)
 
-	list, err := client.ListComplete(ctx, "", nil)
+	list, err := client.ListComplete(ctx, "", "", nil)
 
 	if err != nil {
 		logger.Panic(err)

misc.go

@@ -7,8 +7,8 @@ import (
 )
 
 var (
-	resourceGroupFromResourceIdRegExp = regexp.MustCompile("/resourceGroups/([^/]*)")
-	providerFromResourceIdRegExp      = regexp.MustCompile("/providers/([^/]*)")
+	resourceGroupFromResourceIdRegExp = regexp.MustCompile("/subscriptions/[^/]+/resourceGroups/([^/]*)")
+	providerFromResourceIdRegExp      = regexp.MustCompile("/subscriptions/[^/]+/resourceGroups/[^/]+/providers/([^/]*)")
 	roleDefinitionIdRegExp            = regexp.MustCompile("/Microsoft.Authorization/roleDefinitions/([^/]*)")
 )