Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
octocamocoder47 authored Jan 28, 2025
2 parents 27c4b2c + b85d51c commit 8410cfe
Show file tree
Hide file tree
Showing 36 changed files with 1,892 additions and 1,373 deletions.
36 changes: 20 additions & 16 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,38 @@
---
name: Bug/issue report
name: 🐛 General Bug Report
about: Report an issue to help improve the project.
title: ''
labels: 'kind/bug'
assignees: ''
---
**Description**
### Current Behavior
<!-- A brief description of the issue. -->

**Expected Behavior**
### Expected Behavior
<!-- A brief description of what you expected to happen. -->

**Screenshots**
### Screenshots/Logs
<!-- Add screenshots, if applicable, to help explain your problem. -->

**Environment:**
- OS: [e.g. Ubuntu]
- Browser: [e.g. Chrome, Safari]
- Version: [e.g. 22]
- Device: [e.g. laptop, iPhone 8]
### Environment

---
[Optional] **To Reproduce**
Steps to reproduce the behavior:
- **Host OS:** Mac Linux Windows
- **Platform:** Docker or Kubernetes
- **Meshery Server Version:** stable-v
- **Meshery Client Version:** stable-v

<!-- Optional
### To Reproduce
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
-->

[Optional] **Additional Context**
<!-- Add any other context about the problem here. -->

