.github/pull_request_template.md

@@ -11,10 +11,10 @@ Users ran into this bug doing ... \ Users needed this feature to ...
 # Checklist:
 
 - [ ] I included a concise, user-facing changelog (for details, see https://github.com/solo-io/go-utils/tree/master/changelogutils) which references the issue that is resolved.
-- [ ] If I updated APIs (our protos) or helm values, I ran `make install-deps generated-code` from `tools/wasme/cli` to ensure there will be no code diff
+- [ ] If I updated APIs (our protos) or helm values, I ran `make install-deps operator-gen generated-code` from `tools/wasme/cli` to ensure there will be no code diff
 - [ ] I followed guidelines laid out in the Gloo [contribution guide](https://docs.solo.io/gloo/latest/contributing/)
 - [ ] I opened a draft PR or added the work in progress label if my PR is not ready for review
 - [ ] I have performed a self-review of my own code
 - [ ] I have commented my code, particularly in hard-to-understand areas
 - [ ] I have made corresponding changes to the documentation
-- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] I have added tests that prove my fix is effective or that my feature works

.github/workflows/issue_board.yaml

@@ -0,0 +1,23 @@
+name: issue_board
+
+on:
+  issues:
+    types:
+      - opened
+      - labeled
+jobs:
+  add-to-project:
+    name: Add WASM issue to Gloo Edge project board
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/solo-io/projects/22
+          github-token: ${{ secrets.ORG_CROSS_REPO }}
+          labeled: enhancement, bug
+          label-operator: OR
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/solo-io/projects/24
+          github-token: ${{ secrets.ORG_CROSS_REPO }}
+          labeled: documentation

.github/workflows/pull_request.yaml

@@ -18,10 +18,10 @@ jobs:
       uses: styfle/cancel-workflow-action@0.4.1
       with:
         access_token: ${{ github.token }}
-    - name: Set up Go 1.14
+    - name: Set up Go 1.15
       uses: actions/setup-go@v1
       with:
-        go-version: 1.14
+        go-version: 1.15
       id: go
     - name: Install Protoc
       uses: solo-io/setup-protoc@master
@@ -37,8 +37,12 @@ jobs:
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
         restore-keys: |
           ${{ runner.os }}-go-
+    - name: Install Helm
+      run: |
+        cd $HOME && curl -sSL https://get.helm.sh/helm-v3.2.0-linux-amd64.tar.gz | tar -xzf - linux-amd64/helm && cd -
     - name: Generate Code
       run: |
+        export PATH=$HOME/linux-amd64:$PATH
         cd ./tools/wasme/cli
         ./ci/check-code-and-docs-gen.sh
   test:
@@ -53,6 +57,7 @@ jobs:
     - uses: engineerd/setup-kind@v0.5.0
       with:
         skipClusterCreation: "true"
+        version: v0.11.1
     - name: Install Protoc
       uses: solo-io/setup-protoc@master
       with:
@@ -101,23 +106,23 @@ jobs:
       fail-fast: false
       matrix:
         istio-version: [
-          '1.5.1',
           '1.6.6',
           '1.7.1',
-          '1.8.0-alpha.0'
+          '1.8.4',
+          '1.9.1'
         ]
         include:
-          - istio-version: '1.5.1'
-            istio-binary: 'https://github.com/istio/istio/releases/download/1.5.1/istio-1.5.1-linux.tar.gz'
-            istio-filter-image: 'webassemblyhub.io/ilackarms/assemblyscript-test:istio-1.5'
           - istio-version: '1.6.6'
             istio-binary: 'https://github.com/istio/istio/releases/download/1.6.6/istio-1.6.6-linux-amd64.tar.gz'
             istio-filter-image: 'webassemblyhub.io/ilackarms/assemblyscript-test:istio-1.5'
           - istio-version: '1.7.1'
             istio-binary: 'https://github.com/istio/istio/releases/download/1.7.1/istio-1.7.1-linux-amd64.tar.gz'
             istio-filter-image: 'webassemblyhub.io/sodman/istio-1-7:v0.3'
-          - istio-version: '1.8.0-alpha.0'
-            istio-binary: 'https://github.com/istio/istio/releases/download/1.8.0-alpha.0/istio-1.8.0-alpha.0-linux-amd64.tar.gz'
+          - istio-version: '1.8.4'
+            istio-binary: 'https://github.com/istio/istio/releases/download/1.8.4/istio-1.8.4-linux-amd64.tar.gz'
+            istio-filter-image: 'webassemblyhub.io/sodman/istio-1-7:v0.3'
+          - istio-version: '1.9.1'
+            istio-binary: 'https://github.com/istio/istio/releases/download/1.9.1/istio-1.9.1-linux-amd64.tar.gz'
             istio-filter-image: 'webassemblyhub.io/sodman/istio-1-7:v0.3'
     steps:
     - uses: actions/checkout@v2
@@ -128,6 +133,7 @@ jobs:
     - uses: engineerd/setup-kind@v0.5.0
       with:
         skipClusterCreation: "true"
+        version: v0.11.1
     - name: Install Protoc
       uses: solo-io/setup-protoc@master
       with:
@@ -158,7 +164,7 @@ jobs:
         KUBECTL: ${{ steps.kubectl.outputs.kubectl-path }}
       working-directory: ./tools/wasme/cli
       run: |
-        export PATH=$(dirname $KUBECTL):$PATH
+        export PATH=$PWD/linux-amd64:$(dirname $KUBECTL):$PATH
         export FILTER_IMAGE_ISTIO_TAG=${{ matrix.istio-filter-image }}
         export ISTIO_VERSION=${{ matrix.istio-version }}
         export TEST_PKG=pkg/deploy/istio/

.github/workflows/release.yaml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Go 1.14
+    - name: Set up Go 1.15
       uses: actions/setup-go@v2
       with:
-        go-version: 1.14
+        go-version: 1.15
     - name: Install Protoc
       uses: solo-io/setup-protoc@master
       with:

spec/README.md

@@ -1,133 +1,63 @@
+# Wasm Image specifications
 
-## WASM Artifact Image Specification v0.0.0
+## Introduction
 
-- [Introduction](#introduction)
-- [Terminology](#terminology)
-- [Description](#description)
-    - [Overview](#overview)
-    - [Layers](#layers)
-    - [Running OCI Images with Envoy](#running-oci-images-with-envoy)
-- [Format](#format)
-- [Envoy WASM Filter Specification](#envoy-wasm-filter-specification)
-    - [Example](#example)
+The Wasm Image specification defines how to bundle Wasm modules as container images. A compatible Wasm image consists of a Wasm binary file, and runtime metadata for the target Wasm runtime. We primarily consider the use case of [Envoy] as Wasm runtime and its Wasm filter/plugins, although the spec is intended to be generic and to provide a standard mechanism to manage the building and running of Wasm modules on any Wasm runtime.
 
-
-### Introduction:
-
-The WASM Artifact Image Specification defines how to bundle WASM modules as OCI images. WASM Artifact Images consist of a WASM binary file, configuration file, and metadata for the target WASM runtime.
-
-The spec is intended to be generic, allowing for any type of WASM module whether it is used to extend any Envoy, OPA, or the browser.
-
-The spec can be considered an extension of the OCI Artifact Spec designed specifically for use by applications which produce and consume WASM modules (as opposed to application containers). It is intended to provide a standard mechanism to manage the building and running of WASM modules. 
-
-This document considers primarily the use case of storing WASM Envoy Filters as OCI Images.
-
-### Terminology:
+## Terminology:
 
 | Term                               | Definition                                       |
 |------------------------------------|--------------------------------------------------|
-| WASM Module                        | The distributable, loadable, and executable unit of code in WebAssembly. 
-| WASM OCI Image Specification       | The specification for storing WASM modules as OCI Images.
-| WASM Runtime                       | The execution environment into which a WASM Module may be loaded. This refers to the application itself which loads and executes a wasm module. Examples include web browsers, the Open Policy Agent, the Envoy Proxy, or any other application which supports extension via WASM modules. 
-| Runtime Configuration              | Configuration specific to the runtime which consumes a module. This configuration is stored as JSON and bundled with the module in the image in the specification. 
-| Envoy WASM Filter                  | Custom Filters for the Envoy Proxy built as a WASM module.
-| Envoy WASM OCI Image               | Envoy Filters stored as OCI images according to the specification. 
-| Envoy WASM OCI Artifact Specification | An extension of the WASM OCI Artifact Spec which describes how to bundle and ship Envoy WASM filters as OCI Images. |
-
-### Description:
-
-#### Overview:
-
-The WASM OCI Artifact Specification defines a method of storing WASM modules which makes them easy to build, pull, publish, and execute.
-
-Because each execution environment (runtime) for a WASM module may have runtime-specific configuration parameters, a WASM image is composed of both a content layer, for the WASM module itself, as well as a config layer, with metadata describing the module which is relevant to the target runtime.
-
-#### Layers:
-
-The content layer always consists of the WASM module binary. 
-
-The config layer consists of a JSON-formatted string, which contains metadata for the target runtime. The runtime and ABI (Application Binary Interface) versions of an image can be deduced by parsing the config layer. 
-
-The config layer may also contain additional data, depending on the target runtime. For example, the config for a WASM Envoy Filter contains root_ids available on the filter. 
-
-For the sake of simplicity, the specification only supports a single module per image.
-
-#### Running OCI Images with Envoy:
+| Wasm Module                        | The distributable, loadable, and executable unit of code in WebAssembly. 
+| Wasm Image Specification           | The specification for storing Wasm modules as container images.
+| Wasm Runtime                       | The execution environment into which a Wasm Module may be loaded. This refers to the application itself which loads and executes a wasm module. Examples include web browsers, the Open Policy Agent, the Envoy Proxy, or any other application which supports extension via Wasm modules. 
+| Runtime Configuation              | Configuration or metadata specific to the runtime which consumes a module. 
 
-Envoy supports loading and running WASM modules via a file on local disk or an “Http datasource”.
+## Specifications
 
-Envoy WASM Filters can be stored according to the spec and run with Istio and Gloo, with the help of a local cache which pulls images from remote registries.  
+Here we have several specifications for how to bundle Wasm modules as container images. 
 
-Control planes then configure the Envoy instances to load the filter via the local cache, using the required root_id parameter supplied in the image config if it is available.
+There are two variants of the specification:
+- [spec.md](spec.md)
+- [spec-compat.md](spec-compat.md)
 
+Developers and Wasm module consumers can leverage both of these specifications. 
 
-### Format:
+For clarity, we call the variant in [spec.md](spec.md) *oci*, and the one in [spec-compat.md](spec-compat.md) *compat*.
 
-The WASM OCI Artifact Spec consists of two layers bundled together:
-- A layer specifying configuration for the target runtime
-- A layer containing the compiled WASM module itself
+## Difference between variants
 
-Each layer is associated with its own Media Type, which is stored in the OCI Descriptor for that layer:
+Our goal is to make the *oci* variant the default format for shipping Wasm modules in container images, we acknowledge however that there are toolchains and registries deployed and in use that do not support our custom media types yet. To accomodate those exisiting toolchains, there is the semantically equivalent *compat* variant, which provides the same feature set, but is compatible with existing tooling because it 'looks' very much like a normal container image. Implementations of this spec should support both variants.
 
-| Media Type | Type | Description |
-|------------|------|-------------|
-| application/vnd.module.wasm.config.v1+json | JSON Object | Configuration for the Target WASM runtime.
-| application/vnd.module.wasm.content.layer.v1+wasm | binary data (byte array) | The compiled module data |
+With that said, the key difference between these two variants is that, the *oci* variant makes use of the custom media types on [OCI Artifact] for image layers while the *compat* variant leverages the standard media types.
 
-`application/vnd.module.wasm.config.v1+json` Property Descriptions:
+As a consequence, that introduces the difference in tools available for building and pushing images. 
+For example, the only way to build and push *oci* variant images is to use [`wasme`] cli while you can use [`buildah`] or [`docker`] for *compat* variant images.
 
-| Property   | Type | Description |
-|------------|------|-------------|
-| type | string | Name of the target runtime. Required. Specifies the intended runtime of the bundled module. The content of the Opaque JSON Config is specific to the type of WASM runtime. 
-| abiVersions | string array | List of ABI Versions for the target runtime with which the image is compatible. The format for the version is dependent upon the runtime itself.
-| config | JSON Object | This field stores any configuration parameters required by the target runtime. Its structure depends on the specified runtime. |
+Not only that, the usage of custom media types on top of [OCI Artifact] requires registries to support arbitrary custom media types. Therefore, you might not be able to push *oci* variants to your registry while [WebAssemblyHub] is designed for accepting them.
 
+## Wasm image support in [Istio]
 
-### Envoy WASM Filter Specification
+Istio's Wasm Plugin API has support for **both of these variants** to deploy your Wasm plugins into Envoy sidecars.
 
-The runtime config for Envoy WASM Filter OCI Images has the following format:
+### Which variant should I use in [Istio]?
 
-- *type* is set to `envoy_proxy`
-- *abiVersion* is set to a recognized version of the Envoy Proxy WASM Filter ABI 
-- *config* is a JSON Object containing a list of Filter root_ids that can be used with the provided filter
+Given that Istio supports both of variants, you can choose whichever variant depending on your needs. For example, if you want to use [`docker`] cli, then choose *compat* variant and push them to your container registries. You might want to use [`wasme`] cli and [WebAssemblyHub] then choose the *oci* variant.
 
-The `root_ids` key in the *config* JSON Object will have a list of strings as a value. Each string in the list corresponds to the name of a registered Root Context Helper defined in the module.
+## How can I build images?
 
-#### Example:
+For *oci* variant, see the guideline by [`wasme`].
 
-The following descriptors provide an example of the OCI Image descriptors for an Envoy WASM Filter stored according to the specification:
-```
-[
-  {
-    "mediaType": "application/vnd.module.wasm.config.v1+json",
-    "digest": "sha256:d0a165298ae270c5644be8e9938036a3a7a5191f6be03286c40874d761c18abf",
-    "size": 125,
-    "annotations": {
-      "org.opencontainers.image.title": "runtime-config.json"
-    }
-  },
-  {
-    "mediaType": "application/vnd.module.wasm.content.layer.v1+wasm",
-    "digest": "sha256:5e82b945b59d03620fb360193753cbd08955e30a658dc51735a0fcbc2163d41c",
-    "size": 1043056,
-    "annotations": {
-      "org.opencontainers.image.title": "filter.wasm"
-    }
-  }
-]
-```
+For *compat* variant, follow the instructions in 
+- [build a compat image with buildah](spec-compat.md#appendix-1-build-a-compat-image-with-buildah) if you want to use [`buildah`].
+- [build a compat image with docker](spec-compat.md#appendix-2-build-a-compat-image-with-docker-cli) if you want to use [`docker`].
 
-The following is the runtime config stored as the `application/vnd.module.wasm.config.v1+json` layer:
 
-```{
-  "type": "envoy_proxy",
-  "abi_version": "v0-541b2c1155fffb15ccde92b8324f3e38f7339ba6",
-  "config": {
-    "root_ids": [
-      "add_header_root_id"
-    ]
-  }
-}
-```
+[Envoy]: https://github.com/envoyproxy/envoy
+[Istio]: https://github.com/istio/istio
+[OCI Artifact]: https://github.com/opencontainers/artifacts
+[WebAssemblyHub]: https://webassemblyhub.io/
 
-You can use the `wasme` tool to take new or existing module code and package it according to the WASM OCI Spec.
+[`docker`]: https://docs.docker.com/engine/reference/commandline/cli/
+[`buildah`]: https://github.com/containers/buildah
+[`wasme`]: https://docs.solo.io/web-assembly-hub/latest/installation/