shim pkg/build/builder source-to-image types

Author: liggitt

pkg/build/builder/common.go

@@ -18,6 +18,7 @@ import (
 	"github.com/docker/distribution/reference"
 	"github.com/fsouza/go-dockerclient"
 
+	s2igit "github.com/openshift/source-to-image/pkg/scm/git"
 	"github.com/openshift/source-to-image/pkg/util"
 
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
@@ -263,6 +264,22 @@ func buildEnv(build *buildapi.Build, sourceInfo *git.SourceInfo) []dockerfile.Ke
 	return kv
 }
 
+// TODO: remove this shim (required to adapt vendored types)
+func toS2ISourceInfo(sourceInfo *git.SourceInfo) *s2igit.SourceInfo {
+	return &s2igit.SourceInfo{
+		Ref:            sourceInfo.Ref,
+		CommitID:       sourceInfo.CommitID,
+		Date:           sourceInfo.Date,
+		AuthorName:     sourceInfo.AuthorName,
+		AuthorEmail:    sourceInfo.AuthorEmail,
+		CommitterName:  sourceInfo.CommitterName,
+		CommitterEmail: sourceInfo.CommitterEmail,
+		Message:        sourceInfo.Message,
+		Location:       sourceInfo.Location,
+		ContextDir:     sourceInfo.ContextDir,
+	}
+}
+
 // buildLabels returns a slice of KeyValue pairs in a format that appendLabel can
 // consume.
 func buildLabels(build *buildapi.Build, sourceInfo *git.SourceInfo) []dockerfile.KeyValue {
@@ -273,7 +290,7 @@ func buildLabels(build *buildapi.Build, sourceInfo *git.SourceInfo) []dockerfile
 	if len(build.Spec.Source.ContextDir) > 0 {
 		sourceInfo.ContextDir = build.Spec.Source.ContextDir
 	}
-	labels = util.GenerateLabelsFromSourceInfo(labels, &sourceInfo.SourceInfo, buildapi.DefaultDockerLabelNamespace)
+	labels = util.GenerateLabelsFromSourceInfo(labels, toS2ISourceInfo(sourceInfo), buildapi.DefaultDockerLabelNamespace)
 	addBuildLabels(labels, build)
 
 	kv := make([]dockerfile.KeyValue, 0, len(labels)+len(build.Spec.Output.ImageLabels))

pkg/build/builder/sti.go

@@ -128,7 +128,7 @@ func (s *S2IBuilder) Build() error {
 	}
 	var s2iSourceInfo *s2igit.SourceInfo
 	if sourceInfo != nil {
-		s2iSourceInfo = &sourceInfo.SourceInfo
+		s2iSourceInfo = toS2ISourceInfo(sourceInfo)
 	}
 	injections := s2iapi.VolumeList{}
 	for _, s := range s.build.Spec.Source.Secrets {
@@ -250,7 +250,7 @@ func (s *S2IBuilder) Build() error {
 		return err
 	}
 	if glog.Is(4) {
-		redactedConfig := buildutil.SafeForLoggingS2IConfig(config)
+		redactedConfig := SafeForLoggingS2IConfig(config)
 		glog.V(4).Infof("Creating a new S2I builder with config: %#v\n", describe.Config(client, redactedConfig))
 	}
 	builder, buildInfo, err := s.builder.Builder(config, s2ibuild.Overrides{Downloader: nil})
@@ -370,7 +370,7 @@ func s2iBuildLabels(build *buildapi.Build, sourceInfo *git.SourceInfo) map[strin
 		sourceInfo.ContextDir = build.Spec.Source.ContextDir
 	}
 
-	labels = s2iutil.GenerateLabelsFromSourceInfo(labels, &sourceInfo.SourceInfo, buildapi.DefaultDockerLabelNamespace)
+	labels = s2iutil.GenerateLabelsFromSourceInfo(labels, toS2ISourceInfo(sourceInfo), buildapi.DefaultDockerLabelNamespace)
 
 	// override autogenerated labels
 	for _, lbl := range build.Spec.Output.ImageLabels {

pkg/build/builder/util.go

@@ -13,6 +13,9 @@ import (
 	docker "github.com/fsouza/go-dockerclient"
 
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
+	buildutil "github.com/openshift/origin/pkg/build/util"
+	s2iapi "github.com/openshift/source-to-image/pkg/api"
+	s2iutil "github.com/openshift/source-to-image/pkg/util"
 )
 
 var (
@@ -151,3 +154,37 @@ func extractParentFromCgroupMap(cgMap map[string]string) (string, error) {
 	glog.V(5).Infof("found cgroup parent %v", cgroupParent)
 	return cgroupParent, nil
 }
+
+// SafeForLoggingEnvironmentList returns a copy of an s2i EnvironmentList array with
+// proxy credential values redacted.
+func SafeForLoggingEnvironmentList(env s2iapi.EnvironmentList) s2iapi.EnvironmentList {
+	newEnv := make(s2iapi.EnvironmentList, len(env))
+	copy(newEnv, env)
+	proxyRegex := regexp.MustCompile("(?i)proxy")
+	for i, env := range newEnv {
+		if proxyRegex.MatchString(env.Name) {
+			newEnv[i].Value, _ = s2iutil.SafeForLoggingURL(env.Value)
+		}
+	}
+	return newEnv
+}
+
+// SafeForLoggingS2IConfig returns a copy of an s2i Config with
+// proxy credentials redacted.
+func SafeForLoggingS2IConfig(config *s2iapi.Config) *s2iapi.Config {
+	newConfig := *config
+	newConfig.Environment = SafeForLoggingEnvironmentList(config.Environment)
+	if config.ScriptDownloadProxyConfig != nil {
+		newProxy := *config.ScriptDownloadProxyConfig
+		newConfig.ScriptDownloadProxyConfig = &newProxy
+		if newConfig.ScriptDownloadProxyConfig.HTTPProxy != nil {
+			newConfig.ScriptDownloadProxyConfig.HTTPProxy = buildutil.SafeForLoggingURL(newConfig.ScriptDownloadProxyConfig.HTTPProxy)
+		}
+
+		if newConfig.ScriptDownloadProxyConfig.HTTPProxy != nil {
+			newConfig.ScriptDownloadProxyConfig.HTTPSProxy = buildutil.SafeForLoggingURL(newConfig.ScriptDownloadProxyConfig.HTTPProxy)
+		}
+	}
+	newConfig.ScriptsURL, _ = s2iutil.SafeForLoggingURL(newConfig.ScriptsURL)
+	return &newConfig
+}