Resolving merge conflict in change log by incorporating both changes

Author: varmax2511

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Added
 - Support for importing Buckets and Pre-authenticated requests in Object Storage
 - Support glob inclusion and exclusion patterns for object names allowed in Object Storage Lifecycle
+- Support for sorting for resources returned in `oci_core_images` data source
 
 ### Fixed
 - Import functionality for Objects in Object Storage

examples/compute/image/datasources.tf

@@ -28,4 +28,14 @@ data "oci_core_images" "TFSupportedShapeImages" {
 
   # Uncomment below to filter images that are a specific OS version 
   #operating_system_version = "7.5"
+
+  # Uncomment below to sort images by creation time
+  #sort_by                 = "TIMECREATED"
+  # Default sort order for TIMECREATED is descending (DESC)
+  #sort_order              = "ASC"
+
+  # Uncomment below to sort images by display name, display name sort order is case-sensitive
+  #sort_by                 = "DISPLAYNAME"
+  # Default sort order for DISPLAYNAME is ascending (ASC)
+  #sort_order              = "DESC"
 }

oci/core_image_scenario_test.go

@@ -99,6 +99,9 @@ func (s *ResourceCoreImageTestSuite) TestAccResourceCoreImage_objectStorageImage
 						name = "launch_options.is_pv_encryption_in_transit_enabled"
 						values = ["true"]
 					}
+
+                    sort_by = "TIMECREATED"
+                    sort_order = "DESC"
 				}`, s.OperatingSystem),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("data.oci_core_images.t", "images.0.create_image_allowed", "true"),

oci/core_images_data_source.go

@@ -7,6 +7,7 @@ import (
 	"strconv"
 
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform/helper/validation"
 	oci_core "github.com/oracle/oci-go-sdk/core"
 )
 
@@ -54,6 +55,22 @@ func CoreImagesDataSource() *schema.Resource {
 				Optional:   true,
 				Deprecated: FieldDeprecated("page"),
 			},
+			"sort_by": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ValidateFunc: validation.StringInSlice([]string{
+					string(oci_core.ListImagesSortByTimecreated),
+					string(oci_core.ListImagesSortByDisplayname),
+				}, false),
+			},
+			"sort_order": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ValidateFunc: validation.StringInSlice([]string{
+					string(oci_core.ListImagesSortOrderAsc),
+					string(oci_core.ListImagesSortOrderDesc),
+				}, false),
+			},
 		},
 	}
 }
@@ -118,6 +135,14 @@ func (s *CoreImagesDataSourceCrud) Get() error {
 		request.Page = &tmp
 	}
 
+	if sortBy, ok := s.D.GetOkExists("sort_by"); ok {
+		request.SortBy = oci_core.ListImagesSortByEnum(sortBy.(string))
+	}
+
+	if sortOrder, ok := s.D.GetOkExists("sort_order"); ok {
+		request.SortOrder = oci_core.ListImagesSortOrderEnum(sortOrder.(string))
+	}
+
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "core")
 
 	response, err := s.Client.ListImages(context.Background(), request)

oci/filters_test.go

@@ -642,6 +642,37 @@ func TestApplyFilters_multiProperty(t *testing.T) {
 	}
 }
 
+// Test to validate that the Apply filters do not impact the original item order
+func TestApplyFilters_ElementOrder(t *testing.T) {
+	items := []map[string]interface{}{
+		{"letter": "a"},
+		{"letter": "b"},
+		{"letter": "c"},
+		{"letter": "d"},
+	}
+
+	testSchema := map[string]*schema.Schema{
+		"letter": {
+			Type: schema.TypeString,
+		},
+	}
+
+	filters := &schema.Set{F: func(interface{}) int { return 1 }}
+	filters.Add(map[string]interface{}{
+		"name":   "letter",
+		"values": []interface{}{"a", "d"},
+	})
+
+	res := ApplyFilters(filters, items, testSchema)
+	if len(res) != 2 {
+		t.Errorf("Expected 2 result, got %d", len(res))
+	}
+	if res[0]["letter"] != "a" || res[1]["letter"] != "d" {
+		t.Errorf("Expected sort order not retained, got %s %s", res[0]["letter"], res[1]["letter"])
+	}
+
+}
+
 func TestGetValue_EmptyMap(t *testing.T) {
 	item := map[string]interface{}{}
 

website/docs/d/core_images.html.markdown

@@ -13,7 +13,7 @@ Lists the available images in the specified compartment, including both
 [Oracle-provided images](https://docs.cloud.oracle.com/iaas/Content/Compute/References/images.htm) and
 [custom images](https://docs.cloud.oracle.com/iaas/Content/Compute/Tasks/managingcustomimages.htm) that have
 been created. The list of images returned is ordered to first show all
-Oracle-provided images, then all custom images.
+Oracle-provided images, then all custom images. Read more on [List Images](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/20160918/Image/ListImages)
 
 The order of images returned may change when new images are released.
 
@@ -31,8 +31,11 @@ data "oci_core_images" "test_images" {
 	operating_system_version = "${var.image_operating_system_version}"
 	shape = "${var.image_shape}"
 	state = "${var.image_state}"
+	sort_by = "${var.image_sort_by}"
+	sort_order = "${var.image_sort_order}"
 }
 ```
+For more detailed implementation refer the [image example](https://github.com/oracle/terraform-provider-oci/tree/master/examples/compute/image)
 
 ## Argument Reference
 
@@ -44,7 +47,8 @@ The following arguments are supported:
 * `operating_system_version` - (Optional) The image's operating system version.  Example: `7.2` 
 * `shape` - (Optional) Shape name.
 * `state` - (Optional) A filter to only return resources that match the given lifecycle state.  The state value is case-insensitive. 
-
+* `sort_by` - (Optional) Sort the resources returned, by creation time or display name. Example `TIMECREATED` or `DISPLAYNAME`.
+* `sort_order` - (Optional) The sort order to use, either ascending (`ASC`) or descending (`DESC`).
 
 ## Attributes Reference