Merge pull request #996 from terraform-providers/release_gh

Merge v3.66.0 release into master

Author: alexng-canuck

CHANGELOG.md

@@ -1,4 +1,8 @@
 ## 3.66.0 (Unreleased)
+
+### Added
+- Support for budget alerts service integration with events service
+
 ## 3.65.0 (March 04, 2020)
 
 ### Added

examples/budget/main.tf

@@ -77,7 +77,6 @@ output "budgets" {
 resource "oci_budget_alert_rule" "test_alert_rule" {
   #Required
   budget_id      = "${oci_budget_budget.test_budget.id}"
-  recipients     = "[email protected]"
   threshold      = "100"
   threshold_type = "ABSOLUTE"
   type           = "ACTUAL"
@@ -86,6 +85,7 @@ resource "oci_budget_alert_rule" "test_alert_rule" {
   description  = "alertRuleDescription"
   display_name = "alertRule"
   message      = "possible overspend"
+  recipients   = "[email protected]"
 }
 
 data "oci_budget_alert_rules" "test_alert_rules" {

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.8.0+incompatible
+	github.com/oracle/oci-go-sdk v16.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

@@ -358,6 +358,8 @@ github.com/oracle/oci-go-sdk v15.7.0+incompatible h1:CkhSZ7dL9yB/rNbVX+MVFHojuMT
 github.com/oracle/oci-go-sdk v15.7.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v15.8.0+incompatible h1:SEJ4DBi6DUtCZH26hGtDhQiU3IfjuBFc7R4XjQ8w9DA=
 github.com/oracle/oci-go-sdk v15.8.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v16.0.0+incompatible h1:4BbhAM6wz7u9vtYrBMCPeQ2oRV9oaaqsHenErPvpQs4=
+github.com/oracle/oci-go-sdk v16.0.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/budget_alert_rule_resource.go

@@ -24,10 +24,6 @@ func BudgetAlertRuleResource() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
-			"recipients": {
-				Type:     schema.TypeString,
-				Required: true,
-			},
 			"threshold": {
 				Type:             schema.TypeFloat,
 				Required:         true,
@@ -71,6 +67,10 @@ func BudgetAlertRuleResource() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"recipients": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 
 			// Computed
 			"state": {

oci/budget_alert_rule_test.go

@@ -41,7 +41,6 @@ var (
 
 	alertRuleRepresentation = map[string]interface{}{
 		"budget_id":      Representation{repType: Required, create: `${oci_budget_budget.test_budget.id}`},
-		"recipients":     Representation{repType: Required, create: `[email protected]`, update: `[email protected]`},
 		"threshold":      Representation{repType: Required, create: `100`, update: `200`},
 		"threshold_type": Representation{repType: Required, create: `PERCENTAGE`, update: `ABSOLUTE`},
 		"type":           Representation{repType: Required, create: `ACTUAL`, update: `FORECAST`},
@@ -50,6 +49,7 @@ var (
 		"display_name":   Representation{repType: Optional, create: `displayName`, update: `displayName2`},
 		"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`},
+		"recipients":     Representation{repType: Optional, create: `[email protected]`, update: `[email protected]`},
 	}
 
 	AlertRuleResourceDependencies = generateResourceFromRepresentationMap("oci_budget_budget", "test_budget", Required, Create, budgetRepresentationWithTargetCompartmentId) +
@@ -85,7 +85,6 @@ func TestBudgetAlertRuleResource_basic(t *testing.T) {
 					generateResourceFromRepresentationMap("oci_budget_alert_rule", "test_alert_rule", Required, Create, alertRuleRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(resourceName, "budget_id"),
-					resource.TestCheckResourceAttr(resourceName, "recipients", "[email protected]"),
 					resource.TestCheckResourceAttr(resourceName, "threshold", "100"),
 					resource.TestCheckResourceAttr(resourceName, "threshold_type", "PERCENTAGE"),
 					resource.TestCheckResourceAttr(resourceName, "type", "ACTUAL"),

oci/budget_alert_rules_data_source.go

@@ -67,8 +67,7 @@ func (s *BudgetAlertRulesDataSourceCrud) Get() error {
 	}
 
 	if state, ok := s.D.GetOkExists("state"); ok {
-		tmp := state.(string)
-		request.LifecycleState = &tmp
+		request.LifecycleState = oci_budget.ListAlertRulesLifecycleStateEnum(state.(string))
 	}
 
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "budget")

oci/budget_budgets_data_source.go

@@ -71,8 +71,7 @@ func (s *BudgetBudgetsDataSourceCrud) Get() error {
 	}
 
 	if state, ok := s.D.GetOkExists("state"); ok {
-		tmp := state.(string)
-		request.LifecycleState = &tmp
+		request.LifecycleState = oci_budget.ListBudgetsLifecycleStateEnum(state.(string))
 	}
 
 	if targetType, ok := s.D.GetOkExists("target_type"); ok {

oci/database_autonomous_database_resource_test.go

@@ -99,8 +99,15 @@ var (
 				"nsg_ids":                Representation{repType: Optional, create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}, update: []string{`${oci_core_network_security_group.test_network_security_group.id}`, `${oci_core_network_security_group.test_network_security_group2.id}`}},
 				"private_endpoint_label": Representation{repType: Optional, create: `xlx4fcli`},
 				"subnet_id":              Representation{repType: Optional, create: `${oci_core_subnet.test_subnet.id}`},
+				"timeouts":               RepresentationGroup{Required, autonomousDatabasePrivateEndpointTimeoutsRepresentation},
 			}), []string{"whitelisted_ips"})
 
+	autonomousDatabasePrivateEndpointTimeoutsRepresentation = map[string]interface{}{
+		"create": Representation{repType: Required, create: `10m`},
+		"update": Representation{repType: Required, create: `10m`},
+		"delete": Representation{repType: Required, create: `10m`},
+	}
+
 	AutonomousDatabasePrivateEndpointResourceDependencies = generateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", Required, Create, subnetRepresentation) +
 		generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Required, Create, vcnRepresentation) +
 		generateResourceFromRepresentationMap("oci_core_network_security_group", "test_network_security_group", Required, Create, networkSecurityGroupRepresentation) +

oci/version.go

@@ -6,7 +6,7 @@ import (
 	"log"
 )
 
-const Version = "3.65.0"
+const Version = "3.66.0"
 
 func PrintVersion() {
 	log.Printf("[INFO] terraform-provider-oci %s\n", Version)