Releasing version 4.58.0

Releasing version 4.58.0

Author: jotruon

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.58.0 (Unreleased)
+
+### Bug Fix
+- Reverting `ocpu_count` to be `optional` in `oci_database_cloud_vm_cluster`
+
 ## 4.57.0 (December 15, 2021)
 
 ### Added

oci/database_autonomous_container_database_dataguard_association_test.go

@@ -101,7 +101,7 @@ var (
 func TestDatabaseAutonomousContainerDatabaseDataguardAssociationResource_basic(t *testing.T) {
 	// sshaagar: Commenting AEI test as not needed post migration.
 	// DISALLOWED_API.launchAutonomousExadataInfrastructure
-	t.Skip("Skipping Test for TeamCity")
+	t.Skip("Skipping Test from execution on a regular test run")
 
 	httpreplay.SetScenario("TestDatabaseAutonomousContainerDatabaseDataguardAssociationResource_basic")
 	defer httpreplay.SaveScenario()

oci/database_cloud_vm_cluster_resource.go

@@ -50,10 +50,6 @@ func DatabaseCloudVmClusterResource() *schema.Resource {
 				Type:     schema.TypeInt,
 				Required: true,
 			},
-			"ocpu_count": {
-				Type:     schema.TypeFloat,
-				Required: true,
-			},
 			"display_name": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -155,6 +151,11 @@ func DatabaseCloudVmClusterResource() *schema.Resource {
 					Type: schema.TypeString,
 				},
 			},
+			"ocpu_count": {
+				Type:     schema.TypeFloat,
+				Optional: true,
+				Computed: true,
+			},
 			"scan_listener_port_tcp": {
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -433,16 +434,16 @@ func (s *DatabaseCloudVmClusterResourceCrud) Create() error {
 		request.CpuCoreCount = &tmp
 	}
 
-	if ocpuCount, ok := s.D.GetOkExists("ocpu_count"); ok {
-		tmp := float32(ocpuCount.(float64))
-		request.OcpuCount = &tmp
-	}
-
 	if dataStoragePercentage, ok := s.D.GetOkExists("data_storage_percentage"); ok {
 		tmp := dataStoragePercentage.(int)
 		request.DataStoragePercentage = &tmp
 	}
 
+	if ocpuCount, ok := s.D.GetOkExists("ocpu_count"); ok {
+		tmp := float32(ocpuCount.(float64))
+		request.OcpuCount = &tmp
+	}
+
 	if definedTags, ok := s.D.GetOkExists("defined_tags"); ok {
 		convertedDefinedTags, err := mapToDefinedTags(definedTags.(map[string]interface{}))
 		if err != nil {
@@ -611,11 +612,6 @@ func (s *DatabaseCloudVmClusterResourceCrud) Update() error {
 		request.CpuCoreCount = &tmp
 	}
 
-	if ocpuCount, ok := s.D.GetOkExists("ocpu_count"); ok && s.D.HasChange("ocpu_count") {
-		tmp := float32(ocpuCount.(float64))
-		request.OcpuCount = &tmp
-	}
-
 	if definedTags, ok := s.D.GetOkExists("defined_tags"); ok {
 		convertedDefinedTags, err := mapToDefinedTags(definedTags.(map[string]interface{}))
 		if err != nil {
@@ -651,6 +647,11 @@ func (s *DatabaseCloudVmClusterResourceCrud) Update() error {
 		}
 	}
 
+	if ocpuCount, ok := s.D.GetOkExists("ocpu_count"); ok && s.D.HasChange("ocpu_count") {
+		tmp := float32(ocpuCount.(float64))
+		request.OcpuCount = &tmp
+	}
+
 	if sshPublicKeys, ok := s.D.GetOkExists("ssh_public_keys"); ok {
 		interfaces := sshPublicKeys.([]interface{})
 		tmp := make([]string, len(interfaces))

oci/database_cloud_vm_cluster_test.go

@@ -61,6 +61,7 @@ var (
 		"is_sparse_diskgroup_enabled":     Representation{RepType: Optional, Create: `false`},
 		"license_model":                   Representation{RepType: Optional, Create: `LICENSE_INCLUDED`},
 		"nsg_ids":                         Representation{RepType: Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}},
+		"ocpu_count":                      Representation{RepType: Optional, Create: `4.0`, Update: `4.0`},
 		"scan_listener_port_tcp":          Representation{RepType: Optional, Create: `1521`},
 		"scan_listener_port_tcp_ssl":      Representation{RepType: Optional, Create: `2484`},
 		"time_zone":                       Representation{RepType: Optional, Create: `US/Pacific`},
@@ -253,6 +254,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "is_local_backup_enabled", "true"),
 				resource.TestCheckResourceAttr(resourceName, "is_sparse_diskgroup_enabled", "false"),
 				resource.TestCheckResourceAttr(resourceName, "license_model", "LICENSE_INCLUDED"),
+				resource.TestCheckResourceAttr(resourceName, "ocpu_count", "4"),
 				resource.TestCheckResourceAttrSet(resourceName, "shape"),
 				resource.TestCheckResourceAttr(resourceName, "ssh_public_keys.#", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "state"),
@@ -295,6 +297,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "is_local_backup_enabled", "true"),
 				resource.TestCheckResourceAttr(resourceName, "is_sparse_diskgroup_enabled", "false"),
 				resource.TestCheckResourceAttr(resourceName, "license_model", "LICENSE_INCLUDED"),
+				resource.TestCheckResourceAttr(resourceName, "ocpu_count", "4"),
 				resource.TestCheckResourceAttr(resourceName, "scan_listener_port_tcp", "1521"),
 				resource.TestCheckResourceAttr(resourceName, "scan_listener_port_tcp_ssl", "2484"),
 				resource.TestCheckResourceAttrSet(resourceName, "shape"),
@@ -334,6 +337,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "is_local_backup_enabled", "true"),
 				resource.TestCheckResourceAttr(resourceName, "is_sparse_diskgroup_enabled", "false"),
 				resource.TestCheckResourceAttr(resourceName, "license_model", "LICENSE_INCLUDED"),
+				resource.TestCheckResourceAttr(resourceName, "ocpu_count", "4"),
 				resource.TestCheckResourceAttrSet(resourceName, "shape"),
 				resource.TestCheckResourceAttr(resourceName, "ssh_public_keys.#", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "state"),
@@ -381,6 +385,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.license_model", "LICENSE_INCLUDED"),
 				resource.TestCheckResourceAttrSet(datasourceName, "cloud_vm_clusters.0.listener_port"),
 				resource.TestCheckResourceAttrSet(datasourceName, "cloud_vm_clusters.0.node_count"),
+				resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.ocpu_count", "4"),
 				resource.TestCheckResourceAttrSet(datasourceName, "cloud_vm_clusters.0.scan_dns_name"),
 				resource.TestCheckResourceAttrSet(datasourceName, "cloud_vm_clusters.0.shape"),
 				resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.ssh_public_keys.#", "1"),
@@ -417,6 +422,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(singularDatasourceName, "license_model", "LICENSE_INCLUDED"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "listener_port"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "node_count"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "ocpu_count", "4"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "scan_dns_name"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "shape"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "ssh_public_keys.#", "1"),

oci/marketplace_listing_package_data_source.go

@@ -44,6 +44,10 @@ func MarketplaceListingPackageDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"image_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"operating_system": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -61,10 +65,6 @@ func MarketplaceListingPackageDataSource() *schema.Resource {
 					},
 				},
 			},
