Merge pull request #1002 from terraform-providers/release_merge_v3.68.0

Candidate for release_v3.68.0

Author: zexinwanoci

CHANGELOG.md

@@ -1,4 +1,10 @@
 ## 3.68.0 (Unreleased)
+
+### Added
+- Support for creating DB from backup in DBAAS
+- Support for OCI WAF version 1.2
+- Support for WAF URL in `oci_oce_oce_instance` for disaster recovery
+
 ## 3.67.0 (March 19, 2020)
 
 ### Added

examples/database/db_systems/db_exadata/resources.tf

@@ -77,3 +77,25 @@ resource "oci_database_database" "test_database" {
   db_home_id = "${data.oci_database_db_homes.db_homes.db_homes.0.db_home_id}"
   source     = "NONE"
 }
+
+resource "oci_database_backup" "test_backup" {
+  depends_on   = ["oci_database_db_system.test_db_system"]
+  database_id  = "${oci_database_db_system.test_db_system.db_home.0.database.0.id}"
+  display_name = "FirstBackup"
+}
+
+resource "oci_database_database" "test_database_backup" {
+  #Required
+  database {
+    backup_id           = "${oci_database_backup.test_backup.id}"
+    backup_tde_password = "${var.db_admin_password}"
+    admin_password      = "${var.db_admin_password}"
+    db_name             = "TFdb3Exa"
+    character_set       = "${var.character_set}"
+    ncharacter_set      = "${var.n_character_set}"
+    db_workload         = "${var.db_workload}"
+  }
+
+  db_home_id = "${data.oci_database_db_homes.db_homes.db_homes.0.db_home_id}"
+  source     = "DB_BACKUP"
+}

examples/oce/main.tf