---
### Contributor [Guides](https://docs.meshery.io/project/contributing) and [Handbook](https://layer5.io/community/handbook)
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/contributing/build-and-release)
- 📚 [Instructions for contributing to documentation](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#documentation-contribution-flow)
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
29 changes: 18 additions & 11 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
---
name: Feature Request
about: Suggest an enhancement to this project.
name: 💡 General Feature Request
about: Suggest an enhancement to Meshery.
title: ''
labels: 'kind/enhancement'
assignees: ''
---

**Current Behavior**
### Current Behavior
<!-- A brief description of what the problem is. (e.g. I need to be able to...) -->


**Desired Behavior**
### Desired Behavior
<!-- A brief description of the enhancement. -->

### Implementation
<!-- [Optional] Specifics on the approach to fulfilling the feature request. -->

---
**Resources**
<!-- Helpful tools and reference information. -->
### Acceptance Tests
<!-- [Optional] Stipulations of functional behavior or non-functional items that must be in-place in order for the issue to be closed. -->

**Alternatives / Additional Context**
<!-- A brief description of any alternative solutions or features you've considered or other context that might be helpful. -->
### Mockups
<!-- [Optional] Any visual diagrams of the desired user interface. -->

---
### Contributor [Guides](https://docs.meshery.io/project/contributing) and [Handbook](https://layer5.io/community/handbook)
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/contributing/build-and-release)
- 📚 [Instructions for contributing to documentation](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#documentation-contribution-flow)
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
- 🎨 Wireframes and designs for Meshery UI in [Figma](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
26 changes: 13 additions & 13 deletions .github/config.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
#-------------------------------------------------------------------------------
# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
# Comment to be posted to on first time issues
# Comment to be posted to on first time issues
newIssueWelcomeComment: >
Thanks for opening this issue. A contributor will be by to give feedback soon. In the meantime, please review the [Layer5 Community Welcome Guide](https://docs.google.com/document/d/17OPtDE_rdnPQxmk2Kauhm3GwXF1R5dZ3Cj8qZLKdo5E/edit?usp=sharing) and sure to join the [community Slack](http://slack.layer5.io/).
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
# Comment to be posted to on PRs from first time contributors in your repository
Thanks for opening this issue. A contributor will be by to give feedback soon. In the meantime, please review the [Contributors' Welcome Guide](https://docs.meshery.io/project/community), engage in the [discussion forum](http://discuss.meshery.io), and be sure to join the [community Slack](http://slack.meshery.io/).
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
# Comment to be posted to on PRs from first time contributors in your repository
newPRWelcomeComment: >
Yay, your first pull request! :thumbsup: A contributor will be by to give feedback soon. In the meantime, please review the [Layer5 Community Welcome Guide](https://docs.google.com/document/d/17OPtDE_rdnPQxmk2Kauhm3GwXF1R5dZ3Cj8qZLKdo5E/edit?usp=sharing) and sure to join the [community Slack](http://slack.layer5.io/).
Be sure to double-check that you have signed your commits. Here are instructions for [making signing an implicit activity while peforming a commit](https://github.com/meshery/meshkit/blob/master/CONTRIBUTING.md#general-contribution-flow).
Yay, your first pull request! :thumbsup: A contributor will be by to give feedback soon. In the meantime, you can find updates in the [#github-notifications](https://layer5io.slack.com/archives/CLVT4TSG4) channel in the [community Slack](https://slack.meshery.io).
Be sure to double-check that you have signed your commits. Here are instructions for [making signing an implicit activity while performing a commit](https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin).
#-------------------------------------------------------------------------------
# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
Expand All @@ -18,11 +18,13 @@ firstPRMergeComment: >
Thanks for your contribution to Meshery! :tada:
<picture>
<source media="(prefers-color-scheme: dark)" srcset="./welcome/Meshery-light-logo.png">
<source media="(prefers-color-scheme: light)" srcset="./welcome/Meshery-dark-logo.png">
<img alt="Shows a black logo in light color mode and a white one in dark color mode." src="https://user-images.githubusercontent.com/25423296/163456779-a8556205-d0a5-45e2-ac17-42d089e3c3f8.png">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/meshery/meshery/master/.github/assets/images/Meshery-celebration-Dark.svg">
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/meshery/meshery/master/.github/assets/images/Meshery-celebration-Light.svg">
<img alt="Meshery Logo" src="">
</picture>
&nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; [Join the community](http://slack.meshery.io), if you haven't yet and please leave a :star: [star on the project](../stargazers). :smile:
#-------------------------------------------------------------------------------
# Configuration for request-info - https://github.com/behaviorbot/request-info
# Comment to reply with
Expand All @@ -33,7 +35,6 @@ requestInfoReplyComment: >
#requestInfoUserstoExclude:
# - layer5io/maintainers


#-------------------------------------------------------------------------------
# Configuration for sentiment-bot - https://github.com/behaviorbot/sentiment-bot
# *Required* toxicity threshold between 0 and .99 with the higher numbers being the most toxic
Expand All @@ -42,5 +43,4 @@ sentimentBotToxicityThreshold: .9

# *Required* Comment to reply with
sentimentBotReplyComment: >
Please be sure to review the code of conduct and be respectful of other users. // @layer5io/maintainers
Please be sure to review the code of conduct and be respectful of other users. // @meshery/maintainers
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
golangci:
name: lint
needs: [tidy]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@master
- uses: actions/setup-go@master
Expand All @@ -27,7 +27,7 @@ jobs:
run: make check
tidy:
name: tidy
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@master
- uses: actions/setup-go@master
Expand All @@ -40,7 +40,7 @@ jobs:
codecov:
name: codecov
needs: [ tidy ]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@master
- uses: actions/setup-go@v5
Expand Down
23 changes: 12 additions & 11 deletions .github/workflows/error-codes-updater.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
name: Meshkit Error Codes Utility Runner
on:
workflow_dispatch:
push:
branches:
- 'master'
- "master"
paths:
- '**.go'
- "**.go"

jobs:
Update-error-codes:
name: Error codes utility
if: github.repository == 'layer5io/meshkit'
runs-on: ubuntu-latest
if: github.repository == 'meshery/meshkit'
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@master
# token here with write access to meshkit repo
# token here with write access to meshkit repo
with:
token: ${{ secrets.GH_ACCESS_TOKEN }}
ref: 'master'
ref: "master"

- name: Setup Go
uses: actions/setup-go@master
with:
go-version: '1.23'
go-version: "1.23"

- name: Run utility
run: |
Expand All @@ -37,19 +38,19 @@ jobs:
commit_user_name: l5io
commit_user_email: [email protected]
commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
commit_options: '--signoff'
commit_options: "--signoff"
commit_message: "run error codes utility"
file_pattern: helpers/ **.go

# to push changes to meshery docs
- name: Checkout meshery
uses: actions/checkout@master
with:
repository: 'meshery/meshery'
repository: "meshery/meshery"
# token with write access to meshery repository
token: ${{ secrets.GH_ACCESS_TOKEN }}
path: 'meshery'
ref: 'master'
path: "meshery"
ref: "master"

- name: Update and push docs
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
update_release_draft:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
- uses: release-drafter/release-drafter@v5
Expand Down
14 changes: 7 additions & 7 deletions encoding/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (
)

const (
ErrDecodeYamlCode = ""
ErrUnmarshalCode = ""
ErrUnmarshalInvalidCode = ""
ErrUnmarshalSyntaxCode = ""
ErrUnmarshalTypeCode = ""
ErrUnmarshalUnsupportedTypeCode = ""
ErrUnmarshalUnsupportedValueCode = ""
ErrDecodeYamlCode = "meshkit-11245"
ErrUnmarshalCode = "meshkit-11246"
ErrUnmarshalInvalidCode = "meshkit-11247"
ErrUnmarshalSyntaxCode = "meshkit-11248"
ErrUnmarshalTypeCode = "meshkit-11249"
ErrUnmarshalUnsupportedTypeCode = "meshkit-11250"
ErrUnmarshalUnsupportedValueCode = "meshkit-11251"
)

// ErrDecodeYaml is the error when the yaml unmarshal fails
Expand Down
Loading

0 comments on commit 8410cfe

Please sign in to comment.