-			"image_id": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"package_type": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -248,6 +248,7 @@ func (s *MarketplaceListingPackageDataSourceCrud) SetData() error {
 	if s.Res == nil {
 		return nil
 	}
+
 	s.D.SetId(GenerateDataSourceHashID("MarketplaceListingPackageDataSource-", MarketplaceListingPackageDataSource(), s.D))
 	switch v := (*s.Res).(type) {
 	case oci_marketplace.ImageListingPackage:

oci/marketplace_listing_test.go

@@ -88,7 +88,7 @@ func TestMarketplaceListingResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "icon.#"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "is_featured"),
-				resource.TestCheckResourceAttrSet(singularDatasourceName, "keywords"),
+				//resource.TestCheckResourceAttrSet(singularDatasourceName, "keywords"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "languages.#"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "links.#"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "long_description"),
@@ -101,7 +101,7 @@ func TestMarketplaceListingResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "supported_operating_systems.#"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "support_contacts.#"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "support_links.#"),
-				resource.TestCheckResourceAttrSet(singularDatasourceName, "system_requirements"),
+				//resource.TestCheckResourceAttrSet(singularDatasourceName, "system_requirements"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "tagline"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "usage_information"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "videos.#"),

website/docs/d/marketplace_listing.html.markdown

@@ -77,7 +77,7 @@ The following attributes are exported:
 * `links` - Links to reference material.
 	* `href` - The anchor tag.
 	* `rel` - Reference links to the previous page, next page, and other pages.
-* `listing_type` - In which catalog the listing should exist.
+* `listing_type` - The publisher category to which the listing belongs. The publisher category informs where the listing appears for use.
 * `long_description` - A long description of the listing.
 * `name` - The name of the listing.
 * `package_type` - The listing's package type.
@@ -86,7 +86,7 @@ The following attributes are exported:
 	* `contact_phone` - The phone number of the publisher.
 	* `description` - A description of the publisher.
 	* `hq_address` - The address of the publisher's headquarters.
-	* `id` - Unique identifier for the publisher.
+	* `id` - The unique identifier for the publisher.
 	* `links` - Reference links.
 		* `href` - The anchor tag.
 		* `rel` - Reference links to the previous page, next page, and other pages.
