Properly handle provider host name when using http(s) prefix when adding a new integration #7831

Shulammite-Aso · 2022-01-26T05:44:32Z

Description

When a user has manually included http(s) prefixes in their provider hostname, strip it off so that it uses only the gitpod provided prefix in the configured URL and Redirect URL.

Related Issue(s)

Fixes #7492

How to test

Go to dashboard and under integrations try to add new integration with a self-hosted instance of a provider, then notice that any HTTP(s) prefix is removed from the configured URL

Release Notes

Git Integrations UI – improve handling of host name.

Documentation

gtsiolis · 2022-01-26T10:19:47Z

Thanks for contributing, @Shulammite-Aso! 🍊

/werft run

👍 started the job as gitpod-build-verify-provider-hostname-fork.0

codecov · 2022-01-26T10:32:32Z

Codecov Report

Merging #7831 (ea71364) into main (63f8448) will increase coverage by 1.57%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##            main    #7831      +/-   ##
=========================================
+ Coverage   8.62%   10.20%   +1.57%     
=========================================
  Files         33       18      -15     
  Lines       2341     1009    -1332     
=========================================
- Hits         202      103      -99     
+ Misses      2135      905    -1230     
+ Partials       4        1       -3

Flag	Coverage Δ
components-gitpod-cli-app	`10.20% <ø> (ø)`
components-local-app-app-darwin-amd64	`?`
components-local-app-app-darwin-arm64	`?`
components-local-app-app-linux-amd64	`?`
components-local-app-app-linux-arm64	`?`
components-local-app-app-windows-386	`?`
components-local-app-app-windows-amd64	`?`
components-local-app-app-windows-arm64	`?`
installer-raw-app	`?`

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
installer/pkg/components/ws-manager/configmap.go
installer/pkg/components/ws-manager/role.go
components/local-app/pkg/auth/pkce.go
installer/pkg/components/ws-manager/deployment.go
installer/pkg/common/display.go
installer/pkg/common/ca.go
installer/pkg/common/render.go
components/local-app/pkg/auth/auth.go
installer/pkg/components/ws-manager/rolebinding.go
installer/pkg/common/objects.go
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 63f8448...ea71364. Read the comment docs.

gtsiolis · 2022-01-26T10:39:12Z

@Shulammite-Aso You'll need to sign a Contributor License Agreement (CLA)[1] once before merging your first contribution. Looping in @meysholdt to reach out about the CLA. 🏓

Shulammite-Aso · 2022-01-31T07:12:50Z

@meysholdt how do i sign the Contributor license agreement? I followed this link provided in the docs here to see if it provides hints on how to sign it, but it appears the link is broken.

csweichel · 2022-01-31T09:24:36Z

cc @meysholdt

meysholdt · 2022-02-01T16:34:56Z

Hi @Shulammite-Aso, I've sent the CLA via email / DocuSign.

Shulammite-Aso · 2022-02-01T19:46:58Z

Hi @meysholdt i just signed the document.

meysholdt · 2022-02-02T07:37:20Z

Hi @Shulammite-Aso! Awesome, thank you for signing!

JanKoehnlein

Thanks a lot for the change. I've proposed a few changes.

components/dashboard/src/settings/Integrations.tsx

use 'startsWith' method to strip off http(s) from provider hostname

roboquat · 2022-02-02T22:32:15Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please ask for approval from jankoehnlein after the PR has been reviewed.

Associated issue: #7492

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

components/dashboard/OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

AlexTugarev

@Shulammite-Aso thanks for the contribution!

I left some comments. The main issue remains is, that Gitpod won't accept http URLs for provider connections on the server side.

components/dashboard/src/settings/Integrations.tsx

stale · 2022-02-18T08:22:50Z

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

AlexTugarev · 2022-02-21T07:29:48Z

/werft run

👍 started the job as gitpod-build-verify-provider-hostname-fork.1

AlexTugarev · 2022-02-21T07:31:49Z

Let's verify with a preview environment and lend this PR
⏳

AlexTugarev

Thanks for the contribution, @Shulammite-Aso!
🎉 🎉 🎉

Shulammite-Aso · 2022-02-28T10:10:06Z

Hi @gtsiolis this PR is approved, is it now ready to get merged?

gtsiolis · 2022-02-28T11:22:56Z

Hey, @Shulammite-Aso! I wanted to confirm internally that the signed CLA is in place and stored for future contributions.

Let's merge this. 🚀

Thanks @AlexTugarev @JanKoehnlein @meysholdt @csweichel for helping move this forward! 🏀

gtsiolis

LGTM

gtsiolis · 2022-02-28T15:08:21Z

@JanKoehnlein could you approve this to unblock merging[1]?

JanKoehnlein

LGTM. Thanks a lot for this contribution

strip off http(s) prefix from provider hostname

1ebc780

roboquat added do-not-merge/release-note-label-needed size/S labels Jan 26, 2022

gtsiolis added the community-contribution label Jan 26, 2022

gtsiolis requested a review from a team January 26, 2022 10:19

gtsiolis removed the request for review from a team January 26, 2022 10:39

gtsiolis added do-not-merge/cla-pending CLA has not been signed team: webapp Issue belongs to the WebApp team labels Jan 26, 2022

