Added - filter to ListSystemVersions api to get Latest Versions only

Author: Sanjay Zagade

internal/integrationtest/database_gi_version_test.go

@@ -17,8 +17,9 @@ import (
 var (
 	DatabaseDatabaseGiVersionDataSourceRepresentation = map[string]interface{}{
 		"compartment_id":      acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
-		"shape":               acctest.Representation{RepType: acctest.Required, Create: `ExadataCC.Quarter3.100`},
-		"availability_domain": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
+		"availability_domain": acctest.Representation{RepType: acctest.Optional, Create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
+		"resource_id":         acctest.Representation{RepType: acctest.Optional, Create: `resource_id`},
+		"shape":               acctest.Representation{RepType: acctest.Optional, Create: `ExadataCC.Quarter3.100`},
 	}
 
 	DatabaseGiVersionResourceConfig = AvailabilityDomainConfig

internal/integrationtest/database_system_version_minor_version_test.go

@@ -0,0 +1,57 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package integrationtest
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+
+	"github.com/oracle/terraform-provider-oci/httpreplay"
+	"github.com/oracle/terraform-provider-oci/internal/acctest"
+
+	"github.com/oracle/terraform-provider-oci/internal/utils"
+)
+
+var (
+	DatabaseSystemVersionMinorVersionDataSourceRepresentation = map[string]interface{}{
+		"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
+		"gi_version":     acctest.Representation{RepType: acctest.Required, Create: `18.0.0.0`},
+		"major_version":  acctest.Representation{RepType: acctest.Required, Create: `23`},
+		"is_latest":      acctest.Representation{RepType: acctest.Optional, Create: `false`},
+		"resource_id":    acctest.Representation{RepType: acctest.Optional, Create: `resource_id`},
+		"shape":          acctest.Representation{RepType: acctest.Required, Create: `Exadata.X9M`},
+	}
+
+	DatabaseSystemVersionMinorVersionResourceConfig = ""
+)
+
+// issue-routing-tag: database/default
+func TestDatabaseSystemVersionMinorVersionResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestDatabaseSystemVersionMinorVersionResource_basic")
+	defer httpreplay.SaveScenario()
+
+	config := acctest.ProviderTestConfig()
+
+	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	datasourceName := "data.oci_database_system_version_minor_versions.test_system_version_minor_versions"
+
+	acctest.SaveConfigContent("", "", "", t)
+
+	acctest.ResourceTest(t, nil, []resource.TestStep{
+		// verify datasource
+		{
+			Config: config +
+				acctest.GenerateDataSourceFromRepresentationMap("oci_database_system_version_minor_versions", "test_system_version_minor_versions", acctest.Required, acctest.Create, DatabaseSystemVersionMinorVersionDataSourceRepresentation) +
+				compartmentIdVariableStr + DatabaseSystemVersionMinorVersionResourceConfig,
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
+				resource.TestCheckResourceAttrSet(datasourceName, "system_version_minor_version_collection.#"),
+			),
+		},
+	})
+}

internal/integrationtest/database_system_version_test.go

@@ -19,6 +19,8 @@ var (
 	DatabaseSystemVersionDataSourceRepresentation = map[string]interface{}{
 		"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
 		"gi_version":     acctest.Representation{RepType: acctest.Required, Create: `18.0.0.0`},
+		"is_latest":      acctest.Representation{RepType: acctest.Optional, Create: `false`},
+		"resource_id":    acctest.Representation{RepType: acctest.Optional, Create: `resource_id`},
 		"shape":          acctest.Representation{RepType: acctest.Required, Create: `Exadata.X9M`},
 	}
 

internal/service/database/database_gi_versions_data_source.go

@@ -26,6 +26,10 @@ func DatabaseGiVersionsDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"resource_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"shape": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -82,6 +86,11 @@ func (s *DatabaseGiVersionsDataSourceCrud) Get() error {
 		request.CompartmentId = &tmp
 	}
 
+	if resourceId, ok := s.D.GetOkExists("resource_id"); ok {
+		tmp := resourceId.(string)
+		request.ResourceId = &tmp
+	}
+
 	if shape, ok := s.D.GetOkExists("shape"); ok {
 		tmp := shape.(string)
 		request.Shape = &tmp

internal/service/database/database_system_version_minor_versions_data_source.go

@@ -0,0 +1,189 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package database
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	oci_database "github.com/oracle/oci-go-sdk/v65/database"
+
+	"github.com/oracle/terraform-provider-oci/internal/client"
+	"github.com/oracle/terraform-provider-oci/internal/tfresource"
+)
+
+func DatabaseSystemVersionMinorVersionsDataSource() *schema.Resource {
+	return &schema.Resource{
+		Read: readDatabaseSystemVersionMinorVersions,
+		Schema: map[string]*schema.Schema{
+			"filter": tfresource.DataSourceFiltersSchema(),
+			"compartment_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"gi_version": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"is_latest": {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
+			"major_version": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"resource_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"shape": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"system_version_minor_version_collection": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+
+						// Optional
+
+						// Computed
+						"items": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									// Required
+
+									// Optional
+
+									// Computed
+									"version": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func readDatabaseSystemVersionMinorVersions(d *schema.ResourceData, m interface{}) error {
+	sync := &DatabaseSystemVersionMinorVersionsDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*client.OracleClients).DatabaseClient()
+
+	return tfresource.ReadResource(sync)
+}
+
+type DatabaseSystemVersionMinorVersionsDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_database.DatabaseClient
+	Res    *oci_database.ListSystemVersionMinorVersionsResponse
+}
+
+func (s *DatabaseSystemVersionMinorVersionsDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *DatabaseSystemVersionMinorVersionsDataSourceCrud) Get() error {
+	request := oci_database.ListSystemVersionMinorVersionsRequest{}
+
+	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
+		tmp := compartmentId.(string)
+		request.CompartmentId = &tmp
+	}
+
+	if giVersion, ok := s.D.GetOkExists("gi_version"); ok {
+		tmp := giVersion.(string)
+		request.GiVersion = &tmp
+	}
+
+	if isLatest, ok := s.D.GetOkExists("is_latest"); ok {
+		tmp := isLatest.(bool)
+		request.IsLatest = &tmp
+	}
+
+	if majorVersion, ok := s.D.GetOkExists("major_version"); ok {
+		tmp := majorVersion.(string)
+		request.MajorVersion = &tmp
+	}
+
+	if resourceId, ok := s.D.GetOkExists("resource_id"); ok {
+		tmp := resourceId.(string)
+		request.ResourceId = &tmp
+	}
+
+	if shape, ok := s.D.GetOkExists("shape"); ok {
+		tmp := shape.(string)
+		request.Shape = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "database")
+
+	response, err := s.Client.ListSystemVersionMinorVersions(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	request.Page = s.Res.OpcNextPage
+
+	for request.Page != nil {
+		listResponse, err := s.Client.ListSystemVersionMinorVersions(context.Background(), request)
+		if err != nil {
+			return err
+		}
+
+		s.Res.Items = append(s.Res.Items, listResponse.Items...)
+		request.Page = listResponse.OpcNextPage
+	}
+
+	return nil
+}
+
+func (s *DatabaseSystemVersionMinorVersionsDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(tfresource.GenerateDataSourceHashID("DatabaseSystemVersionMinorVersionsDataSource-", DatabaseSystemVersionMinorVersionsDataSource(), s.D))
+	resources := []map[string]interface{}{}
+	systemVersionMinorVersion := map[string]interface{}{}
+
+	items := []interface{}{}
+	for _, item := range s.Res.Items {
+		items = append(items, SystemVersionMinorVersionSummaryToMap(item))
+	}
+	systemVersionMinorVersion["items"] = items
+
+	if f, fOk := s.D.GetOkExists("filter"); fOk {
+		items = tfresource.ApplyFiltersInCollection(f.(*schema.Set), items, DatabaseSystemVersionMinorVersionsDataSource().Schema["system_version_minor_version_collection"].Elem.(*schema.Resource).Schema)
+		systemVersionMinorVersion["items"] = items
+	}
+
+	resources = append(resources, systemVersionMinorVersion)
+	if err := s.D.Set("system_version_minor_version_collection", resources); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func SystemVersionMinorVersionSummaryToMap(obj oci_database.SystemVersionMinorVersionSummary) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.Version != nil {
+		result["version"] = string(*obj.Version)
+	}
+
+	return result
+}

internal/service/database/database_system_versions_data_source.go

@@ -26,9 +26,17 @@ func DatabaseSystemVersionsDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"is_latest": {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
+			"resource_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"shape": {
 				Type:     schema.TypeString,
-				Required: true,
+				Optional: true,
 			},
 			"system_version_collection": {
 				Type:     schema.TypeList,
@@ -106,6 +114,16 @@ func (s *DatabaseSystemVersionsDataSourceCrud) Get() error {
 		request.GiVersion = &tmp
 	}
 
+	if isLatest, ok := s.D.GetOkExists("is_latest"); ok {
+		tmp := isLatest.(bool)
+		request.IsLatest = &tmp
+	}
+
+	if resourceId, ok := s.D.GetOkExists("resource_id"); ok {
+		tmp := resourceId.(string)
+		request.ResourceId = &tmp
+	}
+
 	if shape, ok := s.D.GetOkExists("shape"); ok {
 		tmp := shape.(string)
 		request.Shape = &tmp

internal/service/database/register_datasource.go

@@ -125,6 +125,7 @@ func RegisterDatasource() {
 	tfresource.RegisterDatasource("oci_database_pluggable_database", DatabasePluggableDatabaseDataSource())
 	tfresource.RegisterDatasource("oci_database_pluggable_databases", DatabasePluggableDatabasesDataSource())
 	tfresource.RegisterDatasource("oci_database_scheduled_action", DatabaseScheduledActionDataSource())
+	tfresource.RegisterDatasource("oci_database_system_version_minor_versions", DatabaseSystemVersionMinorVersionsDataSource())
 	tfresource.RegisterDatasource("oci_database_scheduled_action_params", DatabaseScheduledActionParamsDataSource())
 	tfresource.RegisterDatasource("oci_database_scheduled_actions", DatabaseScheduledActionsDataSource())
 	tfresource.RegisterDatasource("oci_database_scheduling_plan", DatabaseSchedulingPlanDataSource())

website/docs/d/database_gi_versions.html.markdown

@@ -21,6 +21,7 @@ data "oci_database_gi_versions" "test_gi_versions" {
 
 	#Optional
 	availability_domain = var.gi_version_availability_domain
+	resource_id = oci_cloud_guard_resource.test_resource.id
 	shape = var.gi_version_shape
 }
 ```
@@ -31,6 +32,7 @@ The following arguments are supported:
 
 * `availability_domain` - (Optional) The target availability domain. Only passed if the limit is AD-specific.
 * `compartment_id` - (Required) The compartment [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm).
+* `resource_id` - (Optional) If provided, filters the results for the specified resource Id.
 * `shape` - (Optional) If provided, filters the results for the given shape.