Added - Support for OS Management Hub: Limit CSS/VCSS content to the latest package versions only

Author: Terraform Team Automation

examples/os_management_hub/software_source/main.tf

@@ -59,15 +59,15 @@ resource "oci_os_management_hub_software_source" "test_software_source_filter" {
     compartment_id = var.compartment_id
     display_name = "displayName"
     software_source_type = "CUSTOM"
+    vendor_software_sources {
+        display_name = "ol8_baseos_latest-x86_64"
+        id = data.oci_os_management_hub_software_sources.ol8_baseos_latest_x86_64.software_source_collection[0].items[0].id
+    }
     vendor_software_sources {
         #Required
         display_name = "ol8_appstream-x86_64"
         id = data.oci_os_management_hub_software_sources.ol8_appstream_x86_64.software_source_collection[0].items[0].id
     }
-    vendor_software_sources {
-        display_name = "ol8_baseos_latest-x86_64"
-        id = data.oci_os_management_hub_software_sources.ol8_baseos_latest_x86_64.software_source_collection[0].items[0].id
-    }
 
     #Optional
     custom_software_source_filter {
@@ -96,22 +96,28 @@ resource "oci_os_management_hub_software_source" "test_software_source_filter" {
     is_auto_resolve_dependencies = "false"
     is_automatically_updated = "true"
     is_created_from_package_list = "false"
+    is_latest_content_only = "false"
+    origin_software_source_id = data.oci_os_management_hub_software_sources.ol8_baseos_latest_x86_64.software_source_collection[0].items[0].id
+
+    lifecycle {
+        ignore_changes = [defined_tags]
+    }
 }
 
 resource "oci_os_management_hub_software_source" "test_software_source_list" {
     #Required
     compartment_id = var.compartment_id
     display_name = "displayName"
     software_source_type = "CUSTOM"
+    vendor_software_sources {
+        display_name = "ol8_baseos_latest-x86_64"
+        id = data.oci_os_management_hub_software_sources.ol8_baseos_latest_x86_64.software_source_collection[0].items[0].id
+    }
     vendor_software_sources {
         #Required
         display_name = "ol8_appstream-x86_64"
         id = data.oci_os_management_hub_software_sources.ol8_appstream_x86_64.software_source_collection[0].items[0].id
     }
-    vendor_software_sources {
-        display_name = "ol8_baseos_latest-x86_64"
-        id = data.oci_os_management_hub_software_sources.ol8_baseos_latest_x86_64.software_source_collection[0].items[0].id
-    }
 
     #Optional
     defined_tags = {"Operations.CostCenter"= "42"}
@@ -120,6 +126,10 @@ resource "oci_os_management_hub_software_source" "test_software_source_list" {
     is_auto_resolve_dependencies = "false"
     is_automatically_updated = "true"
     is_created_from_package_list = "true"
+
+    lifecycle {
+        ignore_changes = [defined_tags]
+    }
 }
 
 # Get software source
@@ -196,7 +206,7 @@ data "oci_os_management_hub_software_package_software_source" "test_software_pac
 
 # Add software package
 resource "oci_os_management_hub_software_source_add_packages_management" "test_software_source_add_packages_management" {
-    packages = ["ModemManager-glib-1.10.4-1.el8.x86_64.rpm"]
+    packages = ["ModemManager-glib-1.10.4-1.el8.x86_64"]
     software_source_id = oci_os_management_hub_software_source.test_software_source_list.id
 }
 

internal/integrationtest/os_management_hub_software_source_test.go

@@ -87,12 +87,13 @@ var (
 		"description":                   acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
 		"display_name":                  acctest.Representation{RepType: acctest.Required, Create: `displayName`, Update: `displayName2`},
 		"software_source_type":          acctest.Representation{RepType: acctest.Required, Create: `CUSTOM`},
-		"vendor_software_sources":       []acctest.RepresentationGroup{{RepType: acctest.Required, Group: OsManagementHubSoftwareSourceVendorSoftwareSourcesRepresentation2}, {RepType: acctest.Required, Group: OsManagementHubSoftwareSourceVendorSoftwareSourcesRepresentation}},
+		"vendor_software_sources":       []acctest.RepresentationGroup{{RepType: acctest.Required, Group: OsManagementHubSoftwareSourceVendorSoftwareSourcesRepresentation}, {RepType: acctest.Required, Group: OsManagementHubSoftwareSourceVendorSoftwareSourcesRepresentation2}},
 		"custom_software_source_filter": acctest.RepresentationGroup{RepType: acctest.Required, Group: OsManagementHubSoftwareSourceCustomSoftwareSourceFilterRepresentation},
 		"freeform_tags":                 acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}},
 		"is_auto_resolve_dependencies":  acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `false`},
 		"is_automatically_updated":      acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
 		"is_created_from_package_list":  acctest.Representation{RepType: acctest.Optional, Create: `false`},
+		"is_latest_content_only":        acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
 	}
 
 	OsManagementHubSoftwareSourceCustomRepresentation = map[string]interface{}{
@@ -101,7 +102,7 @@ var (
 		"description":                  acctest.Representation{RepType: acctest.Optional, Create: `tf-custom-ss`, Update: `tf-custom-ss2`},
 		"display_name":                 acctest.Representation{RepType: acctest.Required, Create: `tf-custom-ss`, Update: `tf-custom-ss2`},
 		"software_source_type":         acctest.Representation{RepType: acctest.Required, Create: `CUSTOM`},
-		"vendor_software_sources":      []acctest.RepresentationGroup{{RepType: acctest.Required, Group: OsManagementHubSoftwareSourceVendorSoftwareSourcesRepresentation2}, {RepType: acctest.Required, Group: OsManagementHubSoftwareSourceVendorSoftwareSourcesRepresentation}},
+		"vendor_software_sources":      []acctest.RepresentationGroup{{RepType: acctest.Required, Group: OsManagementHubSoftwareSourceVendorSoftwareSourcesRepresentation}, {RepType: acctest.Required, Group: OsManagementHubSoftwareSourceVendorSoftwareSourcesRepresentation2}},
 		"is_auto_resolve_dependencies": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `false`},
 		"is_automatically_updated":     acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
 		"is_created_from_package_list": acctest.Representation{RepType: acctest.Required, Create: `true`},
@@ -206,6 +207,7 @@ func TestOsManagementHubSoftwareSourceResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "is_auto_resolve_dependencies", "false"),
 				resource.TestCheckResourceAttr(resourceName, "is_automatically_updated", "false"),
 				resource.TestCheckResourceAttr(resourceName, "is_created_from_package_list", "false"),
