Merge pull request #12463 from bparees/git_ssh

Merged by openshift-bot

Author: OpenShift Bot

Diff for: pkg/build/api/validation/validation.go

@@ -202,10 +202,6 @@ const (
 	maxJenkinsfileLengthBytes = 100 * 1000
 )
 
-func hasProxy(source *buildapi.GitBuildSource) bool {
-	return (source.HTTPProxy != nil && len(*source.HTTPProxy) > 0) || (source.HTTPSProxy != nil && len(*source.HTTPSProxy) > 0)
-}
-
 func validateSource(input *buildapi.BuildSource, isCustomStrategy, isDockerStrategy, isJenkinsPipelineStrategyFromRepo bool, fldPath *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
 
@@ -273,14 +269,6 @@ func validateSecretRef(ref *kapi.LocalObjectReference, fldPath *field.Path) fiel
 	return allErrs
 }
 
-func isHTTPScheme(in string) bool {
-	u, err := url.Parse(in)
-	if err != nil {
-		return false
-	}
-	return u.Scheme == "http" || u.Scheme == "https"
-}
-
 func validateGitSource(git *buildapi.GitBuildSource, fldPath *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
 	if len(git.URI) == 0 {
@@ -294,9 +282,6 @@ func validateGitSource(git *buildapi.GitBuildSource, fldPath *field.Path) field.
 	if git.HTTPSProxy != nil && len(*git.HTTPSProxy) != 0 && !IsValidURL(*git.HTTPSProxy) {
 		allErrs = append(allErrs, field.Invalid(fldPath.Child("httpsproxy"), *git.HTTPSProxy, "proxy is not a valid url"))
 	}
-	if hasProxy(git) && !isHTTPScheme(git.URI) {
-		allErrs = append(allErrs, field.Invalid(fldPath.Child("uri"), git.URI, "only http:// and https:// GIT protocols are allowed with HTTP or HTTPS proxy set"))
-	}
 	return allErrs
 }
 

Diff for: pkg/build/api/validation/validation_test.go

@@ -396,47 +396,6 @@ func TestValidateBuildUpdate(t *testing.T) {
 	}
 }
 
-func TestBuildConfigGitSourceWithProxyFailure(t *testing.T) {
-	proxyAddress := "127.0.0.1:3128"
-	buildConfig := &buildapi.BuildConfig{
-		ObjectMeta: kapi.ObjectMeta{Name: "config-id", Namespace: "namespace"},
-		Spec: buildapi.BuildConfigSpec{
-			RunPolicy: buildapi.BuildRunPolicySerial,
-			CommonSpec: buildapi.CommonSpec{
-				Source: buildapi.BuildSource{
-					Git: &buildapi.GitBuildSource{
-						URI: "git://github.com/my/repository",
-						ProxyConfig: buildapi.ProxyConfig{
-							HTTPProxy:  &proxyAddress,
-							HTTPSProxy: &proxyAddress,
-						},
-					},
-				},
-				Strategy: buildapi.BuildStrategy{
-					DockerStrategy: &buildapi.DockerBuildStrategy{},
-				},
-				Output: buildapi.BuildOutput{
-					To: &kapi.ObjectReference{
-						Kind: "DockerImage",
-						Name: "repository/data",
-					},
-				},
-			},
-		},
-	}
-	errors := ValidateBuildConfig(buildConfig)
-	if len(errors) != 1 {
-		t.Errorf("Expected one error, got %d", len(errors))
-	}
-	err := errors[0]
-	if err.Type != field.ErrorTypeInvalid {
-		t.Errorf("Expected invalid value validation error, got %q", err.Type)
-	}
-	if err.Detail != "only http:// and https:// GIT protocols are allowed with HTTP or HTTPS proxy set" {
-		t.Errorf("Exptected git:// protocol with proxy validation error, got: %q", err.Detail)
-	}
-}
-
 // TestBuildConfigDockerStrategyImageChangeTrigger ensures that it is invalid to
 // have a BuildConfig with Docker strategy and an ImageChangeTrigger where
 // neither DockerStrategy.From nor ImageChange.From are defined.