fix: uaa access

pivotal-cf · Aug 4, 2023 · 37e2235 · 37e2235
1 parent 00f83c9
commit 37e2235
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/go.sum b/go.sum
@@ -154,16 +154,12 @@ github.com/cloudfoundry/bosh-gcscli v0.0.6/go.mod h1:bsE5hLIzG74rkZNp+LozbIZrBeV
 github.com/cloudfoundry/bosh-s3cli v0.0.95/go.mod h1:9qqPbgWJ4aXpo5It8RGpafc7S3/v+T//HLRjynVD4/8=
 github.com/cloudfoundry/bosh-utils v0.0.0-20201031100303-c96f4f0a552e/go.mod h1:JCrKwetZGjxbfq1U139TZuXDBfdGLtjOEAfxMWKV/QM=
 github.com/cloudfoundry/bosh-utils v0.0.0-20210102100234-ed8dcddc80c2/go.mod h1:JCrKwetZGjxbfq1U139TZuXDBfdGLtjOEAfxMWKV/QM=
-github.com/cloudfoundry/bosh-utils v0.0.369 h1:iVw/A07a/hkyPYQ4NGiZCTUGFhOqaP/5+PuTVerrMHE=
-github.com/cloudfoundry/bosh-utils v0.0.369/go.mod h1:rv+PVeycRL/JnyVgIT6JRkvxy3KbQUCQ//8y9AJUGLk=
 github.com/cloudfoundry/bosh-utils v0.0.373 h1:Qp9gInFsyBeZRnnjWgBm9kqTMcw6W8XSHV9MT85ZeN0=
 github.com/cloudfoundry/bosh-utils v0.0.373/go.mod h1:67n5J3/Iq53LCvubJ4sX5BwdtMWnFcs52djGlEtvv74=
 github.com/cloudfoundry/config-server v0.1.21/go.mod h1:Y3b/MHqyp22CcG0X1qvEHG8lujoebxjD9IAslyS/Yk0=
 github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e h1:FQdRViaoDphGRfgrotl2QGsX1gbloe57dbGBS5CG6KY=
 github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e/go.mod h1:PXmcacyJB/pJjSxEl15IU6rEIKXrhZQRzsr0UTkgNNs=
 github.com/cloudfoundry/socks5-proxy v0.2.0/go.mod h1:0a+Ghg38uB86Dx+de84dFSkILTnBHzCpFMRnjHgSzi4=
-github.com/cloudfoundry/socks5-proxy v0.2.93 h1:41/75yjN0iRDWJ2roCv/Z4mh1SXVFJNWl48XgAAU4PE=
-github.com/cloudfoundry/socks5-proxy v0.2.93/go.mod h1:Oi6r95E3xayW6QFZYsasnPxuo2ySkr5cYWgpBzapdlw=
 github.com/cloudfoundry/socks5-proxy v0.2.94 h1:QxoVf8Ar3hydo6kuFJv9EW4q2hc+kLCzC81hdnd/was=
 github.com/cloudfoundry/socks5-proxy v0.2.94/go.mod h1:Oi6r95E3xayW6QFZYsasnPxuo2ySkr5cYWgpBzapdlw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -695,7 +691,6 @@ github.com/square/certstrap v1.2.0/go.mod h1:CUHqV+fxJW0Y5UQFnnbYwQ7bpKXO1AKbic9
 github.com/square/certstrap v1.3.0 h1:N9P0ZRA+DjT8pq5fGDj0z3FjafRKnBDypP0QHpMlaAk=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=

diff --git a/internal/commands/compile_bosh_release_tarballs.go b/internal/commands/compile_bosh_release_tarballs.go
@@ -4,11 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"gopkg.in/yaml.v3"
 	"log"
 	"os"
 	"path/filepath"
 
+	"gopkg.in/yaml.v3"
+
 	"golang.org/x/exp/slices"
 
 	"github.com/cloudfoundry/bosh-cli/v7/director"
@@ -112,7 +113,7 @@ func (cmd *CompileBOSHReleaseTarballs) Execute(args []string) error {
 	if err != nil {
 		return err
 	}
-	return os.WriteFile(cmd.Options.Kilnfile+".lock", out, 0600)
+	return os.WriteFile(cmd.Options.Kilnfile+".lock", out, 0o600)
 }
 
 func (cmd *CompileBOSHReleaseTarballs) Usage() jhanda.Usage {

diff --git a/pkg/cargo/bosh_release.go b/pkg/cargo/bosh_release.go
@@ -278,7 +278,7 @@ func CompileBOSHReleaseTarballs(_ context.Context, logger *log.Logger, boshDirec
 	result := make([]BOSHReleaseTarball, 0, len(releasesToCompile))
 	for _, tarball := range releasesToCompile {
 		logger.Printf("Exporting and Downloading BOSH Release %s/%s", tarball.Manifest.Name, tarball.Manifest.Version)
-		boshReleaseTarball, err := exportAndDownloadBOSHRelease("releases", boshDirector, deployment, tarball, sc)
+		boshReleaseTarball, err := exportAndDownloadBOSHRelease(boshDirector, deployment, tarball, sc)
 		if err != nil {
 			return nil, err
 		}
@@ -288,7 +288,7 @@ func CompileBOSHReleaseTarballs(_ context.Context, logger *log.Logger, boshDirec
 	return result, nil
 }
 
-func exportAndDownloadBOSHRelease(releasesDirectory string, boshDirector director.Director, deployment director.Deployment, source BOSHReleaseTarball, sc Stemcell) (BOSHReleaseTarball, error) {
+func exportAndDownloadBOSHRelease(boshDirector director.Director, deployment director.Deployment, source BOSHReleaseTarball, sc Stemcell) (BOSHReleaseTarball, error) {
 	releaseMF := source.Manifest
 	exportFileName := fmt.Sprintf("%s-%s-%s-%s.tgz", releaseMF.Name, releaseMF.Version, sc.OS, sc.Version)
 	exportFilePath := filepath.Join(filepath.Dir(source.FilePath), exportFileName)

diff --git a/pkg/directorclient/new.go b/pkg/directorclient/new.go
@@ -37,6 +37,14 @@ type Configuration struct {
 func New(configuration Configuration) (director.Director, error) {
 	boshLogger := boshLog.NewLogger(boshLog.LevelError)
 
+	if configuration.AllProxy != "" {
+		err := os.Setenv("BOSH_ALL_PROXY", configuration.AllProxy)
+		if err != nil {
+			return nil, err
+		}
+		boshHTTPClient.ResetDialerContext()
+	}
+
 	directorConfig, err := director.NewConfigFromURL(configuration.Environment)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get director config from BOSH_ENVIRONMENT: %w", err)