+				resource.TestCheckResourceAttr(resourceName, "is_latest_content_only", "false"),
 				resource.TestCheckResourceAttrSet(resourceName, "os_family"),
 				resource.TestCheckResourceAttrSet(resourceName, "package_count"),
 				resource.TestCheckResourceAttrSet(resourceName, "repo_id"),
@@ -261,14 +263,15 @@ func TestOsManagementHubSoftwareSourceResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "is_auto_resolve_dependencies", "false"),
 				resource.TestCheckResourceAttr(resourceName, "is_automatically_updated", "false"),
 				resource.TestCheckResourceAttr(resourceName, "is_created_from_package_list", "false"),
+				resource.TestCheckResourceAttr(resourceName, "is_latest_content_only", "false"),
 				resource.TestCheckResourceAttrSet(resourceName, "os_family"),
 				resource.TestCheckResourceAttr(resourceName, "packages.#", "0"),
 				resource.TestCheckResourceAttrSet(resourceName, "repo_id"),
 				resource.TestCheckResourceAttr(resourceName, "software_source_type", "CUSTOM"),
 				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
 				resource.TestCheckResourceAttrSet(resourceName, "url"),
 				resource.TestCheckResourceAttr(resourceName, "vendor_software_sources.#", "2"),
-				resource.TestCheckResourceAttr(resourceName, "vendor_software_sources.0.display_name", "ol8_baseos_latest-x86_64"),
+				resource.TestCheckResourceAttrSet(resourceName, "vendor_software_sources.0.display_name"),
 				resource.TestCheckResourceAttrSet(resourceName, "vendor_software_sources.0.id"),
 
 				func(s *terraform.State) (err error) {
@@ -308,6 +311,7 @@ func TestOsManagementHubSoftwareSourceResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "is_auto_resolve_dependencies", "false"),
 				resource.TestCheckResourceAttr(resourceName, "is_automatically_updated", "true"),
 				resource.TestCheckResourceAttr(resourceName, "is_created_from_package_list", "false"),
