fixing merge conflict

spectrocloud · Oct 10, 2023 · 7c33cd9 · 7c33cd9
1 parent c05bad9
commit 7c33cd9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/spectrocloud/cluster_common_profiles.go b/spectrocloud/cluster_common_profiles.go
@@ -154,7 +154,7 @@ func updateProfiles(c *client.V1Client, d *schema.ResourceData) error {
 		SpcApplySettings: settings,
 	}
 	clusterContext := d.Get("context").(string)
-	if err := c.UpdateClusterProfileValues(d.Id(), body); err != nil {
+	if err := c.UpdateClusterProfileValues(d.Id(), clusterContext, body); err != nil {
 		return err
 	}
 

diff --git a/spectrocloud/resource_cluster_import.go b/spectrocloud/resource_cluster_import.go
@@ -112,7 +112,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)
 		}
 	}
@@ -207,7 +207,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)
 	}