Skip to content

Commit

Permalink
resolved merge conflicts for Migration PR
Browse files Browse the repository at this point in the history
Signed-off-by: Aviral Asthana <[email protected]>
  • Loading branch information
Aviral0702 committed Aug 20, 2024
2 parents ef1e69a + b71e4b7 commit 87ca549
Show file tree
Hide file tree
Showing 7,543 changed files with 141,563 additions and 12,920 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/community_member_profile.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Let's recognize <@github-username> as a contributor and community member by crea
- GitHub: <!-- username only -->
- Twitter: <!-- handle only -->
- LinkedIn: <!-- <profilename> only https://www.linkedin.com/in/<profilename> -->
- Meshery Cloud: <!-- <user ID> only UUID https://meshery.layer5.io/user/<uuid> -->
- Layer5 Cloud: <!-- <user ID> only UUID https://meshery.layer5.io/user/<uuid> -->
- Link to profile picture:

A detailed explanation on how to set up a community member profile can be found in the [CONTRIBUTING.md](https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md)
Expand Down
5 changes: 5 additions & 0 deletions .github/build/Makefile.show-help.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.DEFAULT_GOAL := show-help
# See <https://gist.github.com/klmr/575726c7e05d8780505a> for explanation.
.PHONY: show-help
show-help:
@echo "$$(tput bold)Please specify a build target. The choices are:$$(tput sgr0)";echo;sed -ne"/^## /{h;s/.*//;:d" -e"H;n;s/^## //;td" -e"s/:.*//;G;s/\\n## /---/;s/\\n/ /g;p;}" ${MAKEFILE_LIST}|LC_ALL='C' sort -f|awk -F --- -v n=$$(tput cols) -v i=19 -v a="$$(tput setaf 6)" -v z="$$(tput sgr0)" '{printf"%s%*s%s ",a,-i,$$1,z;m=split($$2,w," ");l=n-i;for(j=1;j<=m;j++){l-=length(w[j])+1;if(l<= 0){l=n-i-length(w[j])-1;printf"\n%*s ",-i," ";}printf"%s ",w[j];}printf"\n";}'|more $(shell test $(shell uname) == Darwin && echo '-Xr')
2 changes: 1 addition & 1 deletion .github/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ firstPRMergeComment: >
&nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; Thank you for contributing to the Layer5 community! :tada:
\
\
![Congrats!](https://github.com/layer5io/layer5/blob/master/.github/welcome/Layer5-celebration.webp)
![Congrats!](https://raw.githubusercontent.com/layer5io/layer5/master/.github/welcome/Layer5-celebration.png)
\
\
&nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; [Join the community](https://slack.layer5.io), if you haven't yet and please leave a :star: [star on the project](../stargazers). :smile: and
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ updates:
schedule:
interval: monthly
reviewers:
- Nikhil-Ladha

25 changes: 21 additions & 4 deletions .github/label-commenter-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ comment:
"

labels:
- name: framework/discourse
- name: issue/design required
labeled:
issue:
body: This issue has been labeled with 'framework/discourse'. Note that prior to commencing you need to create an account [here](https://staging-discuss.layer5.io/) and then ask for the admin access. After that start contributing to the discuss forum.
body: This issue has been labeled with 'design-required'. Note that prior to commencing on implementation, a design specification needs to be created and reviewed for approval. See [Creating a Functional Specification](https://docs.google.com/document/d/1RP3IWLc-MiQS-QYasqCoVuCH7--G87p5ezE5f_nOzB8/edit?usp=sharing) to create a design spec.
action: open

- name: issue/remind
labeled:
issue:
Expand All @@ -20,7 +19,6 @@ labels:
pr:
body: Checking in... it has been awhile since we&#39;ve heard from you on this issue. Are you still working on it? Please let us know and please don&#39;t hesitate to contact a [MeshMate](https://layer5.io/community/meshmates/) or any other [community member](https://layer5.io/community/members) for assistance.
action: open

- name: issue/dco
labeled:
issue:
Expand All @@ -33,3 +31,22 @@ labels:
To amend the commits in this PR with your signoff using the instructions provided in the DCO check. \n\n
To configure your dev environment to automatically signoff on your commits in the future, see [these instructions](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin)."
action: open
- name: component/ui
labeled:
issue:
body: This issue has been labeled with 'component/ui'. 🧰 Here are docs on [Contributing to Meshery UI](https://docs.meshery.io/project/contributing/contributing-ui). 🎨 Here is the [Meshery UI Figma File](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI?node-id=4%3A0) File. Lastly, here are docs on [Contributing to Meshery's End-to-End Tests Using Cypress](https://docs.meshery.io/project/contributing/contributing-cypress).
action: open
pr:
body: This PR has been labeled with 'component/ui'. 🧰 Here are docs on [Contributing to Meshery UI](https://docs.meshery.io/project/contributing/contributing-ui). 🎨 Here is the [Meshery UI Figma File](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI?node-id=4%3A0) File. Lastly, here are docs on [Contributing to Meshery's End-to-End Tests Using Cypress](https://docs.meshery.io/project/contributing/contributing-cypress)
action: open
- name: component/mesheryctl
labeled:
issue:
body: This issue has been labeled with 'component/mesheryctl'. Note that after making changes you need to update it in the [mesheryctl command tracker](https://docs.google.com/spreadsheets/d/1q63sIGAuCnIeDs8PeM-0BAkNj8BBgPUXhLbe1Y-318o/edit#gid=0) spreadsheet.
action: open
pr:
body: This PR has been labeled with 'component/mesheryctl'. Note that after making changes you need to update it in the [mesheryctl command tracker](https://docs.google.com/spreadsheets/d/1q63sIGAuCnIeDs8PeM-0BAkNj8BBgPUXhLbe1Y-318o/edit#gid=0) spreadsheet.
action: open
# pr:
# body: Hi, please note that this issue will need an approved design specification before implementation proceeds. See [Creating a Functional Specification](https://docs.google.com/document/d/1RP3IWLc-MiQS-QYasqCoVuCH7--G87p5ezE5f_nOzB8/edit?usp=sharing) to create a design spec.
# action: open
128 changes: 82 additions & 46 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,63 +1,99 @@
area/docs:
- "readme.md"
- "contributing.md"
- changed-files:
- any-glob-to-any-file:
- "readme.md"
- "contributing.md"
area/ci:
- ".github/**/*"
- ".husky/**/*"
- changed-files:
- any-glob-to-any-file:
- ".github/**/*"
- ".husky/**/*"
area/blog:
- "src/collections/blog/**/*"
- "src/pages/blog/**/*"
- "src/templates/blog-*.js"
- changed-files:
- any-glob-to-any-file:
- "src/collections/blog/**/*"
- "src/pages/blog/**/*"
- "src/templates/blog-*.js"
area/careers:
- "src/collections/careers/**/*"
- "src/collections/programs/**/*"
- "src/templates/career-*.js"
- "src/pages/careers/*"
- changed-files:
- any-glob-to-any-file:
- "src/collections/careers/**/*"
- "src/collections/programs/**/*"
- "src/templates/career-*.js"
- "src/pages/careers/*"
area/community:
- "src/collections/members/**/*"
- "src/pages/community/**/*"
- "src/templates/member-*.js"
- changed-files:
- any-glob-to-any-file:
- "src/collections/members/**/*"
- "src/pages/community/**/*"
- "src/templates/member-*.js"
area/events:
- "src/collections/events/**/*"
- "src/templates/event*.js"
- changed-files:
- any-glob-to-any-file:
- "src/collections/events/**/*"
- "src/templates/event*.js"
area/handbook:
- "src/components/HandbookCard/**/*"
- "src/components/Handbook-navigation/**/*"
- "src/sections/Community/Handbook/**/*"
- changed-files:
- any-glob-to-any-file:
- "src/components/HandbookCard/**/*"
- "src/components/Handbook-navigation/**/*"
- "src/sections/Community/Handbook/**/*"
area/landscape:
- "src/sections/Landscape/**/*"
- "src/components/Landscape-Table/**/*"
- "src/collections/landscape/**/*"
- changed-files:
- any-glob-to-any-file:
- "src/sections/Landscape/**/*"
- "src/components/Landscape-Table/**/*"
- "src/collections/landscape/**/*"
area/learn:
- "content-learn"
- "src/components/Learn-Components/**/*"
- "src/collections/service-mesh-books/**/*"
- "src/collections/service-mesh-learn/**/*"
- "src/collections/service-mesh-workshops/**/*"
- "src/templates/book-*.js"
- "src/templates/course-*.js"
- "src/templates/lab-*.js"
- "src/templates/learn-*.js"
- "src/templates/workshop-*.js"
- changed-files:
- any-glob-to-any-file:
- "content-learn"
- "src/components/Learn-Components/**/*"
- "src/collections/service-mesh-books/**/*"
- "src/collections/service-mesh-learn/**/*"
- "src/collections/service-mesh-workshops/**/*"
- "src/templates/book-*.js"
- "src/templates/course-*.js"
- "src/templates/lab-*.js"
- "src/templates/learn-*.js"
- "src/templates/workshop-*.js"
area/news:
- "src/collections/news/**/*"
- "src/templates/news-*.js"
- changed-files:
- any-glob-to-any-file:
- "src/collections/news/**/*"
- "src/templates/news-*.js"
area/partners:
- "src/collections/partners/**/*"
- changed-files:
- any-glob-to-any-file:
- "src/collections/partners/**/*"
area/resources:
- "src/collections/resources/**/*"
- "src/templates/resource-*.js"
- changed-files:
- any-glob-to-any-file:
- "src/collections/resources/**/*"
- "src/templates/resource-*.js"
area/projects:
- "src/collections/projects/**/*"
- "src/pages/projects/**/*"
type/core-styls:
- "src/sections/app.style.js"
- "src/theme/app/*"
- changed-files:
- any-glob-to-any-file:
- "src/collections/projects/**/*"
- "src/pages/projects/**/*"
area/core-styles:
- changed-files:
- any-glob-to-any-file:
- "src/sections/app.style.js"
- "src/theme/app/*"
area/site-config:
- "gatsby-*.js"
- changed-files:
- any-glob-to-any-file:
- "gatsby-*.js"
area/packages:
- "package-*.js"
- changed-files:
- any-glob-to-any-file:
- "package-*.js"
project/meshery:
- "src/collections/integrations/**/*"
- changed-files:
- any-glob-to-any-file:
- "src/collections/integrations/**/*"
project/meshmap:
- "src/sections/Meshmap/**/*"
- changed-files:
- any-glob-to-any-file:
- "src/sections/Meshmap/**/*"
25 changes: 25 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Checks
on:
pull_request:
branches: [ master ]
types: [opened, synchronize, reopened]


jobs:
checks:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@master
with:
persist-credentials: false
fetch-depth: 1

- name: NPM Install
run: npm install

- name: Build
run: npm run build

- name: Run Eslint
run: npm run checklint
28 changes: 28 additions & 0 deletions .github/workflows/label-commenter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Label Commenter

on:
issues:
types:
- labeled

pull_request_target:
types:
- labeled

permissions:
contents: read
issues: write
pull-requests: write

jobs:
comment:
runs-on: ubuntu-22.04
steps:
- name: Checkout repo 🛎️
uses: actions/checkout@master
with:
ref: master # Set your default branch
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Label Commenter
uses: peaceiris/[email protected]
4 changes: 2 additions & 2 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
- uses: actions/labeler@v5
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
repo-token: "${{ secrets.GITHUB_TOKEN }}"
4 changes: 2 additions & 2 deletions .github/workflows/lighthouseci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
lighthouseci:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 19
- run: npm install --legacy-peer-deps && npm install -g @lhci/[email protected]
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/meshmap.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: MeshMap Screenshot Service
'on':
pull_request_target:
types:
- opened
- synchronize
- reopened
workflow_call:
inputs:
fileName:
description: Relative file path from the root directory
required: true
type: string
outputs:
resource_url:
description: The URL of the generated resource.
value: ${{ jobs.MeshMapScreenshot.outputs.resource_url }}
permissions:
actions: read
contents: write
security-events: write
statuses: write
pull-requests: write
id-token: write
jobs:
MeshMapScreenshot:
runs-on: ubuntu-latest
outputs:
resource_url: ${{ steps.test_result.outputs.resource_url }}
steps:
- name: Set PR number
run: |
export pull_number=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")
echo "PULL_NO=$pull_number" >> $GITHUB_ENV
- uses: actions/checkout@v4
- uses: actions/checkout@v4
with:
path: action
repository: layer5labs/meshmap-snapshot
- id: test_result
uses: ${GITHUB_REF/refs/tags//}
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
mesheryToken: ${{ secrets.MESHERY_TOKEN }}
prNumber: ${{ env.PULL_NO }}
application_type: Kubernetes Manifest
filePath: ${{ inputs.fileName == '' && '.gitpod.yml' || inputs.fileName }}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,5 @@ default.profraw
.husky/_/

# Lighthouse CI
.lighthouseci/
.lighthouseci/
.gitpod.yml
11 changes: 11 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This configuration file was automatically generated by Gitpod.
# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml)
# and commit this file to your remote git repository to share the goodness with others.

# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart

tasks:
- init: npm install && npm run build && make
command: npm run start


Loading

0 comments on commit 87ca549

Please sign in to comment.