Added - Support for Design/Implement CPU architecture agnostic configurations

Author: sivaram-govindasamy

examples/psql/main.tf

@@ -135,8 +135,8 @@ resource "oci_psql_db_system" "test_flexdb_system" {
   }
 }
 
-# Creating a dbSystem configuration
-resource "oci_psql_configuration" "test_configuration" {
+# Creating a dbSystem flex configuration
+resource "oci_psql_configuration" "test_fixed_configuration" {
   #Required
   compartment_id = var.compartment_ocid
   shape = "VM.Standard.E4.Flex"
@@ -147,15 +147,14 @@ resource "oci_psql_configuration" "test_configuration" {
     }
   }
   db_version = "14"
-	display_name = "terraform test configuration"
-
-	#Optional
+  display_name = "terraform test configuration"
   instance_memory_size_in_gbs = "64"
   instance_ocpu_count = "4"
-  description = "test configuration created by terraform"
+  is_flexible=false
+  description = "test fixed configuration created by terraform"
 }
 
-# Creating a dbSystem configuration
+# Creating a dbSystem flex configuration
 resource "oci_psql_configuration" "test_flexible_configuration" {
   #Required
   compartment_id = var.compartment_ocid
@@ -168,11 +167,33 @@ resource "oci_psql_configuration" "test_flexible_configuration" {
   }
   db_version = "14"
   display_name = "terraform test flex configuration"
+
+  #Optional
+  instance_memory_size_in_gbs = "0"
+  instance_ocpu_count = "0"
+  is_flexible = true
+  description = "test flexible configuration created by terraform"
+}
+
+# Creating a dbSystem flex configuration with multiple compatible shapes
+resource "oci_psql_configuration" "test_flexible_multiple_comp_configuration" {
+  #Required
+  compartment_id = var.compartment_ocid
+  compatible_shapes = ["VM.Standard.E5.Flex", "VM.Standard.E4.Flex"]
+  db_configuration_overrides {
+    items {
+      config_key = "effective_io_concurrency"
+      overriden_config_value = "1"
+    }
+  }
+  db_version = "15"
+  display_name = "terraform test fixed configuration"
+
   #Optional
   instance_memory_size_in_gbs = "0"
   instance_ocpu_count = "0"
   is_flexible = true
-  description = "test configuration created by terraform"
+  description = "test flexible configuration with multiple compatible shapes created by terraform"
 }
 
 data "oci_psql_configurations" "test_configurations" {

internal/integrationtest/psql_configuration_test.go

@@ -193,6 +193,7 @@ func TestPsqlConfigurationResource_basic(t *testing.T) {
 				acctest.GenerateResourceFromRepresentationMap("oci_psql_configuration", "test_configuration", acctest.Optional, acctest.Create, PsqlConfigurationRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
+				resource.TestCheckResourceAttr(resourceName, "compatible_shapes.#", "1"),
 				resource.TestCheckResourceAttr(resourceName, "configuration_details.#", "1"),
 				resource.TestCheckResourceAttr(resourceName, "db_configuration_overrides.#", "1"),
 				resource.TestCheckResourceAttr(resourceName, "db_configuration_overrides.0.items.#", "1"),
@@ -232,6 +233,7 @@ func TestPsqlConfigurationResource_basic(t *testing.T) {
 					})),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
+				resource.TestCheckResourceAttr(resourceName, "compatible_shapes.#", "1"),
 				resource.TestCheckResourceAttr(resourceName, "configuration_details.#", "1"),
 				resource.TestCheckResourceAttr(resourceName, "db_configuration_overrides.#", "1"),
 				resource.TestCheckResourceAttr(resourceName, "db_configuration_overrides.0.items.#", "1"),
@@ -266,6 +268,7 @@ func TestPsqlConfigurationResource_basic(t *testing.T) {
 				acctest.GenerateResourceFromRepresentationMap("oci_psql_configuration", "test_configuration", acctest.Optional, acctest.Update, PsqlConfigurationRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
+				resource.TestCheckResourceAttr(resourceName, "compatible_shapes.#", "1"),
 				resource.TestCheckResourceAttr(resourceName, "configuration_details.#", "1"),
 				resource.TestCheckResourceAttr(resourceName, "db_configuration_overrides.#", "1"),
 				resource.TestCheckResourceAttr(resourceName, "db_configuration_overrides.0.items.#", "1"),
@@ -362,6 +365,7 @@ func TestPsqlConfigurationResource_basic(t *testing.T) {
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "configuration_id"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
+				resource.TestCheckResourceAttr(singularDatasourceName, "compatible_shapes.#", "1"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "config_type"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "configuration_details.#", "1"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "db_version", "14"),
@@ -491,6 +495,8 @@ func getPsqlConfigurationIds(compartment string) ([]string, error) {
 		id := *configuration.Id
 		resourceIds = append(resourceIds, id)
 		acctest.AddResourceIdToSweeperResourceIdMap(compartmentId, "ConfigurationId", id)
+		acctest.SweeperDefaultResourceId[*configuration.DefaultConfigId] = true
+
 	}
 	return resourceIds, nil
 }

internal/integrationtest/psql_default_configuration_test.go

@@ -118,6 +118,7 @@ func TestPsqlDefaultConfigurationResource_basic(t *testing.T) {
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "default_configuration_id"),
 
+				resource.TestCheckResourceAttr(singularDatasourceName, "compatible_shapes.#", "1"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "configuration_details.#", "1"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "db_version"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "description"),

internal/service/psql/psql_configuration_data_source.go

@@ -70,6 +70,8 @@ func (s *PsqlConfigurationDataSourceCrud) SetData() error {
 		s.D.Set("compartment_id", *s.Res.CompartmentId)
 	}
 
+	s.D.Set("compatible_shapes", s.Res.CompatibleShapes)
+
 	s.D.Set("config_type", s.Res.ConfigType)
 
 	if s.Res.ConfigurationDetails != nil {
@@ -82,6 +84,10 @@ func (s *PsqlConfigurationDataSourceCrud) SetData() error {
 		s.D.Set("db_version", *s.Res.DbVersion)
 	}
 
+	if s.Res.DefaultConfigId != nil {
+		s.D.Set("default_config_id", *s.Res.DefaultConfigId)
+	}
+
 	if s.Res.DefinedTags != nil {
 		s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
 	}

internal/service/psql/psql_configuration_resource.go

@@ -80,13 +80,17 @@ func PsqlConfigurationResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
-			"shape": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
 
 			// Optional
+			"compatible_shapes": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				ConflictsWith: []string{"shape"},
+			},
 			"defined_tags": {
 				Type:             schema.TypeMap,
 				Optional:         true,
@@ -123,6 +127,13 @@ func PsqlConfigurationResource() *schema.Resource {
 				Computed: true,
 				ForceNew: true,
 			},
+			"shape": {
+				Type:          schema.TypeString,
+				Optional:      true,
+				Computed:      true,
+				ForceNew:      true,
+				ConflictsWith: []string{"compatible_shapes"},
+			},
 			"system_tags": {
 				Type:     schema.TypeMap,
 				Optional: true,
@@ -194,6 +205,10 @@ func PsqlConfigurationResource() *schema.Resource {
 					},
 				},
 			},
+			"default_config_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"lifecycle_details": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -284,6 +299,19 @@ func (s *PsqlConfigurationResourceCrud) Create() error {
 		request.CompartmentId = &tmp
 	}
 
+	if compatibleShapes, ok := s.D.GetOkExists("compatible_shapes"); ok {
+		interfaces := compatibleShapes.([]interface{})
+		tmp := make([]string, len(interfaces))
+		for i := range interfaces {
+			if interfaces[i] != nil {
+				tmp[i] = interfaces[i].(string)
+			}
+		}
+		if len(tmp) != 0 || s.D.HasChange("compatible_shapes") {
+			request.CompatibleShapes = tmp
+		}
+	}
+
 	if dbConfigurationOverrides, ok := s.D.GetOkExists("db_configuration_overrides"); ok {
 		if tmpList := dbConfigurationOverrides.([]interface{}); len(tmpList) > 0 {
 			fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "db_configuration_overrides", 0)
@@ -390,6 +418,19 @@ func (s *PsqlConfigurationResourceCrud) Update() error {
 	}
 	request := oci_psql.UpdateConfigurationRequest{}
 
+	if compatibleShapes, ok := s.D.GetOkExists("compatible_shapes"); ok {
+		interfaces := compatibleShapes.([]interface{})
+		tmp := make([]string, len(interfaces))
+		for i := range interfaces {
+			if interfaces[i] != nil {
+				tmp[i] = interfaces[i].(string)
+			}
+		}
+		if len(tmp) != 0 || s.D.HasChange("compatible_shapes") {
+			request.CompatibleShapes = tmp
+		}
+	}
+
 	tmp := s.D.Id()
 	request.ConfigurationId = &tmp
 
@@ -443,6 +484,8 @@ func (s *PsqlConfigurationResourceCrud) SetData() error {
 		s.D.Set("compartment_id", *s.Res.CompartmentId)
 	}
 
+	s.D.Set("compatible_shapes", s.Res.CompatibleShapes)
+
 	s.D.Set("config_type", s.Res.ConfigType)
 
 	if s.Res.ConfigurationDetails != nil {
@@ -455,6 +498,10 @@ func (s *PsqlConfigurationResourceCrud) SetData() error {
 		s.D.Set("db_version", *s.Res.DbVersion)
 	}
 
+	if s.Res.DefaultConfigId != nil {
+		s.D.Set("default_config_id", *s.Res.DefaultConfigId)
+	}
+
 	if s.Res.DefinedTags != nil {
 		s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
 	}
@@ -590,10 +637,16 @@ func ConfigurationSummaryToMap(obj oci_psql.ConfigurationSummary) map[string]int
 		result["compartment_id"] = string(*obj.CompartmentId)
 	}
 
+	result["compatible_shapes"] = obj.CompatibleShapes
+
 	if obj.DbVersion != nil {
 		result["db_version"] = string(*obj.DbVersion)
 	}
 
+	if obj.DefaultConfigId != nil {
+		result["default_config_id"] = string(*obj.DefaultConfigId)
+	}
+
 	if obj.DefinedTags != nil {
 		result["defined_tags"] = tfresource.DefinedTagsToMap(obj.DefinedTags)
 	}

internal/service/psql/psql_configurations_data_source.go

@@ -38,9 +38,18 @@ func PsqlConfigurationsDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"instance_memory_size_in_gbs": {
+				Type:     schema.TypeInt,
+				Optional: true,
+			},
+			"instance_ocpu_count": {
+				Type:     schema.TypeInt,
+				Optional: true,
+			},
 			"shape": {
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 			},
 			"state": {
 				Type:     schema.TypeString,
@@ -109,6 +118,16 @@ func (s *PsqlConfigurationsDataSourceCrud) Get() error {
 		request.DisplayName = &tmp
 	}
 
+	if instanceMemorySizeInGBs, ok := s.D.GetOkExists("instance_memory_size_in_gbs"); ok {
+		tmp := instanceMemorySizeInGBs.(int)
+		request.InstanceMemorySizeInGBs = &tmp
+	}
+
+	if instanceOcpuCount, ok := s.D.GetOkExists("instance_ocpu_count"); ok {
+		tmp := instanceOcpuCount.(int)
+		request.InstanceOcpuCount = &tmp
+	}
+
 	if shape, ok := s.D.GetOkExists("shape"); ok {
 		tmp := shape.(string)
 		request.Shape = &tmp

internal/service/psql/psql_default_configuration_data_source.go

@@ -22,6 +22,15 @@ func PsqlDefaultConfigurationDataSource() *schema.Resource {
 				Required: true,
 			},
 			// Computed
+			"compatible_shapes": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				ConflictsWith: []string{"shape"},
+			},
 			"configuration_details": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -105,8 +114,10 @@ func PsqlDefaultConfigurationDataSource() *schema.Resource {
 				Computed: true,
 			},
 			"shape": {
-				Type:     schema.TypeString,
-				Computed: true,
+				Type:          schema.TypeString,
+				Optional:      true,
+				Computed:      true,
+				ConflictsWith: []string{"compatible_shapes"},
 			},
 			"state": {
 				Type:     schema.TypeString,
@@ -164,6 +175,8 @@ func (s *PsqlDefaultConfigurationDataSourceCrud) SetData() error {
 
 	s.D.SetId(*s.Res.Id)
 
+	s.D.Set("compatible_shapes", s.Res.CompatibleShapes)
+
 	if s.Res.ConfigurationDetails != nil {
 		s.D.Set("configuration_details", []interface{}{DefaultConfigurationDetailsToMap(s.Res.ConfigurationDetails)})
 	} else {

internal/service/psql/psql_default_configurations_data_source.go

@@ -30,9 +30,18 @@ func PsqlDefaultConfigurationsDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"instance_memory_size_in_gbs": {
+				Type:     schema.TypeInt,
+				Optional: true,
+			},
+			"instance_ocpu_count": {
+				Type:     schema.TypeInt,
+				Optional: true,
+			},
 			"shape": {
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 			},
 			"state": {
 				Type:     schema.TypeString,
@@ -53,6 +62,14 @@ func PsqlDefaultConfigurationsDataSource() *schema.Resource {
 									// Optional
 
 									// Computed
+									"compatible_shapes": {
+										Type:     schema.TypeList,
+										Optional: true,
+										Computed: true,
+										Elem: &schema.Schema{
+											Type: schema.TypeString,
+										},
+									},
 									"configuration_details": {
 										Type:     schema.TypeList,
 										Computed: true,
@@ -197,6 +214,16 @@ func (s *PsqlDefaultConfigurationsDataSourceCrud) Get() error {
 		request.DisplayName = &tmp
 	}
 
+	if instanceMemorySizeInGBs, ok := s.D.GetOkExists("instance_memory_size_in_gbs"); ok {
+		tmp := instanceMemorySizeInGBs.(int)
+		request.InstanceMemorySizeInGBs = &tmp
+	}
+
+	if instanceOcpuCount, ok := s.D.GetOkExists("instance_ocpu_count"); ok {
+		tmp := instanceOcpuCount.(int)
+		request.InstanceOcpuCount = &tmp
+	}
+
 	if shape, ok := s.D.GetOkExists("shape"); ok {
 		tmp := shape.(string)
 		request.Shape = &tmp
@@ -306,6 +333,8 @@ func DefaultConfigurationDetailsToMap(obj *oci_psql.DefaultConfigurationDetails)
 func DefaultConfigurationSummaryToMap(obj oci_psql.DefaultConfigurationSummary) map[string]interface{} {
 	result := map[string]interface{}{}
 
+	result["compatible_shapes"] = obj.CompatibleShapes
+
 	if obj.DbVersion != nil {
 		result["db_version"] = string(*obj.DbVersion)
 	}