Merge pull request #983 from terraform-providers/release_merge_v3.64.0

Candidate for release_v3.64.0

Author: afedorch

CHANGELOG.md

@@ -1,4 +1,11 @@
 ## 3.64.0 (Unreleased)
+
+### Added
+- Support Functions integration for ONS service
+- Support IP-based policy for Identity Service
+- Support Extensions to Tenancy, User, Group entities in IAM
+- Support private access in `oci_database_autonomous_database` resource
+
 ## 3.63.0 (February 19, 2020)
 
 ### Added

examples/identity/networksources/networksources.tf

@@ -0,0 +1,80 @@
+// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+variable "compartment_id" {}
+
+variable "network_source_defined_tags_value" {
+  default = "value"
+}
+
+variable "network_source_description" {
+  default = "corporate ip ranges to be used for ip based authorization"
+}
+
+variable "network_source_freeform_tags" {
+  default = {
+    "Department" = "Finance"
+  }
+}
+
+variable "network_source_name" {
+  default = "corpnet"
+}
+
+variable "network_source_public_source_list" {
+  default = ["128.2.13.5"]
+}
+
+variable "network_source_services" {
+  default = ["all"]
+}
+
+variable "network_source_virtual_source_list" {
+  default = []
+}
+
+provider "oci" {
+  tenancy_ocid     = "${var.tenancy_ocid}"
+  user_ocid        = "${var.user_ocid}"
+  fingerprint      = "${var.fingerprint}"
+  private_key_path = "${var.private_key_path}"
+  region           = "${var.region}"
+}
+
+resource "oci_core_vcn" "vcn1" {
+  cidr_block     = "10.0.0.0/16"
+  dns_label      = "vcn1"
+  compartment_id = "${var.compartment_id}"
+  display_name   = "vcn1"
+}
+
+resource "oci_identity_network_source" "test_network_source" {
+  #Required
+  compartment_id = "${var.tenancy_ocid}"
+  description    = "${var.network_source_description}"
+  name           = "${var.network_source_name}"
+
+  #Optional
+  freeform_tags      = "${var.network_source_freeform_tags}"
+  public_source_list = "${var.network_source_public_source_list}"
+  services           = "${var.network_source_services}"
+
+  virtual_source_list = {
+    vcn_id    = "${oci_core_vcn.vcn1.id}"
+    ip_ranges = ["10.0.0.0/16"]
+  }
+}
+
+data "oci_identity_network_sources" "test_network_sources" {
+  #Required
+  compartment_id = "${var.tenancy_ocid}"
+
+  filter = {
+    name   = "id"
+    values = ["${oci_identity_network_source.test_network_source.id}"]
+  }
+}

examples/ons/subscription/function.tf

@@ -0,0 +1,74 @@
+// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+
+variable "config" {
+  default = {
+    "MY_FUNCTION_CONFIG" = "ConfVal"
+  }
+}
+
+variable "image" {}
+variable "image_digest" {}
+
+data "oci_identity_availability_domains" "test_availability_domains" {
+  compartment_id = "${var.tenancy_ocid}"
+}
+
+resource "oci_core_vcn" "test_vcn" {
+  cidr_block     = "10.0.0.0/16"
+  compartment_id = "${var.compartment_ocid}"
+  display_name   = "tf-vcn"
+  dns_label      = "dnslabel"
+}
+
+resource "oci_core_internet_gateway" "test_network_entity" {
+  compartment_id = "${var.compartment_ocid}"
+  vcn_id         = "${oci_core_vcn.test_vcn.id}"
+  display_name   = "-tf-internet-gateway"
+}
+
+resource "oci_core_route_table" "test_route_table" {
+  compartment_id = "${var.compartment_ocid}"
+
+  route_rules {
+    cidr_block        = "0.0.0.0/0"
+    network_entity_id = "${oci_core_internet_gateway.test_network_entity.id}"
+  }
+
+  vcn_id = "${oci_core_vcn.test_vcn.id}"
+}
+
+resource "oci_core_subnet" "test_subnet" {
+  availability_domain        = "${lower("${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}")}"
+  cidr_block                 = "10.0.0.0/16"
+  compartment_id             = "${var.compartment_ocid}"
+  dhcp_options_id            = "${oci_core_vcn.test_vcn.default_dhcp_options_id}"
+  display_name               = "tf-subnet"
+  dns_label                  = "dnslabel"
+  prohibit_public_ip_on_vnic = "false"
+  route_table_id             = "${oci_core_route_table.test_route_table.id}"
+  security_list_ids          = ["${oci_core_vcn.test_vcn.default_security_list_id}"]
+  vcn_id                     = "${oci_core_vcn.test_vcn.id}"
+}
+
+resource "oci_functions_application" "test_application" {
+  #Required
+  compartment_id = "${var.compartment_ocid}"
+  display_name   = "example-application"
+  subnet_ids     = ["${oci_core_subnet.test_subnet.id}"]
+
+  #Optional
+  config = "${var.config}"
+}
+
+resource "oci_functions_function" "test_function" {
+  #Required
+  application_id = "${oci_functions_application.test_application.id}"
+  display_name   = "example-function"
+  image          = "${var.image}"
+  memory_in_mbs  = "128"
+
+  #Optional
+  config             = "${var.config}"
+  image_digest       = "${var.image_digest}"
+  timeout_in_seconds = "30"
+}

