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

fix(api): use arrays instead of map to display ApplicationManifetQuery fields in swagger #17804

Merged
merged 3 commits into from
Apr 12, 2024
Merged

fix(api): use arrays instead of map to display ApplicationManifetQuery fields in swagger #17804

merged 3 commits into from
Apr 12, 2024

Conversation

ishitasequeira
Copy link
Member

The revisionSourceMappings does not show up on the swagger-ui. The openapigen ignores map fields while creating a swagger document. As a fix, we replace map with 2 arrays in the ApplicationManifestQuery object.

To be cherry-picked into release-2.11

Updated swagger:
image

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).
  • The title of the PR conforms to the Toolchain Guide
  • 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.
  • 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).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@ishitasequeira ishitasequeira marked this pull request as ready for review April 11, 2024 02:16
@ishitasequeira ishitasequeira requested a review from a team as a code owner April 11, 2024 02:16
crenshaw-dev
crenshaw-dev requested changes Apr 11, 2024
View reviewed changes
cmd/argocd/commands/app.go Outdated Show resolved Hide resolved
server/application/application.go Outdated Show resolved Hide resolved
@ishitasequeira ishitasequeira force-pushed the update-manifest-query-for-swagger branch from f1af243 to 14aacf2 Compare April 11, 2024 13:53
crenshaw-dev
crenshaw-dev approved these changes Apr 12, 2024
View reviewed changes
Copy link
Member

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

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

Local test lgtm!

@crenshaw-dev crenshaw-dev merged commit 922abef into argoproj:master Apr 12, 2024
27 checks passed
@crenshaw-dev
Copy link
Member

/cherry-pick release-2.11

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Apr 12, 2024
@ishitasequeira
fix(api): use arrays instead of map to display ApplicationManifetQuer…
5f0d1ce 
…y fields in swagger (#17804)

* use arrays instead of map to display ApplicationManifetQuery fields in swagger

Signed-off-by: ishitasequeira <[email protected]>

* fix equality conditions for souce-position check

Signed-off-by: ishitasequeira <[email protected]>

---------

Signed-off-by: ishitasequeira <[email protected]>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Apr 12, 2024
Merged
crenshaw-dev pushed a commit that referenced this pull request Apr 12, 2024
@gcp-cherry-pick-bot @ishitasequeira
fix(api): use arrays instead of map to display ApplicationManifetQuer…
be48990 
…y fields in swagger (#17804) (#17820)

* use arrays instead of map to display ApplicationManifetQuery fields in swagger



* fix equality conditions for souce-position check



---------

Signed-off-by: ishitasequeira <[email protected]>
Co-authored-by: Ishita Sequeira <[email protected]>
This was referenced Apr 18, 2024
Closed
Closed
mkieweg pushed a commit to mkieweg/argo-cd that referenced this pull request Jun 11, 2024
@ishitasequeira @mkieweg
fix(api): use arrays instead of map to display ApplicationManifetQuer…
37a16ba 
…y fields in swagger (argoproj#17804)

* use arrays instead of map to display ApplicationManifetQuery fields in swagger

Signed-off-by: ishitasequeira <[email protected]>

* fix equality conditions for souce-position check

Signed-off-by: ishitasequeira <[email protected]>

---------

Signed-off-by: ishitasequeira <[email protected]>
Hariharasuthan99 pushed a commit to AmadeusITGroup/argo-cd that referenced this pull request Jun 16, 2024
@ishitasequeira @Hariharasuthan99
fix(api): use arrays instead of map to display ApplicationManifetQuer…
e3af13b 
…y fields in swagger (argoproj#17804)

* use arrays instead of map to display ApplicationManifetQuery fields in swagger

Signed-off-by: ishitasequeira <[email protected]>

* fix equality conditions for souce-position check

Signed-off-by: ishitasequeira <[email protected]>

---------

Signed-off-by: ishitasequeira <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crenshaw-dev crenshaw-dev crenshaw-dev 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.
2 participants
@ishitasequeira @crenshaw-dev