+				resource.TestCheckResourceAttr(resourceName, "is_latest_content_only", "true"),
 				resource.TestCheckResourceAttrSet(resourceName, "os_family"),
 				resource.TestCheckResourceAttr(resourceName, "packages.#", "0"),
 				resource.TestCheckResourceAttrSet(resourceName, "repo_id"),

internal/service/os_management_hub/os_management_hub_software_source_data_source.go

@@ -89,6 +89,10 @@ func (s *OsManagementHubSoftwareSourceDataSourceCrud) SetData() error {
 			s.D.Set("is_created_from_package_list", *v.IsCreatedFromPackageList)
 		}
 
+		if v.IsLatestContentOnly != nil {
+			s.D.Set("is_latest_content_only", *v.IsLatestContentOnly)
+		}
+
 		s.D.Set("packages", v.Packages)
 
 		vendorSoftwareSources := []interface{}{}
@@ -263,6 +267,10 @@ func (s *OsManagementHubSoftwareSourceDataSourceCrud) SetData() error {
 			s.D.Set("is_created_from_package_list", *v.IsCreatedFromPackageList)
 		}
 
+		if v.IsLatestContentOnly != nil {
+			s.D.Set("is_latest_content_only", *v.IsLatestContentOnly)
+		}
+
 		s.D.Set("packages", v.Packages)
 
 		if v.SoftwareSourceVersion != nil {

internal/service/os_management_hub/os_management_hub_software_source_resource.go

@@ -200,6 +200,11 @@ func OsManagementHubSoftwareSourceResource() *schema.Resource {
 				Computed: true,
 				ForceNew: true,
 			},
+			"is_latest_content_only": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Computed: true,
+			},
 			"origin_software_source_id": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -618,6 +623,10 @@ func (s *OsManagementHubSoftwareSourceResourceCrud) SetData() error {
 			s.D.Set("is_created_from_package_list", *v.IsCreatedFromPackageList)
 		}
 
+		if v.IsLatestContentOnly != nil {
+			s.D.Set("is_latest_content_only", *v.IsLatestContentOnly)
+		}
+
 		s.D.Set("packages", v.Packages)
 
 		vendorSoftwareSources := []interface{}{}
@@ -796,6 +805,10 @@ func (s *OsManagementHubSoftwareSourceResourceCrud) SetData() error {
 			s.D.Set("is_created_from_package_list", *v.IsCreatedFromPackageList)
 		}
 
+		if v.IsLatestContentOnly != nil {
+			s.D.Set("is_latest_content_only", *v.IsLatestContentOnly)
+		}
+
 		s.D.Set("packages", v.Packages)
 
 		if v.SoftwareSourceVersion != nil {
@@ -1169,6 +1182,10 @@ func (s *OsManagementHubSoftwareSourceResourceCrud) populateTopLevelPolymorphicC
 			tmp := isCreatedFromPackageList.(bool)
 			details.IsCreatedFromPackageList = &tmp
 		}
+		if isLatestContentOnly, ok := s.D.GetOkExists("is_latest_content_only"); ok {
+			tmp := isLatestContentOnly.(bool)
+			details.IsLatestContentOnly = &tmp
+		}
 		if packages, ok := s.D.GetOkExists("packages"); ok {
 			interfaces := packages.([]interface{})
 			tmp := make([]string, len(interfaces))
@@ -1269,6 +1286,10 @@ func (s *OsManagementHubSoftwareSourceResourceCrud) populateTopLevelPolymorphicC
 			tmp := isCreatedFromPackageList.(bool)
 			details.IsCreatedFromPackageList = &tmp
 		}
