Factories for private Gitlab repository with pre-created personal access token #19351

mshaposhnik · 2021-03-22T08:58:19Z

What does this PR do?

This PR allows to accept factories to private Gitlab repositories using pre-created personal access tokens stored as a secret inside the user namespace. Secret example is provided below:

kind: Secret
apiVersion: v1
metadata:
  annotations:
    che.eclipse.org/che-userid: 73a27d90-3d63-4d8c-a8c6-9b4a716c702a
    che.eclipse.org/expired-after: '-1'
    che.eclipse.org/scm-url: 'https://gitlab.apps.cluster-2ab2.2ab2.example.opentlc.com'
    che.eclipse.org/scm-userid: '1'
    che.eclipse.org/scm-username: root
  name: gitlab-personal-access-token-secret
  labels:
    app.kubernetes.io/component: scms-personal-access-token
    app.kubernetes.io/part-of: che.eclipse.org
data:
  token: Yzh5cEt6cURxUWVCa3FKazhtaHg=
type: Opaque

Screenshot/screencast of this PR

What issues does this PR fix or reference?

#19170

How to test this PR?

Prepare private Gitblab repository;
Create and save personal access token on Gitlab side;
Configure Che server to use Gitlab instance and prepare secret in user namespace;
Run factory to prevate repo. Factory should work.

PR Checklist

As the author of this Pull Request I made sure that:

Reviewers

Reviewers, please comment how you tested the PR when approving it.

che-bot · 2021-03-22T09:09:49Z

❌ E2E Happy path tests failed ❗

See Details

Jenkins job
test report
logs and configs
Happy path tests DevFile
image: quay.io/crw_pr/che-server:19351

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

Use comment "[crw-ci-test]" to rerun happy path E2E test.
Use comment "[crw-ci-test --rebuild]" to re-build the images and rerun happy path E2E test.

...re-api-factory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabUrl.java

...ory/src/main/java/org/eclipse/che/api/factory/server/scm/AuthorizingFileContentProvider.java

sparkoo

lgtm, few minor comments

sparkoo · 2021-03-24T10:07:16Z

...re-api-factory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabUrl.java

+        new StringJoiner("/")
+            .add(hostName)
+            .add("api/v4/projects")
+            .add(username + "%2f" + project)


why this needs to be encoded as %2f ?

It's requirement of API:

...re-api-factory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabUrl.java

...ory/src/main/java/org/eclipse/che/api/factory/server/scm/AuthorizingFileContentProvider.java

...i-factory/src/main/java/org/eclipse/che/api/factory/server/urlfactory/DefaultFactoryUrl.java

che-bot · 2021-03-24T12:51:35Z

❌ E2E Happy path tests failed ❗

See Details

Jenkins job
test report
logs and configs
Happy path tests DevFile
image: quay.io/crw_pr/che-server:19351

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

Use comment "[crw-ci-test]" to rerun happy path E2E test.
Use comment "[crw-ci-test --rebuild]" to re-build the images and rerun happy path E2E test.

che-bot · 2021-03-24T15:34:26Z

❌ E2E Happy path tests failed ❗

See Details

Jenkins job
test report
logs and configs
Happy path tests DevFile
image: quay.io/crw_pr/che-server:19351

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

Use comment "[crw-ci-test]" to rerun happy path E2E test.
Use comment "[crw-ci-test --rebuild]" to re-build the images and rerun happy path E2E test.

che-bot · 2021-03-25T08:37:31Z

❌ E2E Happy path tests failed ❗

See Details

Jenkins job
test report
logs and configs
Happy path tests DevFile
image: quay.io/crw_pr/che-server:19351

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

Use comment "[crw-ci-test]" to rerun happy path E2E test.
Use comment "[crw-ci-test --rebuild]" to re-build the images and rerun happy path E2E test.

che-bot · 2021-03-25T10:33:19Z

❌ E2E Happy path tests failed ❗

See Details

Jenkins job
test report
logs and configs
Happy path tests DevFile
image: quay.io/crw_pr/che-server:19351

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

Use comment "[crw-ci-test]" to rerun happy path E2E test.
Use comment "[crw-ci-test --rebuild]" to re-build the images and rerun happy path E2E test.

che-bot · 2021-03-25T12:23:00Z

❌ E2E Happy path tests failed ❗

See Details

Jenkins job
test report
logs and configs
Happy path tests DevFile
image: quay.io/crw_pr/che-server:19351

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

Use comment "[crw-ci-test]" to rerun happy path E2E test.
Use comment "[crw-ci-test --rebuild]" to re-build the images and rerun happy path E2E test.

mshaposhnik · 2021-03-29T06:53:50Z

[crw-ci-test]

che-bot · 2021-03-29T07:00:52Z

❌ E2E Happy path tests failed ❗

See Details

Jenkins job
test report
logs and configs
Happy path tests DevFile
image: quay.io/crw_pr/che-server:19351

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

Use comment "[crw-ci-test]" to rerun happy path E2E test.
Use comment "[crw-ci-test --rebuild]" to re-build the images and rerun happy path E2E test.

mshaposhnik added 3 commits March 18, 2021 20:16

Support for private gitlab factories

fa757ef

Fixups

d3d8962

Fmt fix

87b9b47

mshaposhnik requested review from nickboldt and skabashnyuk as code owners March 22, 2021 08:58

mshaposhnik requested review from sparkoo and removed request for nickboldt March 22, 2021 08:58

che-bot added status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. kind/task Internal things, technical debt, and to-do tasks to be performed. labels Mar 22, 2021

skabashnyuk reviewed Mar 22, 2021

View reviewed changes

...re-api-factory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabUrl.java Show resolved Hide resolved

skabashnyuk reviewed Mar 23, 2021

View reviewed changes

...ory/src/main/java/org/eclipse/che/api/factory/server/scm/AuthorizingFileContentProvider.java Show resolved Hide resolved

skabashnyuk approved these changes Mar 23, 2021

View reviewed changes

sparkoo reviewed Mar 24, 2021

View reviewed changes

Fixups

418f56c

sparkoo approved these changes Mar 24, 2021

View reviewed changes

Fixups

5e990a3

Fixups

6d24c52

Fixups

69ca3eb

Tests fixups

88142e0

mshaposhnik merged commit e99fcd7 into eclipse-che:master Mar 30, 2021

mshaposhnik deleted the gitlab_with_tokens branch March 30, 2021 11:19

che-bot removed the status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. label Mar 30, 2021

che-bot added this to the 7.29 milestone Mar 30, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Factories for private Gitlab repository with pre-created personal access token #19351

Factories for private Gitlab repository with pre-created personal access token #19351

mshaposhnik commented Mar 22, 2021

che-bot commented Mar 22, 2021

sparkoo left a comment

sparkoo Mar 24, 2021

mshaposhnik Mar 24, 2021

che-bot commented Mar 24, 2021

che-bot commented Mar 24, 2021

che-bot commented Mar 25, 2021

che-bot commented Mar 25, 2021

che-bot commented Mar 25, 2021

mshaposhnik commented Mar 29, 2021

che-bot commented Mar 29, 2021

Factories for private Gitlab repository with pre-created personal access token #19351

Factories for private Gitlab repository with pre-created personal access token #19351

Conversation

mshaposhnik commented Mar 22, 2021

What does this PR do?

Screenshot/screencast of this PR

What issues does this PR fix or reference?

How to test this PR?

PR Checklist

Reviewers

che-bot commented Mar 22, 2021

sparkoo left a comment

Choose a reason for hiding this comment

sparkoo Mar 24, 2021

Choose a reason for hiding this comment

mshaposhnik Mar 24, 2021

Choose a reason for hiding this comment

che-bot commented Mar 24, 2021

che-bot commented Mar 24, 2021

che-bot commented Mar 25, 2021

che-bot commented Mar 25, 2021

che-bot commented Mar 25, 2021

mshaposhnik commented Mar 29, 2021

che-bot commented Mar 29, 2021