Merge branch 'master' into master

.github/ISSUE_TEMPLATE/meshmodel.md → .github/ISSUE_TEMPLATE/models.md

@@ -1,12 +1,12 @@
 ---
-name: 🖥 💡 MeshModel Update
-about: An update, addition, or removal of one or more of the models, components, relationships, or policies within MeshModel.
-title: '[MeshModel]: '
-labels: area/meshmodel
+name: 🖥 💡 Models Update
+about: An update, addition, or removal of one or more of the models, components, relationships, workflows, or policies within Meshery Models.
+title: '[Models]: '
+labels: area/models
 assignees: ''
 ---
 ### Current Situation
-<!-- A brief description of the current state of MeshModel -->
+<!-- A brief description of the current state of Models -->
 
 ### Proposed Change
 <!-- A brief description of the change. -->
@@ -19,27 +19,29 @@ assignees: ''
 - 🖥 [MeshModel Overview](https://docs.google.com/presentation/d/1SQMfyu5shjpGKlYONdVzOtd7UYTgLWBcgUvHMLCZ2tY/edit#slide=id.g226f5de5180_19_259)
 - 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
 
-## How to make updates to MeshModel
+## Contributing to Meshery Models
+
+!! See https://docs.meshery.io/project/contributing/contributing-models
 
 ### Instructions for Models
-1. _Forthcoming_
+
+_Forthcoming_
 
 ### Instructions for Components
 While the default shape for new components is a circle, each component should be considered for its best-fit shape.
 1. Review and familiarize with the available set of predefined relationship types. Refer the Cytoscape [node types](https://js.cytoscape.org/demos/node-types/) for a list of possible shapes. 
-1. Propose a specific shape, best-suited to visually represent the Component. Example - Deployment as a pentagon.
-1. Proposee a specific icon, best-suited to visually represent the Component. Example - DaemonSet as a skull icon.
+1. Propose a specific shape, best-suited to visually represent the Component. _Example - Deployment as a pentagon._
+1. Proposee a specific icon, best-suited to visually represent the Component. _Example - DaemonSet as a skull icon._
 
 ### Instructions for Relationships
 1. Identify the relationship and any specific constraints to be enforced between the two specific components, their models or potentially other components, models, or environmental considerations.
-1. Propose a specific visual representation for the relationship. Visual representation examples:
-    - [Hierarchical](https://github.com/meshery/meshery/blob/master/.github/assets/images/hierarchical_relationship.png)
-    - [Sibling](https://github.com/meshery/meshery/blob/master/.github/assets/images/sibling_relationship.png)
-    - [Binding](https://github.com/meshery/meshery/blob/master/.github/assets/images/binding_relationship.png)
+1. Propose a specific visual representation for the relationship. Visual representation examples: [Hierarchical](https://docs.meshery.io/assets/img/meshmodel/relationships/hierarchical_relationship.png), [Sibling](https://docs.meshery.io/assets/img/meshmodel/relationships/sibling_relationship.png), [Binding](https://docs.meshery.io/assets/img/meshmodel/relationships/binding_relationship.png), [Edge](https://docs.meshery.io/assets/img/meshmodel/relationships/mount_edge_relationship.png)
 1. Prospose the appropriate relationship type, using one of the predefined set of relationship types or suggest a new relationship where an existing type does not fit.
 1. Create a Relationship Definition (yaml). See the [Relationship Schema](https://github.com/meshery/meshery/tree/master/server/meshmodel/schemas) in MeshModel and [examples]([url](https://github.com/meshery/meshery/tree/master/server/meshmodel/relationships)).
 1. Create a policy for evaluation of the relationship (rego). See examples.
 
 ### Instructions for Policies
 1. _Forthcoming_
+### Instructions for Policies
+1. _Forthcoming_
 

.github/workflows/generate_keys.yml

@@ -0,0 +1,39 @@
+name: Import Keys
+on: 
+  workflow_dispatch:
+    inputs:
+      spreadsheet_uri:
+        description: Link of the spreadsheet containing keys.
+        type: string
+jobs:
+  fetch-keys:
+    name: Fetch Keys
+    if: github.repository == 'meshery/meshery'
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v4
+      with:
+        token: ${{ secrets.GH_ACCESS_TOKEN }}
+        fetch-depth: 1
+    - name: Set spreadsheet_uri as environment variable
+      run: echo "spreadsheet_uri=" >> $GITHUB_ENV
+      if: inputs.spreadshet_uri != ''
+          echo "spreadsheet_uri=${{ inputs.spreadsheet_uri }}" >> $GITHUB_ENV
+
+    - name: Dump keys from the spreadsheet
+      run: |
+        curl -L "${{ env.spreadsheet_uri }}" -o "./keys.csv";      
+    - name: Create permissions folder
+      run: |
+          [ ! -d "./permissions" ] && mkdir -p "./permissions";
+          mv keys.csv permissions/keys.csv;
+    - name: Commit changes
+      uses: stefanzweifel/git-auto-commit-action@v5
+      with:
+        commit_message: Added permissions keys.
+        branch: master
+        commit_options: '--signoff'
+        commit_user_name: l5io
+        commit_user_email: [email protected]
+        commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>author of the commit that triggered the run

.github/workflows/test_adaptersv2.yaml

@@ -256,7 +256,7 @@ jobs:
               status="partial"
           fi
           echo $(jq '."overall-status" |=  "'$status'"' data.json) > data.json;     
-          MESHERY_VERSION=$(curl -L -s https://github.com/meshery/meshery/releases/latest | grep "/releases/tag/" | head -1 | awk -F '"' '{print $4}' | awk -F '/' '{print $NF}' )    
+          MESHERY_VERSION=$(curl -L -s https://github.com/meshery/meshery/releases/latest | grep -oP 'releases/tag/\K[^"]+' | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+' | head -1)    
           echo $(jq '.metadata."meshery-server-version" |="'$MESHERY_VERSION'"' data.json ) > data.json
           echo "exitstatus=$exitstatus" >> $GITHUB_ENV
       - name: UploadResults

Makefile

@@ -42,6 +42,7 @@ docker-local-cloud:
 	-e PROVIDER_BASE_URLS=$(REMOTE_PROVIDER_LOCAL) \
 	-e DEBUG=true \
 	-e ADAPTER_URLS=$(ADAPTER_URLS) \
+	-e KEYS_PATH=$(KEYS_PATH) \
 	-p 9081:8080 \
 	layer5/meshery ./meshery
 
@@ -53,6 +54,7 @@ docker-cloud:
 	-e PROVIDER_BASE_URLS=$(MESHERY_CLOUD_PROD) \
 	-e DEBUG=true \
 	-e ADAPTER_URLS=$(ADAPTER_URLS) \
+	-e KEYS_PATH=$(KEYS_PATH) \
 	-v meshery-config:/home/appuser/.meshery/config \
   -v $(HOME)/.kube:/home/appuser/.kube:ro \
 	-p 9081:8080 \
@@ -84,6 +86,7 @@ server-local: dep-check
 	DEBUG=true \
 	ADAPTER_URLS=$(ADAPTER_URLS) \
 	APP_PATH=$(APPLICATIONCONFIGPATH) \
+	KEYS_PATH=$(KEYS_PATH) \
 	go run main.go error.go
 
 ## Build Meshery Server on your local machine.
@@ -95,6 +98,7 @@ build-server: dep-check
 	DEBUG=true \
 	ADAPTER_URLS=$(ADAPTER_URLS) \
 	APP_PATH=$(APPLICATIONCONFIGPATH) \
+	KEYS_PATH=$(KEYS_PATH) \
 	GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go build ./server/cmd/main.go ./server/cmd/error.go
 	chmod +x ./main
 
@@ -107,6 +111,7 @@ server: dep-check
 	DEBUG=true \
 	ADAPTER_URLS=$(ADAPTER_URLS) \
 	APP_PATH=$(APPLICATIONCONFIGPATH) \
+	KEYS_PATH=$(KEYS_PATH) \
 	go run main.go error.go;
 
 ## Build and run Meshery Server on your local machine.
@@ -120,6 +125,7 @@ server-without-operator: dep-check
 	DEBUG=true \
 	ADAPTER_URLS=$(ADAPTER_URLS) \
 	APP_PATH=$(APPLICATIONCONFIGPATH) \
+	KEYS_PATH=$(KEYS_PATH) \
 	go run main.go error.go;
 
 ## Build and run Meshery Server with no Kubernetes components on your local machine.
@@ -132,6 +138,7 @@ server-skip-compgen:
 	ADAPTER_URLS=$(ADAPTER_URLS) \
 	APP_PATH=$(APPLICATIONCONFIGPATH) \
  	SKIP_COMP_GEN=true \
+	KEYS_PATH=$(KEYS_PATH) \
 	go run main.go error.go;
 
 ## Build and run Meshery Server on your local machine.
@@ -145,6 +152,7 @@ server-without-k8s: dep-check
 	DEBUG=true \
 	ADAPTER_URLS=$(ADAPTER_URLS) \
 	APP_PATH=$(APPLICATIONCONFIGPATH) \
+	KEYS_PATH=$(KEYS_PATH) \
 	go run main.go error.go;
 
 server-remote-provider: dep-check
@@ -156,6 +164,7 @@ server-remote-provider: dep-check
 	DEBUG=true \
 	ADAPTER_URLS=$(ADAPTER_URLS) \
 	APP_PATH=$(APPLICATIONCONFIGPATH) \
+	KEYS_PATH=$(KEYS_PATH) \
 	go run main.go error.go;
 
 server-local-provider: dep-check
@@ -167,6 +176,7 @@ server-local-provider: dep-check
 	DEBUG=true \
 	ADAPTER_URLS=$(ADAPTER_URLS) \
 	APP_PATH=$(APPLICATIONCONFIGPATH) \
+	KEYS_PATH=$(KEYS_PATH) \
 	go run main.go error.go;
 
 ## Build and run Meshery Server with no seed content.
@@ -179,6 +189,7 @@ server-no-content:
 	ADAPTER_URLS=$(ADAPTER_URLS) \
 	APP_PATH=$(APPLICATIONCONFIGPATH) \
 	SKIP_DOWNLOAD_CONTENT=true \
+	KEYS_PATH=$(KEYS_PATH) \
 	go run main.go error.go;
 
 server-playground: dep-check
@@ -191,6 +202,7 @@ server-playground: dep-check
 	ADAPTER_URLS=$(ADAPTER_URLS) \
 	APP_PATH=$(APPLICATIONCONFIGPATH) \
 	PLAYGROUND=true \
+	KEYS_PATH=$(KEYS_PATH) \
 	go run main.go error.go;
 
 ## Lint check Meshery Server.