From 3433850c9c92efe3a8b575e7cc33c4bd5e0987c3 Mon Sep 17 00:00:00 2001
From: Jake Champlin <jake.champlin.27@gmail.com>
Date: Thu, 6 Apr 2017 13:59:16 -0400
Subject: [PATCH 1/2] provider/opc: Add debug logging

Adds debug logging, fixes a failing instance acceptance test, and updates vendored dep
---
 builtin/providers/opc/config.go               | 24 +++++++++++++++++--
 builtin/providers/opc/provider.go             |  1 +
 .../providers/opc/resource_instance_test.go   |  2 +-
 .../go-oracle-terraform/compute/client.go     |  2 ++
 .../go-oracle-terraform/compute/logging.go    |  2 +-
 .../compute/storage_volumes.go                |  1 +
 vendor/vendor.json                            |  6 ++---
 7 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/builtin/providers/opc/config.go b/builtin/providers/opc/config.go
index 5c473e591..b25167fe9 100644
--- a/builtin/providers/opc/config.go
+++ b/builtin/providers/opc/config.go
@@ -2,11 +2,14 @@ package opc
 
 import (
 	"fmt"
-	"net/http"
+	"log"
 	"net/url"
+	"strings"
 
+	"github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/go-oracle-terraform/compute"
 	"github.com/hashicorp/go-oracle-terraform/opc"
+	"github.com/hashicorp/terraform/helper/logging"
 )
 
 type Config struct {
@@ -33,9 +36,26 @@ func (c *Config) Client() (*compute.Client, error) {
 		Username:       &c.User,
 		Password:       &c.Password,
 		APIEndpoint:    u,
-		HTTPClient:     http.DefaultClient,
+		HTTPClient:     cleanhttp.DefaultClient(),
+	}
+
+	if logging.IsDebugOrHigher() {
+		config.LogLevel = opc.LogDebug
+		config.Logger = opcLogger{}
 	}
 
 	// TODO: http client wrapping / log level
 	return compute.NewComputeClient(&config)
 }
+
+type opcLogger struct{}
+
+func (l opcLogger) Log(args ...interface{}) {
+	tokens := make([]string, 0, len(args))
+	for _, arg := range args {
+		if token, ok := arg.(string); ok {
+			tokens = append(tokens, token)
+		}
+	}
+	log.Printf("[DEBUG] [go-oracle-terraform]: %s", strings.Join(tokens, " "))
+}
diff --git a/builtin/providers/opc/provider.go b/builtin/providers/opc/provider.go
index 579d5ac7b..ddde50d5a 100644
--- a/builtin/providers/opc/provider.go
+++ b/builtin/providers/opc/provider.go
@@ -36,6 +36,7 @@ func Provider() terraform.ResourceProvider {
 				Description: "The HTTP endpoint for OPC API operations.",
 			},
 
+			// TODO Actually implement this
 			"max_retry_timeout": {
 				Type:        schema.TypeInt,
 				Optional:    true,
diff --git a/builtin/providers/opc/resource_instance_test.go b/builtin/providers/opc/resource_instance_test.go
index 3c4e0ffe6..2cc61eb39 100644
--- a/builtin/providers/opc/resource_instance_test.go
+++ b/builtin/providers/opc/resource_instance_test.go
@@ -188,7 +188,7 @@ resource "opc_compute_instance" "test" {
 	image_list = "/oracle/public/oel_6.7_apaas_16.4.5_1610211300"
 	instance_attributes = <<JSON
 {
-  "foo" = "bar"
+  "foo": "bar"
 }
 JSON
 }`, rInt)
diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/compute/client.go b/vendor/github.com/hashicorp/go-oracle-terraform/compute/client.go
index 015b87acd..5b2ee0473 100644
--- a/vendor/github.com/hashicorp/go-oracle-terraform/compute/client.go
+++ b/vendor/github.com/hashicorp/go-oracle-terraform/compute/client.go
@@ -44,6 +44,8 @@ func NewComputeClient(c *opc.Config) (*Client, error) {
 	// Setup logger; defaults to stdout
 	if c.Logger == nil {
 		client.logger = opc.NewDefaultLogger()
+	} else {
+		client.logger = c.Logger
 	}
 
 	// If LogLevel was not set to something different,
diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/compute/logging.go b/vendor/github.com/hashicorp/go-oracle-terraform/compute/logging.go
index 8fde2e5f5..5ce8ac23b 100644
--- a/vendor/github.com/hashicorp/go-oracle-terraform/compute/logging.go
+++ b/vendor/github.com/hashicorp/go-oracle-terraform/compute/logging.go
@@ -13,7 +13,7 @@ func (c *Client) debugLogString(str string) {
 	if c.loglevel != opc.LogDebug {
 		return
 	}
-	c.logger.Log(fmt.Sprintf("[DEBUG]: %s", str))
+	c.logger.Log(str)
 }
 
 func (c *Client) debugLogReq(req *http.Request) {
diff --git a/vendor/github.com/hashicorp/go-oracle-terraform/compute/storage_volumes.go b/vendor/github.com/hashicorp/go-oracle-terraform/compute/storage_volumes.go
index 7193a6c24..5ca9b70c7 100644
--- a/vendor/github.com/hashicorp/go-oracle-terraform/compute/storage_volumes.go
+++ b/vendor/github.com/hashicorp/go-oracle-terraform/compute/storage_volumes.go
@@ -187,6 +187,7 @@ type GetStorageVolumeInput struct {
 }
 
 func (c *StorageVolumeClient) success(result *StorageVolumeInfo) (*StorageVolumeInfo, error) {
+	c.unqualify(&result.ImageList)
 	c.unqualify(&result.Name)
 	c.unqualify(&result.Snapshot)
 
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 0f8bd50ef..71ab6e7e7 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -1970,10 +1970,10 @@
 			"revision": "d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5"
 		},
 		{
-			"checksumSHA1": "mVLpbxsm+8TlXKgkezrh3c5I7+4=",
+			"checksumSHA1": "QmBTE/boTriUYw0meIg7xOXo6ns=",
 			"path": "github.com/hashicorp/go-oracle-terraform/compute",
-			"revision": "381402af3554bcca5fa7eeda94d47003e6ba7ee7",
-			"revisionTime": "2017-04-06T04:33:22Z"
+			"revision": "5508daed82ecd55b71d45e8a149e99d24825e5bb",
+			"revisionTime": "2017-04-06T17:51:51Z"
 		},
 		{
 			"checksumSHA1": "DzK7lYwHt5Isq5Zf73cnQqBO2LI=",

From e620a0de0d584e746cb663096406e3f6630fb48b Mon Sep 17 00:00:00 2001
From: Jake Champlin <jake.champlin.27@gmail.com>
Date: Thu, 6 Apr 2017 14:22:32 -0400
Subject: [PATCH 2/2] remove defunct todo item

---
 builtin/providers/opc/config.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/builtin/providers/opc/config.go b/builtin/providers/opc/config.go
index b25167fe9..eb4b9612d 100644
--- a/builtin/providers/opc/config.go
+++ b/builtin/providers/opc/config.go
@@ -44,7 +44,6 @@ func (c *Config) Client() (*compute.Client, error) {
 		config.Logger = opcLogger{}
 	}
 
-	// TODO: http client wrapping / log level
 	return compute.NewComputeClient(&config)
 }