Merge pull request #104 from hyder/91-admin-host

hyder · web-flow · commit 68d0ec3945b5 · 2019-11-21T15:58:46.000+11:00
removed quotes for references, fixed issue #103
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -11,6 +11,8 @@ The format is based on {uri-changelog}[Keep a Changelog].
 * Helm upgraded to version 3.0.0 #100
 * incubator and jetstack helm repos removed as they can now be searched from helm hub #100
 * tiller disabled and option to enable it is removed #100
+* Fixed bug for empty tuple in data.oci_core_images.oracle_images when use_autonomous=true #103
+* Set minimum version of Terraform to 0.12.16
 
 == v2.0.0-beta.1 (November 14, 2019)
 * Added admin host for operations instead of using the bastion server #91
diff --git a/main.tf b/main.tf
@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 terraform {
-  required_version = ">= 0.12.8"
+  required_version = ">= 0.12.16"
 }
 
 module "base" {
diff --git a/modules/auth/authtoken.tf b/modules/auth/authtoken.tf
@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 resource "oci_identity_auth_token" "ocirtoken" {
-  provider    = "oci.home"
+  provider    = oci.home
   description = "ocir auth token"
   user_id     = var.ocir.user_id
   count       = var.ocir.create_auth_token == true ? 1 : 0
diff --git a/modules/base/admin/instance_principal.tf b/modules/base/admin/instance_principal.tf
@@ -23,7 +23,7 @@ data "oci_identity_compartments" "compartments_id" {
 }
 
 resource "oci_identity_dynamic_group" "admin_instance_principal" {
-  provider       = "oci.home"
+  provider       = oci.home
   compartment_id = var.oci_admin_identity.tenancy_id
   description    = "dynamic group to allow instances to call services for 1 admin"
   matching_rule  = "ALL {instance.id = '${join(",", data.oci_core_instance.admin.*.id)}'}"
@@ -32,7 +32,7 @@ resource "oci_identity_dynamic_group" "admin_instance_principal" {
 }
 
 resource "oci_identity_policy" "admin_instance_principal" {
-  provider       = "oci.home"
+  provider       = oci.home
   compartment_id = var.oci_admin_identity.compartment_id
   description    = "policy to allow admin host to call services"
   name           = "${var.oci_admin_general.label_prefix}-admin_instance_principal"
diff --git a/modules/base/bastion/datasources.tf b/modules/base/bastion/datasources.tf
@@ -85,20 +85,20 @@ data "oci_core_vnic_attachments" "bastion_vnics_attachments" {
   availability_domain = element(var.oci_bastion_infra.ad_names, (var.oci_bastion_infra.availability_domains - 1))
   compartment_id      = var.oci_base_identity.compartment_id
   instance_id         = oci_core_instance.bastion[0].id
-  depends_on          = ["oci_core_instance.bastion"]
+  depends_on          = [oci_core_instance.bastion]
   count               = var.oci_bastion.bastion_enabled == true ? 1 : 0
 }
 
 # Gets the OCID of the first (default) VNIC on the bastion instance
 data "oci_core_vnic" "bastion_vnic" {
   vnic_id    = lookup(data.oci_core_vnic_attachments.bastion_vnics_attachments[0].vnic_attachments[0], "vnic_id")
-  depends_on = ["oci_core_instance.bastion"]
+  depends_on = [oci_core_instance.bastion]
   count      = var.oci_bastion.bastion_enabled == true ? 1 : 0
 }
 
 data "oci_core_instance" "bastion" {
   instance_id = oci_core_instance.bastion[0].id
-  depends_on  = ["oci_core_instance.bastion"]
+  depends_on  = [oci_core_instance.bastion]
   count       = var.oci_bastion.bastion_enabled == true ? 1 : 0
 }
 
diff --git a/modules/base/bastion/locals.tf b/modules/base/bastion/locals.tf
@@ -9,7 +9,7 @@ locals {
   anywhere            = "0.0.0.0/0"
   ssh_port            = 22
   tcp_protocol        = 6
-  autonomous_image_id = lookup(data.oci_core_app_catalog_subscriptions.autonomous_linux[0].app_catalog_subscriptions[0], "listing_resource_id")
-  oracle_image_id     = data.oci_core_images.oracle_images[0].images.0.id
+  autonomous_image_id = var.oci_bastion.use_autonomous == true ? lookup(data.oci_core_app_catalog_subscriptions.autonomous_linux[0].app_catalog_subscriptions[0], "listing_resource_id") : null
+  oracle_image_id     = var.oci_bastion.use_autonomous == false ? data.oci_core_images.oracle_images[0].images.0.id  : null
   bastion_image_id    = var.oci_bastion.use_autonomous == true ? local.autonomous_image_id : (var.oci_bastion.bastion_image_id == "NONE" ? local.oracle_image_id : var.oci_bastion.bastion_image_id)
 }
diff --git a/modules/base/bastion/ons.tf b/modules/base/bastion/ons.tf
@@ -38,21 +38,21 @@ resource "oci_ons_subscription" "bastion_notification" {
 }
 
 resource "oci_identity_dynamic_group" "bastion_notification" {
-  provider       = "oci.home"
+  provider       = oci.home
   compartment_id = var.oci_base_identity.tenancy_id
   description    = "dynamic group to allow bastion to send notifications"
   matching_rule  = "ALL {instance.id = '${join(",", data.oci_core_instance.bastion.*.id)}'}"
   name           = "${var.oci_bastion_general.label_prefix}-bastion-notification"
-  depends_on     = ["oci_core_instance.bastion"]
+  depends_on     = [oci_core_instance.bastion]
   count          = var.oci_bastion_notification.notification_enabled == true && var.oci_bastion.bastion_enabled == true ? 1 : 0
 }
 
 resource "oci_identity_policy" "bastion_notification" {
-  provider       = "oci.home"
+  provider       = oci.home
   compartment_id = var.oci_base_identity.compartment_id
   description    = "policy to allow bastion host to publish messages"
   name           = "${var.oci_bastion_general.label_prefix}-bastion-notification"
   statements     = ["Allow dynamic-group ${oci_identity_dynamic_group.bastion_notification[0].name} to use ons-topic in compartment id ${data.oci_identity_compartments.compartments_id.compartments.0.id} where request.permission='ONS_TOPIC_PUBLISH'"]
-  depends_on     = ["oci_core_instance.bastion"]
+  depends_on     = [oci_core_instance.bastion]
   count          = var.oci_bastion.bastion_enabled == true && var.oci_bastion_notification.notification_enabled == true ? 1 : 0
 }
diff --git a/modules/base/vcn/servicegateway.tf b/modules/base/vcn/servicegateway.tf
@@ -13,7 +13,7 @@ data "oci_core_services" "all_oci_services" {
 resource "oci_core_service_gateway" "service_gateway" {
   compartment_id = var.oci_base_vcn.compartment_id
   display_name   = "${var.oci_base_vcn.label_prefix}-sg-gw"
-  depends_on     = ["oci_core_nat_gateway.nat_gateway"]
+  depends_on     = [oci_core_nat_gateway.nat_gateway]
 
   services {
     service_id = lookup(data.oci_core_services.all_oci_services[0].services[0], "id")
diff --git a/modules/oke/calico.tf b/modules/oke/calico.tf
@@ -27,7 +27,7 @@ resource null_resource "install_calico" {
     bastion_private_key = file(var.oke_ssh_keys.ssh_private_key_path)
   }
 
-  depends_on = ["null_resource.install_kubectl_admin", "null_resource.write_kubeconfig_on_admin"]
+  depends_on = [null_resource.install_kubectl_admin, null_resource.write_kubeconfig_on_admin]
 
   provisioner "file" {
     content     = data.template_file.install_calico[0].rendered
diff --git a/modules/oke/datasources.tf b/modules/oke/datasources.tf
@@ -18,5 +18,5 @@ data "oci_containerengine_cluster_option" "k8s_cluster_option" {
 data "oci_containerengine_node_pools" "all_node_pools" {
   compartment_id = var.oke_identity.compartment_id
   cluster_id     = oci_containerengine_cluster.k8s_cluster.id
-  depends_on     = ["oci_containerengine_node_pool.nodepools"]
+  depends_on     = [oci_containerengine_node_pool.nodepools]
 }
diff --git a/modules/oke/helm.tf b/modules/oke/helm.tf
@@ -24,7 +24,7 @@ resource null_resource "install_helm_admin" {
     bastion_private_key = file(var.oke_ssh_keys.ssh_private_key_path)
   }
 
-  depends_on = ["null_resource.install_kubectl_admin", "null_resource.write_kubeconfig_on_admin"]
+  depends_on = [null_resource.install_kubectl_admin, null_resource.write_kubeconfig_on_admin]
 
   provisioner "file" {
     content     = data.template_file.install_helm[0].rendered
diff --git a/modules/oke/kubeconfig.tf b/modules/oke/kubeconfig.tf
@@ -23,7 +23,7 @@ resource "null_resource" "create_local_kubeconfig" {
 
 resource "local_file" "kube_config_file" {
   content    = data.oci_containerengine_cluster_kube_config.kube_config.content
-  depends_on = ["null_resource.create_local_kubeconfig", "oci_containerengine_cluster.k8s_cluster"]
+  depends_on = [null_resource.create_local_kubeconfig, oci_containerengine_cluster.k8s_cluster]
   filename   = "${path.root}/generated/kubeconfig"
 }
 
@@ -84,7 +84,7 @@ resource "null_resource" "write_kubeconfig_on_admin" {
     bastion_private_key = file(var.oke_ssh_keys.ssh_private_key_path)
   }
 
-  depends_on = ["oci_containerengine_cluster.k8s_cluster"]
+  depends_on = [oci_containerengine_cluster.k8s_cluster]
 
   provisioner "file" {
     content     = data.template_file.generate_kubeconfig[0].rendered
diff --git a/modules/oke/metricserver.tf b/modules/oke/metricserver.tf
@@ -20,7 +20,7 @@ resource null_resource "install_metricserver" {
     bastion_private_key = file(var.oke_ssh_keys.ssh_private_key_path)
   }
 
-  depends_on = ["null_resource.install_kubectl_admin", "null_resource.write_kubeconfig_on_admin"]
+  depends_on = [null_resource.install_kubectl_admin, null_resource.write_kubeconfig_on_admin]
 
   provisioner "file" {
     content     = data.template_file.install_metricserver[0].rendered
diff --git a/modules/oke/nodepools.tf b/modules/oke/nodepools.tf
@@ -4,7 +4,7 @@
 resource "oci_containerengine_node_pool" "nodepools" {
   cluster_id     = oci_containerengine_cluster.k8s_cluster.id
   compartment_id = var.oke_identity.compartment_id
-  depends_on     = ["oci_containerengine_cluster.k8s_cluster"]
+  depends_on     = [oci_containerengine_cluster.k8s_cluster]
 
   kubernetes_version = local.kubernetes_version
   name               = "${var.oke_general.label_prefix}-${var.node_pools.node_pool_name_prefix}-${count.index + 1}"
diff --git a/modules/oke/ocir.tf b/modules/oke/ocir.tf
@@ -9,7 +9,6 @@ data "template_file" "create_ocir_script" {
     region_registry = var.oke_ocir.ocir_urls[var.oke_general.region]
     tenancy_name    = var.oke_ocir.tenancy_name
     username        = var.oke_ocir.username
-    # tiller_enabled  = var.oke_cluster.cluster_options_add_ons_is_tiller_enabled
   }
 
   count = var.oke_ocir.create_auth_token == true ? 1 : 0
@@ -32,7 +31,8 @@ resource null_resource "create_ocir_secret" {
     bastion_private_key = file(var.oke_ssh_keys.ssh_private_key_path)
   }
 
-  depends_on = ["null_resource.write_kubeconfig_on_admin"]
+  depends_on = [null_resource.write_kubeconfig_on_admin]
+  
   provisioner "file" {
     content     = data.template_file.create_ocir_script[0].rendered
     destination = "~/create_ocir_secret.sh"
@@ -49,8 +49,6 @@ resource null_resource "create_ocir_secret" {
 }
 
 resource null_resource "delete_ocir_script" {
-  depends_on = ["null_resource.create_ocir_secret"]
-
   connection {
     host        = var.oke_admin.admin_private_ip
     private_key = file(var.oke_ssh_keys.ssh_private_key_path)
@@ -63,6 +61,8 @@ resource null_resource "delete_ocir_script" {
     bastion_private_key = file(var.oke_ssh_keys.ssh_private_key_path)
   }
 
+  depends_on = [null_resource.create_ocir_secret]
+
   provisioner "remote-exec" {
     inline = [
       "rm -f $HOME/create_ocir_secret.sh",
diff --git a/modules/policies/groups.tf b/modules/policies/groups.tf
@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 resource "oci_identity_dynamic_group" "oke-kms-cluster" {
-  provider       = "oci.home"
+  provider       = oci.home
   compartment_id = var.oci_identity.tenancy_id
   description    = "dynamic group to allow cluster to use kms"
   matching_rule  = local.dynamic_group_rule_all_clusters
@@ -22,7 +22,7 @@ data "template_file" "update_dynamic_group_script" {
     dynamic_group_rule = local.dynamic_group_rule_this_cluster
   }
 
-  depends_on = ["oci_identity_dynamic_group.oke-kms-cluster"]
+  depends_on = [oci_identity_dynamic_group.oke-kms-cluster]
 
   count = var.oke_kms.use_encryption == true && var.admin.admin_enabled == true && var.admin.admin_instance_principal == true ? 1 : 0
 }
@@ -44,7 +44,7 @@ resource null_resource "update_dynamic_group" {
     bastion_private_key = file(var.ssh_keys.ssh_private_key_path)
   }
 
-  depends_on = ["oci_identity_dynamic_group.oke-kms-cluster", "oci_identity_policy.admin_instance_principal_dynamic_group"]
+  depends_on = [oci_identity_dynamic_group.oke-kms-cluster, oci_identity_policy.admin_instance_principal_dynamic_group]
 
   provisioner "file" {
     content     = data.template_file.update_dynamic_group_script[0].rendered
diff --git a/modules/policies/policies.tf b/modules/policies/policies.tf
@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
 resource "oci_identity_policy" "admin_instance_principal_dynamic_group" {
-  provider       = "oci.home"
+  provider       = oci.home
   compartment_id = var.oci_identity.tenancy_id
   description    = "policy to allow admin host to manage dynamic group"
   name           = "${var.label_prefix}-admin-instance-principal-dynamic-group"
@@ -11,7 +11,7 @@ resource "oci_identity_policy" "admin_instance_principal_dynamic_group" {
 }
 
 resource "oci_identity_policy" "oke-kms" {
-  provider       = "oci.home"
+  provider       = oci.home
   compartment_id = var.oci_identity.compartment_id
   description    = "policy to allow instances to allow dynamic group ${var.label_prefix}-oke-kms-cluster to use kms"
   name           = "${var.label_prefix}-oke-kms"
diff --git a/variables.tf b/variables.tf

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl`
`3`	`3`
`4`	`4`	`terraform {`
`5`		`- required_version = ">= 0.12.8"`
	`5`	`+ required_version = ">= 0.12.16"`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`module "base" {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ resource null_resource "install_calico" {`
`27`	`27`	`bastion_private_key = file(var.oke_ssh_keys.ssh_private_key_path)`
`28`	`28`	`}`
`29`	`29`
`30`		`- depends_on = ["null_resource.install_kubectl_admin", "null_resource.write_kubeconfig_on_admin"]`
	`30`	`+ depends_on = [null_resource.install_kubectl_admin, null_resource.write_kubeconfig_on_admin]`
`31`	`31`
`32`	`32`	`provisioner "file" {`
`33`	`33`	`content = data.template_file.install_calico[0].rendered`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ data "oci_containerengine_cluster_option" "k8s_cluster_option" {`
`18`	`18`	`data "oci_containerengine_node_pools" "all_node_pools" {`
`19`	`19`	`compartment_id = var.oke_identity.compartment_id`
`20`	`20`	`cluster_id = oci_containerengine_cluster.k8s_cluster.id`
`21`		`- depends_on = ["oci_containerengine_node_pool.nodepools"]`
	`21`	`+ depends_on = [oci_containerengine_node_pool.nodepools]`
`22`	`22`	`}`