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

cleanup: replaced resty client with http client in sync and moved to … #1016

Merged
merged 1 commit into from
Dec 22, 2022

Conversation

aokirisaki
Copy link
Contributor

…common

Signed-off-by: Ana-Roberta Lisca ana.kagome@yahoo.com

What type of PR is this?

Which issue does this PR fix:
#969
What does this PR do / Why do we need it:

If an issue # is not available please add repro steps and logs showing the issue:

Testing done on this change:

Automation added to e2e:

Will this break upgrades or downgrades?

Does this PR introduce any user-facing change?:


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@aokirisaki aokirisaki force-pushed the remove-resty-sync branch 2 times, most recently from bfd3cfb to 5eec6a0 Compare November 28, 2022 14:11
@aokirisaki aokirisaki force-pushed the remove-resty-sync branch 5 times, most recently from 0b2a21a to f261887 Compare December 9, 2022 11:58
@codecov
Copy link

codecov bot commented Dec 9, 2022

Codecov Report

Merging #1016 (b912d73) into main (4f4b676) will increase coverage by 0.09%.
The diff coverage is 83.38%.

@@            Coverage Diff             @@
##             main    #1016      +/-   ##
==========================================
+ Coverage   88.95%   89.04%   +0.09%     
==========================================
  Files          74       74              
  Lines       15038    15025      -13     
==========================================
+ Hits        13377    13379       +2     
+ Misses       1296     1282      -14     
+ Partials      365      364       -1     
Impacted Files Coverage Δ
pkg/cli/client.go 83.52% <50.00%> (+0.69%) ⬆️
pkg/extensions/sync/signatures.go 83.66% <68.54%> (+0.53%) ⬆️
pkg/extensions/sync/utils.go 91.55% <83.33%> (-1.09%) ⬇️
pkg/common/common.go 93.57% <93.28%> (-6.43%) ⬇️
pkg/extensions/sync/on_demand.go 93.82% <93.75%> (+0.25%) ⬆️
pkg/extensions/sync/sync.go 87.22% <94.11%> (+1.51%) ⬆️
pkg/storage/local/local.go 82.80% <100.00%> (-0.23%) ⬇️
... and 1 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@aokirisaki aokirisaki force-pushed the remove-resty-sync branch 5 times, most recently from f45d77e to 50eb5c6 Compare December 14, 2022 10:45
return false
}

fileInfo, err := os.Stat(d)

Check failure

Code scanning / CodeQL

Uncontrolled data used in path expression

This path depends on a [user-provided value](1). This path depends on a [user-provided value](2). This path depends on a [user-provided value](3). This path depends on a [user-provided value](4). This path depends on a [user-provided value](5). This path depends on a [user-provided value](6). This path depends on a [user-provided value](7). This path depends on a [user-provided value](8).
@aokirisaki aokirisaki force-pushed the remove-resty-sync branch 2 times, most recently from 9c26788 to 8d039b5 Compare December 19, 2022 08:34
pkg/cli/client_test.go Outdated Show resolved Hide resolved
pkg/common/common.go Outdated Show resolved Hide resolved
pkg/extensions/sync/on_demand.go Outdated Show resolved Hide resolved
pkg/extensions/sync/signatures.go Outdated Show resolved Hide resolved
pkg/extensions/sync/signatures.go Show resolved Hide resolved
Signed-off-by: Ana-Roberta Lisca <ana.kagome@yahoo.com>
}
}

artifactManifestBuf, err := json.Marshal(ociArtifact)
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think this is my mistake, we already have ociArtifactBuf, no need to marshal again :D.

@peusebiu
Copy link
Collaborator

otherwise LGTM

@@ -18,10 +19,10 @@ import (
"github.com/containers/image/v5/types"
"github.com/opencontainers/go-digest"
ispec "github.com/opencontainers/image-spec/specs-go/v1"
"gopkg.in/resty.v1"
Copy link
Contributor

Choose a reason for hiding this comment

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

yup, good stuff!

Copy link
Contributor

@rchincha rchincha left a comment

Choose a reason for hiding this comment

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

lgtm

@rchincha
Copy link
Contributor

go-resty/resty#611
^ why we did this!

@rchincha rchincha merged commit 14238d4 into project-zot:main Dec 22, 2022
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.

None yet

4 participants