Align 3.6 with master

pkg/lib/editor/js/core-config-setup/core-config-setup.js

@@ -1499,7 +1499,7 @@ angular.module("quay-config")
           $scope.certsUploading = true;
           $scope.certMeta = Object.entries($scope.certs)
             .filter(([filename, contents]) =>
-              filename.startsWith("extra_ca_certs/")
+              filename.startsWith("extra_ca_cert_")
             )
             .map(([filename, contents]) => {
               try {

pkg/lib/fieldgroups/bitbucketbuildtrigger/bitbucketbuildtrigger_test.go

@@ -24,7 +24,7 @@ func TestValidateBitbucketBuildTrigger(t *testing.T) {
 		{name: "BuildSupportOnBitbucketOnMissingConsumerSecret", config: map[string]interface{}{"FEATURE_BUILD_SUPPORT": true, "FEATURE_BITBUCKET_BUILD": true, "BITBUCKET_TRIGGER_CONFIG": map[string]interface{}{"CONSUMER_KEY": ""}}, want: "invalid"},
 		{name: "BuildSupportOnBitbucketOnEmptyConsumerSecret", config: map[string]interface{}{"FEATURE_BUILD_SUPPORT": true, "FEATURE_BITBUCKET_BUILD": true, "BITBUCKET_TRIGGER_CONFIG": map[string]interface{}{"CONSUMER_KEY": "", "CONSUMER_SECRET": ""}}, want: "invalid"},
 		{name: "BuildSupportOnBitbucketOnInvalidConfig", config: map[string]interface{}{"FEATURE_BUILD_SUPPORT": true, "FEATURE_BITBUCKET_BUILD": true, "BITBUCKET_TRIGGER_CONFIG": map[string]interface{}{"CONSUMER_KEY": "foo", "CONSUMER_SECRET": "bar"}}, want: "invalid"},
-		{name: "BuildSupportOnBitbucketOnValidConfig", config: map[string]interface{}{"FEATURE_BUILD_SUPPORT": true, "FEATURE_BITBUCKET_BUILD": true, "BITBUCKET_TRIGGER_CONFIG": map[string]interface{}{"CONSUMER_KEY": "A39bvHgf3ZJxdvAXyS", "CONSUMER_SECRET": "VtqYfxbjDNFUsYbsU3vcTTqbyGxbGvYf"}}, want: "valid"},
+		{name: "BuildSupportOnBitbucketOnValidConfig", config: map[string]interface{}{"FEATURE_BUILD_SUPPORT": true, "FEATURE_BITBUCKET_BUILD": true, "BITBUCKET_TRIGGER_CONFIG": map[string]interface{}{"CONSUMER_KEY": "gsjCjq84wHsm4sH4BH", "CONSUMER_SECRET": "dVr7BbNHaxVer4mbUVeegJusSYrk4e8J"}}, want: "valid"},
 	}
 
 	// Iterate through tests

pkg/lib/shared/storage_validators.go

@@ -137,6 +137,7 @@ func ValidateStorage(opts Options, storageName string, storageType string, args
 
 			accessKey = value.AccessKeyID
 			secretKey = value.SecretAccessKey
+			token = value.SessionToken
 
 		}
 		if ok, err := validateMinioGateway(opts, storageName, endpoint, accessKey, secretKey, bucketName, token, isSecure, fgName); !ok {

pkg/lib/shared/validators.go

@@ -44,16 +44,20 @@ func ValidateGitHubOAuth(clientID, clientSecret string) bool {
 
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
+		log.Warning(err)
 		return false
 	}
 	defer resp.Body.Close()
 
-	if resp.StatusCode == 200 {
-		return true
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		log.Warning(err)
+		return false
 	}
 
-	return false
+	log.Debugf("github response: %d, %s", resp.StatusCode, string(body))
 
+	return resp.StatusCode == 200
 }
 
 // ValidateRequiredObject validates that a object input is not nil
@@ -437,10 +441,19 @@ func ValidateBitbucketOAuth(clientID, clientSecret string) bool {
 	req.SetBasicAuth(clientID, clientSecret)
 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 
-	resp, _ := http.DefaultClient.Do(req)
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		log.Warning(err)
+		return false
+	}
 
-	respBody, _ := ioutil.ReadAll(resp.Body)
+	respBody, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		log.Warning(err)
+		return false
+	}
 
+	log.Debugf("bitbucket response: %d, %s", resp.StatusCode, string(respBody))
 	// Load response into json
 	var responseJSON map[string]interface{}
 	_ = json.Unmarshal(respBody, &responseJSON)
@@ -813,7 +826,7 @@ func ValidateLDAPServer(opts Options, ldapUri, ldapAdminDn, ldapAdminPasswd, lda
 		Controls: []ldap.Control{ldap.NewControlPaging(32)},
 	}
 
-	result, err := l.Search(request)
+	_, err = l.Search(request)
 	if err != nil {
 		return false, ValidationError{
 			Tags:       []string{"LDAP_URI"},
@@ -822,14 +835,6 @@ func ValidateLDAPServer(opts Options, ldapUri, ldapAdminDn, ldapAdminPasswd, lda
 		}
 	}
 
-	if len(result.Entries) < 1 {
-		return false, ValidationError{
-			Tags:       []string{"LDAP_URI"},
-			FieldGroup: fgName,
-			Message:    "Could not find any users matching filter in LDAP server",
-		}
-	}
-
 	return true, ValidationError{}
 
 }