Release 3.23.0

Release 3.23.0

Author: dshelbyo

.gitattributes

@@ -0,0 +1,3 @@
+vendor/github.com/oracle/oci-go-sdk/**/* merge=ours
+vendor/vendor.json merge=ours
+vendor/github.com/oracle/oci-go-sdk/* merge=ours

.gitignore

@@ -23,3 +23,5 @@ debug.test
 docs/solutions/rhel74_image/ipxe.sh
 vendor/github.com/oracle/oci-go-sdk/target
 *.test
+.gitmodules
+oci/record

CHANGELOG.md

@@ -1,4 +1,11 @@
-## 3.22.1 (Unreleased)
+## 3.23.0 (Unreleased)
+
+### Added
+- Support for updating `license_model` for `oci_autonomous_database` resource
+- Support for updating `static_routes` and new `cpe_local_identifier` in `oci_core_ipsec` resource for improved VPN service usability
+- Support for updating `whitelisted_ips` in `autonomous_database`. Note: Cannot be used during creation.
+- Support tagging for Dynamic Groups in Identity 
+
 ## 3.22.0 (April 10, 2019)
 
 ### Added

GNUmakefile

@@ -8,6 +8,7 @@ WEBSITE_REPO=github.com/hashicorp/terraform-website
 prefix := $(if $(debug),TF_LOG=DEBUG OCI_GO_SDK_DEBUG=v, )
 timeout := $(if $(timeout), $(timeout), 120m)
 run_regex := $(if $(run), -run $(run), )
+test_tags := $(if $(tags), -tags $(tags), )
 skip_goimports_check_flag := $(if $(skip_goimports_check), -s, )
 
 default: build
@@ -24,7 +25,7 @@ sweep: fmtcheck
 	TF_ACC=1 $(prefix) go test $(TEST) -v -run TestMain -sweep=$(sweep) -sweep-run=$(sweep-run) -timeout $(timeout)
 
 testacc: fmtcheck
-	TF_ACC=1 $(prefix) go test $(TEST) -v $(TESTARGS) $(run_regex) -timeout $(timeout)
+	TF_ACC=1 $(prefix) go test $(TEST) -v $(TESTARGS) $(run_regex) $(test_tags) -timeout $(timeout)
 
 vet:
 	@echo "go vet ."

examples/compute/windows/userdata/setup.ps1

@@ -14,6 +14,5 @@ Connect-IscsiTarget -NodeAddress $iqn -TargetPortalAddress $ipv4 -IsPersistent $
 Write-Output 'Configured ISCSI for Block Volumes'
 
 Write-Output 'Configuring the new disk for a partition and file system'
-# By default the disk is initialized, if it is not, you can add this command before partitioning: Initialize-Disk -PartitionStyle MBR -PassThru
-Get-Disk -Number 1 | New-Partition -AssignDriveLetter -UseMaximumSize | Format-Volume -FileSystem NTFS -NewFileSystemLabel "tfdisk" -Confirm:$false
+Get-Disk -Number 1 | Initialize-Disk -PartitionStyle MBR -PassThru | New-Partition -AssignDriveLetter -UseMaximumSize | Format-Volume -FileSystem NTFS -NewFileSystemLabel "tfdisk" -Confirm:$false
 Write-Output 'Configured the new disk'

examples/compute/windows/variables.tf

@@ -52,14 +52,13 @@ variable instance_image_ocid {
   type = "map"
 
   default = {
-    # Images released after June 2018 have cloudbase-init and winrm enabled by default, refer to the release notes - https://docs.cloud.oracle.com/iaas/images/
-    # The below Image OCIDs are for Windows-Server-2012-R2-Standard-Edition-VM-Gen2-2018.12.12-0
-    # See https://docs.cloud.oracle.com/iaas/images/image/5e34cde5-6cef-4cc3-b8f1-c8fc3a088302/
-    us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaarlo3ace3wq34aompwj3u2z2xteonboapg663woz6d2iovarowhja"
-
-    us-ashburn-1   = "ocid1.image.oc1.iad.aaaaaaaabzwak2haqxh3r7h6dajgu4enp7q7hcrreql45awryd5frjsd5l6a"
-    eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaaourcjktoe3gprvwfksxc36r4rxgbcjs5qvtrja6w6euivci635vq"
-    uk-london-1    = "ocid1.image.oc1.uk-london-1.aaaaaaaadb4mg7ii73wkrntmiunr7x7qrh7ompczvy3xbggm27pkhotpgj2q"
+    # Images released in and after July 2018 have cloudbase-init and winrm enabled by default, refer to the release notes - https://docs.cloud.oracle.com/iaas/images/
+    # Image OCIDs for Windows-Server-2012-R2-Standard-Edition-VM-Gen2-2018.10.12-0 - https://docs.cloud.oracle.com/iaas/images/image/80b70ffd-5efc-479e-872c-d1bf6bcbefbd/
+    eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaat5km25plmetj6gtnhrr5xprmv7boe25q2vrzwhbgno5yh2owybja"
+
+    us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaaxgzzrdoge7zxrjtmjqjhicaxsujljvaju3mbwryo5x5k5axlmsza"
+    uk-london-1  = "ocid1.image.oc1.uk-london-1.aaaaaaaaedntd3p6jed5d2p7gsohfu6x3k67s364amtzb5vwfzrvfzt2rrlq"
+    us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaaskz7sq3mlmiwazehuqzoxdq4xz7sinrwn5m6kedxz3td2c7it2vq"
   }
 }
 

examples/identity/group.tf

@@ -32,11 +32,26 @@ output "groups" {
 /*
  * Some more directives to show dynamic groups and policy for it
  */
