Candidate for release_v3.35.0

Candidate for release_v3.35.0

Author: dshelbyo

CHANGELOG.md

@@ -1,4 +1,19 @@
-## 3.34.1 (Unreleased)
+## 3.35.0 (Unreleased)
+
+### Added
+- Support for creating `instance_configuration` resource from the specified instance
+- Support for Budget Alerts for Cost Tracking Tags
+- Support for moving `oci_monitoring_alarm` across compartments
+- Support for moving `health_checks_http_monitor` and `health_checks_ping_monitor` resources across compartments
+- Support for moving `database_autonomous_database` and `database_db_system` resources across compartments
+- Support for moving `database_autonomous_container_database` and `database_autonomous_exadata_infrastructure` resources across compartments
+- Support for scheduling KMS vault deletion by specified time
+
+### Fixed
+- Fixed `oci_load_balancer_backend_set` by explicitly making `session_persistence_configuration` and `lb_cookie_session_persistence_configuration` mutually exclusive [Issue #825](https://github.com/terraform-providers/terraform-provider-oci/issues/825)
+- Fixed use case of `oci_load_balancer_backend_set` with `lb_cookie_session_persistence_configuration` update operation without setting optional parameters `max_age_in_seconds` and `domain`
+- Fixed `oci_identity_user_capabilities_management` to correctly set `can_use_auth_tokens` field
+
 ## 3.34.0 (July 17, 2019)
 
 ### Added

examples/autoscaling/compute.tf

@@ -101,6 +101,24 @@ resource "oci_autoscaling_auto_scaling_configuration" "TFAutoScalingConfiguratio
         }
       }
     }
