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

Fix design file YAML indentation #13558

Merged

Conversation

souvikinator
Copy link
Contributor

@souvikinator souvikinator commented Feb 11, 2025

Notes for Reviewers

  • This PR fixes #

This specific part of the code is not using the Yaml converter from encoder in meshkit. Tried incorporating the meshkit encoder however the ToYaml first unmarshalls to map[string]interface{} and since maps in Go are by definition unordered we are loosing out on the fields arrangement.

Ideally we would want to work ensuring that the order of JSON and YAML is maintained right in the encoder and I'm working on it.

Edit:
New changes are incorporated. The MeshKit PR (meshery/meshkit#675) must be merged first, then this one.

Signed commits

  • Yes, I signed my commits.

Signed-off-by: Souvik Kar Mahapatra <souvikat001@gmail.com>
Copy link

github-actions bot commented Feb 11, 2025

leecalcote
leecalcote previously approved these changes Feb 11, 2025
Copy link
Member

@leecalcote leecalcote left a comment

Choose a reason for hiding this comment

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

Lgtm

Signed-off-by: Souvik Kar Mahapatra <souvikat001@gmail.com>
@souvikinator
Copy link
Contributor Author

@leecalcote implemented changes in MeshKit to enforce YAML indentation and preserve field ordering.
Please note: Merge the MeshKit PR first (meshery/meshkit#675), then this PR.

Copy link
Contributor

@fitzergerald fitzergerald left a comment

Choose a reason for hiding this comment

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

Include upgrade to latest MeshKit

Signed-off-by: Souvik Kar Mahapatra <souvikat001@gmail.com>
Copy link

END-TO-END TESTS

  • Testing started at: February 12th 2025, 9:41:39 am

📦 Test Result Summary

  • ✅ 25 passed
  • ❌ 2 failed
  • ⚠️ 10 flaked
  • ⏩ 0 skipped

Duration: 7 minutes and 53 seconds

Overall Result: 👎 Some tests failed.

[Show/Hide] Test Result Details
Test Browser Test Case Tags Result
1 chromium-meshery-provider Transition to disconnected state and then back to connected state unstable ⚠️
2 chromium-meshery-provider Transition to ignored state and then back to connected state unstable ⚠️
3 chromium-meshery-provider Transition to not found state and then back to connected state unstable ⚠️
4 chromium-meshery-provider Delete Kubernetes cluster connections unstable ⚠️
5 chromium-meshery-provider Compare test of a performance profile with load generator "fortio" and service mesh "None" unstable ⚠️
6 chromium-meshery-provider Delete a performance profile with load generator "fortio" and service mesh "None" unstable ⚠️
7 chromium-local-provider Add a cluster connection by uploading kubeconfig file unstable ⚠️
8 chromium-local-provider Transition to disconnected state and then back to connected state unstable ⚠️
9 chromium-local-provider Transition to ignored state and then back to connected state unstable ⚠️
10 chromium-local-provider Transition to not found state and then back to connected state unstable ⚠️
11 chromium-local-provider Delete Kubernetes cluster connections unstable ⚠️
12 chromium-local-provider View detailed result of a performance profile (Graph Visualiser) with load generator "fortio" and service mesh "None" unstable ⚠️
13 chromium-local-provider Edit the configuration of a performance profile with load generator "fortio" and service mesh "None" unstable ⚠️
14 chromium-local-provider Compare test of a performance profile with load generator "fortio" and service mesh "None" unstable ⚠️
15 chromium-local-provider Delete a performance profile with load generator "fortio" and service mesh "None" unstable ⚠️
16 chromium-local-provider Aggregation Charts are displayed
17 chromium-local-provider Connect to Meshery Istio Adapter and configure it
18 chromium-local-provider Toggle "Send Anonymous Usage Statistics" unstable ⚠️
19 chromium-local-provider Toggle "Send Anonymous Performance Results" unstable ⚠️

@leecalcote leecalcote merged commit 720d9b1 into meshery:master Feb 12, 2025
12 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants