fix

Signed-off-by: Anatolii Bazko <[email protected]>
eclipse-che · Oct 27, 2023 · 86d17e0 · 86d17e0
1 parent 9d179e6
commit 86d17e0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/pkg/common/constants/constants.go b/pkg/common/constants/constants.go
@@ -66,6 +66,7 @@ const (
 	BitBucketOAuthConfigMountPath              = "/che-conf/oauth/bitbucket"
 	BitBucketOAuthConfigPrivateKeyFileName     = "private.key"
 	BitBucketOAuthConfigConsumerKeyFileName    = "consumer.key"
+	GitHubOAuth                                = "github"
 	GitHubOAuthConfigMountPath                 = "/che-conf/oauth/github"
 	GitHubOAuthConfigClientIdFileName          = "id"
 	GitHubOAuthConfigClientSecretFileName      = "secret"

diff --git a/pkg/deploy/server/server_deployment.go b/pkg/deploy/server/server_deployment.go
@@ -268,7 +268,13 @@ func MountBitBucketOAuthConfig(ctx *chetypes.DeployContext, deployment *appsv1.D
 }
 
 func MountGitHubOAuthConfig(ctx *chetypes.DeployContext, deployment *appsv1.Deployment) error {
-	secrets, err := getAllGitProviderOAuthConfigs(ctx, "github")
+	secrets, err := deploy.GetSecrets(ctx, map[string]string{
+		constants.KubernetesPartOfLabelKey:    constants.CheEclipseOrg,
+		constants.KubernetesComponentLabelKey: constants.OAuthScmConfiguration,
+	}, map[string]string{
+		constants.CheEclipseOrgOAuthScmServer: constants.GitHubOAuth,
+	})
+
 	if err != nil {
 		return err
 	}

diff --git a/pkg/deploy/server/server_util.go b/pkg/deploy/server/server_util.go
@@ -26,22 +26,20 @@ func getComponentName(ctx *chetypes.DeployContext) string {
 }
 
 func getOAuthConfig(ctx *chetypes.DeployContext, oauthProvider string) (*corev1.Secret, error) {
-	if secrets, err := getAllGitProviderOAuthConfigs(ctx, oauthProvider); err != nil {
+	secrets, err := deploy.GetSecrets(ctx, map[string]string{
+		constants.KubernetesPartOfLabelKey:    constants.CheEclipseOrg,
+		constants.KubernetesComponentLabelKey: constants.OAuthScmConfiguration,
+	}, map[string]string{
+		constants.CheEclipseOrgOAuthScmServer: oauthProvider,
+	})
+
+	if err != nil {
 		return nil, err
 	} else if len(secrets) == 0 {
 		return nil, nil
-	} else if len(secrets) == 1 {
-		return &secrets[0], nil
-	} else {
+	} else if len(secrets) > 1 {
 		return nil, fmt.Errorf("More than 1 OAuth %s configuration secrets found", oauthProvider)
 	}
-}
 
-func getAllGitProviderOAuthConfigs(ctx *chetypes.DeployContext, oauthProvider string) ([]corev1.Secret, error) {
-	return deploy.GetSecrets(ctx, map[string]string{
-		constants.KubernetesPartOfLabelKey:    constants.CheEclipseOrg,
-		constants.KubernetesComponentLabelKey: constants.OAuthScmConfiguration,
-	}, map[string]string{
-		constants.CheEclipseOrgOAuthScmServer: oauthProvider,
-	})
+	return &secrets[0], nil
 }