+
+    rules {
+      action {
+        type  = "CHANGE_COUNT_BY"
+        value = "-1"
+      }
+
+      display_name = "TFScaleInRule"
+
+      metric {
+        metric_type = "CPU_UTILIZATION"
+
+        threshold {
+          operator = "LT"
+          value    = "1"
+        }
+      }
+    }
   }
 
   auto_scaling_resources {

examples/budget/main.tf

@@ -22,10 +22,14 @@ provider "oci" {
 
 resource "oci_budget_budget" "test_budget" {
   #Required
-  amount                = "1"
-  compartment_id        = "${var.tenancy_ocid}"
-  reset_period          = "MONTHLY"
-  target_compartment_id = "${var.compartment_ocid}"
+  amount         = "1"
+  compartment_id = "${var.tenancy_ocid}"
+  reset_period   = "MONTHLY"
+  target_type    = "COMPARTMENT"
+
+  targets = [
+    "${var.compartment_ocid}",
+  ]
 
   #Optional
   description  = "budget1 description"
@@ -38,17 +42,17 @@ data "oci_budget_budget" "budget1" {
 
 output "budget" {
   value = {
-    amount                = "${data.oci_budget_budget.budget1.amount}"
-    compartment_id        = "${data.oci_budget_budget.budget1.compartment_id}"
-    reset_period          = "${data.oci_budget_budget.budget1.reset_period}"
-    target_compartment_id = "${data.oci_budget_budget.budget1.target_compartment_id}"
-    description           = "${data.oci_budget_budget.budget1.description}"
-    display_name          = "${data.oci_budget_budget.budget1.display_name}"
-    alert_rule_count      = "${data.oci_budget_budget.budget1.alert_rule_count}"
-    state                 = "${data.oci_budget_budget.budget1.state}"
-    time_created          = "${data.oci_budget_budget.budget1.time_created}"
-    time_updated          = "${data.oci_budget_budget.budget1.time_updated}"
-    version               = "${data.oci_budget_budget.budget1.version}"
+    amount           = "${data.oci_budget_budget.budget1.amount}"
+    compartment_id   = "${data.oci_budget_budget.budget1.compartment_id}"
+    reset_period     = "${data.oci_budget_budget.budget1.reset_period}"
+    targets          = "${data.oci_budget_budget.budget1.targets.0}"
+    description      = "${data.oci_budget_budget.budget1.description}"
+    display_name     = "${data.oci_budget_budget.budget1.display_name}"
+    alert_rule_count = "${data.oci_budget_budget.budget1.alert_rule_count}"
+    state            = "${data.oci_budget_budget.budget1.state}"
+    time_created     = "${data.oci_budget_budget.budget1.time_created}"
+    time_updated     = "${data.oci_budget_budget.budget1.time_updated}"
+    version          = "${data.oci_budget_budget.budget1.version}"
 
     # These values are not always present
     //    actual_spend        = "${data.oci_budget_budget.budget1.actual_spend}"

go.mod

@@ -3,7 +3,7 @@ module github.com/terraform-providers/terraform-provider-oci
 require (
 	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
 	github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
-	github.com/oracle/oci-go-sdk v5.15.0+incompatible
+	github.com/oracle/oci-go-sdk v6.0.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

@@ -274,6 +274,8 @@ github.com/oracle/oci-go-sdk v5.14.0+incompatible h1:RL/BN87saea2/iGFCT3jmr+IK42
 github.com/oracle/oci-go-sdk v5.14.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v5.15.0+incompatible h1:rTlmaWEe255HczQJ2uOPM9xw3prU9jNk5GxPy+RFi3k=
 github.com/oracle/oci-go-sdk v5.15.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v6.0.0+incompatible h1:oxUPiF7KPhC0hRoAhAK3hTIZ1K0cz3NfawAQK3Sslb8=
+github.com/oracle/oci-go-sdk v6.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

httpreplay/recorder.go

@@ -42,7 +42,13 @@ type roundTripperProxy struct {
 }
 
 func (rtp *roundTripperProxy) RoundTrip(r *http.Request) (*http.Response, error) {
-	return rtp.recorder.RoundTrip(r, rtp.chained)
+	res, err := rtp.recorder.RoundTrip(r, rtp.chained)
+	if err != nil && err.Error() == "Requested interaction not found" {
+		debugLogf("stop RoundTrip for err: %v", err)
+		panic(err)
+	}
+
+	return res, err
 }
 
 func (rtp *roundTripperProxy) CancelRequest(r *http.Request) {

oci/budget_alert_rule_test.go

@@ -47,7 +47,7 @@ var (
 		"defined_tags":   Representation{repType: Optional, create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
 		"description":    Representation{repType: Optional, create: `description`, update: `description2`},
 		"display_name":   Representation{repType: Optional, create: `displayName`, update: `displayName2`},
-		"freeform_tags":  Representation{repType: Optional, create: map[string]string{"bar-key": "value"}, update: map[string]string{"Department": "Accounting"}},
+		"freeform_tags":  Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
 		"message":        Representation{repType: Optional, create: `message`, update: `message2`},
 	}
 

oci/budget_budget_data_source.go

@@ -104,6 +104,10 @@ func (s *BudgetBudgetDataSourceCrud) SetData() error {
 		s.D.Set("target_compartment_id", *s.Res.TargetCompartmentId)
 	}
 
+	s.D.Set("target_type", s.Res.TargetType)
+
+	s.D.Set("targets", s.Res.Targets)
+
 	if s.Res.TimeCreated != nil {
 		s.D.Set("time_created", s.Res.TimeCreated.String())
 	}

oci/budget_budget_resource.go

@@ -35,11 +35,6 @@ func BudgetBudgetResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
-			"target_compartment_id": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
 
 			// Optional
 			"defined_tags": {
@@ -65,6 +60,30 @@ func BudgetBudgetResource() *schema.Resource {
 				Computed: true,
 				Elem:     schema.TypeString,
 			},
+			"target_compartment_id": {
+				Type:          schema.TypeString,
+				Optional:      true,
+				Computed:      true,
+				ForceNew:      true,
+				ConflictsWith: []string{"target_type"},
+				Deprecated:    FieldDeprecatedForAnother("target_compartment_id", "target_type"),
+			},
+			"target_type": {
+				Type:          schema.TypeString,
+				Optional:      true,
+				Computed:      true,
+				ForceNew:      true,
+				ConflictsWith: []string{"target_compartment_id"},
+			},
+			"targets": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
 
 			// Computed
 			"actual_spend": {
@@ -209,6 +228,22 @@ func (s *BudgetBudgetResourceCrud) Create() error {
 		request.TargetCompartmentId = &tmp
 	}
 
+	if targetType, ok := s.D.GetOkExists("target_type"); ok {
+		request.TargetType = oci_budget.CreateBudgetDetailsTargetTypeEnum(targetType.(string))
+	}
+
+	request.Targets = []string{}
+	if targets, ok := s.D.GetOkExists("targets"); ok {
+		interfaces := targets.([]interface{})
+		tmp := make([]string, len(interfaces))
+		for i := range interfaces {
+			if interfaces[i] != nil {
+				tmp[i] = interfaces[i].(string)
+			}
+		}
+		request.Targets = tmp
+	}
+
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "budget")
 
 	response, err := s.Client.CreateBudget(context.Background(), request)
@@ -340,6 +375,10 @@ func (s *BudgetBudgetResourceCrud) SetData() error {
 		s.D.Set("target_compartment_id", *s.Res.TargetCompartmentId)
 	}
 
+	s.D.Set("target_type", s.Res.TargetType)
+
+	s.D.Set("targets", s.Res.Targets)
+
 	if s.Res.TimeCreated != nil {
 		s.D.Set("time_created", s.Res.TimeCreated.String())
 	}