meysholdt added cla: accepted ✔️ and removed do-not-merge/cla-pending CLA has not been signed labels Feb 2, 2022

JanKoehnlein suggested changes Feb 2, 2022

View reviewed changes

components/dashboard/src/settings/Integrations.tsx Outdated Show resolved Hide resolved

components/dashboard/src/settings/Integrations.tsx Outdated Show resolved Hide resolved

roboquat assigned JanKoehnlein Feb 2, 2022

use 'startsWith' instead of 'includes'

8c3feed

use 'startsWith' method to strip off http(s) from provider hostname

JanKoehnlein requested a review from AlexTugarev February 3, 2022 08:34

AlexTugarev reviewed Feb 3, 2022

View reviewed changes

components/dashboard/src/settings/Integrations.tsx Outdated Show resolved Hide resolved

components/dashboard/src/settings/Integrations.tsx Outdated Show resolved Hide resolved

stale bot added the meta: stale This issue/PR is stale and will be closed soon label Feb 18, 2022

AlexTugarev removed the meta: stale This issue/PR is stale and will be closed soon label Feb 18, 2022

change hostname and remove http block

ea71364

Shulammite-Aso requested a review from a team February 19, 2022 03:12

roboquat added release-note and removed do-not-merge/release-note-label-needed labels Feb 21, 2022

AlexTugarev approved these changes Feb 21, 2022

View reviewed changes

gtsiolis approved these changes Feb 28, 2022

View reviewed changes

JanKoehnlein approved these changes Feb 28, 2022

View reviewed changes

roboquat merged commit d4a2db8 into gitpod-io:main Feb 28, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Properly handle provider host name when using http(s) prefix when adding a new integration #7831

Properly handle provider host name when using http(s) prefix when adding a new integration #7831

Shulammite-Aso commented Jan 26, 2022 •

edited by AlexTugarev

Loading

gtsiolis commented Jan 26, 2022 •

edited by werft-gitpod-dev-com bot

Loading

codecov bot commented Jan 26, 2022 •

edited

Loading

gtsiolis commented Jan 26, 2022 •

edited

Loading

Shulammite-Aso commented Jan 31, 2022

csweichel commented Jan 31, 2022

meysholdt commented Feb 1, 2022

Shulammite-Aso commented Feb 1, 2022

meysholdt commented Feb 2, 2022

JanKoehnlein left a comment

roboquat commented Feb 2, 2022

AlexTugarev left a comment

stale bot commented Feb 18, 2022

AlexTugarev commented Feb 21, 2022 •

edited by werft-gitpod-dev-com bot

Loading

AlexTugarev commented Feb 21, 2022 •

edited by werft-gitpod-dev-com bot

Loading

AlexTugarev left a comment

Shulammite-Aso commented Feb 28, 2022

gtsiolis commented Feb 28, 2022 •

edited by werft-gitpod-dev-com bot

Loading

gtsiolis left a comment

gtsiolis commented Feb 28, 2022

JanKoehnlein left a comment

Properly handle provider host name when using http(s) prefix when adding a new integration #7831

Properly handle provider host name when using http(s) prefix when adding a new integration #7831

Conversation

Shulammite-Aso commented Jan 26, 2022 • edited by AlexTugarev Loading

Description

Related Issue(s)

How to test

Release Notes

Documentation

gtsiolis commented Jan 26, 2022 • edited by werft-gitpod-dev-com bot Loading

codecov bot commented Jan 26, 2022 • edited Loading

Codecov Report

gtsiolis commented Jan 26, 2022 • edited Loading

Shulammite-Aso commented Jan 31, 2022

csweichel commented Jan 31, 2022

meysholdt commented Feb 1, 2022

Shulammite-Aso commented Feb 1, 2022

meysholdt commented Feb 2, 2022

JanKoehnlein left a comment

Choose a reason for hiding this comment

roboquat commented Feb 2, 2022

AlexTugarev left a comment

Choose a reason for hiding this comment

stale bot commented Feb 18, 2022

AlexTugarev commented Feb 21, 2022 • edited by werft-gitpod-dev-com bot Loading

AlexTugarev commented Feb 21, 2022 • edited by werft-gitpod-dev-com bot Loading

AlexTugarev left a comment

Choose a reason for hiding this comment

Shulammite-Aso commented Feb 28, 2022

gtsiolis commented Feb 28, 2022 • edited by werft-gitpod-dev-com bot Loading

gtsiolis left a comment

Choose a reason for hiding this comment

gtsiolis commented Feb 28, 2022

JanKoehnlein left a comment

Choose a reason for hiding this comment

Shulammite-Aso commented Jan 26, 2022 •

edited by AlexTugarev

Loading

gtsiolis commented Jan 26, 2022 •

edited by werft-gitpod-dev-com bot

Loading

codecov bot commented Jan 26, 2022 •

edited

Loading

gtsiolis commented Jan 26, 2022 •

edited

Loading

AlexTugarev commented Feb 21, 2022 •

edited by werft-gitpod-dev-com bot

Loading

AlexTugarev commented Feb 21, 2022 •

edited by werft-gitpod-dev-com bot

Loading

gtsiolis commented Feb 28, 2022 •

edited by werft-gitpod-dev-com bot

Loading