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.

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

1766 - Git Tag and Chart Version assumed to match #1892

Merged
merged 18 commits into from
Jul 11, 2023
Merged

1766 - Git Tag and Chart Version assumed to match #1892

merged 18 commits into from
Jul 11, 2023

Conversation

cmwylie19
Copy link
Contributor

Description

What we could do (to keep backwards compat in tact and address #1766) is see if there is an @ ref on the git URL and if there is, leave it on there, and if not append the @tag as we do today. Dedup some code in src/pkg/packager/prepare.go, and src/pkg/packager/create.go.

Related Issue

Fixes #1766

Relates to

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Other (security config, docs update, etc)

Checklist before merging

cmwylie19 and others added 3 commits July 6, 2023 19:55
Signed-off-by: Case Wylie <cmwylie19@defenseunicorns.com>
Signed-off-by: Case Wylie <cmwylie19@defenseunicorns.com>
## Description

Creates a `pending` ADR for initial work on `zarf bundle`.

## Related Issue

Relates to #1711

## Type of change

- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

## Checklist before merging

- [ ] Test, docs, adr added or updated as needed
- [x] [Contributor Guide
Steps](https://github.com/defenseunicorns/zarf/blob/main/CONTRIBUTING.md#developer-workflow)
followed

---------

Signed-off-by: razzle <harry@razzle.cloud>
Co-authored-by: Wayne Starr <Racer159@users.noreply.github.com>
Co-authored-by: Casey Wylie <cmwylie19@defenseunicorns.com>
@netlify
Copy link

netlify bot commented Jul 7, 2023

Deploy Preview for zarf-docs canceled.

Name Link
🔨 Latest commit ae36435
🔍 Latest deploy log https://app.netlify.com/sites/zarf-docs/deploys/64ad996fbd9fa50008eb2e32

@cmwylie19 cmwylie19 mentioned this pull request Jul 7, 2023
5 tasks
@cmwylie19 cmwylie19 added the needs-tests PR Label - Tests required to merge label Jul 7, 2023
cmwylie19 added 2 commits July 9, 2023 15:38
Signed-off-by: Case Wylie <cmwylie19@defenseunicorns.com>
Signed-off-by: Case Wylie <cmwylie19@defenseunicorns.com>
@cmwylie19 cmwylie19 changed the title 1766 1766 - Git Tag and Chart Version assumed to match Jul 9, 2023
Noxsios and others added 3 commits July 10, 2023 17:02
## Description

Fixes what I broke.

This does re-architect some portions of OrasRemote and locks it down
more. Everything in `*remote.Registry` is no longer exposed to outside
usage and users of this remote client are restricted to the public
receiver methods written in `pkg/oci`.

The context is now private as it really should not be edited outside of
private receivers within OrasRemote.

During the writing of this PR I found out that ORAs already handles
scopes at the request level and there is zero need to handle scopes
yourself. I have not checked if I never had to do this, or if ORAs
updated.

## Related Issue

Fixes #1881 
Fixes #1795 
Fixes #1821 

## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

## Checklist before merging

- [x] Test, docs, adr added or updated as needed
- [x] [Contributor Guide
Steps](https://github.com/defenseunicorns/zarf/blob/main/CONTRIBUTING.md#developer-workflow)
followed

---------

Signed-off-by: razzle <harry@razzle.cloud>
…1891)

Add ExitOnInterrupt utils function; catch interrupts when using wait

## Description

Add ability to catch interrupts when using wait command.

## Related Issue

Fixes #1864

## Type of change

- [X] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

## Checklist before merging

- [X] Test, docs, adr added or updated as needed
- [X] [Contributor Guide
Steps](https://github.com/defenseunicorns/zarf/blob/main/CONTRIBUTING.md#developer-workflow)
followed

---------

Co-authored-by: Wayne Starr <Racer159@users.noreply.github.com>
Signed-off-by: Case Wylie <cmwylie19@defenseunicorns.com>
@cmwylie19
Copy link
Contributor Author

I am removing the needs-tests label because I am going to address the tests in the metrics pr as this current PR is a prereq along with the named port pr and the waitFor pr which has been merged.

@cmwylie19 cmwylie19 removed the needs-tests PR Label - Tests required to merge label Jul 10, 2023
@cmwylie19 cmwylie19 marked this pull request as ready for review July 10, 2023 21:09
src/internal/packager/helm/repo.go Show resolved Hide resolved
src/internal/packager/helm/repo.go Outdated Show resolved Hide resolved
cmwylie19 and others added 5 commits July 10, 2023 17:25
Co-authored-by: Wayne Starr <Racer159@users.noreply.github.com>
Signed-off-by: Case Wylie <cmwylie19@defenseunicorns.com>
Signed-off-by: Case Wylie <cmwylie19@defenseunicorns.com>
src/pkg/transform/git_test.go Show resolved Hide resolved
src/pkg/transform/git.go Show resolved Hide resolved
…andards

Signed-off-by: Case Wylie <cmwylie19@defenseunicorns.com>
Noxsios
Noxsios previously approved these changes Jul 11, 2023
Signed-off-by: Case Wylie <cmwylie19@defenseunicorns.com>
Copy link
Contributor

@Racer159 Racer159 left a comment

Choose a reason for hiding this comment

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

lgtm

@Racer159 Racer159 merged commit 12bbda8 into main Jul 11, 2023
@Racer159 Racer159 deleted the 1766 branch July 11, 2023 21:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Git Tag and Chart Version assumed to match
4 participants