@@ -30,6 +30,12 @@ resource "oci_oce_oce_instance" "test_oce_instance" {
   object_storage_namespace = "${var.tenancy_name}"
   tenancy_id               = "${var.tenancy_ocid}"
   tenancy_name             = "${var.tenancy_name}"
+
+  #optional
+  freeform_tags       = "${map("freeformkey", "freeformvalue")}"
+  description         = "description"
+  instance_usage_type = "NONPRIMARY"
+  waf_primary_domain  = "oracle.com"
 }
 
 data "oci_oce_oce_instances" "test_oce_instances" {

examples/waas/waas_full.tf

@@ -163,7 +163,35 @@ resource "oci_waas_waas_policy" "test_waas_policy" {
     is_https_forced               = true
     is_origin_compression_enabled = true
     is_response_buffering_enabled = true
+    is_sni_enabled                = true
+    websocket_path_prefixes       = ["/url1"]
     tls_protocols                 = ["TLS_V1_1"]
+
+    health_checks = {
+      is_enabled                     = true
+      is_response_text_check_enabled = true
+      expected_response_code_group   = ["2XX"]
+      expected_response_text         = "testResponseText"
+
+      headers = {
+        "Host"       = "oracle.com"
+        "User-Agent" = "Oracle-TerraformProvider"
+      }
+
+      method              = "GET"
+      path                = "/testpath"
+      timeout_in_seconds  = 10
+      unhealthy_threshold = 5
+      interval_in_seconds = 10
+      healthy_threshold   = 2
+    }
+
+    load_balancing_method = {
+      method                     = "STICKY_COOKIE"
+      name                       = "name2"
+      domain                     = "example.com"
+      expiration_time_in_seconds = 10
+    }
   }
 
   timeouts {
@@ -195,6 +223,19 @@ resource "oci_waas_waas_policy" "test_waas_policy" {
       bypass_challenges            = ["JS_CHALLENGE"]
       redirect_response_code       = "FOUND"
       redirect_url                 = "http://192.168.0.3"
+      captcha_footer               = "captchaFooter"
+      captcha_header               = "captchaHeader"
+      captcha_submit_label         = "captchaSubmitLabel"
+      captcha_title                = "captchaTitle"
+
+      response_header_manipulation = {
+        #Required
+        action = "EXTEND_HTTP_RESPONSE_HEADER"
+        header = "header"
+
+        #Optional
+        value = "value"
+      }
     }
 
     address_rate_limiting {
@@ -243,6 +284,11 @@ resource "oci_waas_waas_policy" "test_waas_policy" {
       #Optional
       action = "DETECT"
       id     = "${oci_waas_custom_protection_rule.test_custom_protection_rule.id}"
+
+      exclusions = {
+        exclusions = ["example.com"]
+        target     = "REQUEST_COOKIES"
+      }
     }
 
     device_fingerprint_challenge {
@@ -312,6 +358,17 @@ resource "oci_waas_waas_policy" "test_waas_policy" {
       #Optional
       action                       = "DETECT"
       action_expiration_in_seconds = 10
+      are_redirects_challenged     = true
+      is_nat_enabled               = true
+
+      criteria = {
+        #Required
+        condition = "URL_IS"
+        value     = "/public"
+
+        #Optional
+        is_case_sensitive = true
+      }
 
       challenge_settings {
         #Optional
@@ -351,8 +408,11 @@ resource "oci_waas_waas_policy" "test_waas_policy" {
 
     whitelists {
       #Required
-      addresses = ["192.168.127.127", "192.168.127.128"]
-      name      = "whitelist_name"
+      name = "whitelist_name"
+
+      #Optional
+      addresses     = ["192.168.127.127", "192.168.127.128"]
+      address_lists = ["${oci_waas_address_list.test_address_list.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 v17.0.0+incompatible
+	github.com/oracle/oci-go-sdk v17.1.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

@@ -362,6 +362,8 @@ github.com/oracle/oci-go-sdk v16.0.0+incompatible h1:4BbhAM6wz7u9vtYrBMCPeQ2oRV9
 github.com/oracle/oci-go-sdk v16.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v17.0.0+incompatible h1:VueI9WISwu2+GwYd2WzuFO+M7ufSnpA707MooU+8xNs=
 github.com/oracle/oci-go-sdk v17.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v17.1.0+incompatible h1:jGo2O7T1wFAI+wh7gI1KYcYACCtWknACHQdg1vDg2/Y=
+github.com/oracle/oci-go-sdk v17.1.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_backup_resource.go

@@ -59,6 +59,10 @@ func DatabaseBackupResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"shape": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -220,6 +224,10 @@ func (s *DatabaseBackupResourceCrud) SetData() error {
 		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
 	}
 
+	if s.Res.Shape != nil {
+		s.D.Set("shape", *s.Res.Shape)
+	}
+
 	s.D.Set("state", s.Res.LifecycleState)
 
 	if s.Res.TimeEnded != nil {

oci/database_backup_test.go

@@ -85,6 +85,7 @@ func TestDatabaseBackupResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(datasourceName, "backups.0.database_size_in_gbs"),
 					resource.TestCheckResourceAttr(datasourceName, "backups.0.display_name", "Monthly Backup"),
 					resource.TestCheckResourceAttrSet(datasourceName, "backups.0.id"),
+					resource.TestCheckResourceAttrSet(datasourceName, "backups.0.shape"),
 					resource.TestCheckResourceAttrSet(datasourceName, "backups.0.state"),
 					resource.TestCheckResourceAttrSet(datasourceName, "backups.0.time_ended"),
 					resource.TestCheckResourceAttrSet(datasourceName, "backups.0.time_started"),

oci/database_backups_data_source.go

@@ -126,6 +126,10 @@ func (s *DatabaseBackupsDataSourceCrud) SetData() error {
 			backup["lifecycle_details"] = *r.LifecycleDetails
 		}
 
+		if r.Shape != nil {
+			backup["shape"] = *r.Shape
+		}
+
 		backup["state"] = r.LifecycleState
 
 		if r.TimeEnded != nil {