+		if isLatestContentOnly, ok := s.D.GetOkExists("is_latest_content_only"); ok {
+			tmp := isLatestContentOnly.(bool)
+			details.IsLatestContentOnly = &tmp
+		}
 		if packages, ok := s.D.GetOkExists("packages"); ok {
 			interfaces := packages.([]interface{})
 			tmp := make([]string, len(interfaces))
@@ -1360,6 +1381,10 @@ func (s *OsManagementHubSoftwareSourceResourceCrud) populateTopLevelPolymorphicU
 			tmp := isAutomaticallyUpdated.(bool)
 			details.IsAutomaticallyUpdated = &tmp
 		}
+		if isLatestContentOnly, ok := s.D.GetOkExists("is_latest_content_only"); ok {
+			tmp := isLatestContentOnly.(bool)
+			details.IsLatestContentOnly = &tmp
+		}
 		if vendorSoftwareSources, ok := s.D.GetOkExists("vendor_software_sources"); ok {
 			interfaces := vendorSoftwareSources.([]interface{})
 			tmp := make([]oci_os_management_hub.Id, len(interfaces))

website/docs/d/os_management_hub_software_source.html.markdown

@@ -62,6 +62,12 @@ The following attributes are exported:
 * `is_auto_resolve_dependencies` - Indicates whether the service should automatically resolve package dependencies when including specific packages in the software source.
 * `is_automatically_updated` - Indicates whether the service should automatically update the custom software source to use the latest package versions available. The service reviews packages levels once a day.
 * `is_created_from_package_list` - Indicates whether the service should create the software source from a list of packages provided by the user.
+* `is_latest_content_only` - Indicates whether the software source will include only the latest versions of content from vendor software sources, while accounting for other constraints set in the custom or versioned custom software source (such as a package list or filters).
+	* For a module filter that does not specify a stream, this will include all available streams, and within each stream only the latest version of packages.
+	* For a module filter that does specify a stream, this will include only the latest version of packages for the specified stream.
+	* For a package filter that does not specify a version, this will include only the latest available version of the package.
+	* For a package filter that does specify a version, this will include only the specified version of the package (the isLatestContentOnly attribute is ignored).
+	* For a package list, this will include only the specified version of packages and modules in the list (the isLatestContentOnly attribute is ignored). 
 * `is_mandatory_for_autonomous_linux` - Indicates whether the software source is required for the Autonomous Linux service.
 * `origin_software_source_id` - This property applies only to replicated vendor software sources. This is the [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the vendor software source in the root compartment.
 * `os_family` - The OS family the software source belongs to.

website/docs/d/os_management_hub_software_sources.html.markdown

@@ -97,6 +97,12 @@ The following attributes are exported:
 * `is_auto_resolve_dependencies` - Indicates whether the service should automatically resolve package dependencies when including specific packages in the software source.
 * `is_automatically_updated` - Indicates whether the service should automatically update the custom software source to use the latest package versions available. The service reviews packages levels once a day.
 * `is_created_from_package_list` - Indicates whether the service should create the software source from a list of packages provided by the user.
+* `is_latest_content_only` - Indicates whether the software source will include only the latest versions of content from vendor software sources, while accounting for other constraints set in the custom or versioned custom software source (such as a package list or filters).
+	* For a module filter that does not specify a stream, this will include all available streams, and within each stream only the latest version of packages.
+	* For a module filter that does specify a stream, this will include only the latest version of packages for the specified stream.
+	* For a package filter that does not specify a version, this will include only the latest available version of the package.
+	* For a package filter that does specify a version, this will include only the specified version of the package (the isLatestContentOnly attribute is ignored).
+	* For a package list, this will include only the specified version of packages and modules in the list (the isLatestContentOnly attribute is ignored). 
 * `is_mandatory_for_autonomous_linux` - Indicates whether the software source is required for the Autonomous Linux service.
 * `origin_software_source_id` - This property applies only to replicated vendor software sources. This is the [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the vendor software source in the root compartment.
 * `os_family` - The OS family the software source belongs to.