fixes for test failures

Author: parweza

provider/core_dhcp_options_resource.go

@@ -10,6 +10,8 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
 
+	"fmt"
+
 	oci_core "github.com/oracle/oci-go-sdk/core"
 )
 
@@ -212,7 +214,11 @@ func (s *DhcpOptionsResourceCrud) Create() error {
 		interfaces := options.([]interface{})
 		tmp := make([]oci_core.DhcpOption, len(interfaces))
 		for i, toBeConverted := range interfaces {
-			tmp[i] = mapToDhcpOption(toBeConverted.(map[string]interface{}))
+			converted, err := mapToDhcpOption(toBeConverted.(map[string]interface{}))
+			if err != nil {
+				return err
+			}
+			tmp[i] = converted
 		}
 		request.Options = tmp
 	}
@@ -278,7 +284,11 @@ func (s *DhcpOptionsResourceCrud) Update() error {
 		interfaces := options.([]interface{})
 		tmp := make([]oci_core.DhcpOption, len(interfaces))
 		for i, toBeConverted := range interfaces {
-			tmp[i] = mapToDhcpOption(toBeConverted.(map[string]interface{}))
+			converted, err := mapToDhcpOption(toBeConverted.(map[string]interface{}))
+			if err != nil {
+				return err
+			}
+			tmp[i] = converted
 		}
 		request.Options = tmp
 	}
@@ -340,7 +350,7 @@ func (s *DhcpOptionsResourceCrud) SetData() error {
 	return nil
 }
 
-func mapToDhcpOption(raw map[string]interface{}) oci_core.DhcpOption {
+func mapToDhcpOption(raw map[string]interface{}) (oci_core.DhcpOption, error) {
 	var baseObject oci_core.DhcpOption
 	//discriminator
 	typeRaw, ok := raw["type"]
@@ -352,6 +362,9 @@ func mapToDhcpOption(raw map[string]interface{}) oci_core.DhcpOption {
 	}
 	switch strings.ToLower(type_) {
 	case strings.ToLower("DomainNameServer"):
+		if searchDomainNames, ok := raw["search_domain_names"]; ok && len(searchDomainNames.([]interface{})) > 0 {
+			return nil, fmt.Errorf("'search_domain_names' should not be specified for type DomainNameServer")
+		}
 		details := oci_core.DhcpDnsOption{}
 		details.CustomDnsServers = []string{}
 		if customDnsServers, ok := raw["custom_dns_servers"]; ok {
@@ -367,6 +380,14 @@ func mapToDhcpOption(raw map[string]interface{}) oci_core.DhcpOption {
 		}
 		baseObject = details
 	case strings.ToLower("SearchDomain"):
+		if customDnsServers, ok := raw["custom_dns_servers"]; ok && len(customDnsServers.([]interface{})) > 0 {
+			return nil, fmt.Errorf("'custom_dns_servers' should not be specified for type SearchDomain")
+		}
+
+		if serverType, ok := raw["server_type"]; ok && len(serverType.(string)) > 0 {
+			return nil, fmt.Errorf("'server_type' should not be specified for type SearchDomain")
+		}
+
 		details := oci_core.DhcpSearchDomainOption{}
 		details.SearchDomainNames = []string{}
 		if searchDomainNames, ok := raw["search_domain_names"]; ok {
@@ -380,8 +401,9 @@ func mapToDhcpOption(raw map[string]interface{}) oci_core.DhcpOption {
 		baseObject = details
 	default:
 		log.Printf("[WARN] Unknown type '%v' was specified", type_)
+		return baseObject, fmt.Errorf("unknown type '%v' was specified", type_)
 	}
-	return baseObject
+	return baseObject, nil
 }
 
 func DhcpOptionToMap(obj oci_core.DhcpOption) map[string]interface{} {

provider/database_db_home_test.go

@@ -78,6 +78,7 @@ variable "db_home_db_version" { default = "12.1.0.2" }
 )
 
 func TestDatabaseDbHomeResource_basic(t *testing.T) {
+	t.Skip("Skipping this test for now as dbhome is not supported as a resource for now.")
 	provider := testAccProvider
 	config := testProviderConfig()
 

provider/helpers_objectstorage.go

@@ -12,9 +12,10 @@ import (
 	"os"
 	"sync"
 
+	"strings"
+
 	"github.com/oracle/oci-go-sdk/common"
 	oci_object_storage "github.com/oracle/oci-go-sdk/objectstorage"
-	"strings"
 )
 
 const defaultFilePartSize int64 = 128 * 1024 * 1024 // 128MB

provider/identity_policy_resource_test.go

@@ -62,11 +62,8 @@ func (s *ResourceIdentityPolicyTestSuite) TestAccResourceIdentityPolicy_basic()
 					resource.TestCheckResourceAttrSet(s.ResourceName, "compartment_id"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "time_created"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "ETag"),
-					resource.TestCheckResourceAttrSet(s.ResourceName, "etag"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "lastUpdateETag"),
-					resource.TestCheckResourceAttrSet(s.ResourceName, "last_update_etag"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "policyHash"),
-					resource.TestCheckResourceAttrSet(s.ResourceName, "policy_hash"),
 					resource.TestCheckResourceAttr(s.ResourceName, "name", "p1-"+s.Token),
 					resource.TestCheckResourceAttr(s.ResourceName, "description", "automated test policy"),
 					resource.TestCheckResourceAttr(s.ResourceName, "statements.#", "1"),

provider/object_storage_object_head_data_source_test.go

@@ -41,7 +41,7 @@ func (s *DatasourceObjectstorageObjectHeadTestSuite) SetupTest() {
 		object = "-tf-object"
 		content = "test content"
 		metadata = {
-			"content_type" = "text/plain"
+			"content-type" = "text/plain"
 		}
 	}`, nil)
 	s.ResourceName = "data.oci_objectstorage_object_head.t"

provider/object_storage_object_resource.go

@@ -18,8 +18,9 @@ import (
 
 	"strconv"
 
-	oci_object_storage "github.com/oracle/oci-go-sdk/objectstorage"
 	"os"
+
+	oci_object_storage "github.com/oracle/oci-go-sdk/objectstorage"
 )
 
 const (

provider/object_storage_object_test.go

@@ -10,12 +10,13 @@ import (
 	"regexp"
 	"testing"
 
+	"os"
+	"strconv"
+
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/oracle/oci-go-sdk/common"
 	oci_object_storage "github.com/oracle/oci-go-sdk/objectstorage"
-	"os"
-	"strconv"
 )
 
 const (

provider/provider.go

@@ -324,6 +324,7 @@ func resourcesMap() map[string]*schema.Resource {
 		"oci_core_volume_attachment":               VolumeAttachmentResource(),
 		"oci_core_volume_backup":                   VolumeBackupResource(),
 		"oci_core_volume_backup_policy_assignment": VolumeBackupPolicyAssignmentResource(),
+		//Do remember to enable database_db_home_test if you are enabling DB Home resource
 		//"oci_database_db_home":                     DbHomeResource(),
 		"oci_database_db_system":               DbSystemResource(),
 		"oci_database_backup":                  BackupResource(),