Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove trailing slash in spec.url when getting tags for oci repository #792

Merged
merged 1 commit into from
Jun 29, 2022
Merged

Remove trailing slash in spec.url when getting tags for oci repository #792

merged 1 commit into from
Jun 29, 2022

Conversation

somtochiama
Copy link
Member

Closes: #flux2/2857

Construct full URL for HelmRepository of OCI type properly when there's a trailing slash in spec.url of the helm repository.

Signed-off-by: Somtochi Onyekwere [email protected]

@somtochiama somtochiama changed the title Remove trailing slash in spec.url of helm re Remove trailing slash in spec.url when getting tags for oci repository Jun 23, 2022
@somtochiama somtochiama requested a review from makkes June 23, 2022 09:25
@darkowlzz darkowlzz added area/helm Helm related issues and pull requests area/oci OCI related issues and pull requests labels Jun 23, 2022
@darkowlzz darkowlzz mentioned this pull request Jun 23, 2022
Merged
@darkowlzz
Copy link
Contributor

Let's make this testable in TestOCIChartRepoisitory_Get, also let's fix the typo in the test name:

- TestOCIChartRepoisitory_Get
+ TestOCIChartRepository_Get

The URL in

source-controller/internal/helm/repository/oci_chart_repository_test.go

Line 161 in 7c07b7a

url := "oci://localhost:5000/my_repo"
can be made an input of the test cases and we can have a case with trailing slash in the URL.

@darkowlzz darkowlzz requested a review from souleb June 23, 2022 19:28
@somtochiama somtochiama requested a review from souleb June 27, 2022 09:41
souleb
souleb approved these changes Jun 27, 2022
View reviewed changes
Copy link
Member

@souleb souleb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! thanks @somtochiama

darkowlzz
darkowlzz reviewed Jun 28, 2022
View reviewed changes
Copy link
Contributor

@darkowlzz darkowlzz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's remove all the changes from controllers/helmchart_controller.go as they have been add in #770 and keep this PR focused on oci_chart_repository.go and its tests.

internal/helm/repository/oci_chart_repository_test.go Outdated Show resolved Hide resolved
internal/helm/repository/oci_chart_repository_test.go Outdated Show resolved Hide resolved
@somtochiama somtochiama force-pushed the trailing-slash branch 3 times, most recently from 7666490 to b40e5b6 Compare June 29, 2022 09:32
@somtochiama
Remove trailing slash
35a7ea1 
Signed-off-by: Somtochi Onyekwere <[email protected]>
darkowlzz
darkowlzz approved these changes Jun 29, 2022
View reviewed changes
Copy link
Contributor

@darkowlzz darkowlzz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks.

@darkowlzz darkowlzz merged commit baf7988 into fluxcd:main Jun 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@darkowlzz darkowlzz darkowlzz approved these changes

@souleb souleb souleb approved these changes

@makkes makkes Awaiting requested review from makkes

Assignees
No one assigned
Labels
area/helm Helm related issues and pull requests area/oci OCI related issues and pull requests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

flux cli OCI helm repo reconcile panic
4 participants
@somtochiama @darkowlzz @makkes @souleb