Skip to content

fix: Address issue during diff when secret data is nil #7603

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
Merged
merged 2 commits into from
Nov 3, 2021
Merged

fix: Address issue during diff when secret data is nil #7603

merged 2 commits into from
Nov 3, 2021

Conversation

leoluz
Copy link
Collaborator

@leoluz leoluz commented Nov 2, 2021 •
edited
Loading

Signed-off-by: Leonardo Luz Almeida leonardo_almeida@intuit.com

Fixes #5584

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).

@leoluz
fix: update gitops-engine to latest + log improvements
b4c57e4 
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
@leoluz leoluz mentioned this pull request Nov 2, 2021
Closed
3 tasks
@codecov
Copy link

codecov bot commented Nov 2, 2021 •
edited
Loading

Codecov Report

Merging #7603 (63c7227) into master (7750f57) will decrease coverage by 0.02%.
The diff coverage is 13.33%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7603      +/-   ##
==========================================
- Coverage   41.41%   41.38%   -0.03%     
==========================================
  Files         161      161              
  Lines       21630    21689      +59     
==========================================
+ Hits         8958     8977      +19     
- Misses      11409    11446      +37     
- Partials     1263     1266       +3
Impacted Files Coverage Δ
controller/state.go 68.02% <ø> (ø)
server/application/application.go 32.18% <0.00%> (ø)
controller/appcontroller.go 53.03% <16.66%> (-0.06%) ⬇️
util/db/repository.go 38.46% <0.00%> (-1.54%) ⬇️
util/helm/cmd.go 28.65% <0.00%> (-1.23%) ⬇️
pkg/apis/application/v1alpha1/types.go 57.27% <0.00%> (-0.25%) ⬇️
cmd/argocd/commands/app.go 0.53% <0.00%> (-0.01%) ⬇️
util/db/db.go 84.61% <0.00%> (ø)
util/helm/helm.go 60.81% <0.00%> (ø)
util/helm/helmver.go 80.00% <0.00%> (ø)
... and 7 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 7750f57...63c7227. Read the comment docs.

@leoluz
run go mod tidy
63c7227 
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
@leoluz leoluz requested a review from alexmt November 3, 2021 13:57
alexmt
alexmt approved these changes Nov 3, 2021
View reviewed changes
Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

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

LGTM

@alexmt alexmt merged commit 0d4e40e into argoproj:master Nov 3, 2021
lukpep pushed a commit to lukpep/argo-cd that referenced this pull request Nov 3, 2021
@leoluz @lukpep
fix: Address issue during diff when secret data is nil (argoproj#7603)
f7e4335 
* fix: update gitops-engine to latest + log improvements

Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>

* run go mod tidy

Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
Signed-off-by: lukasz.peplinski <lukpep@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexmt alexmt alexmt approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Using an explicitly empty secret throws error
2 participants
@leoluz @alexmt