aherman
/
terraform
mirror of https://github.com/hashicorp/terraform
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move helper/logging to internal

Browse Source 
remove a dead code file too
pull/26632/head
James Bardin 5 years ago
parent 5e047b0a0b
commit 6ca477f042
24 changed files with 18 additions and 88 deletions
Show Stats Download Patch File Download Diff File

2
backend/local/local_test.go
Unescape View File

@ -7,7 +7,7 @@ import (
"os"
"testing"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/internal/logging"
)
func TestMain(m *testing.M) {

2
backend/remote-state/azure/sender.go
Unescape View File

@ -6,7 +6,7 @@ import (
"net/http/httputil"
"github.com/Azure/go-autorest/autorest"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/internal/logging"
)
func buildSender() autorest.Sender {

2
backend/remote-state/inmem/backend_test.go
Unescape View File

@ -10,7 +10,7 @@ import (
"github.com/hashicorp/hcl/v2"
"github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/internal/logging"
statespkg "github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/states/remote"
)

2
backend/remote-state/s3/backend.go
Unescape View File

@ -12,8 +12,8 @@ import (
"github.com/aws/aws-sdk-go/service/s3"
awsbase "github.com/hashicorp/aws-sdk-go-base"
"github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/internal/logging"
"github.com/hashicorp/terraform/version"
)

2
backend/remote/remote_test.go
Unescape View File

@ -7,7 +7,7 @@ import (
"os"
"testing"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/internal/logging"
)
func TestMain(m *testing.M) {

2
command/command_test.go
Unescape View File

@ -29,8 +29,8 @@ import (
"github.com/hashicorp/terraform/configs"
"github.com/hashicorp/terraform/configs/configload"
"github.com/hashicorp/terraform/configs/configschema"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/internal/copy"
"github.com/hashicorp/terraform/internal/logging"
"github.com/hashicorp/terraform/plans"
"github.com/hashicorp/terraform/plans/planfile"
"github.com/hashicorp/terraform/providers"

2
dag/dag_test.go
Unescape View File

@ -14,7 +14,7 @@ import (
"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/internal/logging"
)
func TestMain(m *testing.M) {

70
helper/logging/transport.go
Unescape View File

@ -1,70 +0,0 @@
package logging
import (
"bytes"
"encoding/json"
"log"
"net/http"
"net/http/httputil"
"strings"
)
type transport struct {
name string
transport http.RoundTripper
}
func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
if IsDebugOrHigher() {
reqData, err := httputil.DumpRequestOut(req, true)
if err == nil {
log.Printf("[DEBUG] "+logReqMsg, t.name, prettyPrintJsonLines(reqData))
} else {
log.Printf("[ERROR] %s API Request error: %#v", t.name, err)
}
}
resp, err := t.transport.RoundTrip(req)
if err != nil {
return resp, err
}
if IsDebugOrHigher() {
respData, err := httputil.DumpResponse(resp, true)
if err == nil {
log.Printf("[DEBUG] "+logRespMsg, t.name, prettyPrintJsonLines(respData))
} else {
log.Printf("[ERROR] %s API Response error: %#v", t.name, err)
}
}
return resp, nil
}
func NewTransport(name string, t http.RoundTripper) *transport {
return &transport{name, t}
}
// prettyPrintJsonLines iterates through a []byte line-by-line,
// transforming any lines that are complete json into pretty-printed json.
func prettyPrintJsonLines(b []byte) string {
parts := strings.Split(string(b), "\n")
for i, p := range parts {
if b := []byte(p); json.Valid(b) {
var out bytes.Buffer
json.Indent(&out, b, "", " ")
parts[i] = out.String()
}
}
return strings.Join(parts, "\n")
}
const logReqMsg = `%s API Request Details:
---[ REQUEST ]---------------------------------------
%s
-----------------------------------------------------`
const logRespMsg = `%s API Response Details:
---[ RESPONSE ]--------------------------------------
%s
-----------------------------------------------------`

2
helper/resource/testing.go
Unescape View File

@ -24,8 +24,8 @@ import (
"github.com/hashicorp/terraform/command/format"
"github.com/hashicorp/terraform/configs"
"github.com/hashicorp/terraform/configs/configload"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/internal/logging"
"github.com/hashicorp/terraform/providers"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/terraform"

2
internal/getproviders/http_mirror_source.go
Unescape View File

@ -18,8 +18,8 @@ import (
"golang.org/x/net/idna"
"github.com/hashicorp/terraform/addrs"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/httpclient"
"github.com/hashicorp/terraform/internal/logging"
"github.com/hashicorp/terraform/version"
)

2
internal/getproviders/registry_client.go
Unescape View File

@ -21,8 +21,8 @@ import (
svcauth "github.com/hashicorp/terraform-svchost/auth"
"github.com/hashicorp/terraform/addrs"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/httpclient"
"github.com/hashicorp/terraform/internal/logging"
"github.com/hashicorp/terraform/version"
)

2
internal/initwd/module_install_test.go
Unescape View File

@ -14,8 +14,8 @@ import (
version "github.com/hashicorp/go-version"
"github.com/hashicorp/terraform/configs"
"github.com/hashicorp/terraform/configs/configload"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/internal/copy"
"github.com/hashicorp/terraform/internal/logging"
"github.com/hashicorp/terraform/registry"
"github.com/hashicorp/terraform/tfdiags"
)

0
helper/logging/indent.go → internal/logging/indent.go
Unescape View File

0
helper/logging/indent_test.go → internal/logging/indent_test.go
Unescape View File

0
helper/logging/level.go → internal/logging/level.go
Unescape View File

0
helper/logging/level_test.go → internal/logging/level_test.go
Unescape View File

0
helper/logging/logging.go → internal/logging/logging.go
Unescape View File

2
main.go
Unescape View File

@ -18,8 +18,8 @@ import (
"github.com/hashicorp/terraform/addrs"
"github.com/hashicorp/terraform/command/cliconfig"
"github.com/hashicorp/terraform/command/format"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/httpclient"
"github.com/hashicorp/terraform/internal/logging"
"github.com/hashicorp/terraform/version"
"github.com/mattn/go-colorable"
"github.com/mattn/go-shellwords"

2
registry/client.go
Unescape View File

@ -16,8 +16,8 @@ import (
"github.com/hashicorp/go-retryablehttp"
svchost "github.com/hashicorp/terraform-svchost"
"github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/httpclient"
"github.com/hashicorp/terraform/internal/logging"
"github.com/hashicorp/terraform/registry/regsrc"
"github.com/hashicorp/terraform/registry/response"
"github.com/hashicorp/terraform/version"

2
repl/session_test.go
Unescape View File

@ -12,8 +12,8 @@ import (
"github.com/hashicorp/terraform/addrs"
"github.com/hashicorp/terraform/configs/configschema"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/internal/logging"
"github.com/hashicorp/terraform/providers"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/terraform"

2
states/statemgr/statemgr_test.go
Unescape View File

@ -10,7 +10,7 @@ import (
"testing"
"time"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/internal/logging"
)
func TestNewLockInfo(t *testing.T) {

2
terraform/graph_builder.go
Unescape View File

@ -6,7 +6,7 @@ import (
"strings"
"github.com/hashicorp/terraform/addrs"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/internal/logging"
"github.com/hashicorp/terraform/tfdiags"
)

2
terraform/terraform_test.go
Unescape View File

@ -19,8 +19,8 @@ import (
"github.com/hashicorp/terraform/configs"
"github.com/hashicorp/terraform/configs/configload"
"github.com/hashicorp/terraform/helper/experiment"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/internal/logging"
"github.com/hashicorp/terraform/plans"
"github.com/hashicorp/terraform/providers"
"github.com/hashicorp/terraform/provisioners"

2
terraform/transform.go
Unescape View File

@ -4,7 +4,7 @@ import (
"log"
"github.com/hashicorp/terraform/dag"
"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/internal/logging"
)
// GraphTransformer is the interface that transformers implement. This

Write Preview
Loading…
Cancel
Save