examples/ons/subscription/provider.tf

@@ -50,20 +50,12 @@ variable "subscription_defined_tags_value" {
   default = "value"
 }
 
-variable "subscription_endpoint" {
-  default = "[email protected]"
-}
-
 variable "subscription_freeform_tags" {
   default = {
     "Department" = "Finance"
   }
 }
 
-variable "subscription_protocol" {
-  default = "EMAIL"
-}
-
 provider "oci" {
   region           = "${var.region}"
   tenancy_ocid     = "${var.tenancy_ocid}"

examples/ons/subscription/subscription.tf

@@ -1,10 +1,22 @@
 // Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 
-resource "oci_ons_subscription" "test_subscription" {
+resource "oci_ons_subscription" "test_subscription_email" {
   #Required
   compartment_id = "${var.compartment_ocid}"
-  endpoint       = "${var.subscription_endpoint}"
-  protocol       = "${var.subscription_protocol}"
+  endpoint       = "[email protected]"
+  protocol       = "EMAIL"
+  topic_id       = "${oci_ons_notification_topic.test_notification_topic.id}"
+
+  #Optional
+  defined_tags  = "${map("${oci_identity_tag_namespace.tag_namespace1.name}.${oci_identity_tag.tag1.name}", "${var.subscription_defined_tags_value}")}"
+  freeform_tags = "${var.subscription_freeform_tags}"
+}
+
+resource "oci_ons_subscription" "test_subscription_funtions" {
+  #Required
+  compartment_id = "${var.compartment_ocid}"
+  endpoint       = "${oci_functions_function.test_function.id}"
+  protocol       = "ORACLE_FUNCTIONS"
   topic_id       = "${oci_ons_notification_topic.test_notification_topic.id}"
 
   #Optional
@@ -17,5 +29,5 @@ data "oci_ons_subscriptions" "test_subscriptions" {
   compartment_id = "${var.compartment_ocid}"
 
   #Optional
-  topic_id = "${oci_ons_subscription.test_subscription.topic_id}"
+  topic_id = "${oci_ons_subscription.test_subscription_email.topic_id}"
 }

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce
 	github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
 	github.com/mitchellh/cli v1.0.0
-	github.com/oracle/oci-go-sdk v15.6.0+incompatible
+	github.com/oracle/oci-go-sdk v15.7.0+incompatible
 	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.3.0
 	gopkg.in/yaml.v2 v2.2.2

go.sum

@@ -354,6 +354,8 @@ github.com/oracle/oci-go-sdk v15.5.0+incompatible h1:GdG5NWt+lhv0+WslpaF1dbz8KkS
 github.com/oracle/oci-go-sdk v15.5.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v15.6.0+incompatible h1:6kX7J6cJnFeWwCPUfiywDD5joxx6qQbJ0SyqnaaKlqU=
 github.com/oracle/oci-go-sdk v15.6.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v15.7.0+incompatible h1:CkhSZ7dL9yB/rNbVX+MVFHojuMTo+4dFOSorz/iNxmY=
+github.com/oracle/oci-go-sdk v15.7.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58 h1:m3CEgv3ah1Rhy82L+c0QG/U3VyY1UsvsIdkh0/rU97Y=
 github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=

oci/database_autonomous_database_data_source.go

@@ -134,12 +134,26 @@ func (s *DatabaseAutonomousDatabaseDataSourceCrud) SetData() error {
 		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
 	}
 
+	s.D.Set("nsg_ids", s.Res.NsgIds)
+
+	if s.Res.PrivateEndpoint != nil {
+		s.D.Set("private_endpoint", *s.Res.PrivateEndpoint)
+	}
+
+	if s.Res.PrivateEndpointLabel != nil {
+		s.D.Set("private_endpoint_label", *s.Res.PrivateEndpointLabel)
+	}
+
 	if s.Res.ServiceConsoleUrl != nil {
 		s.D.Set("service_console_url", *s.Res.ServiceConsoleUrl)
 	}
 
 	s.D.Set("state", s.Res.LifecycleState)
 
+	if s.Res.SubnetId != nil {
+		s.D.Set("subnet_id", *s.Res.SubnetId)
+	}
+
 	if s.Res.SystemTags != nil {
 		s.D.Set("system_tags", systemTagsToMap(s.Res.SystemTags))
 	}