vdb_group fix and database_name fix

Author: Uddipaan Hazarika

internal/provider/resource_vdb.go

@@ -1591,7 +1591,9 @@ func resourceVdbRead(ctx context.Context, d *schema.ResourceData, meta interface
 	d.Set("post_stop", flattenHooks(result.GetHooks().PostStop))
 	d.Set("pre_rollback", flattenHooks(result.GetHooks().PreRollback))
 	d.Set("post_rollback", flattenHooks(result.GetHooks().PostRollback))
-	d.Set("database_name", result.GetDatabaseName())
+	if !*result.IsAppdata {
+		d.Set("database_name", result.GetDatabaseName())
+	}
 	d.Set("tags", flattenTags(result.GetTags()))
 	d.Set("vdb_restart", result.GetVdbRestart())
 

internal/provider/resource_vdb_group.go

@@ -30,7 +30,7 @@ func resourceVdbGroup() *schema.Resource {
 			},
 			"vdb_ids": {
 				Type:     schema.TypeList,
-				Required: true,
+				Optional: true,
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
@@ -45,9 +45,9 @@ func resourceVdbGroupCreate(ctx context.Context, d *schema.ResourceData, meta in
 
 	client := meta.(*apiClient).client
 
-	apiRes, httpRes, err := client.VDBGroupsAPI.CreateVdbGroup(ctx).CreateVDBGroupRequest(*dctapi.NewCreateVDBGroupRequest(
-		d.Get("name").(string),
-	)).Execute()
+	vdbGroupCreateReq := *dctapi.NewCreateVDBGroupRequest(d.Get("name").(string))
+	vdbGroupCreateReq.SetVdbIds(toStringArray(d.Get("vdb_ids")))
+	apiRes, httpRes, err := client.VDBGroupsAPI.CreateVdbGroup(ctx).CreateVDBGroupRequest(vdbGroupCreateReq).Execute()
 
 	if diags := apiErrorResponseHelper(ctx, apiRes, httpRes, err); diags != nil {
 		return diags
@@ -74,6 +74,7 @@ func resourceVdbGroupRead(ctx context.Context, d *schema.ResourceData, meta inte
 	apiRes, httpRes, err := client.VDBGroupsAPI.GetVdbGroup(ctx, vdbGroupId).Execute()
 
 	if diags := apiErrorResponseHelper(ctx, apiRes, httpRes, err); diags != nil {
+		d.SetId("")
 		return diags
 	}