More tests and review comments

Author: GomathiselviS

internal/provider/group_resource.go

@@ -105,8 +105,6 @@ func (d *GroupResourceModel) CreateRequestBody() ([]byte, diag.Diagnostics) {
 
 	// Variables
 	if IsValueProvided(d.Variables) {
-		// var vars map[string]interface{}
-		// diags.Append(d.Variables.Unmarshal(&vars)...)
 		body["variables"] = d.Variables.ValueString()
 	}
 
@@ -138,8 +136,17 @@ func (d *GroupResourceModel) ParseHttpResponse(body []byte) error {
 	}
 
 	d.Name = types.StringValue(result["name"].(string))
-	d.Description = types.StringValue(result["description"].(string))
+	if result["description"] != "" {
+		d.Description = types.StringValue(result["description"].(string))
+	} else {
+		d.Description = types.StringNull()
+	}
 	d.URL = types.StringValue(result["url"].(string))
+	if result["variables"] != nil {
+		d.Variables = jsontypes.NewNormalizedValue(result["variables"].(string))
+	} else {
+		d.Variables = jsontypes.NewNormalizedNull()
+	}
 
 	return nil
 }
@@ -287,15 +294,8 @@ func (r GroupResource) UpdateGroup(data GroupResourceModelInterface) diag.Diagno
 
 func (r GroupResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
 	var data GroupResourceModel
-	var data_with_URL GroupResourceModel
-
-	// Read Terraform plan and state data into the model
-	// The URL is generated once the group is created. To update the correct group, we retrieve the state data and append the URL from the state data to the plan data.
 
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &data)...)
-	resp.Diagnostics.Append(req.State.Get(ctx, &data_with_URL)...)
-	data.URL = data_with_URL.URL
-
 	resp.Diagnostics.Append(r.UpdateGroup(&data)...)
 	if resp.Diagnostics.HasError() {
 		return

internal/provider/group_resource_test.go

@@ -18,22 +18,40 @@ import (
 
 func TestParseHttpResponse(t *testing.T) {
 	t.Run("Basic Test", func(t *testing.T) {
-		g := GroupResourceModel{
-			Name: types.StringValue("group1"),
-			URL:  types.StringValue("/api/v2/groups/24/"),
+		expected := GroupResourceModel{
+			Name:        types.StringValue("group1"),
+			Description: types.StringValue(""),
+			URL:         types.StringValue("/api/v2/groups/24/"),
 		}
+		g := GroupResourceModel{}
 		body := []byte(`{"name": "group1", "url": "/api/v2/groups/24/", "description": ""}`)
 		err := g.ParseHttpResponse(body)
 		assert.NoError(t, err)
+		if expected != g {
+			t.Errorf("Expected (%s) not equal to actual (%s)", expected, g)
+		}
 	})
 	t.Run("Test with variables", func(t *testing.T) {
-		g := GroupResourceModel{
-			Name: types.StringValue("group1"),
-			URL:  types.StringValue("/api/v2/groups/24/"),
+		expected := GroupResourceModel{
+			Name:        types.StringValue("group1"),
+			URL:         types.StringValue("/api/v2/groups/24/"),
+			Description: types.StringValue(""),
+			Variables:   jsontypes.NewNormalizedValue("{\"ansible_network_os\":\"ios\"}"),
 		}
+		g := GroupResourceModel{}
 		body := []byte(`{"name": "group1", "url": "/api/v2/groups/24/", "description": "", "variables": "{\"ansible_network_os\":\"ios\"}"}`)
 		err := g.ParseHttpResponse(body)
 		assert.NoError(t, err)
+		if expected != g {
+			t.Errorf("Expected (%s) not equal to actual (%s)", expected, g)
+		}
+	})
+	t.Run("JSON error", func(t *testing.T) {
+		g := GroupResourceModel{}
+		body := []byte("Not valid JSON")
+		err := g.ParseHttpResponse(body)
+		assert.Error(t, err)
+
 	})
 }