+
+variable "dynamic_group_defined_tags_value" {
+  default = "value"
+}
+
+variable "dynamic_group_freeform_tags" {
+  default = {
+    "Department" = "Finance"
+  }
+}
+
 resource "oci_identity_dynamic_group" "dynamic-group-1" {
   compartment_id = "${var.tenancy_ocid}"
   name           = "tf-example-dynamic-group"
   description    = "dynamic group created by terraform"
   matching_rule  = "instance.compartment.id = ${data.oci_identity_compartments.compartments1.compartments.0.id}"
+
+  #Optional
+  defined_tags  = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.dynamic_group_defined_tags_value}")}"
+  freeform_tags = "${var.dynamic_group_freeform_tags}"
 }
 
 data "oci_identity_dynamic_groups" "dynamic-groups-1" {

httpreplay/README.md

@@ -0,0 +1,117 @@
+**HTTP Replay**
+=====
+
+Synopsis
+-----
+
+```
+	// install the hook for HTTP replaying:
+	
+		if h, ok := client.HTTPClient.(*http.Client); ok {
+			_, err := httpreplay.InstallRecorder(h)
+			if err != nil {
+				return err
+			}
+		}
+
+func TestMyServiceResource_basic(t *testing.T) {
+    // In a unit test, tell the recorder what test we are running
+    httpreplay.SetScenario("TestMyServiceResource_basic")
+    defer httpreplay.SaveScenario()
+    ... testing happens ...
+}
+```
+
+Description
+-----
+
+This library provides a recording mechanism for the OCI-GO-SDK. It hooks into
+the 'Transport' layer of the HTTP request, calling through to the real
+network as needed.
+
+* bypass (default): Do nothing
+* record: Store the Interaction
+* replay: Load the Interaction file and send back the response
+        
+Select the record or replay mode by specifying a build tag to go: `-tags <mode>`
+
+
+Functions
+-----
+
+InstallRecorder
+* Install hooks into the `http.Client` to allow the record/replay library to 
+  intercept HTTP calls.  `InstallRecorder` tries to be safe if called multiple
+  times, but it is possible to fool it.  Best is to only call it once per 
+  `http.Client`.
+
+SetScenario
+* Name the scenario that is about to run.  
+
+  Currently, this specifies 
+  the filename that the scenario data will be saved into, 
+  with a `.yaml` extension.  
+  - If `-tags record` is specified, the 
+  requests are written to this file in the `SaveScenario` call. The Interaction file
+   will be stored in directory  `~<prj_path>/record/` with the name passed into. 
+   - If `-tags replay` is specified, then a file by that name is immediately 
+  read and used for generating replies to network requests.
+
+SaveScenario
+* Save the scenario data.
+
+  Currently, if `-tags record` is specified, this writes all the 
+  recorded requests to the file named in `SetScenario`.
+  
+
+Record Storage 
+-----
+   
+* In record mode: After running the test case, the record file will be stored under "oci/record/".
+* In replay mode: Look for the record file under "oci/record/" and throw error if it is not found.
+
+
+Example usage 
+-----
+* To run normally: `go test`
+* Or run 1 specific test case: `go test -run <testname>`
+----
+* To record interactions: `go test -tags record`
+* Or to record 1 specific test case: `go test -run <testname> -tags record`
+----
+* To replay interactions: `go test -tags replay`
+* Or to replay 1 specific test case: `go test -run <testname> -tags replay`
+
+### Example Output
+
+Run with recording turned on, the test portion takes 2411 seconds:
+    
+    > go test -v -timeout 120m -run TestResourceCoreImageTestSuite -tags record
+    === RUN   TestResourceCoreImageTestSuite
+    === RUN   TestResourceCoreImageTestSuite/TestAccResourceCoreImage_basic
+    === RUN   TestResourceCoreImageTestSuite/TestAccResourceCoreImage_createFromExport_objectStorageTuple
+    === RUN   TestResourceCoreImageTestSuite/TestAccResourceCoreImage_createFromExport_objectStorageUri
+    --- PASS: TestResourceCoreImageTestSuite (2411.14s)
+        --- PASS: TestResourceCoreImageTestSuite/TestAccResourceCoreImage_basic (2410.58s)
+        --- SKIP: TestResourceCoreImageTestSuite/TestAccResourceCoreImage_createFromExport_objectStorageTuple (0.00s)
+            core_image_resource_test.go:191: Long running test, requires per tenancy namespace + bucket + image export object to run
+        --- SKIP: TestResourceCoreImageTestSuite/TestAccResourceCoreImage_createFromExport_objectStorageUri (0.00s)
+            core_image_resource_test.go:155: Long running test, requires exported image available via public url
+    PASS
+
+
+Now that we have a recording, run in replay mode, note that it is only 4.09 seconds:
+
+    > go test -v -run TestResourceCoreImageTestSuite -tags replay
+    === RUN   TestResourceCoreImageTestSuite
+    === RUN   TestResourceCoreImageTestSuite/TestAccResourceCoreImage_basic
+    === RUN   TestResourceCoreImageTestSuite/TestAccResourceCoreImage_createFromExport_objectStorageTuple
+    === RUN   TestResourceCoreImageTestSuite/TestAccResourceCoreImage_createFromExport_objectStorageUri
+    --- PASS: TestResourceCoreImageTestSuite (4.09s)
+        --- PASS: TestResourceCoreImageTestSuite/TestAccResourceCoreImage_basic (3.60s)
+        --- SKIP: TestResourceCoreImageTestSuite/TestAccResourceCoreImage_createFromExport_objectStorageTuple (0.00s)
+            core_image_resource_test.go:191: Long running test, requires per tenancy namespace + bucket + image export object to run
+        --- SKIP: TestResourceCoreImageTestSuite/TestAccResourceCoreImage_createFromExport_objectStorageUri (0.00s)
+            core_image_resource_test.go:155: Long running test, requires exported image available via public url
+    PASS
+

httpreplay/bypassing.go

@@ -0,0 +1,31 @@
+// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+
+// +build !record
+// +build !replay
+
+package httpreplay
+
+import (
+	"net/http"
+)
+
+// InstallRecorder does no-op.
+func InstallRecorder(client *http.Client) (HTTPRecordingClient, error) {
+	return client, nil
+}
+
+// SetScenario lets the recorder know which test is currently executing
+func SetScenario(name string) error {
+	debugLogf("Not recording. %s", name)
+	return nil
+}
+
+// SaveScenario saves the recorded service calls for the current scenario
+func SaveScenario() error {
+	return nil
+}
+
+// ShouldRetryImmediately returns true if replaying
+func ShouldRetryImmediately() bool {
+	return false
+}

httpreplay/common.go

@@ -0,0 +1,91 @@
+// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+
+package httpreplay
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+	"os"
+	"path/filepath"
+
+	yaml "gopkg.in/yaml.v2"
+)
+
+func init() {
+	SetDebugLogger(DefaultLogger())
+}
+
+// HTTPRecordingClient wraps the execution of a http request, adding record/replay functionality.  It is meant to be compatible with oci-go-sdk's client.HTTPRequestDispatcher interface.
+type HTTPRecordingClient interface {
+	Do(req *http.Request) (*http.Response, error)
+}
+
+var currentLogger *log.Logger
+
+// DebugLogf logs a formatted string to stderr.  It should be considered temporary, and in a release version either removed or replaced with a passed-in logging interface.
+func debugLogf(format string, v ...interface{}) {
+	if currentLogger != nil {
+		err := currentLogger.Output(2, fmt.Sprintf(format, v...))
+		if err != nil {
+			log.Println("[WARN] Failed to write to current logger")
+		}
+	}
+}
+
+func SetDebugLogger(logger *log.Logger) {
+	currentLogger = logger
+}
+
+func DefaultLogger() *log.Logger {
+	return log.New(os.Stderr, "", log.Ldate|log.Ltime|log.Lshortfile)
+}
+
+func saveOrLog(d interface{}, fn string) {
+	if err := save(d, fn); err != nil {
+		debugLogf("Error: %v", err)
+	}
+}
+
+// Save writes some data on disk for future re-use
+func save(d interface{}, fn string) error {
+	// Create directory for scenario if missing
+	scenarioDir := filepath.Dir(fn)
+	if _, err := os.Stat(scenarioDir); os.IsNotExist(err) {
+		if err = os.MkdirAll(scenarioDir, 0755); err != nil {
+			return err
+		}
+	}
+
+	// Marshal to YAML and save interactions
+	data, err := yaml.Marshal(d)
+	if err != nil {
+		return err
+	}
+
+	f, err := os.Create(fn)
+	if err != nil {
+		return err
+	}
+
+	defer func(f *os.File) {
+		err := f.Close()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}(f)
+
+	// Honor the YAML structure specification
+	// http://www.yaml.org/spec/1.2/spec.html#id2760395
+	_, err = f.Write([]byte("---\n"))
+	if err != nil {
+		return err
+	}
+
+	_, err = f.Write(data)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}