fix: Don't multiplex subscriptions (#2018)

erezrokah · web-flow · commit 94d43b3db6ea · 2022-10-03T10:37:02.000Z
#### Summary Fixes #1947 We shouldn't be multiplexing subscriptions as the API returns all subscriptions. So we were basically getting all subscriptions for each subscription, and then using the client subscription id to set the value in the DB. Since we use `ID` as the primary key and do an upsert (at least in v2), the last operation is the one that "took". ~~I think this also means subscription locations should not be multiplexed either and be a relation of subscriptions. Most of the changes are to support relations in the new SDK list pager API.~~ Removed the relations stuff to simplify things ~~Still a draft as needs some cleanup, which I'll do next week~~ Done ---
diff --git a/plugins/source/azure/codegen/recipes/base.go b/plugins/source/azure/codegen/recipes/base.go
@@ -81,6 +81,7 @@ type resourceDefinition struct {
 	mockGetFunctionArgs      []string
 	subServiceOverride       string
 	relations                []resourceDefinition
+	singleSubscription       bool
 }
 
 type byTemplates struct {
@@ -161,7 +162,10 @@ func parseAzureStruct(serviceNameOverride string, definition resourceDefinition)
 
 func initColumns(table *codegen.TableDefinition, definition resourceDefinition) codegen.ColumnDefinitions {
 	columns := []codegen.ColumnDefinition{}
-	columns = append(columns, subscriptionIdColumn)
+	if !definition.singleSubscription {
+		// add subscription id if we are not in single subscription mode
+		columns = append(columns, subscriptionIdColumn)
+	}
 	if definition.parent != "" {
 		columns = append(columns, codegen.ColumnDefinition{
 			Name:     definition.parent,
@@ -220,6 +224,10 @@ func initTable(serviceNameOverride string, definition resourceDefinition, azureS
 		table.Multiplex = "client.SubscriptionMultiplex"
 	}
 
+	if definition.singleSubscription {
+		table.Multiplex = "client.SingleSubscriptionMultiplex"
+	}
+
 	if definition.includeColumns != "" {
 		regex := regexp.MustCompile(definition.includeColumns)
 		newColumns := make(codegen.ColumnDefinitions, 0)
diff --git a/plugins/source/azure/codegen/recipes/subscriptions.go b/plugins/source/azure/codegen/recipes/subscriptions.go
@@ -21,9 +21,10 @@ func Subscriptions() []Resource {
 			},
 			definitions: []resourceDefinition{
 				{
-					azureStruct:    &armsubscriptions.Subscription{},
-					mockListResult: "ClientListResponse",
-					tableName:      "subscriptions",
+					azureStruct:        &armsubscriptions.Subscription{},
+					mockListResult:     "ClientListResponse",
+					tableName:          "subscriptions",
+					singleSubscription: true,
 				},
 				{
 					azureStruct:        &armsubscriptions.TenantIDDescription{},
diff --git a/plugins/source/azure/docs/tables/azure_subscriptions.md b/plugins/source/azure/docs/tables/azure_subscriptions.md
@@ -7,7 +7,6 @@ The primary key for this table is **id**.
 ## Columns
 | Name          | Type          |
 | ------------- | ------------- |
-|subscription_id|String|
 |authorization_source|String|
 |managed_by_tenants|JSON|
 |subscription_policies|JSON|
diff --git a/plugins/source/azure/resources/services/subscriptions/subscriptions.go b/plugins/source/azure/resources/services/subscriptions/subscriptions.go
@@ -13,13 +13,8 @@ func Subscriptions() *schema.Table {
 	return &schema.Table{
 		Name:      "azure_subscriptions",
 		Resolver:  fetchSubscriptionsSubscriptions,
-		Multiplex: client.SubscriptionMultiplex,
+		Multiplex: client.SingleSubscriptionMultiplex,
 		Columns: []schema.Column{
-			{
-				Name:     "subscription_id",
-				Type:     schema.TypeString,
-				Resolver: client.ResolveAzureSubscription,
-			},
 			{
 				Name:     "authorization_source",
 				Type:     schema.TypeString,

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,10 @@ func Subscriptions() []Resource {`
`21`	`21`	`},`
`22`	`22`	`definitions: []resourceDefinition{`
`23`	`23`	`{`
`24`		`- azureStruct: &armsubscriptions.Subscription{},`
`25`		`- mockListResult: "ClientListResponse",`
`26`		`- tableName: "subscriptions",`
	`24`	`+ azureStruct: &armsubscriptions.Subscription{},`
	`25`	`+ mockListResult: "ClientListResponse",`
	`26`	`+ tableName: "subscriptions",`
	`27`	`+ singleSubscription: true,`
`27`	`28`	`},`
`28`	`29`	`{`
`29`	`30`	`azureStruct: &armsubscriptions.TenantIDDescription{},`