PLT-721: Fixed Day2 operations on tenant resource's

spectrocloud · Oct 6, 2023 · f4369a1 · f4369a1
1 parent 26105b5
commit f4369a1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/spectrocloud/cluster_common_profiles.go b/spectrocloud/cluster_common_profiles.go
@@ -141,6 +141,10 @@ func setPackManifests(pack *models.V1PackValuesEntity, p map[string]interface{},
 
 func updateProfiles(c *client.V1Client, d *schema.ResourceData) error {
 	log.Printf("Updating profiles")
+	var clusterContext string
+	if ct, ok := d.GetOk("context"); ok && c != nil {
+		clusterContext = ct.(string)
+	}
 	profiles, err := toAddonDeplProfiles(c, d)
 	if err != nil {
 		return err
@@ -153,7 +157,8 @@ func updateProfiles(c *client.V1Client, d *schema.ResourceData) error {
 		Profiles:         profiles,
 		SpcApplySettings: settings,
 	}
-	if err := c.UpdateClusterProfileValues(d.Id(), body); err != nil {
+	clusterContext = d.Get("context").(string)
+	if err := c.UpdateClusterProfileValues(d.Id(), clusterContext, body); err != nil {
 		return err
 	}
 
@@ -162,7 +167,6 @@ func updateProfiles(c *client.V1Client, d *schema.ResourceData) error {
 	}
 
 	ctx := context.Background()
-	clusterContext := d.Get("context").(string)
 	if err := waitForProfileDownload(ctx, c, clusterContext, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil {
 		return err
 	}

diff --git a/spectrocloud/resource_cluster_import.go b/spectrocloud/resource_cluster_import.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
@@ -39,6 +40,13 @@ func resourceClusterImport() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"context": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "project",
+				ValidateFunc: validation.StringInSlice([]string{"", "project", "tenant"}, false),
+				Description:  "The context of the cluster. Can be `project` or `tenant`. Default is `project`.",
+			},
 			"tags": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -103,7 +111,7 @@ func resourceCloudClusterImport(ctx context.Context, d *schema.ResourceData, m i
 		return diag.FromErr(err)
 	}
 	if profiles != nil {
-		if err := c.UpdateClusterProfileValues(uid, profiles); err != nil {
+		if err := c.UpdateClusterProfileValues(uid, ClusterContext, profiles); err != nil {
 			return diag.FromErr(err)
 		}
 	}
@@ -198,7 +206,8 @@ func resourceCloudClusterUpdate(_ context.Context, d *schema.ResourceData, m int
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	err = c.UpdateClusterProfileValues(d.Id(), profiles)
+	ClusterContext := d.Get("context").(string)
+	err = c.UpdateClusterProfileValues(d.Id(), ClusterContext, profiles)
 	if err != nil {
 		return diag.FromErr(err)
 	}