Merge pull request #707 from terraform-providers/release

Release v3.14.1

Author: ravitandonrt

CHANGELOG.md

@@ -1,4 +1,9 @@
 ## 3.14.1 (Unreleased)
+
+### Fixed
+- Timeout should be updatable for the `oci_containerengine_cluster` and `oci_containerengine_node_pool` resources
+- Virtual Circuit `public_prefixes` to be updatable and importable. [Issue #700](https://github.com/terraform-providers/terraform-provider-oci/issues/700)
+
 ## 3.14.0 (January 29, 2019)
 
 ### Added

GNUmakefile

@@ -5,7 +5,7 @@ GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
 PKG_NAME=oci
 WEBSITE_REPO=github.com/hashicorp/terraform-website
 
-prefix := $(if $(debug),TF_LOG=DEBUG OCI_GO_SDK_DEBUG=1, )
+prefix := $(if $(debug),TF_LOG=DEBUG OCI_GO_SDK_DEBUG=v, )
 timeout := $(if $(timeout), $(timeout), 120m)
 run_regex := $(if $(run), -run $(run), )
 skip_goimports_check_flag := $(if $(skip_goimports_check), -s, )

docs/examples/fast_connect/variables.tf

@@ -41,15 +41,19 @@ variable "virtual_circuit_display_name" {
 }
 
 variable "virtual_circuit_public_prefixes_cidr_block" {
-  default = "0.0.0.0/5"
+  default = "0.0.0.0/6"
 }
 
 variable "virtual_circuit_public_prefixes_cidr_block2" {
-  default = "206.209.218.0/24"
+  default = "206.209.218.0/25"
+}
+
+variable "virtual_circuit_public_prefixes_cidr_block3" {
+  default = "206.209.219.0/24"
 }
 
 variable "virtual_circuit_region" {
-  default = "r1"
+  default = "us-phoenix-1"
 }
 
 variable "virtual_circuit_state" {

docs/examples/fast_connect/virtual_circuit.tf

@@ -45,6 +45,7 @@ resource "oci_core_virtual_circuit" "virtual_circuit_public" {
   display_name     = "${var.virtual_circuit_display_name}"
 
   #provider_service_id = "${oci_core_provider_service.provider_service.id}"
+
   public_prefixes = [
     {
       #Required
@@ -53,8 +54,10 @@ resource "oci_core_virtual_circuit" "virtual_circuit_public" {
     {
       cidr_block = "${var.virtual_circuit_public_prefixes_cidr_block2}"
     },
+    {
+      cidr_block = "${var.virtual_circuit_public_prefixes_cidr_block3}"
+    },
   ]
-
   region = "${var.virtual_circuit_region}"
 }
 

oci/audit_audit_events_data_source.go

@@ -19,9 +19,9 @@ import (
 	"time"
 )
 
-func AuditEventsDataSource() *schema.Resource {
+func AuditAuditEventsDataSource() *schema.Resource {
 	return &schema.Resource{
-		Read: readAuditEvents,
+		Read: readAuditAuditEvents,
 		Schema: map[string]*schema.Schema{
 			"filter": dataSourceFiltersSchema(),
 			"compartment_id": {
@@ -142,25 +142,25 @@ func AuditEventsDataSource() *schema.Resource {
 	}
 }
 
-func readAuditEvents(d *schema.ResourceData, m interface{}) error {
-	sync := &AuditEventsDataSourceCrud{}
+func readAuditAuditEvents(d *schema.ResourceData, m interface{}) error {
+	sync := &AuditAuditEventsDataSourceCrud{}
 	sync.D = d
 	sync.Client = m.(*OracleClients).auditClient
 
 	return ReadResource(sync)
 }
 
-type AuditEventsDataSourceCrud struct {
+type AuditAuditEventsDataSourceCrud struct {
 	D      *schema.ResourceData
 	Client *oci_audit.AuditClient
 	Res    *oci_audit.ListEventsResponse
 }
 
-func (s *AuditEventsDataSourceCrud) VoidState() {
+func (s *AuditAuditEventsDataSourceCrud) VoidState() {
 	s.D.SetId("")
 }
 
-func (s *AuditEventsDataSourceCrud) Get() error {
+func (s *AuditAuditEventsDataSourceCrud) Get() error {
 	request := oci_audit.ListEventsRequest{}
 
 	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
@@ -210,7 +210,7 @@ func (s *AuditEventsDataSourceCrud) Get() error {
 	return nil
 }
 
-func (s *AuditEventsDataSourceCrud) SetData() error {
+func (s *AuditAuditEventsDataSourceCrud) SetData() error {
 	if s.Res == nil {
 		return nil
 	}
@@ -295,7 +295,7 @@ func (s *AuditEventsDataSourceCrud) SetData() error {
 	}
 
 	if f, fOk := s.D.GetOkExists("filter"); fOk {
-		resources = ApplyFilters(f.(*schema.Set), resources, AuditEventsDataSource().Schema["audit_events"].Elem.(*schema.Resource).Schema)
+		resources = ApplyFilters(f.(*schema.Set), resources, AuditAuditEventsDataSource().Schema["audit_events"].Elem.(*schema.Resource).Schema)
 	}
 
 	if err := s.D.Set("audit_events", resources); err != nil {

oci/audit_configuration_data_source.go

@@ -9,9 +9,9 @@ import (
 	oci_audit "github.com/oracle/oci-go-sdk/audit"
 )
 
-func ConfigurationDataSource() *schema.Resource {
+func AuditConfigurationDataSource() *schema.Resource {
 	return &schema.Resource{
-		Read: readSingularConfiguration,
+		Read: readSingularAuditConfiguration,
 		Schema: map[string]*schema.Schema{
 			"compartment_id": {
 				Type:     schema.TypeString,
@@ -26,25 +26,25 @@ func ConfigurationDataSource() *schema.Resource {
 	}
 }
 
-func readSingularConfiguration(d *schema.ResourceData, m interface{}) error {
-	sync := &ConfigurationDataSourceCrud{}
+func readSingularAuditConfiguration(d *schema.ResourceData, m interface{}) error {
+	sync := &AuditConfigurationDataSourceCrud{}
 	sync.D = d
 	sync.Client = m.(*OracleClients).auditClient
 
 	return ReadResource(sync)
 }
 
-type ConfigurationDataSourceCrud struct {
+type AuditConfigurationDataSourceCrud struct {
 	D      *schema.ResourceData
 	Client *oci_audit.AuditClient
 	Res    *oci_audit.GetConfigurationResponse
 }
 
-func (s *ConfigurationDataSourceCrud) VoidState() {
+func (s *AuditConfigurationDataSourceCrud) VoidState() {
 	s.D.SetId("")
 }
 
-func (s *ConfigurationDataSourceCrud) Get() error {
+func (s *AuditConfigurationDataSourceCrud) Get() error {
 	request := oci_audit.GetConfigurationRequest{}
 
 	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
@@ -63,7 +63,7 @@ func (s *ConfigurationDataSourceCrud) Get() error {
 	return nil
 }
 
-func (s *ConfigurationDataSourceCrud) SetData() error {
+func (s *AuditConfigurationDataSourceCrud) SetData() error {
 	if s.Res == nil {
 		return nil
 	}

oci/audit_configuration_resource.go

@@ -11,13 +11,13 @@ import (
 	oci_audit "github.com/oracle/oci-go-sdk/audit"
 )
 
-func ConfigurationResource() *schema.Resource {
+func AuditConfigurationResource() *schema.Resource {
 	return &schema.Resource{
 		Timeouts: DefaultTimeout,
-		Create:   createConfiguration,
-		Read:     readConfiguration,
-		Update:   updateConfiguration,
-		Delete:   deleteConfiguration,
+		Create:   createAuditConfiguration,
+		Read:     readAuditConfiguration,
+		Update:   updateAuditConfiguration,
+		Delete:   deleteAuditConfiguration,
 		Schema: map[string]*schema.Schema{
 			// Required
 			"compartment_id": {
@@ -35,51 +35,51 @@ func ConfigurationResource() *schema.Resource {
 	}
 }
 
-func createConfiguration(d *schema.ResourceData, m interface{}) error {
-	sync := &ConfigurationResourceCrud{}
+func createAuditConfiguration(d *schema.ResourceData, m interface{}) error {
+	sync := &AuditConfigurationResourceCrud{}
 	sync.D = d
 	sync.Client = m.(*OracleClients).auditClient
 
 	return CreateResource(d, sync)
 }
 
-func readConfiguration(d *schema.ResourceData, m interface{}) error {
-	sync := &ConfigurationResourceCrud{}
+func readAuditConfiguration(d *schema.ResourceData, m interface{}) error {
+	sync := &AuditConfigurationResourceCrud{}
 	sync.D = d
 	sync.Client = m.(*OracleClients).auditClient
 
 	return ReadResource(sync)
 }
 
-func updateConfiguration(d *schema.ResourceData, m interface{}) error {
-	sync := &ConfigurationResourceCrud{}
+func updateAuditConfiguration(d *schema.ResourceData, m interface{}) error {
+	sync := &AuditConfigurationResourceCrud{}
 	sync.D = d
 	sync.Client = m.(*OracleClients).auditClient
 
 	return UpdateResource(d, sync)
 }
 
-func deleteConfiguration(d *schema.ResourceData, m interface{}) error {
+func deleteAuditConfiguration(d *schema.ResourceData, m interface{}) error {
 	return nil
 }
 
-type ConfigurationResourceCrud struct {
+type AuditConfigurationResourceCrud struct {
 	BaseCrud
 	Client                 *oci_audit.AuditClient
 	Res                    *oci_audit.Configuration
 	DisableNotFoundRetries bool
 }
 
-func (s *ConfigurationResourceCrud) ID() string {
+func (s *AuditConfigurationResourceCrud) ID() string {
 	return s.D.Get("compartment_id").(string)
 }
 
-func (s *ConfigurationResourceCrud) Create() error {
+func (s *AuditConfigurationResourceCrud) Create() error {
 	// This resource can't actually be created. So treat it as an update instead.
 	return s.Update()
 }
 
-func (s *ConfigurationResourceCrud) Get() error {
+func (s *AuditConfigurationResourceCrud) Get() error {
 	request := oci_audit.GetConfigurationRequest{}
 
 	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
@@ -98,7 +98,7 @@ func (s *ConfigurationResourceCrud) Get() error {
 	return nil
 }
 
-func (s *ConfigurationResourceCrud) Update() error {
+func (s *AuditConfigurationResourceCrud) Update() error {
 	request := oci_audit.UpdateConfigurationRequest{}
 
 	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
@@ -128,7 +128,7 @@ func (s *ConfigurationResourceCrud) Update() error {
 	return WaitForResourceCondition(s, retentionPolicyFunc, s.D.Timeout(schema.TimeoutUpdate))
 }
 
-func (s *ConfigurationResourceCrud) SetData() error {
+func (s *AuditConfigurationResourceCrud) SetData() error {
 	if s.Res.RetentionPeriodDays != nil {
 		s.D.Set("retention_period_days", *s.Res.RetentionPeriodDays)
 	}

oci/containerengine_cluster_kube_config_data_source.go

@@ -11,9 +11,9 @@ import (
 	"io/ioutil"
 )
 
-func ClusterKubeConfigDataSource() *schema.Resource {
+func ContainerengineClusterKubeConfigDataSource() *schema.Resource {
 	return &schema.Resource{
-		Read: readSingularClusterKubeConfig,
+		Read: readSingularContainerengineClusterKubeConfig,
 		Schema: map[string]*schema.Schema{
 			"cluster_id": {
 				Type:     schema.TypeString,
@@ -37,25 +37,25 @@ func ClusterKubeConfigDataSource() *schema.Resource {
 	}
 }
 
-func readSingularClusterKubeConfig(d *schema.ResourceData, m interface{}) error {
-	sync := &ClusterKubeConfigDataSourceCrud{}
+func readSingularContainerengineClusterKubeConfig(d *schema.ResourceData, m interface{}) error {
+	sync := &ContainerengineClusterKubeConfigDataSourceCrud{}
 	sync.D = d
 	sync.Client = m.(*OracleClients).containerEngineClient
 
 	return ReadResource(sync)
 }
 
-type ClusterKubeConfigDataSourceCrud struct {
+type ContainerengineClusterKubeConfigDataSourceCrud struct {
 	D      *schema.ResourceData
 	Client *oci_containerengine.ContainerEngineClient
 	Res    *[]byte
 }
 
-func (s *ClusterKubeConfigDataSourceCrud) VoidState() {
+func (s *ContainerengineClusterKubeConfigDataSourceCrud) VoidState() {
 	s.D.SetId("")
 }
 
-func (s *ClusterKubeConfigDataSourceCrud) Get() error {
+func (s *ContainerengineClusterKubeConfigDataSourceCrud) Get() error {
 	request := oci_containerengine.CreateKubeconfigRequest{}
 
 	if clusterId, ok := s.D.GetOkExists("cluster_id"); ok {
@@ -92,7 +92,7 @@ func (s *ClusterKubeConfigDataSourceCrud) Get() error {
 	return nil
 }
 
-func (s *ClusterKubeConfigDataSourceCrud) SetData() error {
+func (s *ContainerengineClusterKubeConfigDataSourceCrud) SetData() error {
 	if s.Res == nil {
 		return nil
 	}

oci/containerengine_cluster_option_data_source.go

@@ -9,9 +9,9 @@ import (
 	oci_containerengine "github.com/oracle/oci-go-sdk/containerengine"
 )
 
-func ClusterOptionDataSource() *schema.Resource {
+func ContainerengineClusterOptionDataSource() *schema.Resource {
 	return &schema.Resource{
-		Read: readSingularClusterOption,
+		Read: readSingularContainerengineClusterOption,
 		Schema: map[string]*schema.Schema{
 			"cluster_option_id": {
 				Type:     schema.TypeString,
@@ -29,25 +29,25 @@ func ClusterOptionDataSource() *schema.Resource {
 	}
 }
 
-func readSingularClusterOption(d *schema.ResourceData, m interface{}) error {
-	sync := &ClusterOptionDataSourceCrud{}
+func readSingularContainerengineClusterOption(d *schema.ResourceData, m interface{}) error {
+	sync := &ContainerengineClusterOptionDataSourceCrud{}
 	sync.D = d
 	sync.Client = m.(*OracleClients).containerEngineClient
 
 	return ReadResource(sync)
 }
 
-type ClusterOptionDataSourceCrud struct {
+type ContainerengineClusterOptionDataSourceCrud struct {
 	D      *schema.ResourceData
 	Client *oci_containerengine.ContainerEngineClient
 	Res    *oci_containerengine.GetClusterOptionsResponse
 }
 
-func (s *ClusterOptionDataSourceCrud) VoidState() {
+func (s *ContainerengineClusterOptionDataSourceCrud) VoidState() {
 	s.D.SetId("")
 }
 
-func (s *ClusterOptionDataSourceCrud) Get() error {
+func (s *ContainerengineClusterOptionDataSourceCrud) Get() error {
 	request := oci_containerengine.GetClusterOptionsRequest{}
 
 	if clusterOptionId, ok := s.D.GetOkExists("cluster_option_id"); ok {
@@ -66,7 +66,7 @@ func (s *ClusterOptionDataSourceCrud) Get() error {
 	return nil
 }
 
-func (s *ClusterOptionDataSourceCrud) SetData() error {
+func (s *ContainerengineClusterOptionDataSourceCrud) SetData() error {
 	if s.Res == nil {
 		return nil
 	}