feat: Add instance_view to azure_compute_virtual_machines table (#5941)

yevgenypats · web-flow · commit d65d80fc24bf · 2022-12-25T10:32:23.000Z
apparently `az vm list` always returns instance_views column as empty so to get that data we need additional call.
diff --git a/plugins/source/azure/codegen0/internal/azparser/parser.go b/plugins/source/azure/codegen0/internal/azparser/parser.go
@@ -33,6 +33,10 @@ var newFuncToSkipPerPackage = map[string]map[string]bool{
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/sql/armsql": {
 		"NewDeletedServersClient": true,
 	},
+	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute": {
+		// we migrated this to manual written client as it has childs
+		"NewVirtualMachinesClient": true,
+	},
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos": {
 		"NewDatabaseAccountsClient": true,
 	},
diff --git a/plugins/source/azure/codegen1/recipes/compute.go b/plugins/source/azure/codegen1/recipes/compute.go
diff --git a/plugins/source/azure/codegen2/main.go b/plugins/source/azure/codegen2/main.go
@@ -145,7 +145,9 @@ func initTable(parent *recipes.Table, r *recipes.Table) error {
 	if r.Relations != nil {
 		for _, relation := range r.Relations {
 			r.Table.Relations = append(r.Table.Relations, relation.Name+"()")
-			initTable(r, relation)
+			if err := initTable(r, relation); err != nil {
+				return err
+			}
 		}
 	}
 	return nil
@@ -162,7 +164,7 @@ func generateTable(parent *recipes.Table, r *recipes.Table) error {
 	}
 	var buff bytes.Buffer
 	if err := tpl.Execute(&buff, r); err != nil {
-		return fmt.Errorf("failed to execute template for %s: %w", r.Table.Name, err)
+		return fmt.Errorf("failed to execute template for  %w", err)
 	}
 
 	filePath := path.Join(currentDir, "../resources/services", r.PackageName)
diff --git a/plugins/source/azure/codegen2/recipes/compute.go b/plugins/source/azure/codegen2/recipes/compute.go
diff --git a/plugins/source/azure/codegen2/recipes/compute_e.go b/plugins/source/azure/codegen2/recipes/compute_e.go
@@ -26,6 +26,26 @@ func init() {
 				},
 			},
 		},
+		{
+			Service:        "armcompute",
+			Name:           "virtual_machines",
+			Struct:         &armcompute.VirtualMachine{},
+			ResponseStruct: &armcompute.VirtualMachinesClientListAllResponse{},
+			Client:         &armcompute.VirtualMachinesClient{},
+			ListFunc:       (&armcompute.VirtualMachinesClient{}).NewListAllPager,
+			NewFunc:        armcompute.NewVirtualMachinesClient,
+			URL:            "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/virtualMachines",
+			Multiplex:      `client.SubscriptionMultiplexRegisteredNamespace(client.Namespacemicrosoft_compute)`,
+			SkipMock:       true,
+			ExtraColumns: []codegen.ColumnDefinition{
+				SubscriptionIdColumn,
+				{
+					Name:     "instance_view",
+					Type:     schema.TypeJSON,
+					Resolver: `getInstanceView`,
+				},
+			},
+		},
 	}
 	Tables = append(Tables, tables...)
 }
diff --git a/plugins/source/azure/docs/tables/README.md b/plugins/source/azure/docs/tables/README.md
@@ -53,8 +53,8 @@
 - [azure_compute_restore_point_collections](azure_compute_restore_point_collections.md)
 - [azure_compute_snapshots](azure_compute_snapshots.md)
 - [azure_compute_virtual_machine_scale_sets](azure_compute_virtual_machine_scale_sets.md)
-- [azure_compute_virtual_machines](azure_compute_virtual_machines.md)
 - [azure_compute_skus](azure_compute_skus.md)
+- [azure_compute_virtual_machines](azure_compute_virtual_machines.md)
 - [azure_confluent_marketplace_agreements](azure_confluent_marketplace_agreements.md)
 - [azure_connectedvmware_clusters](azure_connectedvmware_clusters.md)
 - [azure_connectedvmware_datastores](azure_connectedvmware_datastores.md)
diff --git a/plugins/source/azure/docs/tables/azure_compute_virtual_machines.md b/plugins/source/azure/docs/tables/azure_compute_virtual_machines.md
@@ -11,6 +11,7 @@ The primary key for this table is **id**.
 |_cq_id|UUID|
 |_cq_parent_id|UUID|
 |subscription_id|String|
+|instance_view|JSON|
 |location|String|
 |extended_location|JSON|
 |identity|JSON|
