PLT-740: Fixed cluster common field tenant day 2 operations

spectrocloud · Oct 12, 2023 · 721b51c · 721b51c
1 parent b4b6eca
commit 721b51c
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 18 deletions.
diff --git a/spectrocloud/cluster_common_fields.go b/spectrocloud/cluster_common_fields.go
@@ -41,7 +41,7 @@ func readCommonFields(c *client.V1Client, d *schema.ResourceData, cluster *model
 		}
 	}
 
-	if policy, err := c.GetClusterScanConfig(d.Id()); err != nil {
+	if policy, err := c.GetClusterScanConfig(d.Id(), ClusterContext); err != nil {
 		return diag.FromErr(err), true
 	} else if policy != nil && policy.Spec.DriverSpec != nil {
 		if err := d.Set("scan_policy", flattenScanPolicy(policy.Spec.DriverSpec)); err != nil {
@@ -57,7 +57,7 @@ func readCommonFields(c *client.V1Client, d *schema.ResourceData, cluster *model
 		}
 	}
 
-	if namespace, err := c.GetClusterNamespaceConfig(d.Id()); err != nil {
+	if namespace, err := c.GetClusterNamespaceConfig(d.Id(), ClusterContext); err != nil {
 		return diag.FromErr(err), true
 	} else if namespace != nil && namespace.Items != nil {
 		if err := d.Set("namespaces", flattenClusterNamespaces(namespace.Items)); err != nil {

diff --git a/spectrocloud/cluster_common_host.go b/spectrocloud/cluster_common_host.go
@@ -106,7 +106,12 @@ func flattenSourceRanges(hostConfig *models.V1HostClusterConfig) string {
 
 func updateHostConfig(c *client.V1Client, d *schema.ResourceData) error {
 	if hostConfigs := toClusterHostConfigs(d); hostConfigs != nil {
-		return c.ApplyClusterHostConfig(d.Id(), &models.V1HostClusterConfigEntity{
+		clusterContext := d.Get("context").(string)
+		err := ValidateContext(clusterContext)
+		if err != nil {
+			return err
+		}
+		return c.ApplyClusterHostConfig(d.Id(), clusterContext, &models.V1HostClusterConfigEntity{
 			HostClusterConfig: hostConfigs,
 		})
 	}

diff --git a/spectrocloud/cluster_common_location.go b/spectrocloud/cluster_common_location.go
@@ -85,7 +85,10 @@ func flattenLocationConfig(location *models.V1ClusterLocation) []interface{} {
 
 func updateLocationConfig(c *client.V1Client, d *schema.ResourceData) error {
 	clusterContext := d.Get("context").(string)
-
+	err := ValidateContext(clusterContext)
+	if err != nil {
+		return err
+	}
 	if locationConfigs := toClusterLocationConfigs(d); locationConfigs != nil {
 		return c.ApplyClusterLocationConfig(clusterContext, d.Id(), &models.V1SpectroClusterLocationInputEntity{
 			Location: locationConfigs,

diff --git a/spectrocloud/cluster_common_metadata.go b/spectrocloud/cluster_common_metadata.go
@@ -7,7 +7,12 @@ import (
 )
 
 func updateClusterMetadata(c *client.V1Client, d *schema.ResourceData) error {
-	return c.UpdateClusterMetadata(d.Id(), toUpdateClusterMetadata(d))
+	clusterContext := d.Get("context").(string)
+	err := ValidateContext(clusterContext)
+	if err != nil {
+		return err
+	}
+	return c.UpdateClusterMetadata(d.Id(), clusterContext, toUpdateClusterMetadata(d))
 }
 
 func toUpdateClusterMetadata(d *schema.ResourceData) *models.V1ObjectMetaInputEntitySchema {
@@ -17,7 +22,12 @@ func toUpdateClusterMetadata(d *schema.ResourceData) *models.V1ObjectMetaInputEn
 }
 
 func updateClusterAdditionalMetadata(c *client.V1Client, d *schema.ResourceData) error {
-	return c.UpdateAdditionalClusterMetadata(d.Id(), toUpdateClusterAdditionalMetadata(d))
+	clusterContext := d.Get("context").(string)
+	err := ValidateContext(clusterContext)
+	if err != nil {
+		return err
+	}
+	return c.UpdateAdditionalClusterMetadata(d.Id(), clusterContext, toUpdateClusterAdditionalMetadata(d))
 }
 
 func toUpdateClusterAdditionalMetadata(d *schema.ResourceData) *models.V1ClusterMetaAttributeEntity {

diff --git a/spectrocloud/cluster_common_namespaces.go b/spectrocloud/cluster_common_namespaces.go
@@ -74,7 +74,12 @@ func flattenClusterNamespaces(items []*models.V1ClusterNamespaceResource) []inte
 
 func updateClusterNamespaces(c *client.V1Client, d *schema.ResourceData) error {
 	if namespaces := toClusterNamespaces(d); namespaces != nil {
-		return c.ApplyClusterNamespaceConfig(d.Id(), namespaces)
+		clusterContext := d.Get("context").(string)
+		err := ValidateContext(clusterContext)
+		if err != nil {
+			return err
+		}
+		return c.ApplyClusterNamespaceConfig(d.Id(), clusterContext, namespaces)
 	}
 	return nil
 }
diff --git a/spectrocloud/cluster_common_ospatch.go b/spectrocloud/cluster_common_ospatch.go
@@ -14,12 +14,28 @@ import (
 
 func updateClusterOsPatchConfig(c *client.V1Client, d *schema.ResourceData) error {
 	machineConfig := toMachineManagementConfig(d)
-	if machineConfig != nil {
-		return c.UpdateClusterOsPatchConfig(d.Id(), toUpdateOsPatchEntityClusterRbac(machineConfig.OsPatchConfig))
+	clusterContext := d.Get("context").(string)
+	err := ValidateContext(clusterContext)
+	if err != nil {
+		return err
+	}
+	if machineConfig.OsPatchConfig != nil {
+		return c.UpdateClusterOsPatchConfig(d.Id(), clusterContext, toUpdateOsPatchEntityClusterRbac(machineConfig.OsPatchConfig))
+	} else {
+		return c.UpdateClusterOsPatchConfig(d.Id(), clusterContext, toUpdateOsPatchEntityClusterRbac(getDefaultOsPatchConfig().OsPatchConfig))
 	}
 	return nil
 }
 
+func getDefaultOsPatchConfig() *models.V1MachineManagementConfig {
+	return &models.V1MachineManagementConfig{
+		OsPatchConfig: &models.V1OsPatchConfig{
+			PatchOnBoot:      false,
+			RebootIfRequired: false,
+		},
+	}
+}
+
 func toUpdateOsPatchEntityClusterRbac(config *models.V1OsPatchConfig) *models.V1OsPatchEntity {
 	return &models.V1OsPatchEntity{
 		OsPatchConfig: config,

diff --git a/spectrocloud/cluster_common_rbac.go b/spectrocloud/cluster_common_rbac.go
@@ -1,7 +1,6 @@
 package spectrocloud
 
 import (
-	"fmt"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
 	"github.com/spectrocloud/hapi/models"
@@ -135,12 +134,13 @@ func flattenClusterRBAC(items []*models.V1ClusterRbac) []interface{} {
 }
 
 func updateClusterRBAC(c *client.V1Client, d *schema.ResourceData) error {
-	ClusterContext := d.Get("context").(string)
-	if ClusterContext != "project" && ClusterContext != "tenant" {
-		return fmt.Errorf("invalid Context set - %s", ClusterContext)
+	clusterContext := d.Get("context").(string)
+	err := ValidateContext(clusterContext)
+	if err != nil {
+		return err
 	}
 	if rbacs := toClusterRBACsInputEntities(d); rbacs != nil {
-		return c.ApplyClusterRbacConfig(d.Id(), rbacs, ClusterContext)
+		return c.ApplyClusterRbacConfig(d.Id(), clusterContext, rbacs)
 	}
 	return nil
 }
diff --git a/spectrocloud/resource_cluster_import.go b/spectrocloud/resource_cluster_import.go
@@ -167,7 +167,8 @@ func resourceCloudClusterImportManoifests(cluster *models.V1SpectroCluster, d *s
 		// Importing from Pending which isn't desired until intention is to apply the manifest locally
 		if len(cluster.Metadata.Labels) > 0 {
 			if v, ok := cluster.Metadata.Labels["apply"]; ok && v == "true" {
-				importManifest, err := c.GetClusterImportManifest(cluster.Metadata.UID)
+				context := d.Get("context").(string)
+				importManifest, err := c.GetClusterImportManifest(cluster.Metadata.UID, context)
 				if err != nil {
 					return err
 				}

diff --git a/spectrocloud/schemas/backup_policy.go b/spectrocloud/schemas/backup_policy.go
@@ -60,9 +60,9 @@ func BackupPolicySchema() *schema.Schema {
 					Description: "The list of cluster UIDs to include in the backup. If `include_all_clusters` is set to `true`, then all clusters will be included.",
 				},
 				"include_all_clusters": {
-					Type:        schema.TypeBool,
-					Optional:    true,
-					Default:     true,
+					Type:     schema.TypeBool,
+					Optional: true,
+					//Default:     true,
 					Description: "Whether to include all clusters in the backup. If set to false, only the clusters specified in `cluster_uids` will be included.",
 				},
 			},