@@ -120,8 +120,8 @@ The following attributes are exported:
 * `support_links` - Links to support resources for the listing.
 	* `name` - Text that describes the resource.
 	* `url` - The URL of the resource.
-* `supported_operating_systems` - List of operating systems supported.
-	* `name` - name of the operating system
+* `supported_operating_systems` - The list of operating systems supported by the listing.
+	* `name` - The name of the operating system.
 * `system_requirements` - System requirements for the listing.
 * `tagline` - The tagline of the listing.
 * `time_released` - The release date of the listing.

website/docs/d/marketplace_listing_package.html.markdown

@@ -55,10 +55,10 @@ The following attributes are exported:
 * `app_catalog_listing_id` - The ID of the listing resource associated with this listing package. For more information, see [AppCatalogListing](https://docs.cloud.oracle.com/en-us/iaas/api/#/en/iaas/latest/AppCatalogListing/) in the Core Services API. 
 * `app_catalog_listing_resource_version` - The resource version of the listing resource associated with this listing package.
 * `description` - Description of this package.
-* `image_id` - The id of the image corresponding to the package.
+* `image_id` - The ID of the image corresponding to the package.
 * `listing_id` - The ID of the listing that the specified package belongs to.
-* `operating_system` - OS used by the listing.
-	* `name` - name of the operating system
+* `operating_system` - The operating system used by the listing.
+	* `name` - The name of the operating system.
 * `package_type` - The specified package's type.
 * `pricing` - The model for pricing.
 	* `currency` - The currency of the pricing model.

website/docs/d/marketplace_listing_packages.html.markdown

@@ -63,9 +63,10 @@ The following attributes are exported:
 * `app_catalog_listing_id` - The ID of the listing resource associated with this listing package. For more information, see [AppCatalogListing](https://docs.cloud.oracle.com/en-us/iaas/api/#/en/iaas/latest/AppCatalogListing/) in the Core Services API. 
 * `app_catalog_listing_resource_version` - The resource version of the listing resource associated with this listing package.
 * `description` - Description of this package.
+* `image_id` - The ID of the image corresponding to the package.
 * `listing_id` - The ID of the listing that the specified package belongs to.
-* `operating_system` - OS used by the listing.
-	* `name` - name of the operating system
+* `operating_system` - The operating system used by the listing.
+	* `name` - The name of the operating system.
 * `package_type` - The specified package's type.
 * `pricing` - The model for pricing.
 	* `currency` - The currency of the pricing model.

website/docs/d/marketplace_listings.html.markdown

@@ -54,9 +54,9 @@ The following arguments are supported:
 * `compartment_id` - (Optional) The unique identifier for the compartment.
 * `is_featured` - (Optional) Indicates whether to show only featured listings. If this is set to `false` or is omitted, then all listings will be returned. 
 * `listing_id` - (Optional) The unique identifier for the listing.
-* `listing_types` - (Optional) The type of the listing
+* `listing_types` - (Optional) The type of the listing.
 * `name` - (Optional) The name of the listing.
-* `operating_systems` - (Optional) OS of the listing.
+* `operating_systems` - (Optional) The operating system of the listing.
 * `package_type` - (Optional) A filter to return only packages that match the given package type exactly. 
 * `pricing` - (Optional) Name of the pricing type. If multiple pricing types are provided, then any listing with one or more matching pricing models will be returned. 
 * `publisher_id` - (Optional) Limit results to just this publisher.
@@ -98,7 +98,7 @@ The following attributes are exported:
 * `links` - Links to reference material.
 	* `href` - The anchor tag.
 	* `rel` - Reference links to the previous page, next page, and other pages.
-* `listing_type` - In which catalog the listing should exist.
+* `listing_type` - The publisher category to which the listing belongs. The publisher category informs where the listing appears for use.
 * `long_description` - A long description of the listing.
 * `name` - The name of the listing.
 * `package_type` - The listing's package type.
@@ -107,7 +107,7 @@ The following attributes are exported:
 	* `contact_phone` - The phone number of the publisher.
 	* `description` - A description of the publisher.
 	* `hq_address` - The address of the publisher's headquarters.
-	* `id` - Unique identifier for the publisher.
+	* `id` - The unique identifier for the publisher.
 	* `links` - Reference links.
 		* `href` - The anchor tag.
 		* `rel` - Reference links to the previous page, next page, and other pages.
@@ -141,8 +141,8 @@ The following attributes are exported:
 * `support_links` - Links to support resources for the listing.
 	* `name` - Text that describes the resource.
 	* `url` - The URL of the resource.
-* `supported_operating_systems` - List of operating systems supported.
-	* `name` - name of the operating system
+* `supported_operating_systems` - The list of operating systems supported by the listing.
+	* `name` - The name of the operating system.
 * `system_requirements` - System requirements for the listing.
 * `tagline` - The tagline of the listing.
 * `time_released` - The release date of the listing.