Enabled Costs to be retrieved by just subscription and or resource (#11)

* Used queryText to get information by resource id

* Added onBlur Handler

* Added New Line

dfe-azurecostbackend-datasource/package.json

@@ -1,7 +1,7 @@
 {
   "id": "1",
   "name": "azurecost-backend",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Azure cost backend",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env production",

dfe-azurecostbackend-datasource/pkg/plugin/datasource.go

@@ -193,7 +193,10 @@ func (d *Datasource) QueryData(ctx context.Context, req *backend.QueryDataReques
 	return response, nil
 }
 
-type queryModel struct{}
+type queryModel struct {
+	QueryText string `json:"queryText"`
+	Constant  float64  `json:"constant"`
+}
 
 func (d *Datasource) query(_ context.Context, pCtx backend.PluginContext, query backend.DataQuery) backend.DataResponse {
 	var response backend.DataResponse
@@ -214,6 +217,7 @@ func (d *Datasource) query(_ context.Context, pCtx backend.PluginContext, query
 	//MAB Added
 	log.Print("Starting Datasource")
 	log.Println("URL:", d.config.AzureCostSubscriptionUrl)
+	log.Println("ResourceId:", qm.QueryText)
 
 	// Call the fetchToken function
 	token, err := fetchToken(d.config)
@@ -228,12 +232,12 @@ func (d *Datasource) query(_ context.Context, pCtx backend.PluginContext, query
 	start, end := getCurrentYearDates()
 
 	timeRange := query.TimeRange
-	if !timeRange.From.IsZero() && !timeRange.To.IsZero(){
+	if !timeRange.From.IsZero() && !timeRange.To.IsZero() {
 		start = timeRange.From.Format("2006-01-02")
-    	end = timeRange.To.Format("2006-01-02")
+		end = timeRange.To.Format("2006-01-02")
 	}
 
-	costs, err := getCosts(token, d.config, start, end)
+	costs, err := getCosts(token, d.config, start, end, qm.QueryText)
 	if err != nil {
 		log.Println("Error getting costs:", err)
 		return response
@@ -373,9 +377,15 @@ func parseAccessToken(body []byte) (string, error) {
 }
 
 // Fetch Costs
-func getCosts(token string, config Config, start string, end string) (CostResponse, error) {
+func getCosts(token string, config Config, start string, end string, resourceid string) (CostResponse, error) {
 	url := config.SubscriptionID + "/providers/Microsoft.CostManagement/query?api-version=2023-03-01"
 
+	if len(resourceid) > 2 {
+		url = config.SubscriptionID + "/resourceGroups/" + resourceid + "/providers/Microsoft.CostManagement/query?api-version=2023-03-01"
+	}
+
+	log.Println("CostUrl:", url)
+
 	bodyParameters := map[string]interface{}{
 		"type":      "Usage",
 		"timeframe": "Custom",
@@ -495,5 +505,4 @@ func getCurrentYearDates() (string, string) {
 	thirtyFirstOfDecemberFormatted := thirtyFirstOfDecember.Format("2006-01-02")
 
 	return firstOfJanuaryFormatted, thirtyFirstOfDecemberFormatted
-}
-
+}

dfe-azurecostbackend-datasource/pkg/plugin/datasource_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"net/http"
 	"net/http/httptest"
+	"strconv"
 	"testing"
 	"time"
 	"encoding/json"
@@ -145,7 +146,7 @@ func TestGetCosts(t *testing.T) {
 	token := "your-mock-token"
 	config.TokenURL = server.URL
 	start, end := getCurrentYearDates()
-	costs, err := getCosts(token, config, start, end)
+	costs, err := getCosts(token, config, start, end, "resourceid")
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
@@ -204,8 +205,8 @@ func TestGetCurrentYearDates(t *testing.T) {
 	firstOfJanuary, thirtyFirstOfDecember := getCurrentYearDates()
 
 	// Expected results for the mock date
-	expectedFirstOfJanuary := "2023-01-01"
-	expectedThirtyFirstOfDecember := "2023-12-31"
+	expectedFirstOfJanuary := strconv.Itoa(time.Now().Year()) +  "-01-01"
+	expectedThirtyFirstOfDecember := strconv.Itoa(time.Now().Year()) + "-12-31"
 
 	// Check if the actual results match the expected results
 	if firstOfJanuary != expectedFirstOfJanuary {
@@ -215,5 +216,4 @@ func TestGetCurrentYearDates(t *testing.T) {
 	if thirtyFirstOfDecember != expectedThirtyFirstOfDecember {
 		t.Errorf("Thirty-First of December: expected %s, got %s", expectedThirtyFirstOfDecember, thirtyFirstOfDecember)
 	}
-}
-
+}