update action to just apply patterns

Signed-off-by: Navendu Pottekkat <[email protected]>

update action to just apply patterns

Signed-off-by: Navendu Pottekkat <[email protected]>

remove service mesh

Signed-off-by: Navendu Pottekkat <[email protected]>

loop through all service meshes

Signed-off-by: Navendu Pottekkat <[email protected]>

update workflow

Signed-off-by: Navendu Pottekkat <[email protected]>

update action script

Signed-off-by: Navendu Pottekkat <[email protected]>

update script

Signed-off-by: Navendu Pottekkat <[email protected]>

update adapters list

Signed-off-by: Navendu Pottekkat <[email protected]>

update script

Signed-off-by: Navendu Pottekkat <[email protected]>

update script

Signed-off-by: Navendu Pottekkat <[email protected]>

update script

Signed-off-by: Navendu Pottekkat <[email protected]>

Author: pottekkat

.gitignore

@@ -11,5 +11,7 @@
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
+.vscode/*
+
 # Dependency directories (remove the comment below to include it)
 # vendor/

action.yml

@@ -2,23 +2,25 @@ name: "Service Mesh Pattern Testing with Meshery"
 description: "Importing Pattern to Meshery"
 author: "Layer5"
 inputs:
+  # token to authenticate with Meshery
   provider_token:
     description: "Provider token to use. NOTE: value of the 'token' key in auth.json"
-  service_mesh:
-    # used for provisioning appropriate meshery-adatper
-    description: "Service mesh to use. e.g: osm, istio etc"
-    default: istio
-    required: true
+    required: false
+  # platform to deploy Meshery to
   platform:
-    description: "Platform to deploy meshery on. Possible values: docker, kubernetes"
+    description: "Platform to deploy Meshery to. Allowed values: docker, kubernetes"
     default: docker
-  url:
-    description: "A raw Github URL for the patterns to be deployed"
-    default: "https://raw.githubusercontent.com/service-mesh-patterns/service-mesh-patterns/master/samples/IstioFilterPattern.yaml"
-    required: true
+    required: false
+  pattern_url:
+    description: "URL of the pattern to be deployed"
+    required: false
+  # upload the pattern file to the .github folder and reference its path relative to the folder
+  pattern_file:
+    description: "Name of the pattern file relative to the .github folder"
+    required: false
 runs:
   using: "node12"
   main: "main.js"
 branding:
-  icon: 'check-circle'
-  color: 'green'
+  icon: 'settings'
+  color: 'purple'

main.sh

@@ -6,14 +6,7 @@ set -o pipefail
 
 SCRIPT_DIR=$(dirname -- "$(readlink -f "${BASH_SOURCE[0]}" || realpath "${BASH_SOURCE[0]}")")
 
-# Short names
-declare -A meshName
-meshName["open_service_mesh"]=osm
-meshName["traefik_mesh"]=traefik-mesh
-meshName["network_service_mesh"]=nsm
-
 main() {
-	local INPUT_SERVICE_MESH="istio"
 	get_dependencies
 
 	setupArgs=()
@@ -25,30 +18,15 @@ main() {
 		setupArgs+=(--platform ${INPUT_PLATFORM})
 	fi
 
-	if [[ -n "${INPUT_SERVICE_MESH:-}" ]]; then
-		meshNameLower=`echo $INPUT_SERVICE_MESH  | tr -d '"' | tr '[:upper:]' '[:lower:]'`
-		if [ $meshNameLower = "open_service_mesh" ] || [ $meshNameLower = "traefik_mesh" ] || [ $meshNameLower = "network_service_mesh" ]
-		then
-			serviceMeshAbb=${meshName["$meshNameLower"]}
-		else
-			serviceMeshAbb=$meshNameLower
-		fi
-		setupArgs+=(--service-mesh ${serviceMeshAbb})
-	fi
-
 	bash "$SCRIPT_DIR/meshery.sh" "${setupArgs[@]}"
 
 	commandArgs=()
-	if [[ -n "${INPUT_PATTERN_FILENAME:-}" ]]; then
-		commandArgs=(--pattern-filename ${INPUT_PATTERN_FILENAME})
-	fi
-
-	if [[ -n "${INPUT_PATTERN_NAME:-}" ]]; then
-		commandArgs=(--pattern-name ${INPUT_PATTERN_NAME})
+	if [[ -n "${INPUT_PATTERN_FILE:-}" ]]; then
+		commandArgs=(--pattern-file ${INPUT_PATTERN_FILE})
 	fi
 
-	if [[ -n "${INPUT_SERVICE_MESH:-}" ]]; then
-		commandArgs+=(--service-mesh ${meshNameLower})
+	if [[ -n "${INPUT_PATTERN_URL:-}" ]]; then
+		commandArgs=(--pattern-url ${INPUT_PATTERN_URL})
 	fi
 
 	bash "$SCRIPT_DIR/mesheryctl.sh" "${commandArgs[@]}"

meshery.sh

@@ -9,21 +9,10 @@ SCRIPT_DIR=$(dirname -- "$(readlink -f "${BASH_SOURCE[0]}" || realpath "${BASH_S
 main() {
 
 	local provider_token=
-	local PLATFORM=docker
-	local service_mesh_adapter=
+	local meshery_platform=
 
 	parse_command_line "$@"
 
-	echo "Checking if a k8s cluster exits..."
-	if kubectl config current-context
-	then
-		echo "Cluster found"
-	else
-		printf "Cluster not found. \nCreating one...\n"
-		create_k8s_cluster
-		echo "Cluster created successfully!"
-	fi
-
 	if [[ -z $provider_token ]]
 	then
 		printf "Token not provided.\n Using local provider..."
@@ -35,46 +24,11 @@ main() {
 	kubectl config view --minify --flatten > ~/minified_config
 	mv ~/minified_config ~/.kube/config
 
-	curl -L https://git.io/meshery | DEPLOY_MESHERY=false bash -
-
-	mesheryctl system context create new-context --adapters $service_mesh_adapter --platform docker --url http://localhost:9081 --set --yes
-
-	mesheryctl system start --yes
+	curl -L https://git.io/meshery | PLATFORM=$meshery_platform bash -
 
 	sleep 30
 }
 
-create_k8s_cluster() {
-	curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64
-	sudo install minikube-linux-amd64 /usr/local/bin/minikube
-	sudo apt update -y
-	sudo apt install conntrack
-	minikube version
-	minikube start --driver=docker --kubernetes-version=v1.20.7
-	sleep 40
-}
-
-wait_for_docker() {
-	while :
-	do
-		if docker version -f '{{.Server.Version}} - {{.Client.Version}}'
-		then
-			break
-		else
-			sleep 5
-		fi
-	done
-}
-
-meshery_config() {
-	mkdir ~/.meshery
-	config='{"contexts":{"local":{"endpoint":"http://localhost:9081","token":"Default","platform":"docker","adapters":[],"channel":"stable","version":"latest"}},"current-context":"local","tokens":[{"location":"auth.json","name":"Default"}]}'
-
-	echo $config | yq e '."contexts"."local"."adapters"[0]="'$1'"' -P - > ~/.meshery/config.yaml
-
-	cat ~/.meshery/config.yaml
-}
-
 parse_command_line() {
 	while :
 	do
@@ -90,22 +44,13 @@ parse_command_line() {
 				;;
 			-p|--platform)
 				if [[ -n "${2:-}" ]]; then
-					PLATFORM=$2
+					meshery_platform=$2
 					shift
 				else
 					echo "ERROR: '-p|--platform' cannot be empty." >&2
 					exit 1
 				fi
 				;;
-			--service-mesh)
-				if [[ -n "${2:-}" ]]; then
-					service_mesh_adapter=meshery-$2
-					shift
-				else
-					echo "ERROR: '--service-mesh' cannot be empty." >&2
-					exit 1
-				fi
-				;;
 			*)
 				break
 				;;

mesheryctl.sh

@@ -10,66 +10,63 @@ declare -A adapters
 adapters["istio"]=meshery-istio:10000
 adapters["linkerd"]=meshery-linkerd:10001
 adapters["consul"]=meshery-consul:10002
-adapters["octarine"]=meshery-octarine:10003
-adapters["nsm"]=meshery-nsm:10004
 adapters["network_service_mesh"]=meshery-nsm:10004
 adapters["kuma"]=meshery-kuma:10007
 adapters["cpx"]=meshery-cpx:10008
-adapters["osm"]=meshery-osm:10009
 adapters["open_service_mesh"]=meshery-osm:10009
-adapters["traefik-mesh"]=meshery-traefik-mesh:10006
-adapters["traefik_mesh"]=meshery-traefik-mesh:10006
 
 main() {
 
-	local pattern_filename=pat.yml
-	local service_mesh=
-	local service_mesh_adapter=
-	local url=
-	
+	local pattern_file=
+	local pattern_url=
 
 	parse_command_line "$@"
 
-		shortName=$(echo ${adapters["$service_mesh"]} | cut -d '-' -f2 | cut -d ':' -f1)
-		
-		docker network connect bridge meshery_meshery_1
-		docker network connect minikube meshery_meshery_1
-		docker network connect bridge meshery_meshery-"$shortName"_1
-		docker network connect minikube meshery_meshery-"$shortName"_1
+	docker network connect bridge meshery_meshery_1
+	docker network connect minikube meshery_meshery_1
 
-		mesheryctl system config minikube -t ~/auth.json
-		echo "Deploying $service_mesh..."
-		mesheryctl mesh deploy --adapter $service_mesh_adapter -t ~/auth.json $service_mesh
-		sleep 30
-		docker ps
-		mesheryctl pattern apply --file $url -t ~/auth.json
-		sleep 30s
-		kubectl get all --all-namespaces
+	for mesh in "${!adapters[@]}"
+		do
+			shortName=$(echo ${adapters["$mesh"]} | cut -d '-' -f2 | cut -d ':' -f1)
+			docker network connect bridge meshery_meshery-"$shortName"_1
+			docker network connect minikube meshery_meshery-"$shortName"_1
+		done
+
+	mesheryctl system config minikube -t ~/auth.json
+
+	if [ -z "$pattern_file" ]
+	then
+		mesheryctl pattern apply --file $pattern_url -t ~/auth.json
+	else
+		mesheryctl pattern apply --file $pattern_file -t ~/auth.json
+	fi
+
+	sleep 30s
+	kubectl get all --all-namespaces
 }
 
 parse_command_line() {
 	while :
 	do
 		case "${1:-}" in
-			--service-mesh)
+			--pattern-file)
+				if [[ -n "${2:-}" ]]; then
+					pattern_file=$2
+					shift
+				else
+					echo "ERROR: '--pattern-file' cannot be empty." >&2
+					exit 1
+				fi
+				;;
+			--pattern-url)
 				if [[ -n "${2:-}" ]]; then
-					service_mesh=$2
-					service_mesh_adapter=${adapters["$2"]}
+					pattern_url=$2
 					shift
 				else
-					echo "ERROR: '--service-mesh' cannot be empty." >&2
+					echo "ERROR: '--pattern-url' cannot be empty." >&2
 					exit 1
 				fi
 				;;
-			# --pattern-filename)
-			# 	if [[ -n "${2:-}" ]]; then
-			# 		pattern_filename=$2
-			# 		shift
-			# 	else
-			# 		echo "ERROR: '--pattern-filename' cannot be empty." >&2
-			# 		exit 1
-			# 	fi
-			# 	;;
 			*)
 				break
 				;;