Merge pull request #623 from terraform-providers/release

Release 3.3.0

Author: kilokahn

CHANGELOG.md

@@ -1,4 +1,11 @@
-## 3.2.1 (Unreleased)
+## 3.3.0 (Unreleased)
+
+### Added
+- Support for new Image launch mode: paravirtualization
+
+### Fixed
+- Fix logic to prevent unexpected diffs related to numbers. Issue [#607](https://github.com/terraform-providers/terraform-provider-oci/issues/607)
+
 ## 3.2.0 (September 28, 2018)
 
 ### Added

docs/core/images.md

@@ -16,6 +16,7 @@ The following attributes are exported:
 * `launch_mode` - Specifies the configuration mode for launching virtual machine (VM) instances. The configuration modes are:
 	* `NATIVE` - VM instances launch with iSCSI boot and VFIO devices. The default value for Oracle-provided images.
 	* `EMULATED` - VM instances launch with emulated devices, such as the E1000 network driver and emulated SCSI disk controller.
+	* `PARAVIRTUALIZED` - VM instances launch with paravirtualized devices using virtio drivers.
 	* `CUSTOM` - VM instances launch with custom configuration settings specified in the `LaunchOptions` parameter. 
 * `launch_options` - 
 	* `boot_volume_type` - Emulation type for volume.
@@ -29,7 +30,8 @@ The following attributes are exported:
 		* `UEFI_64` - Boot VM using UEFI style firmware compatible with 64 bit operating systems.  This is the default for Oracle provided images. 
 	* `network_type` - Emulation type for NIC.
 		* `E1000` - Emulated Gigabit ethernet controller.  Compatible with Linux e1000 network driver.
-		* `VFIO` - Direct attached Virtual Function network controller.  Default for Oracle provided images. 
+		* `VFIO` - Direct attached Virtual Function network controller.  Default for Oracle provided images.
+		* `PARAVIRTUALIZED` - VM instances launch with paravirtualized devices using virtio drivers. 
 	* `remote_data_volume_type` - Emulation type for volume.
 		* `ISCSI` - ISCSI attached block storage device. This is the default for Boot Volumes and Remote Block Storage volumes on Oracle provided images.
 		* `SCSI` - Emulated SCSI disk.
@@ -79,6 +81,7 @@ The following arguments are supported:
 * `launch_mode` - (Optional) Specifies the configuration mode for launching virtual machine (VM) instances. The configuration modes are:
 	* `NATIVE` - VM instances launch with iSCSI boot and VFIO devices. The default value for Oracle-provided images.
 	* `EMULATED` - VM instances launch with emulated devices, such as the E1000 network driver and emulated SCSI disk controller.
+	* `PARAVIRTUALIZED` - VM instances launch with paravirtualized devices using virtio drivers.
 	* `CUSTOM` - VM instances launch with custom configuration settings specified in the `LaunchOptions` parameter. 
 
 
@@ -164,11 +167,13 @@ resource "oci_core_image" "test_image" {
 Gets a list of images.
 
 ### List Operation
-Lists the available images in the specified compartment.
-If you specify a value for the `sortBy` parameter, Oracle-provided images appear first in the list, followed by custom images.
-For more
-information about images, see
-[Managing Custom Images](https://docs.us-phoenix-1.oraclecloud.com/Content/Compute/Tasks/managingcustomimages.htm).
+Lists the available images in the specified compartment, including both
+[Oracle-provided images](https://docs.us-phoenix-1.oraclecloud.com/Content/Compute/References/images.htm) and
+[custom images](https://docs.us-phoenix-1.oraclecloud.com/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.
+
+The order of images returned may change when new images are released.
 
 The following arguments are supported:
 

docs/database/db_systems.md

@@ -63,7 +63,7 @@ see [Default Options for the Initial Database](https://docs.us-phoenix-1.oraclec
 
 The DB System will include a command line interface (CLI) that you can use to create additional databases and
 manage existing databases. For more information, see the
-[Oracle Database CLI Reference](https://docs.us-phoenix-1.oraclecloud.com/Content/Database/References/odacli.htm#Oracle_Database_CLI_Reference).
+[Oracle Database CLI Reference](https://docs.cloud.oracle.com/iaas/Content/Database/References/dbacli.htm).
 
 
 The following arguments are supported:

docs/examples/db_systems/datasources.tf

@@ -1,5 +1,5 @@
 # Gets a list of Availability Domains
-data "oci_identity_availability_domains" "availability_domains" {
+data "oci_identity_availability_domains" "ADs" {
   compartment_id = "${var.tenancy_ocid}"
 }
 
@@ -70,7 +70,7 @@ data "oci_database_db_versions" "test_db_versions_by_db_system_id" {
 }
 
 data "oci_database_db_system_shapes" "test_db_system_shapes" {
-  availability_domain = "${lookup(data.oci_identity_availability_domains.availability_domains.availability_domains[0],"name")}"
+  availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
   compartment_id      = "${var.compartment_ocid}"
 
   filter {

docs/examples/db_systems/network.tf

@@ -0,0 +1,36 @@
+resource "oci_core_virtual_network" "vcn" {
+  cidr_block     = "10.1.0.0/16"
+  compartment_id = "${var.compartment_ocid}"
+  display_name   = "TFExampleVCNDBSystem"
+  dns_label      = "tfexamplevcndbsystem"
+}
+
+resource "oci_core_subnet" "subnet" {
+  availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
+  cidr_block          = "10.1.20.0/24"
+  display_name        = "TFExampleSubnetDBSystem"
+  dns_label           = "tfexamplesubnetdbsystem"
+  security_list_ids   = ["${oci_core_virtual_network.vcn.default_security_list_id}"]
+  compartment_id      = "${var.compartment_ocid}"
+  vcn_id              = "${oci_core_virtual_network.vcn.id}"
+  route_table_id      = "${oci_core_route_table.route_table.id}"
+  dhcp_options_id     = "${oci_core_virtual_network.vcn.default_dhcp_options_id}"
+}
+
+resource "oci_core_internet_gateway" "internet_gateway" {
+  compartment_id = "${var.compartment_ocid}"
+  display_name   = "TFExampleIGDBSystem"
+  vcn_id         = "${oci_core_virtual_network.vcn.id}"
+}
+
+resource "oci_core_route_table" "route_table" {
+  compartment_id = "${var.compartment_ocid}"
+  vcn_id         = "${oci_core_virtual_network.vcn.id}"
+  display_name   = "TFExampleRouteTableDBSystem"
+
+  route_rules {
+    destination       = "0.0.0.0/0"
+    destination_type  = "CIDR_BLOCK"
+    network_entity_id = "${oci_core_internet_gateway.internet_gateway.id}"
+  }
+}

docs/examples/db_systems/resources.tf

@@ -1,5 +1,5 @@
 resource "oci_database_db_system" "test_db_system" {
-  availability_domain = "${lookup(data.oci_identity_availability_domains.availability_domains.availability_domains[0],"name")}"
+  availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
   compartment_id      = "${var.compartment_ocid}"
   cpu_core_count      = "${lookup(data.oci_database_db_system_shapes.test_db_system_shapes.db_system_shapes[0], "minimum_core_count")}"
   database_edition    = "${var.db_edition}"
@@ -24,7 +24,7 @@ resource "oci_database_db_system" "test_db_system" {
 
   disk_redundancy = "${var.db_disk_redundancy}"
   shape           = "${var.db_system_shape}"
-  subnet_id       = "${var.subnet_ocid}"
+  subnet_id       = "${oci_core_subnet.subnet.id}"
   ssh_public_keys = ["${var.ssh_public_key}"]
   display_name    = "${var.db_system_display_name}"
 

docs/examples/db_systems/variables.tf

@@ -8,16 +8,15 @@ variable "compartment_ocid" {}
 variable "ssh_public_key" {}
 variable "ssh_private_key" {}
 
-variable "subnet_ocid" {}
 
 # Choose an Availability Domain
-variable "availability_domain_index" {
-  default = "1"
+variable "availability_domain" {
+  default = "2"
 }
 
 # DBSystem specific 
 variable "db_system_shape" {
-  default = "BM.HighIO1.36"
+  default = "VM.Standard1.1"
 }
 
 variable "cpu_core_count" {
@@ -29,7 +28,7 @@ variable "db_edition" {
 }
 
 variable "db_admin_password" {
-  default = "BEstrO0ng_#11"
+  default = "BEstrO0ng_#12"
 }
 
 variable "db_name" {

oci/core_boot_volume_backup_test.go

@@ -148,7 +148,7 @@ data "oci_core_boot_volume_backups" "test_boot_volume_backups" {
 	#Optional
 	boot_volume_id = "${oci_core_instance.test_instance.boot_volume_id}"
 	display_name = "${var.boot_volume_backup_display_name}"
-	//state = "${var.boot_volume_backup_state}"
+	state = "${var.boot_volume_backup_state}"
 
     filter {
     	name = "id"
@@ -160,7 +160,7 @@ data "oci_core_boot_volume_backups" "test_boot_volume_backups" {
 					resource.TestCheckResourceAttrSet(datasourceName, "boot_volume_id"),
 					resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName2"),
-					//resource.TestCheckResourceAttr(datasourceName, "state", "AVAILABLE"),
+					resource.TestCheckResourceAttr(datasourceName, "state", "AVAILABLE"),
 
 					resource.TestCheckResourceAttr(datasourceName, "boot_volume_backups.#", "1"),
 					resource.TestCheckResourceAttrSet(datasourceName, "boot_volume_backups.0.boot_volume_id"),

oci/core_volume_test.go

@@ -332,6 +332,61 @@ variable "volume_state" { default = "AVAILABLE" }
 	})
 }
 
+// This is a test to validate that interpolation syntax can be passed into int64
+// fields that are being represented as strings in the schema. This is a regression
+// test for issue found in https://github.com/terraform-providers/terraform-provider-oci/issues/607
+func TestCoreVolumeResource_int64_interpolation(t *testing.T) {
+	provider := testAccProvider
+	config := testProviderConfig()
+
+	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	resourceName := "oci_core_volume.test_volume"
+	resourceName2 := "oci_core_volume.test_volume2"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() { testAccPreCheck(t) },
+		Providers: map[string]terraform.ResourceProvider{
+			"oci": provider,
+		},
+		CheckDestroy: testAccCheckCoreVolumeDestroy,
+		Steps: []resource.TestStep{
+			// verify create
+			{
+				Config: config + VolumePropertyVariables + compartmentIdVariableStr + VolumeRequiredOnlyResource + `
+data "oci_core_volumes" "test_volumes" {
+	#Required
+	compartment_id = "${var.compartment_id}"
+
+	#Optional
+	availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
+
+	filter {
+		name = "id"
+		values = ["${oci_core_volume.test_volume.id}"]
+	}
+}
+
+resource "oci_core_volume" "test_volume2" {
+	#Required
+	availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
+	compartment_id = "${var.compartment_id}"
+
+	size_in_gbs = "${data.oci_core_volumes.test_volumes.volumes.0.size_in_gbs}"
+}`,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					// Check on default values used
+					resource.TestCheckResourceAttr(resourceName, "size_in_mbs", "51200"),
+					resource.TestCheckResourceAttr(resourceName, "size_in_gbs", "50"),
+					resource.TestCheckResourceAttr(resourceName2, "size_in_mbs", "51200"),
+					resource.TestCheckResourceAttr(resourceName2, "size_in_gbs", "50"),
+				),
+			},
+		},
+	})
+}
+
 // This test is separated from the basic test due to weird behavior from Terraform test framework.
 // An test step that results in an error will result in the state being voided. Isolate such test steps to
 // avoid interfering with regular tests that Create/Update resources.

oci/helpers.go

@@ -68,9 +68,16 @@ func validateInt64TypeString(v interface{}, k string) (ws []string, errors []err
 }
 
 func int64StringDiffSuppressFunction(key string, old string, new string, d *schema.ResourceData) bool {
-	//  We can ignore the error since the validate func takes care of this before it reaches here
-	oldIntVal, _ := strconv.ParseInt(old, 10, 64)
-	newIntVal, _ := strconv.ParseInt(new, 10, 64)
+	// We may get interpolation syntax in this function call as well; so be sure to check for errors.
+	oldIntVal, err := strconv.ParseInt(old, 10, 64)
+	if err != nil {
+		return false
+	}
+
+	newIntVal, err := strconv.ParseInt(new, 10, 64)
+	if err != nil {
+		return false
+	}
 	return oldIntVal == newIntVal
 }