Releasing version 4.39.0

Releasing version 4.39.0

Author: srishtipmishra

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 4.39.0 (Unreleased)
+
+### Added
+- Support for network error retry
+
+### Fixed
+- Removed default value for `assign_private_dns_record` in `oci_core_vnic_attachment`
+
 ## 4.38.0 (August 04, 2021)
 
 ### Added

oci/core_vnic_attachment_resource.go

@@ -43,7 +43,6 @@ func CoreVnicAttachmentResource() *schema.Resource {
 						"assign_private_dns_record": {
 							Type:     schema.TypeBool,
 							Optional: true,
-							Default:  true,
 							ForceNew: true,
 						},
 						"assign_public_ip": {

oci/retry.go

@@ -4,6 +4,7 @@
 package oci
 
 import (
+	"log"
 	"math/rand"
 	"strings"
 	"time"
@@ -109,6 +110,12 @@ func getExpectedRetryDuration(response oci_common.OCIOperationResponse, disableN
 
 func getDefaultExpectedRetryDuration(response oci_common.OCIOperationResponse, disableNotFoundRetries bool) time.Duration {
 	defaultRetryTime := shortRetryTime
+
+	if oci_common.IsNetworkError(response.Error) {
+		log.Printf("[DEBUG] Retrying for network error...")
+		return defaultRetryTime
+	}
+
 	if response.Response == nil || response.Response.HTTPResponse() == nil {
 		return 0
 	}
@@ -151,6 +158,10 @@ func getDefaultExpectedRetryDuration(response oci_common.OCIOperationResponse, d
 
 func getIdentityExpectedRetryDuration(response oci_common.OCIOperationResponse, disableNotFoundRetries bool, optionals ...interface{}) time.Duration {
 	defaultRetryTime := getDefaultExpectedRetryDuration(response, disableNotFoundRetries)
+	if oci_common.IsNetworkError(response.Error) {
+		return defaultRetryTime
+	}
+
 	if response.Response == nil || response.Response.HTTPResponse() == nil {
 		return defaultRetryTime
 	}
@@ -173,6 +184,10 @@ func getIdentityExpectedRetryDuration(response oci_common.OCIOperationResponse,
 
 func getDatabaseExpectedRetryDuration(response oci_common.OCIOperationResponse, disableNotFoundRetries bool, optionals ...interface{}) time.Duration {
 	defaultRetryTime := getDefaultExpectedRetryDuration(response, disableNotFoundRetries)
+	if oci_common.IsNetworkError(response.Error) {
+		return defaultRetryTime
+	}
+
 	if response.Response == nil || response.Response.HTTPResponse() == nil {
 		return defaultRetryTime
 	}
@@ -191,6 +206,9 @@ func getDatabaseExpectedRetryDuration(response oci_common.OCIOperationResponse,
 
 func getObjectstorageServiceExpectedRetryDuration(response oci_common.OCIOperationResponse, disableNotFoundRetries bool, optionals ...interface{}) time.Duration {
 	defaultRetryTime := getDefaultExpectedRetryDuration(response, disableNotFoundRetries)
+	if oci_common.IsNetworkError(response.Error) {
+		return defaultRetryTime
+	}
 	if response.Response == nil || response.Response.HTTPResponse() == nil {
 		return defaultRetryTime
 	}

oci/retry_test.go

@@ -5,11 +5,14 @@ package oci
 
 import (
 	"fmt"
+	"net"
 	"net/http"
 	"sync"
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/terraform-providers/terraform-provider-oci/httpreplay"
 
 	"github.com/oracle/oci-go-sdk/v45/common"
@@ -45,7 +48,6 @@ func retryLoop(t *testing.T, r *retryTestInput) {
 
 	for i := uint(1); true; i++ {
 		operationResponse := common.NewOCIOperationResponse(TestOCIResponse{statusCode: r.httpResponseStatusCode, header: r.header}, r.responseError, i)
-
 		expectedShouldRetry := getElapsedRetryDuration(startTime) < (time.Duration(r.expectedRetryTimeSeconds) * time.Second)
 		actualShouldRetry := retryPolicy.ShouldRetryOperation(operationResponse)
 		if actualShouldRetry != expectedShouldRetry {
@@ -78,6 +80,54 @@ func retryLoop(t *testing.T, r *retryTestInput) {
 	}
 }
 
+func TestNetTimeoutError(t *testing.T) {
+	errNet := net.DNSError{
+		Err:       "Timeout",
+		IsTimeout: true,
+	}
+	assert.Equal(t, common.IsNetworkError(&errNet), true)
+
+	if httpreplay.ModeRecordReplay() {
+		t.Skip("Skip Retry Tests in HttpReplay mode.")
+	}
+	shortRetryTime = 15 * time.Second
+	longRetryTime = 30 * time.Second
+	configuredRetryDuration = nil
+	r := retryTestInput{
+		serviceName:              "core",
+		httpResponseStatusCode:   404,
+		header:                   map[string][]string{},
+		responseError:            &errNet,
+		expectedRetryTimeSeconds: 15,
+		jitterMode:               true,
+	}
+	retryLoop(t, &r)
+}
+
+func TestNetTemporaryError(t *testing.T) {
+	errNet := net.DNSError{
+		Err:         "Temporary",
+		IsTemporary: true,
+	}
+	assert.Equal(t, common.IsNetworkError(&errNet), true)
+
+	if httpreplay.ModeRecordReplay() {
+		t.Skip("Skip Retry Tests in HttpReplay mode.")
+	}
+	shortRetryTime = 15 * time.Second
+	longRetryTime = 30 * time.Second
+	configuredRetryDuration = nil
+	r := retryTestInput{
+		serviceName:              "core",
+		httpResponseStatusCode:   404,
+		header:                   map[string][]string{},
+		responseError:            &errNet,
+		expectedRetryTimeSeconds: 15,
+		jitterMode:               true,
+	}
+	retryLoop(t, &r)
+}
+
 // Test a simple retry loop, simulating a 429 rate error
 // issue-routing-tag: terraform/default
 func TestUnitRetryLoop_basic(t *testing.T) {

oci/version.go

@@ -7,8 +7,8 @@ import (
 	"log"
 )
 
-const Version = "4.38.0"
-const ReleaseDate = "2021-08-04"
+const Version = "4.39.0"
+const ReleaseDate = "2021-08-11"
 
 func PrintVersion() {
 	log.Printf("[INFO] terraform-provider-oci %s\n", Version)

website/docs/r/core_vnic_attachment.html.markdown

@@ -48,7 +48,7 @@ resource "oci_core_vnic_attachment" "test_vnic_attachment" {
 The following arguments are supported:
 
 * `create_vnic_details` - (Required) (Updatable) Contains properties for a VNIC. You use this object when creating the primary VNIC during instance launch or when creating a secondary VNIC. For more information about VNICs, see [Virtual Network Interface Cards (VNICs)](https://docs.cloud.oracle.com/iaas/Content/Network/Tasks/managingVNICs.htm). 
-	* `assign_private_dns_record` - (Optional) Whether the VNIC should be assigned a DNS record. If set to false, no DNS record registion for the VNIC; if set to true, DNS record will be registered. The default value is true.  Example: `true`
+	* `assign_private_dns_record` - (Optional) Whether the VNIC should be assigned a DNS record. If set to false, no DNS record registion for the VNIC; if set to true, DNS record will be registered. Example: `true`
 
 		If you specify a `hostnameLabel`, the `assignPrivateDnsRecord` is require to be set to true. 
 	* `assign_public_ip` - (Optional) Whether the VNIC should be assigned a public IP address. Defaults to whether the subnet is public or private. If not set and the VNIC is being created in a private subnet (that is, where `prohibitPublicIpOnVnic` = true in the [Subnet](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Subnet/)), then no public IP address is assigned. If not set and the subnet is public (`prohibitPublicIpOnVnic` = false), then a public IP address is assigned. If set to true and `prohibitPublicIpOnVnic` = true, an error is returned.