diff --git a/plugins/source/azure/resources/plugin/tables.go b/plugins/source/azure/resources/plugin/tables.go
diff --git a/plugins/source/azure/resources/services/compute/virtual_machine_instance_views_fetch.go b/plugins/source/azure/resources/services/compute/virtual_machine_instance_views_fetch.go
@@ -0,0 +1,27 @@
+package compute
+
+import (
+	"context"
+
+	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute"
+	"github.com/cloudquery/cloudquery/plugins/source/azure/client"
+	"github.com/cloudquery/plugin-sdk/schema"
+)
+
+func getInstanceView(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error {
+	cl := meta.(*client.Client)
+	svc, err := armcompute.NewVirtualMachinesClient(cl.SubscriptionId, cl.Creds, cl.Options)
+	if err != nil {
+		return err
+	}
+	item := resource.Item.(*armcompute.VirtualMachine)
+	group, err := client.ParseResourceGroup(*item.ID)
+	if err != nil {
+		return err
+	}
+	instanceView, err := svc.InstanceView(ctx, group, *item.Name, nil)
+	if err != nil {
+		return err
+	}
+	return resource.Set(c.Name, instanceView.VirtualMachineInstanceView)
+}
diff --git a/plugins/source/azure/resources/services/compute/virtual_machines.go b/plugins/source/azure/resources/services/compute/virtual_machines.go
diff --git a/plugins/source/azure/resources/services/compute/virtual_machines_mock_test.go b/plugins/source/azure/resources/services/compute/virtual_machines_mock_test.go
@@ -1,12 +1,12 @@
-// Code generated by codegen2; DO NOT EDIT.
 package compute
 
 import (
 	"encoding/json"
-	"github.com/cloudquery/cloudquery/plugins/source/azure/client"
 	"net/http"
 	"testing"
 
+	"github.com/cloudquery/cloudquery/plugins/source/azure/client"
+
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute"
 	"github.com/cloudquery/plugin-sdk/faker"
 	"github.com/gorilla/mux"
@@ -32,6 +32,23 @@ func createVirtualMachines(router *mux.Router) error {
 			return
 		}
 	})
+
+	var instanceViewItem armcompute.VirtualMachinesClientInstanceViewResponse
+	if err := faker.FakeObject(&instanceViewItem); err != nil {
+		return err
+	}
+	// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/instanceView
+	router.HandleFunc("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/instanceView", func(w http.ResponseWriter, r *http.Request) {
+		b, err := json.Marshal(&instanceViewItem)
+		if err != nil {
+			http.Error(w, "unable to marshal request: "+err.Error(), http.StatusBadRequest)
+			return
+		}
+		if _, err := w.Write(b); err != nil {
+			http.Error(w, "failed to write", http.StatusBadRequest)
+			return
+		}
+	})
 	return nil
 }
 
diff --git a/website/pages/docs/plugins/sources/azure/tables.md b/website/pages/docs/plugins/sources/azure/tables.md
@@ -53,8 +53,8 @@
 - [azure_compute_restore_point_collections](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/azure/docs/tables/azure_compute_restore_point_collections.md)
 - [azure_compute_snapshots](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/azure/docs/tables/azure_compute_snapshots.md)
 - [azure_compute_virtual_machine_scale_sets](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/azure/docs/tables/azure_compute_virtual_machine_scale_sets.md)
-- [azure_compute_virtual_machines](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/azure/docs/tables/azure_compute_virtual_machines.md)
 - [azure_compute_skus](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/azure/docs/tables/azure_compute_skus.md)
+- [azure_compute_virtual_machines](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/azure/docs/tables/azure_compute_virtual_machines.md)
 - [azure_confluent_marketplace_agreements](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/azure/docs/tables/azure_confluent_marketplace_agreements.md)
 - [azure_connectedvmware_clusters](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/azure/docs/tables/azure_connectedvmware_clusters.md)
 - [azure_connectedvmware_datastores](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/azure/docs/tables/azure_connectedvmware_datastores.md)

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,9 @@ func initTable(parent recipes.Table, r recipes.Table) error {`
`145`	`145`	`if r.Relations != nil {`
`146`	`146`	`for _, relation := range r.Relations {`
`147`	`147`	`r.Table.Relations = append(r.Table.Relations, relation.Name+"()")`
`148`		`- initTable(r, relation)`
	`148`	`+ if err := initTable(r, relation); err != nil {`
	`149`	`+ return err`
	`150`	`+ }`
`149`	`151`	`}`
`150`	`152`	`}`
`151`	`153`	`return nil`
`@@ -162,7 +164,7 @@ func generateTable(parent recipes.Table, r recipes.Table) error {`
`162`	`164`	`}`
`163`	`165`	`var buff bytes.Buffer`
`164`	`166`	`if err := tpl.Execute(&buff, r); err != nil {`
`165`		`- return fmt.Errorf("failed to execute template for %s: %w", r.Table.Name, err)`
	`167`	`+ return fmt.Errorf("failed to execute template for %w", err)`
`166`	`168`	`}`
`167`	`169`
`168`	`170`	`filePath := path.Join(currentDir, "../resources/services", r.PackageName)`