Merge pull request #33 from kumarabd/kumarabd/feature/smi-grpc-fix

modified smi-conformance build

.github/workflows/ci.yml

@@ -25,15 +25,21 @@ jobs:
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
-    - name: Docker build & push
+    - name: Docker build & push services
       if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master') && success()
       run: |
         cd service && docker build --no-cache -t ${{ secrets.IMAGE_NAME }} .
         docker tag ${{ secrets.IMAGE_NAME }}:latest ${{ secrets.IMAGE_NAME }}:${GITHUB_SHA::6}
         docker push ${{ secrets.IMAGE_NAME }}:latest
         docker push ${{ secrets.IMAGE_NAME }}:${GITHUB_SHA::6}
+        cd ../smi-conformance && docker build --no-cache -t smi-conformance:latest .
+        docker tag smi-conformance:latest smi-conformance:${GITHUB_SHA::6}
+        docker push smi-conformance:latest
+        docker push smi-conformance:${GITHUB_SHA::6}
     - name: Docker tag release & push
       if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success()
       run: |
         docker tag ${{ secrets.IMAGE_NAME }}:latest ${{ secrets.IMAGE_NAME }}:${GITHUB_REF/refs\/tags\//}
         docker push ${{ secrets.IMAGE_NAME }}:${GITHUB_REF/refs\/tags\//}
+        docker tag smi-conformance:latest smi-conformance:${GITHUB_REF/refs\/tags\//}
+        docker push smi-conformance:${GITHUB_REF/refs\/tags\//}

deploy/maesh.yaml

@@ -97,11 +97,11 @@ mesh:
 # Tracing configuration.
 #
 tracing:
-  deploy: true
+  deploy: false
   jaeger:
     image:
       name: groundnuty/k8s-wait-for:v1.3
-    enabled: true
+    enabled: false
     localagenthostport: ""
     samplingserverurl: ""
   # datadog:
@@ -142,10 +142,10 @@ tracing:
 # Metrics configuration.
 #
 metrics:
-  deploy: true
+  deploy: false
   prometheus:
     # whether to expose Prometheus metrics
-    enabled: true
+    enabled: false
   ## you can override values of the metrics subchart here.
   ## check charts/metrics/values.yaml for the defaults.
   ## example:

smi-conformance/Dockerfile

@@ -1,20 +1,21 @@
 FROM golang:1.14-alpine3.11 as build-img
 LABEL maintainer "Layer5.io"
 
-ENV GO111MODULE=off
 
 RUN apk update && apk add --no-cache git libc-dev gcc pkgconf && mkdir /home/meshery
 COPY ${PWD} /go/src/github.com/layer5io/learn-layer5/smi-conformance/
 WORKDIR /go/src/github.com/layer5io/learn-layer5/smi-conformance/
 # RUN git rev-parse HEAD > /home/meshery/version
 # RUN git describe --tags `git rev-list --tags --max-count=1` >> /home/com/version
-
 RUN go mod vendor && go build -a -ldflags "-s -w" -o /home/meshery/smi_conformance main.go
 
 FROM alpine:latest
 
-RUN apk --no-cache add ca-certificates
+RUN apk --no-cache add ca-certificates && mkdir /home/test-yamls && mkdir /home/test-yamls/traffic-access && mkdir /home/test-yamls/traffic-spec && mkdir /home/test-yamls/traffic-split
 COPY --from=build-img /home/meshery/** /home/
+COPY --from=build-img /go/src/github.com/layer5io/learn-layer5/smi-conformance/test-gen/test-yamls/traffic-access/** /home/test-yamls/traffic-access/
+COPY --from=build-img /go/src/github.com/layer5io/learn-layer5/smi-conformance/test-gen/test-yamls/test-split/** /home/test-yamls/traffic-split/
+COPY --from=build-img /go/src/github.com/layer5io/learn-layer5/smi-conformance/test-gen/test-yamls/test-spec/** /home/test-yamls/traffic-spec/
 WORKDIR /home/
 EXPOSE 10008
 CMD ["sh","-c","./smi_conformance"]

smi-conformance/conformance/conformance.proto

@@ -5,18 +5,25 @@ option go_package = "conformance;conformance";
 
 message Request {
     map<string, string> annotations=1;
-    string meshname=2;
+    string meshname = 2;
 }
 
 message SingleTestResult {
-    string name =1;
-    string testCasesPassed =2;
-    string totalCases =3;
-    string message=4;
+    string name = 1;
+    string time = 2;
+    string assertions = 3;
+    Failure failure = 4;
+}
+
+message Failure {
+	string test = 1;
+    string message = 2;
 }
 
 message Response {
-    repeated SingleTestResult singleTestResult=1;
+	string tests = 1;
+	string failures = 2;
+    repeated SingleTestResult singleTestResult=3;
 }
 
 service conformanceTesting{

smi-conformance/go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4
 	github.com/kudobuilder/kuttl v0.0.0-00010101000000-000000000000
 	github.com/kumarabd/gokit v0.2.0
+	github.com/sirupsen/logrus v1.6.0
 	github.com/stretchr/testify v1.6.1 // indirect
 	golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1 // indirect
 	google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 // indirect