Filter image on display name (#346)

briangustafson · web-flow · commit f7f73629cc8d · 2017-11-01T17:03:28.000-07:00
This is temporary fix for issue #345. As noted in each example usage of oci_core_images, the images returned may change over time - a longer term solution is in the works.
diff --git a/data_source_obmcs_core_instances_test.go b/data_source_obmcs_core_instances_test.go
@@ -52,9 +52,7 @@ func (s *DatasourceCoreInstanceTestSuite) SetupTest() {
 
 	data "oci_core_images" "t" {
 		compartment_id = "${var.compartment_id}"
-		operating_system = "Oracle Linux"
-		operating_system_version = "7.4"
-		limit = 1
+		display_name = "Oracle-Linux-7.4-2017.10.25-0"
 	}
 
 	resource "oci_core_instance" "t" {
diff --git a/docs/examples/clusters/Mongodb/datasources.tf b/docs/examples/clusters/Mongodb/datasources.tf
@@ -3,11 +3,11 @@ data "oci_identity_availability_domains" "ADs" {
   compartment_id = "${var.tenancy_ocid}"
 }
 
-# Gets the OCID of the OS image to use
+# Gets the OCID of the image. This technique is for example purposes only. The results of oci_core_images may
+# change over time for Oracle-provided images, so the only sure way to get the correct OCID is to supply it directly.
 data "oci_core_images" "OLImageOCID" {
     compartment_id = "${var.compartment_ocid}"
-    operating_system = "${var.InstanceOS}"
-    operating_system_version = "${var.InstanceOSVersion}"
+    display_name = "${var.InstanceImageDisplayName}"
 }
 
 # Gets a list of vNIC attachments on the bastion host
diff --git a/docs/examples/clusters/Mongodb/variables.tf b/docs/examples/clusters/Mongodb/variables.tf
@@ -17,12 +17,8 @@ variable "MongoDBShape" {
     default = "BM.DenseIO1.36"
 }
 
-variable "InstanceOS" {
-    default = "Oracle Linux"
-}
-
-variable "InstanceOSVersion" {
-    default = "7.4"
+variable "InstanceImageDisplayName" {
+    default = "Oracle-Linux-7.4-2017.10.25-0"
 }
 
 variable "VPC-CIDR" {
diff --git a/docs/examples/compute/extended_metadata/extended_metadata.tf b/docs/examples/compute/extended_metadata/extended_metadata.tf
@@ -28,11 +28,11 @@ data "oci_identity_availability_domains" "ADs" {
     compartment_id = "${var.tenancy_ocid}"
 }
 
-# Gets the OCID of the OS image to use
+# Gets the OCID of the image. This technique is for example purposes only. The results of oci_core_images may
+# change over time for Oracle-provided images, so the only sure way to get the correct OCID is to supply it directly.
 data "oci_core_images" "OLImageOCID" {
     compartment_id = "${var.compartment_ocid}"
-    operating_system = "Oracle Linux"
-    operating_system_version = "7.4"
+    display_name = "Oracle-Linux-7.4-2017.10.25-0"
 }
 
 # Gets a list of vNIC attachments on the instance
diff --git a/docs/examples/compute/instance/datasources.tf b/docs/examples/compute/instance/datasources.tf
@@ -3,11 +3,11 @@ data "oci_identity_availability_domains" "ADs" {
   compartment_id = "${var.tenancy_ocid}"
 }
 
-# Gets the OCID of the OS image to use
+# Gets the OCID of the image. This technique is for example purposes only. The results of oci_core_images may
+# change over time for Oracle-provided images, so the only sure way to get the correct OCID is to supply it directly.
 data "oci_core_images" "OLImageOCID" {
     compartment_id = "${var.compartment_ocid}"
-    operating_system = "${var.InstanceOS}"
-    operating_system_version = "${var.InstanceOSVersion}"
+    display_name = "${var.InstanceImageDisplayName}"
 }
 
 # Gets a list of vNIC attachments on the instance
diff --git a/docs/examples/compute/instance/variables.tf b/docs/examples/compute/instance/variables.tf
@@ -19,12 +19,8 @@ variable "InstanceShape" {
     default = "VM.Standard1.2"
 }
 
-variable "InstanceOS" {
-    default = "Oracle Linux"
-}
-
-variable "InstanceOSVersion" {
-    default = "7.4"
+variable "InstanceImageDisplayName" {
+    default = "Oracle-Linux-7.4-2017.10.25-0"
 }
 
 variable "DBSize" {
diff --git a/docs/examples/compute/instance_lite/instance_lite.tf b/docs/examples/compute/instance_lite/instance_lite.tf
@@ -27,10 +27,11 @@ data "oci_identity_availability_domains" "ADs" {
 
 /* Instances */
 
+# Gets the OCID of the image. This technique is for example purposes only. The results of oci_core_images may
+# change over time for Oracle-provided images, so the only sure way to get the correct OCID is to supply it directly.
 data "oci_core_images" "image-list" {
-  compartment_id = "${var.compartment_ocid}"
-  operating_system = "Oracle Linux"
-  operating_system_version = "7.4"
+    compartment_id = "${var.compartment_ocid}"
+    display_name = "Oracle-Linux-7.4-2017.10.25-0"
 }
 
 resource "oci_core_instance" "instance1" {
diff --git a/docs/examples/compute/multi_vnic/multi_vnic.tf b/docs/examples/compute/multi_vnic/multi_vnic.tf
@@ -19,12 +19,8 @@ variable "InstanceShape" {
     default = "VM.Standard1.8"
 }
 
-variable "InstanceOS" {
-    default = "Oracle Linux"
-}
-
-variable "InstanceOSVersion" {
-    default = "7.4"
+variable "InstanceImageDisplayName" {
+    default = "Oracle-Linux-7.4-2017.10.25-0"
 }
 
 provider "oci" {
@@ -58,11 +54,11 @@ resource "oci_core_subnet" "ExampleSubnet" {
   dns_label = "examplesubnet"
 }
 
-# Gets the OCID of the OS image to use
+# Gets the OCID of the image. This technique is for example purposes only. The results of oci_core_images may
+# change over time for Oracle-provided images, so the only sure way to get the correct OCID is to supply it directly.
 data "oci_core_images" "OLImageOCID" {
     compartment_id = "${var.compartment_ocid}"
-    operating_system = "${var.InstanceOS}"
-    operating_system_version = "${var.InstanceOSVersion}"
+    display_name = "${var.InstanceImageDisplayName}"
 }
 
 resource "oci_core_instance" "ExampleInstance" {
diff --git a/docs/examples/compute/private_ip/private_ip.tf b/docs/examples/compute/private_ip/private_ip.tf
@@ -29,11 +29,11 @@ data "oci_identity_availability_domains" "ADs" {
     compartment_id = "${var.tenancy_ocid}"
 }
 
-# Gets the OCID of the OS image to use
+# Gets the OCID of the image. This technique is for example purposes only. The results of oci_core_images may
+# change over time for Oracle-provided images, so the only sure way to get the correct OCID is to supply it directly.
 data "oci_core_images" "OLImageOCID" {
     compartment_id = "${var.compartment_ocid}"
-    operating_system = "Oracle Linux"
-    operating_system_version = "7.4"
+    display_name = "Oracle-Linux-7.4-2017.10.25-0"
 }
 
 # Create Instance
diff --git a/docs/examples/load_balancer/lb_full/lb_full.tf b/docs/examples/load_balancer/lb_full/lb_full.tf
@@ -120,10 +120,11 @@ resource "oci_core_security_list" "securitylist1" {
 
 /* Instances */
 
+# Gets the OCID of the image. This technique is for example purposes only. The results of oci_core_images may
+# change over time for Oracle-provided images, so the only sure way to get the correct OCID is to supply it directly.
 data "oci_core_images" "image-list" {
-  compartment_id = "${var.compartment_ocid}"
-  operating_system = "Oracle Linux"
-  operating_system_version = "7.4"
+    compartment_id = "${var.compartment_ocid}"
+    display_name = "Oracle-Linux-7.4-2017.10.25-0"
 }
 
 resource "oci_core_instance" "instance1" {
diff --git a/docs/examples/networking/hybrid_dns/dns.tf b/docs/examples/networking/hybrid_dns/dns.tf
@@ -21,12 +21,8 @@ variable "InstanceShape" {
     default = "VM.Standard1.1"
 }
 
-variable "InstanceOS" {
-    default = "Oracle Linux"
-}
-
-variable "InstanceOSVersion" {
-    default = "7.4"
+variable "InstanceImageDisplayName" {
+    default = "Oracle-Linux-7.4-2017.10.25-0"
 }
 
 variable "vcn_cidr" {
@@ -187,11 +183,11 @@ resource "oci_core_subnet" "MgmtSubnet2" {
     dhcp_options_id = "${oci_core_dhcp_options.MgmtDhcpOptions.id}"
 }
 
-# Gets the OCID of the OS image to use
+# Gets the OCID of the image. This technique is for example purposes only. The results of oci_core_images may
+# change over time for Oracle-provided images, so the only sure way to get the correct OCID is to supply it directly.
 data "oci_core_images" "OLImageOCID" {
     compartment_id = "${var.compartment_ocid}"
-    operating_system = "${var.InstanceOS}"
-    operating_system_version = "${var.InstanceOSVersion}"
+    display_name = "${var.InstanceImageDisplayName}"
 }
 
 resource "oci_core_instance" "DnsVM" {
diff --git a/docs/examples/networking/hybrid_dns/env-vars b/docs/examples/networking/hybrid_dns/env-vars
@@ -20,8 +20,7 @@ export TF_VAR_private_subnet_cidr=""
 
 ### Instance configuration
 export TF_VAR_InstanceShape=""
-export TF_VAR_InstanceOS=""
-export TF_VAR_InstanceOSVersion=""
+export TF_VAR_InstanceImageDisplayName=""
 
 ### Instance credentials
 export TF_VAR_ssh_public_key=$(cat .../id_rsa.pub)
diff --git a/docs/examples/networking/nat/nat.tf b/docs/examples/networking/nat/nat.tf
@@ -15,12 +15,8 @@ variable "InstanceShape" {
     default = "VM.Standard1.2"
 }
 
-variable "InstanceOS" {
-    default = "Oracle Linux"
-}
-
-variable "InstanceOSVersion" {
-    default = "7.4"
+variable "InstanceImageDisplayName" {
+    default = "Oracle-Linux-7.4-2017.10.25-0"
 }
 
 variable "vcn_cidr" {
@@ -128,11 +124,11 @@ resource "oci_core_subnet" "MgmtSubnet" {
     dhcp_options_id = "${oci_core_virtual_network.CoreVCN.default_dhcp_options_id}"
 }
 
-# Gets the OCID of the OS image to use
+# Gets the OCID of the image. This technique is for example purposes only. The results of oci_core_images may
+# change over time for Oracle-provided images, so the only sure way to get the correct OCID is to supply it directly.
 data "oci_core_images" "OLImageOCID" {
     compartment_id = "${var.compartment_ocid}"
-    operating_system = "${var.InstanceOS}"
-    operating_system_version = "${var.InstanceOSVersion}"
+    display_name = "${var.InstanceImageDisplayName}"
 }
 
 resource "oci_core_instance" "NatInstance" {
diff --git a/docs/examples/storage/nfs/datasources.tf b/docs/examples/storage/nfs/datasources.tf
@@ -3,11 +3,11 @@ data "oci_identity_availability_domains" "ADs" {
   compartment_id = "${var.tenancy_ocid}"
 }
 
-# Gets the OCID of the OS image to use
+# Gets the OCID of the image. This technique is for example purposes only. The results of oci_core_images may
+# change over time for Oracle-provided images, so the only sure way to get the correct OCID is to supply it directly.
 data "oci_core_images" "OLImageOCID" {
     compartment_id = "${var.compartment_ocid}"
-    operating_system = "${var.InstanceOS}"
-    operating_system_version = "${var.InstanceOSVersion}"
+    display_name = "${var.InstanceImageDisplayName}"
 }
 
 # Gets a list of vNIC attachments on the instance
diff --git a/docs/examples/storage/nfs/variables.tf b/docs/examples/storage/nfs/variables.tf
@@ -19,12 +19,8 @@ variable "InstanceShape" {
     default = "VM.Standard1.4"
 }
 
-variable "InstanceOS" {
-    default = "Oracle Linux"
-}
-
-variable "InstanceOSVersion" {
-    default = "7.4"
+variable "InstanceImageDisplayName" {
+    default = "Oracle-Linux-7.4-2017.10.25-0"
 }
 
 variable "2TB" {
diff --git a/docs/solutions/chef/datasources.tf b/docs/solutions/chef/datasources.tf
@@ -3,11 +3,11 @@ data "oci_identity_availability_domains" "ADs" {
   compartment_id = "${var.tenancy_ocid}"
 }
 
-# Gets the OCID of the OS image to use
+# Gets the OCID of the image. This technique is for example purposes only. The results of oci_core_images may
+# change over time for Oracle-provided images, so the only sure way to get the correct OCID is to supply it directly.
 data "oci_core_images" "OLImageOCID" {
-  compartment_id = "${var.compartment_ocid}"
-  operating_system = "${var.InstanceOS}"
-  operating_system_version = "${var.InstanceOSVersion}"
+    compartment_id = "${var.compartment_ocid}"
+    display_name = "${var.InstanceImageDisplayName}"
 }
 
 # Gets a list of vNIC attachments on the instance
diff --git a/docs/solutions/chef/variables.tf b/docs/solutions/chef/variables.tf
@@ -19,12 +19,8 @@ variable "InstanceShape" {
   default = "VM.Standard1.2"
 }
 
-variable "InstanceOS" {
-  default = "Oracle Linux"
-}
-
-variable "InstanceOSVersion" {
-  default = "7.4"
+variable "InstanceImageDisplayName" {
+    default = "Oracle-Linux-7.4-2017.10.25-0"
 }
 
 variable "BootStrapFile" {
diff --git a/provider_test.go b/provider_test.go
@@ -81,9 +81,7 @@ resource "oci_core_subnet" "WebSubnetAD1" {
 var instanceConfig = subnetConfig + `
 data "oci_core_images" "t" {
 	compartment_id = "${var.compartment_id}"
-  	operating_system = "Oracle Linux"
-  	operating_system_version = "7.4"
-  	limit = 1
+  	display_name = "Oracle-Linux-7.4-2017.10.25-0"
 }
 
 data "oci_identity_policies" "policies" {
@@ -143,9 +141,7 @@ resource "oci_core_subnet" "t" {
 
 data "oci_core_images" "t" {
 	compartment_id = "${var.compartment_id}"
-  	operating_system = "Oracle Linux"
-  	operating_system_version = "7.4"
-  	limit = 1
+  	display_name = "Oracle-Linux-7.4-2017.10.25-0"
 }
 
 resource "oci_core_instance" "t" {
diff --git a/resource_obmcs_core_instance_test.go b/resource_obmcs_core_instance_test.go
@@ -58,9 +58,7 @@ func (s *ResourceCoreInstanceTestSuite) SetupTest() {
 	
 	data "oci_core_images" "t" {
 		compartment_id = "${var.compartment_id}"
-		operating_system = "Oracle Linux"
-		operating_system_version = "7.4"
-		limit = 1
+		display_name = "Oracle-Linux-7.4-2017.10.25-0"
 	}`
 
 	s.ResourceName = "oci_core_instance.t"
diff --git a/resource_obmcs_core_volume_attachment_test.go b/resource_obmcs_core_volume_attachment_test.go
@@ -51,9 +51,7 @@ func (s *ResourceCoreVolumeAttachmentTestSuite) SetupTest() {
 
 	data "oci_core_images" "t" {
 		compartment_id = "${var.compartment_id}"
-		operating_system = "Oracle Linux"
-		operating_system_version = "7.4"
-		limit = 1
+		display_name = "Oracle-Linux-7.4-2017.10.25-0"
 	}
 	
 	resource "oci_core_instance" "t" {
diff --git a/test_templates.go b/test_templates.go
@@ -56,9 +56,7 @@ func testImage1() string {
 	return `
 	data "oci_core_images" "t" {
 		compartment_id = "${var.compartment_ocid}"
-		operating_system = "Oracle Linux"
-		operating_system_version = "7.4"
-		limit = 1
+		display_name = "Oracle-Linux-7.4-2017.10.25-0"
 	}`
 }
 

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,7 @@ func (s *DatasourceCoreInstanceTestSuite) SetupTest() {`
`52`	`52`
`53`	`53`	`data "oci_core_images" "t" {`
`54`	`54`	`compartment_id = "${var.compartment_id}"`
`55`		`- operating_system = "Oracle Linux"`
`56`		`- operating_system_version = "7.4"`
`57`		`- limit = 1`
	`55`	`+ display_name = "Oracle-Linux-7.4-2017.10.25-0"`
`58`	`56`	`}`
`59`	`57`
`60`	`58`	`resource "oci_core_instance" "t" {`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,11 @@ data "oci_identity_availability_domains" "ADs" {`
`3`	`3`	`compartment_id = "${var.tenancy_ocid}"`
`4`	`4`	`}`
`5`	`5`
`6`		`-# Gets the OCID of the OS image to use`
	`6`	`+# Gets the OCID of the image. This technique is for example purposes only. The results of oci_core_images may`
	`7`	`+# change over time for Oracle-provided images, so the only sure way to get the correct OCID is to supply it directly.`
`7`	`8`	`data "oci_core_images" "OLImageOCID" {`
`8`	`9`	`compartment_id = "${var.compartment_ocid}"`
`9`		`- operating_system = "${var.InstanceOS}"`
`10`		`- operating_system_version = "${var.InstanceOSVersion}"`
	`10`	`+ display_name = "${var.InstanceImageDisplayName}"`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`# Gets a list of vNIC attachments on the bastion host`
Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,8 @@ variable "MongoDBShape" {`
`17`	`17`	`default = "BM.DenseIO1.36"`
`18`	`18`	`}`
`19`	`19`
`20`		`-variable "InstanceOS" {`
`21`		`- default = "Oracle Linux"`
`22`		`-}`
`23`		`-`
`24`		`-variable "InstanceOSVersion" {`
`25`		`- default = "7.4"`
	`20`	`+variable "InstanceImageDisplayName" {`
	`21`	`+ default = "Oracle-Linux-7.4-2017.10.25-0"`
`26`	`22`	`}`
`27`	`23`
`28`	`24`	`variable "VPC-CIDR" {`
Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,11 @@ data "oci_identity_availability_domains" "ADs" {`
`28`	`28`	`compartment_id = "${var.tenancy_ocid}"`
`29`	`29`	`}`
`30`	`30`
`31`		`-# Gets the OCID of the OS image to use`
	`31`	`+# Gets the OCID of the image. This technique is for example purposes only. The results of oci_core_images may`
	`32`	`+# change over time for Oracle-provided images, so the only sure way to get the correct OCID is to supply it directly.`
`32`	`33`	`data "oci_core_images" "OLImageOCID" {`
`33`	`34`	`compartment_id = "${var.compartment_ocid}"`
`34`		`- operating_system = "Oracle Linux"`
`35`		`- operating_system_version = "7.4"`
	`35`	`+ display_name = "Oracle-Linux-7.4-2017.10.25-0"`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`# Gets a list of vNIC attachments on the instance`
Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,8 @@ variable "InstanceShape" {`
`19`	`19`	`default = "VM.Standard1.2"`
`20`	`20`	`}`
`21`	`21`
`22`		`-variable "InstanceOS" {`
`23`		`- default = "Oracle Linux"`
`24`		`-}`
`25`		`-`
`26`		`-variable "InstanceOSVersion" {`
`27`		`- default = "7.4"`
	`22`	`+variable "InstanceImageDisplayName" {`
	`23`	`+ default = "Oracle-Linux-7.4-2017.10.25-0"`
`28`	`24`	`}`
`29`	`25`
`30`	`26`	`variable "DBSize" {`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ data "oci_identity_availability_domains" "ADs" {`
`29`	`29`	`compartment_id = "${var.tenancy_ocid}"`
`30`	`30`	`}`
`31`	`31`
`32`		`-# Gets the OCID of the OS image to use`
	`32`	`+# Gets the OCID of the image. This technique is for example purposes only. The results of oci_core_images may`
	`33`	`+# change over time for Oracle-provided images, so the only sure way to get the correct OCID is to supply it directly.`
`33`	`34`	`data "oci_core_images" "OLImageOCID" {`
`34`	`35`	`compartment_id = "${var.compartment_ocid}"`
`35`		`- operating_system = "Oracle Linux"`
`36`		`- operating_system_version = "7.4"`
	`36`	`+ display_name = "Oracle-Linux-7.4-2017.10.25-0"`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`# Create Instance`