iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move custom http client creation with env proxy args into same package as other network related helpers

This commit is contained in:
Megan Marsh 2020-11-04 14:50:34 -08:00
parent 7b57e28600
commit 45b5f0c2ee
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/qemu/step_set_iso.go
View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"net/http" "net/http"
commonhelper "github.com/hashicorp/packer/helper/common" "github.com/hashicorp/packer/common/net"
"github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/helper/multistep"
"github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer"
) )
@ -29,7 +29,7 @@ func (s *stepSetISO) Run(ctx context.Context, state multistep.StateBag) multiste
req.Header.Set("User-Agent", "Packer") req.Header.Set("User-Agent", "Packer")
httpClient := commonhelper.HttpClientWithEnvironmentProxy() httpClient := net.HttpClientWithEnvironmentProxy()
res, err := httpClient.Do(req) res, err := httpClient.Do(req)
if err == nil && (res.StatusCode >= 200 && res.StatusCode < 300) { if err == nil && (res.StatusCode >= 200 && res.StatusCode < 300) {

2
helper/common/default_client.go → common/net/default_client.go
View File

@ -1,4 +1,4 @@
package common package net
import ( import (
"net/http" "net/http"

4
post-processor/vagrant-cloud/client.go
View File

@ -11,7 +11,7 @@ import (
"os" "os"
"strings" "strings"
commonhelper "github.com/hashicorp/packer/helper/common" "github.com/hashicorp/packer/common/net"
) )
type VagrantCloudClient struct { type VagrantCloudClient struct {
@ -48,7 +48,7 @@ func (v VagrantCloudErrors) FormatErrors() string {
func (v VagrantCloudClient) New(baseUrl string, token string, InsecureSkipTLSVerify bool) (*VagrantCloudClient, error) { func (v VagrantCloudClient) New(baseUrl string, token string, InsecureSkipTLSVerify bool) (*VagrantCloudClient, error) {
c := &VagrantCloudClient{ c := &VagrantCloudClient{
client: commonhelper.HttpClientWithEnvironmentProxy(), client: net.HttpClientWithEnvironmentProxy(),
BaseURL: baseUrl, BaseURL: baseUrl,
AccessToken: token, AccessToken: token,
} }