Release 0.7.0 (#833)

.dockerignore

@@ -52,8 +52,6 @@ detritus/
 
 # Dotnet Core ignores
 *.swp
-*.pdb
-*.deps.json
 *.*~
 project.lock.json
 .DS_Store
@@ -84,9 +82,6 @@ bld/
 msbuild.log
 msbuild.err
 msbuild.wrn
-csharp/OpenMatch/obj
-Chart.lock
-
 
 # Visual Studio 2015
 .vs/
@@ -137,6 +132,3 @@ build/
 
 # Secrets Directories
 install/helm/open-match/secrets/
-
-# Helm tar charts
-install/helm/open-match/charts/

.github/ISSUE_TEMPLATE/bugreport.md

@@ -1,30 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: kind/bug
-assignees: ''
-
----
-
-<!-- Please use this template while reporting a bug and provide as much info as possible. Not doing so may result in your bug not being addressed in a timely manner. Thanks!
-
-If the matter is security related, please disclose it privately via 
--->
-
-
-**What happened**:
-
-**What you expected to happen**:
-
-**How to reproduce it (as minimally and precisely as possible)**:
-
-**Anything else we need to know?**:
-
-**Output of `kubectl version`**:
-
-**Cloud Provider/Platform (AKS, GKE, Minikube etc.)**: 
-
-**Open Match Release Version**:
-
-**Install Method(yaml/helm):**:

.github/ISSUE_TEMPLATE/featurerequest.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: kind/feature
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/release.md

@@ -1,5 +1,5 @@
 ---
-name: Publish a Release
+name: release
 about: Instructions and checklist for creating a release.
 title: 'Release X.Y.Z-rc.N'
 labels: kind/release
@@ -122,7 +122,7 @@ git push origin release-0.5
 **Note: This step is performed by the person who starts the release. It is
 only required once.**
 - [ ] Create the next [version milestone](https://github.com/googleforgames/open-match/milestones) and use [semantic versioning](https://semver.org/) when naming it to be consistent with the [Go community](https://blog.golang.org/versioning-proposal).
-- [ ] Create a *draft* [release](https://github.com/googleforgames/open-match/releases).  Note that github has both "Pre-release" and "draft" as different concepts for a release.  Until the release is finalized, only use "Save draft", and do not use "Publish release".
+- [ ] Create a *draft* [release](https://github.com/googleforgames/open-match/releases).
 - [ ] Use the [release template](https://github.com/googleforgames/open-match/blob/master/docs/governance/templates/release.md)
   - [ ] `Tag` = v{version}. Example: v0.5.0. Append -rc.# for release candidates. Example: v0.5.0-rc.1.
   - [ ] `Target` = release-X.Y. Example: release-0.5.
@@ -148,16 +148,7 @@ TODO: Add guidelines for labeling issues.
 - [ ] If this is a new minor version in the newest major version then run `./docs/governance/templates/release.sh {source version tag} latest`.
 - [ ] Copy the files from `build/release/` generated from `make release` to the release draft you created.  You can drag and drop the files using the Github UI.
 - [ ] Open the [`README.md`](readme-deploy) update the version references and submit. (Release candidates can ignore this step.)
-- [ ] Run proto-gen-doc to update API references in open-match-docs repo.
-- [ ] Update [Slack invitation link](https://slack.com/help/articles/201330256-invite-new-members-to-your-workspace#share-an-invite-link) in [open-match.dev](https://open-match.dev/site/docs/contribute/#get-involved).
-- [ ] Test Open Match installation under GKE and Minikube enviroment and make sure the first match example works.
-- [ ] Update usage requirements in the Installation doc - e.g. supported minikube version, kubectl version, golang version, etc.
-
-## Finalize
-
-- [ ] Save the release as a draft.
-- [ ] Circulate the draft release to active contributors.  Where reasonable, get everyone's ok on the release notes before continuing.
-- [ ] Publish the [Release](om-release) in Github.  This will notify repository watchers.
+- [ ] Publish the [Release](om-release) in Github.
 
 ## Announce
 

.gitignore

@@ -50,8 +50,6 @@ detritus/
 
 # Dotnet Core ignores
 *.swp
-*.pdb
-*.deps.json
 *.*~
 project.lock.json
 .DS_Store
@@ -82,8 +80,6 @@ bld/
 msbuild.log
 msbuild.err
 msbuild.wrn
-csharp/OpenMatch/obj
-Chart.lock
 
 # Visual Studio 2015
 .vs/
@@ -130,6 +126,3 @@ tools/reaper/reaper
 
 # Secrets Directories
 install/helm/open-match/secrets/
-
-# Helm tar charts
-install/helm/open-match/charts/

.golangci.yaml

@@ -16,8 +16,6 @@
 # with their default values.
 
 # https://github.com/golangci/golangci-lint#config-file
-service:
-  golangci-lint-version: 1.18.0
 
 # options for analysis running
 run:
@@ -167,21 +165,19 @@ linters-settings:
 linters:
   enable-all: true
   disable:
-    - dupl
-    - funlen
-    - gochecknoglobals
-    - goconst
-    - gocritic
-    - gocyclo
-    - gofmt
     - goimports
-    - gosec
-    - interfacer # deprecated - "A tool that suggests interfaces is prone to bad suggestions"
-    - lll
-    - prealloc
-    - scopelint
-    - staticcheck
     - stylecheck
+    - gocritic
+    - dupl
+    - gocyclo
+    - gosec
+    - lll
+    - staticcheck
+    - scopelint
+    - prealloc
+    - gofmt
+    - interfacer # deprecated - "A tool that suggests interfaces is prone to bad suggestions"
+    - gochecknoglobals
 
 #linters:
 #  enable-all: true

Dockerfile.base-build

@@ -12,8 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# When updating Go version, update Dockerfile.ci, Dockerfile.base-build, and go.mod
-FROM golang:1.13.1
+FROM golang:latest
 ENV GO111MODULE=on
 
 WORKDIR /go/src/open-match.dev/open-match

Dockerfile.ci

@@ -34,13 +34,11 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-stretch" && \
     apt-get update -y && apt-get install google-cloud-sdk google-cloud-sdk-app-engine-go -y -qq
 
 # Install Golang
-# https://github.com/docker-library/golang/blob/master/1.13/stretch/Dockerfile
+# https://github.com/docker-library/golang/blob/fd272b2b72db82a0bd516ce3d09bba624651516c/1.12/stretch/Dockerfile
 RUN mkdir -p /toolchain/golang
 WORKDIR /toolchain/golang
 RUN sudo rm -rf /usr/local/go/
-
-# When updating Go version, update Dockerfile.ci, Dockerfile.base-build, and go.mod
-RUN curl -L https://golang.org/dl/go1.13.1.linux-amd64.tar.gz | sudo tar -C /usr/local -xz
+RUN curl -L https://storage.googleapis.com/golang/go1.12.6.linux-amd64.tar.gz | sudo tar -C /usr/local -xz
 
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH

Makefile

@@ -52,7 +52,7 @@
 # If you want information on how to edit this file checkout,
 # http://makefiletutorial.com/
 
-BASE_VERSION = 0.8.0-rc.1
+BASE_VERSION = 0.7.0
 SHORT_SHA = $(shell git rev-parse --short=7 HEAD | tr -d [:punct:])
 BRANCH_NAME = $(shell git rev-parse --abbrev-ref HEAD | tr -d [:punct:])
 VERSION = $(BASE_VERSION)-$(SHORT_SHA)
@@ -61,10 +61,11 @@ YEAR_MONTH = $(shell date -u +'%Y%m')
 YEAR_MONTH_DAY = $(shell date -u +'%Y%m%d')
 MAJOR_MINOR_VERSION = $(shell echo $(BASE_VERSION) | cut -d '.' -f1).$(shell echo $(BASE_VERSION) | cut -d '.' -f2)
 PROTOC_VERSION = 3.8.0
-HELM_VERSION = 3.0.0-beta.5
+HELM_VERSION = 2.14.1
 KUBECTL_VERSION = 1.14.3
+SKAFFOLD_VERSION = latest
 MINIKUBE_VERSION = latest
-GOLANGCI_VERSION = 1.18.0
+GOLANGCI_VERSION = 1.17.1
 KIND_VERSION = 0.4.0
 SWAGGERUI_VERSION = 3.23.0
 TERRAFORM_VERSION = 0.12.3
@@ -99,7 +100,6 @@ GO111MODULE = on
 GOLANG_TEST_COUNT = 1
 SWAGGERUI_PORT = 51500
 PROMETHEUS_PORT = 9090
-JAEGER_QUERY_PORT = 16686
 GRAFANA_PORT = 3000
 LOCUST_PORT = 8089
 FRONTEND_PORT = 51504
@@ -109,10 +109,12 @@ SYNCHRONIZER_PORT = 51506
 DEMO_PORT = 51507
 PROTOC := $(TOOLCHAIN_BIN)/protoc$(EXE_EXTENSION)
 HELM = $(TOOLCHAIN_BIN)/helm$(EXE_EXTENSION)
+TILLER = $(TOOLCHAIN_BIN)/tiller$(EXE_EXTENSION)
 MINIKUBE = $(TOOLCHAIN_BIN)/minikube$(EXE_EXTENSION)
 KUBECTL = $(TOOLCHAIN_BIN)/kubectl$(EXE_EXTENSION)
 KIND = $(TOOLCHAIN_BIN)/kind$(EXE_EXTENSION)
 TERRAFORM = $(TOOLCHAIN_BIN)/terraform$(EXE_EXTENSION)
+SKAFFOLD = $(TOOLCHAIN_BIN)/skaffold$(EXE_EXTENSION)
 CERTGEN = $(TOOLCHAIN_BIN)/certgen$(EXE_EXTENSION)
 GOLANGCI = $(TOOLCHAIN_BIN)/golangci-lint$(EXE_EXTENSION)
 DOTNET = $(TOOLCHAIN_DIR)/dotnet/dotnet$(EXE_EXTENSION)
@@ -122,6 +124,7 @@ OPEN_MATCH_CHART_NAME = open-match
 OPEN_MATCH_RELEASE_NAME = open-match
 OPEN_MATCH_KUBERNETES_NAMESPACE = open-match
 OPEN_MATCH_SECRETS_DIR = $(REPOSITORY_ROOT)/install/helm/open-match/secrets
+REDIS_NAME = om-redis
 GCLOUD_ACCOUNT_EMAIL = $(shell gcloud auth list --format yaml | grep account: | cut -c 10-)
 _GCB_POST_SUBMIT ?= 0
 # Latest version triggers builds of :latest images.
@@ -151,8 +154,9 @@ ifeq ($(GCP_PROJECT_ID),)
 endif
 
 ifeq ($(OS),Windows_NT)
-	HELM_PACKAGE = https://get.helm.sh/helm-v$(HELM_VERSION)-windows-amd64.zip
+	HELM_PACKAGE = https://storage.googleapis.com/kubernetes-helm/helm-v$(HELM_VERSION)-windows-amd64.zip
 	MINIKUBE_PACKAGE = https://storage.googleapis.com/minikube/releases/$(MINIKUBE_VERSION)/minikube-windows-amd64.exe
+	SKAFFOLD_PACKAGE = https://storage.googleapis.com/skaffold/releases/$(SKAFFOLD_VERSION)/skaffold-windows-amd64.exe
 	EXE_EXTENSION = .exe
 	PROTOC_PACKAGE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOC_VERSION)/protoc-$(PROTOC_VERSION)-win64.zip
 	KUBECTL_PACKAGE = https://storage.googleapis.com/kubernetes-release/release/v$(KUBECTL_VERSION)/bin/windows/amd64/kubectl.exe
@@ -165,8 +169,9 @@ ifeq ($(OS),Windows_NT)
 else
 	UNAME_S := $(shell uname -s)
 	ifeq ($(UNAME_S),Linux)
-		HELM_PACKAGE = https://get.helm.sh/helm-v$(HELM_VERSION)-linux-amd64.tar.gz
+		HELM_PACKAGE = https://storage.googleapis.com/kubernetes-helm/helm-v$(HELM_VERSION)-linux-amd64.tar.gz
 		MINIKUBE_PACKAGE = https://storage.googleapis.com/minikube/releases/$(MINIKUBE_VERSION)/minikube-linux-amd64
+		SKAFFOLD_PACKAGE = https://storage.googleapis.com/skaffold/releases/$(SKAFFOLD_VERSION)/skaffold-linux-amd64
 		PROTOC_PACKAGE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOC_VERSION)/protoc-$(PROTOC_VERSION)-linux-x86_64.zip
 		KUBECTL_PACKAGE = https://storage.googleapis.com/kubernetes-release/release/v$(KUBECTL_VERSION)/bin/linux/amd64/kubectl
 		GOLANGCI_PACKAGE = https://github.com/golangci/golangci-lint/releases/download/v$(GOLANGCI_VERSION)/golangci-lint-$(GOLANGCI_VERSION)-linux-amd64.tar.gz
@@ -177,8 +182,9 @@ else
 		SED_REPLACE = sed -i
 	endif
 	ifeq ($(UNAME_S),Darwin)
-		HELM_PACKAGE = https://get.helm.sh/helm-v$(HELM_VERSION)-darwin-amd64.tar.gz
+		HELM_PACKAGE = https://storage.googleapis.com/kubernetes-helm/helm-v$(HELM_VERSION)-darwin-amd64.tar.gz
 		MINIKUBE_PACKAGE = https://storage.googleapis.com/minikube/releases/$(MINIKUBE_VERSION)/minikube-darwin-amd64
+		SKAFFOLD_PACKAGE = https://storage.googleapis.com/skaffold/releases/$(SKAFFOLD_VERSION)/skaffold-darwin-amd64
 		PROTOC_PACKAGE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOC_VERSION)/protoc-$(PROTOC_VERSION)-osx-x86_64.zip
 		KUBECTL_PACKAGE = https://storage.googleapis.com/kubernetes-release/release/v$(KUBECTL_VERSION)/bin/darwin/amd64/kubectl
 		GOLANGCI_PACKAGE = https://github.com/golangci/golangci-lint/releases/download/v$(GOLANGCI_VERSION)/golangci-lint-$(GOLANGCI_VERSION)-darwin-amd64.tar.gz
@@ -190,13 +196,11 @@ else
 	endif
 endif
 
-GOLANG_PROTOS = pkg/pb/backend.pb.go pkg/pb/frontend.pb.go pkg/pb/matchfunction.pb.go pkg/pb/mmlogic.pb.go pkg/pb/messages.pb.go pkg/pb/extensions.pb.go pkg/pb/evaluator.pb.go internal/ipb/synchronizer.pb.go pkg/pb/backend.pb.gw.go pkg/pb/frontend.pb.gw.go pkg/pb/matchfunction.pb.gw.go pkg/pb/mmlogic.pb.gw.go pkg/pb/evaluator.pb.gw.go
-
-CSHARP_PROTOS = csharp/OpenMatch/Backend.cs csharp/OpenMatch/Frontend.cs csharp/OpenMatch/Evaluator.cs csharp/OpenMatch/Matchfunction.cs csharp/OpenMatch/Messages.cs csharp/OpenMatch/Mmlogic.cs
+GOLANG_PROTOS = pkg/pb/backend.pb.go pkg/pb/frontend.pb.go pkg/pb/matchfunction.pb.go pkg/pb/mmlogic.pb.go pkg/pb/messages.pb.go pkg/pb/evaluator.pb.go internal/ipb/synchronizer.pb.go pkg/pb/backend.pb.gw.go pkg/pb/frontend.pb.gw.go pkg/pb/matchfunction.pb.gw.go pkg/pb/mmlogic.pb.gw.go pkg/pb/evaluator.pb.gw.go
 
 SWAGGER_JSON_DOCS = api/frontend.swagger.json api/backend.swagger.json api/mmlogic.swagger.json api/matchfunction.swagger.json api/evaluator.swagger.json
 
-ALL_PROTOS = $(GOLANG_PROTOS) $(SWAGGER_JSON_DOCS) $(CSHARP_PROTOS)
+ALL_PROTOS = $(GOLANG_PROTOS) $(SWAGGER_JSON_DOCS)
 
 # CMDS is a list of all folders in cmd/
 CMDS = $(notdir $(wildcard cmd/*))
@@ -325,29 +329,35 @@ build/chart/index.yaml.$(YEAR_MONTH_DAY): build/chart/index.yaml
 
 build/chart/: build/chart/index.yaml build/chart/index.yaml.$(YEAR_MONTH_DAY)
 
-install-chart-prerequisite: build/toolchain/bin/kubectl$(EXE_EXTENSION) update-chart-deps
-	-$(KUBECTL) create namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE)
+install-chart-prerequisite: build/toolchain/bin/kubectl$(EXE_EXTENSION)
 	$(KUBECTL) apply -f install/gke-metadata-server-workaround.yaml
 
-# Used for Open Match development. Install om-configmap-override.yaml by default.
-HELM_UPGRADE_FLAGS = --cleanup-on-fail -i --atomic --no-hooks --debug --timeout=600s --namespace=$(OPEN_MATCH_KUBERNETES_NAMESPACE) --set global.gcpProjectId=$(GCP_PROJECT_ID) --set open-match-override.enabled=true
-# Used for generate static yamls. Install om-configmap-override.yaml as needed.
-HELM_TEMPLATE_FLAGS = --no-hooks --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) --set usingHelmTemplate=true
-HELM_IMAGE_FLAGS = --set global.image.registry=$(REGISTRY) --set global.image.tag=$(TAG)
-
 install-large-chart: install-chart-prerequisite build/toolchain/bin/helm$(EXE_EXTENSION) install/helm/open-match/secrets/
-	$(HELM) upgrade $(OPEN_MATCH_RELEASE_NAME) $(HELM_UPGRADE_FLAGS) install/helm/open-match $(HELM_IMAGE_FLAGS) \
-		--set open-match-telemetry.enabled=true \
+	$(HELM) upgrade $(OPEN_MATCH_RELEASE_NAME) --install --wait --debug install/helm/open-match \
+		--timeout=600 \
+		--namespace=$(OPEN_MATCH_KUBERNETES_NAMESPACE) \
+		--set global.image.registry=$(REGISTRY) \
+		--set global.image.tag=$(TAG) \
 		--set global.telemetry.grafana.enabled=true \
 		--set global.telemetry.jaeger.enabled=true \
 		--set global.telemetry.prometheus.enabled=true \
-		--set global.logging.rpc.enabled=true
+		--set global.logging.rpc.enabled=true \
+		--set global.gcpProjectId=$(GCP_PROJECT_ID)
 
 install-chart: install-chart-prerequisite build/toolchain/bin/helm$(EXE_EXTENSION) install/helm/open-match/secrets/
-	$(HELM) upgrade $(OPEN_MATCH_RELEASE_NAME) $(HELM_UPGRADE_FLAGS) install/helm/open-match $(HELM_IMAGE_FLAGS)
+	$(HELM) upgrade $(OPEN_MATCH_RELEASE_NAME) --install --wait --debug install/helm/open-match \
+		--timeout=400 \
+		--namespace=$(OPEN_MATCH_KUBERNETES_NAMESPACE) \
+		--set global.image.registry=$(REGISTRY) \
+		--set global.image.tag=$(TAG) \
+		--set global.gcpProjectId=$(GCP_PROJECT_ID)
 
 install-scale-chart: build/toolchain/bin/helm$(EXE_EXTENSION) install/helm/open-match/secrets/
-	$(HELM) upgrade $(OPEN_MATCH_RELEASE_NAME) $(HELM_UPGRADE_FLAGS) install/helm/open-match $(HELM_IMAGE_FLAGS) \
+	$(HELM) upgrade $(OPEN_MATCH_RELEASE_NAME) --install --wait --debug install/helm/open-match \
+		--timeout=600 \
+		--namespace=$(OPEN_MATCH_KUBERNETES_NAMESPACE) \
+		--set global.image.registry=$(REGISTRY) \
+		--set global.image.tag=$(TAG) \
 		--set open-match-core.enabled=true \
 		--set open-match-telemetry.enabled=true \
 		--set open-match-demo.enabled=false \
@@ -357,33 +367,43 @@ install-scale-chart: build/toolchain/bin/helm$(EXE_EXTENSION) install/helm/open-
 		--set global.telemetry.jaeger.enabled=true \
 		--set global.telemetry.prometheus.enabled=true \
 		--set open-match-scale.enabled=true \
-		--set global.logging.rpc.enabled=false
+		--set global.logging.rpc.enabled=true \
+		--set global.gcpProjectId=$(GCP_PROJECT_ID)
 
 install-ci-chart: install-chart-prerequisite build/toolchain/bin/helm$(EXE_EXTENSION) install/helm/open-match/secrets/
 	# Ignore errors result from reruning a failed build
 	-$(KUBECTL) create clusterrolebinding default-view-$(OPEN_MATCH_KUBERNETES_NAMESPACE) --clusterrole=view --serviceaccount=$(OPEN_MATCH_KUBERNETES_NAMESPACE):default
-	$(HELM) upgrade $(OPEN_MATCH_RELEASE_NAME) $(HELM_UPGRADE_FLAGS) install/helm/open-match $(HELM_IMAGE_FLAGS) \
-		--set redis.ignoreLists.ttl=1000ms \
+	$(HELM) upgrade $(OPEN_MATCH_RELEASE_NAME) --install --wait --debug install/helm/open-match \
+		--timeout=600 \
+		--namespace=$(OPEN_MATCH_KUBERNETES_NAMESPACE) \
+		--set global.image.registry=$(REGISTRY) \
+		--set global.image.tag=$(TAG) \
 		--set open-match-test.enabled=true \
 		--set open-match-demo.enabled=false \
-		--set open-match-customize.function.image=openmatch-mmf-go-pool \
+		--set open-match-customize.enabled=false \
+		--set global.gcpProjectId=$(GCP_PROJECT_ID) \
 		--set ci=true
 
 dry-chart: build/toolchain/bin/helm$(EXE_EXTENSION)
-	$(HELM) upgrade $(HELM_UPGRADE_FLAGS) --dry-run $(OPEN_MATCH_RELEASE_NAME) install/helm/open-match $(HELM_IMAGE_FLAGS)
+	$(HELM) upgrade --install --wait --debug --dry-run $(OPEN_MATCH_RELEASE_NAME) install/helm/open-match \
+		--namespace=$(OPEN_MATCH_KUBERNETES_NAMESPACE) \
+		--set global.image.registry=$(REGISTRY) \
+		--set global.image.tag=$(TAG)
 
 delete-chart: build/toolchain/bin/helm$(EXE_EXTENSION) build/toolchain/bin/kubectl$(EXE_EXTENSION)
-	-$(HELM) uninstall $(OPEN_MATCH_RELEASE_NAME)
+	-$(HELM) delete --purge $(OPEN_MATCH_RELEASE_NAME)
 	-$(KUBECTL) --ignore-not-found=true delete crd prometheuses.monitoring.coreos.com
 	-$(KUBECTL) --ignore-not-found=true delete crd servicemonitors.monitoring.coreos.com
 	-$(KUBECTL) --ignore-not-found=true delete crd prometheusrules.monitoring.coreos.com
 	-$(KUBECTL) delete namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE)
 
-install/yaml/: update-chart-deps install/yaml/install.yaml install/yaml/01-open-match-core.yaml install/yaml/02-open-match-demo.yaml install/yaml/03-prometheus-chart.yaml install/yaml/04-grafana-chart.yaml install/yaml/05-jaeger-chart.yaml install/yaml/06-open-match-override-configmap.yaml
+install/yaml/: install/yaml/install.yaml install/yaml/01-open-match-core.yaml install/yaml/02-open-match-demo.yaml install/yaml/03-prometheus-chart.yaml install/yaml/04-grafana-chart.yaml install/yaml/05-jaeger-chart.yaml
 
 install/yaml/01-open-match-core.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 	mkdir -p install/yaml/
-	$(HELM) template $(OPEN_MATCH_RELEASE_NAME) $(HELM_TEMPLATE_FLAGS) $(HELM_IMAGE_FLAGS) \
+	$(HELM) template --name $(OPEN_MATCH_RELEASE_NAME) --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) \
+		--set global.image.registry=$(REGISTRY) \
+		--set global.image.tag=$(TAG) \
 		--set open-match-customize.enabled=false \
 		--set open-match-telemetry.enabled=false \
 		--set open-match-demo.enabled=false \
@@ -391,14 +411,18 @@ install/yaml/01-open-match-core.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 
 install/yaml/02-open-match-demo.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 	mkdir -p install/yaml/
-	$(HELM) template $(OPEN_MATCH_RELEASE_NAME) $(HELM_TEMPLATE_FLAGS) $(HELM_IMAGE_FLAGS) \
+	$(HELM) template --name $(OPEN_MATCH_RELEASE_NAME) --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) \
+		--set global.image.registry=$(REGISTRY) \
+		--set global.image.tag=$(TAG) \
 		--set open-match-core.enabled=false \
 		--set open-match-telemetry.enabled=false \
 		install/helm/open-match > install/yaml/02-open-match-demo.yaml
 
 install/yaml/03-prometheus-chart.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 	mkdir -p install/yaml/
-	$(HELM) template $(OPEN_MATCH_RELEASE_NAME) $(HELM_TEMPLATE_FLAGS) $(HELM_IMAGE_FLAGS) \
+	$(HELM) template --name $(OPEN_MATCH_RELEASE_NAME) --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) \
+		--set global.image.registry=$(REGISTRY) \
+		--set global.image.tag=$(TAG) \
 		--set open-match-customize.enabled=false \
 		--set open-match-demo.enabled=false \
 		--set open-match-core.enabled=false \
@@ -407,7 +431,9 @@ install/yaml/03-prometheus-chart.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 
 install/yaml/04-grafana-chart.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 	mkdir -p install/yaml/
-	$(HELM) template $(OPEN_MATCH_RELEASE_NAME) $(HELM_TEMPLATE_FLAGS) $(HELM_IMAGE_FLAGS) \
+	$(HELM) template --name $(OPEN_MATCH_RELEASE_NAME) --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) \
+		--set global.image.registry=$(REGISTRY) \
+		--set global.image.tag=$(TAG) \
 		--set open-match-customize.enabled=false \
 		--set open-match-demo.enabled=false \
 		--set open-match-core.enabled=false \
@@ -416,23 +442,20 @@ install/yaml/04-grafana-chart.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 
 install/yaml/05-jaeger-chart.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 	mkdir -p install/yaml/
-	$(HELM) template $(OPEN_MATCH_RELEASE_NAME) $(HELM_TEMPLATE_FLAGS) $(HELM_IMAGE_FLAGS) \
+	$(HELM) template --name $(OPEN_MATCH_RELEASE_NAME) --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) \
+		--set global.image.registry=$(REGISTRY) \
+		--set global.image.tag=$(TAG) \
 		--set open-match-customize.enabled=false \
 		--set open-match-demo.enabled=false \
 		--set open-match-core.enabled=false \
 		--set global.telemetry.jaeger.enabled=true \
 		install/helm/open-match > install/yaml/05-jaeger-chart.yaml
 
-install/yaml/06-open-match-override-configmap.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
-	mkdir -p install/yaml/
-	$(HELM) template $(OPEN_MATCH_RELEASE_NAME) $(HELM_TEMPLATE_FLAGS) $(HELM_IMAGE_FLAGS) \
-		--set open-match-override.enabled=true \
-		-s templates/om-configmap-override.yaml \
-		install/helm/open-match > install/yaml/06-open-match-override-configmap.yaml
-
 install/yaml/install.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 	mkdir -p install/yaml/
-	$(HELM) template $(OPEN_MATCH_RELEASE_NAME) $(HELM_TEMPLATE_FLAGS) $(HELM_IMAGE_FLAGS) \
+	$(HELM) template --name $(OPEN_MATCH_RELEASE_NAME) --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) \
+		--set global.image.registry=$(REGISTRY) \
+		--set global.image.tag=$(TAG) \
 		--set open-match-customize.enabled=false \
 		--set open-match-demo.enabled=false \
 		--set global.telemetry.jaeger.enabled=true \
@@ -446,10 +469,10 @@ set-redis-password:
 		read REDIS_PASSWORD; \
 		stty echo; \
 		printf "\n"; \
-		$(KUBECTL) create secret generic om-redis -n $(OPEN_MATCH_KUBERNETES_NAMESPACE) --from-literal=redis-password=$$REDIS_PASSWORD --dry-run -o yaml | $(KUBECTL) replace -f - --force
+		$(KUBECTL) create secret generic $(REDIS_NAME) -n $(OPEN_MATCH_KUBERNETES_NAMESPACE) --from-literal=redis-password=$$REDIS_PASSWORD --dry-run -o yaml | $(KUBECTL) replace -f - --force
 
 install-toolchain: install-kubernetes-tools install-protoc-tools install-openmatch-tools
-install-kubernetes-tools: build/toolchain/bin/kubectl$(EXE_EXTENSION) build/toolchain/bin/helm$(EXE_EXTENSION) build/toolchain/bin/minikube$(EXE_EXTENSION) build/toolchain/bin/terraform$(EXE_EXTENSION)
+install-kubernetes-tools: build/toolchain/bin/kubectl$(EXE_EXTENSION) build/toolchain/bin/helm$(EXE_EXTENSION) build/toolchain/bin/minikube$(EXE_EXTENSION) build/toolchain/bin/skaffold$(EXE_EXTENSION) build/toolchain/bin/terraform$(EXE_EXTENSION)
 install-protoc-tools: build/toolchain/bin/protoc$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-go$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-grpc-gateway$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-swagger$(EXE_EXTENSION)
 install-openmatch-tools: build/toolchain/bin/certgen$(EXE_EXTENSION) build/toolchain/bin/reaper$(EXE_EXTENSION)
 
@@ -457,10 +480,12 @@ build/toolchain/bin/helm$(EXE_EXTENSION):
 	mkdir -p $(TOOLCHAIN_BIN)
 	mkdir -p $(TOOLCHAIN_DIR)/temp-helm
 ifeq ($(suffix $(HELM_PACKAGE)),.zip)
-	cd $(TOOLCHAIN_DIR)/temp-helm && curl -Lo helm.zip $(HELM_PACKAGE) && unzip -d $(TOOLCHAIN_BIN) -j -q -o helm.zip
+	cd $(TOOLCHAIN_DIR)/temp-helm && curl -Lo helm.zip $(HELM_PACKAGE) && unzip -j -q -o helm.zip
 else
-	cd $(TOOLCHAIN_DIR)/temp-helm && curl -Lo helm.tar.gz $(HELM_PACKAGE) && tar xzf helm.tar.gz -C $(TOOLCHAIN_BIN) --strip-components 1
+	cd $(TOOLCHAIN_DIR)/temp-helm && curl -Lo helm.tar.gz $(HELM_PACKAGE) && tar xzf helm.tar.gz --strip-components 1
 endif
+	mv $(TOOLCHAIN_DIR)/temp-helm/helm$(EXE_EXTENSION) $(HELM)
+	mv $(TOOLCHAIN_DIR)/temp-helm/tiller$(EXE_EXTENSION) $(TILLER)
 	rm -rf $(TOOLCHAIN_DIR)/temp-helm/
 
 build/toolchain/bin/ct$(EXE_EXTENSION):
@@ -484,6 +509,11 @@ build/toolchain/bin/kubectl$(EXE_EXTENSION):
 	curl -Lo $(KUBECTL) $(KUBECTL_PACKAGE)
 	chmod +x $(KUBECTL)
 
+build/toolchain/bin/skaffold$(EXE_EXTENSION):
+	mkdir -p $(TOOLCHAIN_BIN)
+	curl -Lo $(SKAFFOLD) $(SKAFFOLD_PACKAGE)
+	chmod +x $(SKAFFOLD)
+
 build/toolchain/bin/golangci-lint$(EXE_EXTENSION):
 	mkdir -p $(TOOLCHAIN_BIN)
 	mkdir -p $(TOOLCHAIN_DIR)/temp-golangci
@@ -529,20 +559,16 @@ build/toolchain/bin/protoc$(EXE_EXTENSION):
 	(cd $(TOOLCHAIN_DIR); unzip -q -o protoc-temp.zip)
 	rm $(TOOLCHAIN_DIR)/protoc-temp.zip $(TOOLCHAIN_DIR)/readme.txt
 
-build/toolchain/bin/protoc-gen-doc$(EXE_EXTENSION):
-	mkdir -p $(TOOLCHAIN_BIN)
-	cd $(TOOLCHAIN_BIN) && $(GO) build -i -pkgdir . github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc
-
 build/toolchain/bin/protoc-gen-go$(EXE_EXTENSION):
 	mkdir -p $(TOOLCHAIN_BIN)
-	cd $(TOOLCHAIN_BIN) && $(GO) build -i -pkgdir . github.com/golang/protobuf/protoc-gen-go
+	cd $(TOOLCHAIN_BIN) && $(GO) build -pkgdir . github.com/golang/protobuf/protoc-gen-go
 
 build/toolchain/bin/protoc-gen-grpc-gateway$(EXE_EXTENSION):
-	cd $(TOOLCHAIN_BIN) && $(GO) build -i -pkgdir . github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
+	cd $(TOOLCHAIN_BIN) && $(GO) build -pkgdir . github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
 
 build/toolchain/bin/protoc-gen-swagger$(EXE_EXTENSION):
 	mkdir -p $(TOOLCHAIN_BIN)
-	cd $(TOOLCHAIN_BIN) && $(GO) build -i -pkgdir . github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
+	cd $(TOOLCHAIN_BIN) && $(GO) build -pkgdir . github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
 
 build/toolchain/bin/certgen$(EXE_EXTENSION): tools/certgen/certgen$(EXE_EXTENSION)
 	mkdir -p $(TOOLCHAIN_BIN)
@@ -552,6 +578,30 @@ build/toolchain/bin/reaper$(EXE_EXTENSION): tools/reaper/reaper$(EXE_EXTENSION)
 	mkdir -p $(TOOLCHAIN_BIN)
 	cp -f $(REPOSITORY_ROOT)/tools/reaper/reaper$(EXE_EXTENSION) $(TOOLCHAIN_BIN)/reaper$(EXE_EXTENSION)
 
+push-helm-ci: build/toolchain/bin/helm$(EXE_EXTENSION) build/toolchain/bin/kubectl$(EXE_EXTENSION)
+	$(HELM) init --service-account tiller --force-upgrade --client-only
+
+push-helm: build/toolchain/bin/helm$(EXE_EXTENSION) build/toolchain/bin/kubectl$(EXE_EXTENSION)
+	$(KUBECTL) create serviceaccount --namespace kube-system tiller
+	$(HELM) init --service-account tiller --force-upgrade
+	$(KUBECTL) create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller
+ifneq ($(strip $($(KUBECTL) get clusterroles | grep -i rbac)),)
+	$(KUBECTL) patch deploy --namespace kube-system tiller-deploy -p '{"spec":{"template":{"spec":{"serviceAccount":"tiller"}}}}'
+endif
+	@echo "Waiting for Tiller to become ready..."
+	$(KUBECTL) wait deployment --timeout=60s --for condition=available -l app=helm,name=tiller --namespace kube-system
+	$(KUBECTL) wait pod --timeout=60s --for condition=Ready -l app=helm,name=tiller --namespace kube-system
+
+delete-helm: build/toolchain/bin/helm$(EXE_EXTENSION) build/toolchain/bin/kubectl$(EXE_EXTENSION)
+	-$(HELM) reset
+	-$(KUBECTL) --ignore-not-found=true delete serviceaccount --namespace kube-system tiller
+	-$(KUBECTL) --ignore-not-found=true delete clusterrolebinding tiller-cluster-rule
+ifneq ($(strip $($(KUBECTL) get clusterroles | grep -i rbac)),)
+	-$(KUBECTL) --ignore-not-found=true delete deployment --namespace kube-system tiller-deploy
+endif
+	@echo "Waiting for Tiller to go away..."
+	-$(KUBECTL) wait deployment --timeout=60s --for delete -l app=helm,name=tiller --namespace kube-system
+
 # Fake target for docker
 docker: no-sudo
 
@@ -600,7 +650,7 @@ get-kind-kubeconfig: build/toolchain/bin/kind$(EXE_EXTENSION)
 delete-kind-cluster: build/toolchain/bin/kind$(EXE_EXTENSION) build/toolchain/bin/kubectl$(EXE_EXTENSION)
 	-$(KIND) delete cluster
 
-create-gke-cluster: GKE_VERSION = 1.13.9-gke.3 # gcloud beta container get-server-config --zone us-west1-a
+create-gke-cluster: GKE_VERSION = 1.13.6 # gcloud beta container get-server-config --zone us-central1-a
 create-gke-cluster: GKE_CLUSTER_SHAPE_FLAGS = --machine-type n1-standard-4 --enable-autoscaling --min-nodes 1 --num-nodes 2 --max-nodes 10 --disk-size 50
 create-gke-cluster: GKE_FUTURE_COMPAT_FLAGS = --no-enable-basic-auth --no-issue-client-certificate --enable-ip-alias --metadata disable-legacy-endpoints=true --enable-autoupgrade
 create-gke-cluster: build/toolchain/bin/kubectl$(EXE_EXTENSION) gcloud
@@ -637,24 +687,6 @@ pkg/pb/%.pb.go: api/%.proto third_party/ build/toolchain/bin/protoc$(EXE_EXTENSI
 		--go_out=plugins=grpc:$(REPOSITORY_ROOT)/build/prototmp
 	mv $(REPOSITORY_ROOT)/build/prototmp/open-match.dev/open-match/$@ $@
 
-csharp/OpenMatch/Annotations.cs: third_party/
-	$(PROTOC) third_party/protoc-gen-swagger/options/annotations.proto \
-		-I $(REPOSITORY_ROOT) -I $(PROTOC_INCLUDES) \
-		--plugin=protoc-gen-grpc=grpc_csharp_plugin \
-		--csharp_out=$(REPOSITORY_ROOT)/csharp/OpenMatch
-
-csharp/OpenMatch/Openapiv2.cs: third_party/
-	$(PROTOC) third_party/protoc-gen-swagger/options/openapiv2.proto \
-		-I $(REPOSITORY_ROOT) -I $(PROTOC_INCLUDES) \
-		--plugin=protoc-gen-grpc=grpc_csharp_plugin \
-		--csharp_out=$(REPOSITORY_ROOT)/csharp/OpenMatch/
-
-csharp/OpenMatch/%.cs: third_party/ build/toolchain/bin/protoc$(EXE_EXTENSION) csharp/OpenMatch/Openapiv2.cs csharp/OpenMatch/Annotations.cs
-	$(PROTOC) api/$(shell echo $(*F)| tr A-Z a-z).proto \
-		-I $(REPOSITORY_ROOT) -I $(PROTOC_INCLUDES) \
-		--plugin=protoc-gen-grpc=grpc_csharp_plugin \
-		--csharp_out=$(REPOSITORY_ROOT)/csharp/OpenMatch
-
 internal/ipb/%.pb.go: internal/api/%.proto third_party/ build/toolchain/bin/protoc$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-go$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-grpc-gateway$(EXE_EXTENSION)
 	mkdir -p $(REPOSITORY_ROOT)/build/prototmp $(REPOSITORY_ROOT)/internal/ipb
 	$(PROTOC) $< \
@@ -674,21 +706,6 @@ api/%.swagger.json: api/%.proto third_party/ build/toolchain/bin/protoc$(EXE_EXT
 		-I $(REPOSITORY_ROOT) -I $(PROTOC_INCLUDES) \
 		--swagger_out=logtostderr=true,allow_delete_body=true:$(REPOSITORY_ROOT)
 
-api/api.md: third_party/ build/toolchain/bin/protoc-gen-doc$(EXE_EXTENSION)
-	$(PROTOC) api/*.proto \
-		-I $(REPOSITORY_ROOT) -I $(PROTOC_INCLUDES) \
-  		--doc_out=. \
-  		--doc_opt=markdown,api.md
-# Crazy hack that insert hugo link reference to this API doc -)	
-	$(SED_REPLACE) '1 i\---\
-title: "Open Match API References" \
-linkTitle: "Open Match API References" \
-weight: 2 \
-description: \
-  This document provides API references for Open Match services. \
---- \
-' ./api.md && mv ./api.md $(REPOSITORY_ROOT)/../open-match-docs/site/content/en/docs/Reference/
-  
 # Include structure of the protos needs to be called out do the dependency chain is run through properly.
 pkg/pb/backend.pb.go: pkg/pb/messages.pb.go
 pkg/pb/frontend.pb.go: pkg/pb/messages.pb.go
@@ -706,7 +723,7 @@ test: $(ALL_PROTOS) tls-certs third_party/
 	$(GO) test -cover -test.count $(GOLANG_TEST_COUNT) -run IgnoreRace$$ ./...
 
 test-e2e-cluster: all-protos tls-certs third_party/
-	-$(KUBECTL) wait job --for condition=complete -n $(OPEN_MATCH_KUBERNETES_NAMESPACE) -l component=e2e-job --timeout 200s
+	-$(KUBECTL) wait job --for condition=complete -n $(OPEN_MATCH_KUBERNETES_NAMESPACE) -l component=e2e-job --timeout 150s
 	$(KUBECTL) logs job/e2e-job -n $(OPEN_MATCH_KUBERNETES_NAMESPACE)
 	$(KUBECTL) wait job --for condition=complete -n $(OPEN_MATCH_KUBERNETES_NAMESPACE) -l component=e2e-job --timeout 0
 
@@ -722,7 +739,7 @@ vet:
 	$(GO) vet ./...
 
 golangci: build/toolchain/bin/golangci-lint$(EXE_EXTENSION)
-	GO111MODULE=on $(GOLANGCI) run --config=$(REPOSITORY_ROOT)/.golangci.yaml
+	-GO111MODULE=on $(GOLANGCI) run --config=$(REPOSITORY_ROOT)/.golangci.yaml
 
 lint: fmt vet golangci lint-chart terraform-lint
 
@@ -865,9 +882,9 @@ ci-reap-namespaces: build/toolchain/bin/reaper$(EXE_EXTENSION)
 
 # For presubmit we want to update the protobuf generated files and verify that tests are good.
 presubmit: GOLANG_TEST_COUNT = 5
-presubmit: clean third_party/ update-chart-deps assets update-deps lint build install-toolchain test md-test terraform-test
+presubmit: clean update-deps third_party/ assets lint build install-toolchain test md-test terraform-test
 
-build/release/: presubmit clean-install-yaml install/yaml/
+build/release/: clean-install-yaml update-chart-deps install/yaml/
 	mkdir -p $(BUILD_DIR)/release/
 	cp $(REPOSITORY_ROOT)/install/yaml/* $(BUILD_DIR)/release/
 
@@ -895,8 +912,6 @@ clean-secrets:
 	rm -rf $(OPEN_MATCH_SECRETS_DIR)
 
 clean-protos:
-	rm -rf $(REPOSITORY_ROOT)/build/prototmp/
-	rm -rf $(REPOSITORY_ROOT)/csharp/OpenMatch/*.cs
 	rm -rf $(REPOSITORY_ROOT)/pkg/pb/
 	rm -rf $(REPOSITORY_ROOT)/internal/ipb/
 
@@ -971,10 +986,6 @@ proxy-synchronizer: build/toolchain/bin/kubectl$(EXE_EXTENSION)
 	@echo "Synchronizer Trace: http://localhost:$(SYNCHRONIZER_PORT)/debug/tracez"
 	$(KUBECTL) port-forward --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) $(shell $(KUBECTL) get pod --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) --selector="app=open-match,component=synchronizer,release=$(OPEN_MATCH_RELEASE_NAME)" --output jsonpath='{.items[0].metadata.name}') $(SYNCHRONIZER_PORT):51506 $(PORT_FORWARD_ADDRESS_FLAG)
 
-proxy-jaeger: build/toolchain/bin/kubectl$(EXE_EXTENSION)
-	@echo "Jaeger Query Frontend: http://localhost:16686"
-	$(KUBECTL) port-forward --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) $(shell $(KUBECTL) get pod --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) --selector="app.kubernetes.io/name=jaeger,app.kubernetes.io/component=query" --output jsonpath='{.items[0].metadata.name}') $(JAEGER_QUERY_PORT):16686 $(PORT_FORWARD_ADDRESS_FLAG)
-
 proxy-grafana: build/toolchain/bin/kubectl$(EXE_EXTENSION)
 	@echo "User: admin"
 	@echo "Password: openmatch"
@@ -1000,7 +1011,7 @@ proxy-locust: build/toolchain/bin/kubectl$(EXE_EXTENSION)
 
 # Run `make proxy` instead to run everything at the same time.
 # If you run this directly it will just run each proxy sequentially.
-proxy-all: proxy-frontend proxy-backend proxy-mmlogic proxy-grafana proxy-prometheus proxy-synchronizer proxy-ui proxy-dashboard proxy-demo proxy-jaeger
+proxy-all: proxy-frontend proxy-backend proxy-mmlogic proxy-grafana proxy-prometheus proxy-synchronizer proxy-ui proxy-dashboard proxy-demo
 
 proxy:
 	# This is an exception case where we'll call recursive make.
@@ -1010,8 +1021,8 @@ proxy:
 update-deps:
 	$(GO) mod tidy
 
-build-csharp: build/toolchain/dotnet/ csharp/OpenMatch/Annotations.cs csharp/OpenMatch/Openapiv2.cs
-	(cd $(REPOSITORY_ROOT)/csharp/OpenMatch && $(DOTNET) build -o .)
+build-csharp: build/toolchain/dotnet/
+	(cd $(REPOSITORY_ROOT)/csharp/OpenMatch && $(DOTNET) build -o . && rm -rf obj/ *.pdb *.deps.json)
 
 third_party/: third_party/google/api third_party/protoc-gen-swagger/options third_party/swaggerui/
 

api/README.md

@@ -6,10 +6,4 @@ gRPC has first-class support for [many languages](https://grpc.io/docs/) and pro
 
 For HTTP/HTTPS Open Match uses a gRPC proxy to serve the API. Since HTTP does not provide a structure for request/responses we use Swagger to provide a schema. You can view the Swagger docs for each service in this directory's `*.swagger.json` files. In addition each server will host it's swagger doc via `GET /swagger.json` if you want to dynamically load them at runtime.
 
-Lastly, Open Match supports insecure and TLS mode for serving the API. It's strongly preferred to use TLS mode in production but insecure mode can be used for test and local development. To help with certificates management see `tools/certgen` to create self-signed certificates.
-
-# Open Match API Development Guide
-
-Open Match proto comments follow the same format as [this file](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/core/example/example.proto)
-
-If you plan to change the proto definitions, please update the comments and run `make api/api.md` to reflect the latest changes in open-match-docs.
+Lastly, Open Match supports insecure and TLS mode for serving the API. It's strongly preferred to use TLS mode in production but insecure mode can be used for test and local development. To help with certificates management see `tools/certgen` to create self-signed certificates.

api/backend.proto

@@ -55,7 +55,8 @@ option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
   // https://github.com/grpc-ecosystem/grpc-gateway/blob/master/examples/proto/examplepb/a_bit_of_everything.proto
 };
 
-// FunctionConfig specifies a MMF address and client type for Backend to establish connections with the MMF
+// Configuration for the Match Function to be triggered by Open Match to
+// generate proposals.
 message FunctionConfig {
   string host = 1;
   int32 port = 2;
@@ -67,35 +68,36 @@ message FunctionConfig {
 }
 
 message FetchMatchesRequest {
-  // FunctionConfig specifies a MMF address and client type for Backend to establish connections with the MMF
+  // Configuration of the MatchFunction to be executed for the given list of MatchProfiles
   FunctionConfig config = 1;
 
-  // MatchProfiles that will be sent to thhe MMF specified in the FunctionConfig.
+  // MatchProfiles for which this MatchFunction should be executed.
   repeated MatchProfile profiles = 2;
 }
 
 message FetchMatchesResponse {
-  // A Match generated by the user-defined MMF with the specified MatchProfiles.
-  // A valid Match response will contain at least one ticket.
+  // Result Match for the requested MatchProfile.
+  // Note that OpenMatch will validate the proposals, a valid match should contain at least one ticket.
   Match match = 1;
 }
 
 message AssignTicketsRequest {
-  // TicketIds is a list of strings representing Open Match generated Ids which apply to an Assignment.
+  // List of Ticket IDs for which the Assignment is to be made.
   repeated string ticket_ids = 1;
 
-  // An Assignment specifies game connection related information to be associated with the TicketIds.
+  // Assignment to be associated with the Ticket IDs.
   Assignment assignment = 2;
 }
 
 message AssignTicketsResponse {}
 
-// The Backent service implements APIs to generate matches and handle ticket assignments.
+// The service implementing the Backent API that is called to generate matches
+// and make assignments for Tickets.
 service Backend {
-  // FetchMatches triggers a MatchFunction with the specified MatchProfiles, while each MatchProfile 
-  // returns a set of match proposals. FetchMatches method streams the results back to the caller.
-  // FetchMatches immediately returns an error if it encounters any execution failures.
-  //   - If the synchronizer is enabled, FetchMatch will then call the synchronizer to deduplicate proposals with overlapped tickets.
+  // FetchMatch triggers execution of the specfied MatchFunction for each of the
+  // specified MatchProfiles. Each MatchFunction execution returns a set of
+  // proposals which are then evaluated to generate results. FetchMatch method
+  // streams these results back to the caller.
   rpc FetchMatches(FetchMatchesRequest) returns (stream FetchMatchesResponse) {
     option (google.api.http) = {
       post: "/v1/backend/matches:fetch"
@@ -103,7 +105,8 @@ service Backend {
     };
   }
 
-  // AssignTickets overwrites the Assignment field of the input TicketIds.
+  // AssignTickets sets the specified Assignment on the Tickets for the Ticket
+  // IDs passed.
   rpc AssignTickets(AssignTicketsRequest) returns (AssignTicketsResponse) {
     option (google.api.http) = {
       post: "/v1/backend/tickets:assign"

api/backend.swagger.json

@@ -26,7 +26,7 @@
   "paths": {
     "/v1/backend/matches:fetch": {
       "post": {
-        "summary": "FetchMatches triggers a MatchFunction with the specified MatchProfiles, while each MatchProfile \nreturns a set of match proposals. FetchMatches method streams the results back to the caller.\nFetchMatches immediately returns an error if it encounters any execution failures.\n  - If the synchronizer is enabled, FetchMatch will then call the synchronizer to deduplicate proposals with overlapped tickets.",
+        "summary": "FetchMatch triggers execution of the specfied MatchFunction for each of the\nspecified MatchProfiles. Each MatchFunction execution returns a set of\nproposals which are then evaluated to generate results. FetchMatch method\nstreams these results back to the caller.",
         "operationId": "FetchMatches",
         "responses": {
           "200": {
@@ -59,7 +59,7 @@
     },
     "/v1/backend/tickets:assign": {
       "post": {
-        "summary": "AssignTickets overwrites the Assignment field of the input TicketIds.",
+        "summary": "AssignTickets sets the specified Assignment on the Tickets for the Ticket\nIDs passed.",
         "operationId": "AssignTickets",
         "responses": {
           "200": {
@@ -100,11 +100,11 @@
           "items": {
             "type": "string"
           },
-          "description": "TicketIds is a list of strings representing Open Match generated Ids which apply to an Assignment."
+          "description": "List of Ticket IDs for which the Assignment is to be made."
         },
         "assignment": {
           "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment specifies game connection related information to be associated with the TicketIds."
+          "description": "Assignment to be associated with the Ticket IDs."
         }
       }
     },
@@ -118,26 +118,61 @@
           "type": "string",
           "description": "Connection information for this Assignment."
         },
+        "properties": {
+          "type": "object",
+          "description": "Other details to be sent to the players."
+        },
         "error": {
           "$ref": "#/definitions/rpcStatus",
           "description": "Error when finding an Assignment for this Ticket."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
         }
       },
-      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
+      "description": "An Assignment object represents the assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
     },
-    "openmatchDoubleRangeFilter": {
+    "openmatchBoolEqualsFilter": {
       "type": "object",
       "properties": {
-        "double_arg": {
+        "attribute": {
+          "type": "string"
+        },
+        "value": {
+          "type": "boolean",
+          "format": "boolean"
+        }
+      },
+      "title": "Filters boolean values.\n  attribute: \"foo\"\n  value: false\nmatches:\n  {\"foo\": false}\ndoes not match:\n  {\"foo\": true}\n  {\"foo\": \"bar\"}\n  {\"foo\": 1}\n  {\"foo\": \"false\"}\n  {\"foo\": [false]}\n  {\"foo\": null}\n  {}"
+    },
+    "openmatchFetchMatchesRequest": {
+      "type": "object",
+      "properties": {
+        "config": {
+          "$ref": "#/definitions/openmatchFunctionConfig",
+          "title": "Configuration of the MatchFunction to be executed for the given list of MatchProfiles"
+        },
+        "profiles": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/openmatchMatchProfile"
+          },
+          "description": "MatchProfiles for which this MatchFunction should be executed."
+        }
+      }
+    },
+    "openmatchFetchMatchesResponse": {
+      "type": "object",
+      "properties": {
+        "match": {
+          "$ref": "#/definitions/openmatchMatch",
+          "description": "Result Match for the requested MatchProfile.\nNote that OpenMatch will validate the proposals, a valid match should contain at least one ticket."
+        }
+      }
+    },
+    "openmatchFloatRangeFilter": {
+      "type": "object",
+      "properties": {
+        "attribute": {
           "type": "string",
-          "description": "Name of the ticket's search_fields.double_args this Filter operates on."
+          "description": "Name of the ticket attribute this Filter operates on."
         },
         "max": {
           "type": "number",
@@ -150,32 +185,7 @@
           "description": "Minimum value. Defaults to 0."
         }
       },
-      "title": "Filters numerical values to only those within a range.\n  double_arg: \"foo\"\n  max: 10\n  min: 5\nmatches:\n  {\"foo\": 5}\n  {\"foo\": 7.5}\n  {\"foo\": 10}\ndoes not match:\n  {\"foo\": 4}\n  {\"foo\": 10.01}\n  {\"foo\": \"7.5\"}\n  {}"
-    },
-    "openmatchFetchMatchesRequest": {
-      "type": "object",
-      "properties": {
-        "config": {
-          "$ref": "#/definitions/openmatchFunctionConfig",
-          "title": "FunctionConfig specifies a MMF address and client type for Backend to establish connections with the MMF"
-        },
-        "profiles": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/openmatchMatchProfile"
-          },
-          "description": "MatchProfiles that will be sent to thhe MMF specified in the FunctionConfig."
-        }
-      }
-    },
-    "openmatchFetchMatchesResponse": {
-      "type": "object",
-      "properties": {
-        "match": {
-          "$ref": "#/definitions/openmatchMatch",
-          "description": "A Match generated by the user-defined MMF with the specified MatchProfiles.\nA valid Match response will contain at least one ticket."
-        }
-      }
+      "title": "Filters numerical values to only those within a range.\n  attribute: \"foo\"\n  max: 10\n  min: 5\nmatches:\n  {\"foo\": 5}\n  {\"foo\": 7.5}\n  {\"foo\": 10}\ndoes not match:\n  {\"foo\": 4}\n  {\"foo\": 10.01}\n  {\"foo\": \"7.5\"}\n  {\"foo\": true}\n  {\"foo\": [7.5]}\n  {\"foo\": null}\n  {}"
     },
     "openmatchFunctionConfig": {
       "type": "object",
@@ -191,7 +201,7 @@
           "$ref": "#/definitions/openmatchFunctionConfigType"
         }
       },
-      "title": "FunctionConfig specifies a MMF address and client type for Backend to establish connections with the MMF"
+      "description": "Configuration for the Match Function to be triggered by Open Match to\ngenerate proposals."
     },
     "openmatchFunctionConfigType": {
       "type": "string",
@@ -230,12 +240,9 @@
           },
           "title": "Set of Rosters that comprise this Match"
         },
-        "extensions": {
+        "properties": {
           "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
+          "description": "Match properties for this Match. Open Match does not interpret this field."
         }
       },
       "description": "A Match is used to represent a completed match object. It can be generated by\na MatchFunction as a proposal or can be returned by OpenMatch as a result in\nresponse to the FetchMatches call.\nWhen a match is returned by the FetchMatches call, it should contain at least \none ticket to be considered as valid."
@@ -247,6 +254,10 @@
           "type": "string",
           "description": "Name of this match profile."
         },
+        "properties": {
+          "type": "object",
+          "description": "Set of properties associated with this MatchProfile. (Optional)\nOpen Match does not interpret these properties but passes them through to\nthe MatchFunction."
+        },
         "pools": {
           "type": "array",
           "items": {
@@ -260,13 +271,6 @@
             "$ref": "#/definitions/openmatchRoster"
           },
           "description": "Set of Rosters for this match request. Could be empty Rosters used to\nindicate the composition of the generated Match or they could be partially\npre-populated Ticket list to be used in scenarios such as backfill / join\nin progress."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
         }
       },
       "description": "A MatchProfile is Open Match's representation of a Match specification. It is\nused to indicate the criteria for selecting players for a match. A\nMatchProfile is the input to the API to get matches and is passed to the\nMatchFunction. It contains all the information required by the MatchFunction\nto generate match proposals."
@@ -278,24 +282,24 @@
           "type": "string",
           "description": "A developer-chosen human-readable name for this Pool."
         },
-        "double_range_filters": {
+        "float_range_filters": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/openmatchDoubleRangeFilter"
+            "$ref": "#/definitions/openmatchFloatRangeFilter"
           },
           "description": "Set of Filters indicating the filtering criteria. Selected players must\nmatch every Filter."
         },
+        "bool_equals_filters": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/openmatchBoolEqualsFilter"
+          }
+        },
         "string_equals_filters": {
           "type": "array",
           "items": {
             "$ref": "#/definitions/openmatchStringEqualsFilter"
           }
-        },
-        "tag_present_filters": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/openmatchTagPresentFilter"
-          }
         }
       }
     },
@@ -316,80 +320,35 @@
       },
       "description": "A Roster is a named collection of Ticket IDs. It exists so that a Tickets\nassociated with a Match can be labelled to belong to a team, sub-team etc. It\ncan also be used to represent the current state of a Match in scenarios such\nas backfill, join-in-progress etc."
     },
-    "openmatchSearchFields": {
-      "type": "object",
-      "properties": {
-        "double_args": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "number",
-            "format": "double"
-          },
-          "description": "Float arguments.  Filterable on ranges."
-        },
-        "string_args": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "description": "String arguments.  Filterable on equality."
-        },
-        "tags": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "Filterable on presence or absence of given value."
-        }
-      },
-      "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-    },
     "openmatchStringEqualsFilter": {
       "type": "object",
       "properties": {
-        "string_arg": {
-          "type": "string",
-          "description": "Name of the ticket's search_fields.string_args this Filter operates on."
+        "attribute": {
+          "type": "string"
         },
         "value": {
           "type": "string"
         }
       },
-      "title": "Filters strings exactly equaling a value.\n  string_arg: \"foo\"\n  value: \"bar\"\nmatches:\n  {\"foo\": \"bar\"}\ndoes not match:\n  {\"foo\": \"baz\"}\n  {\"bar\": \"foo\"}\n  {}"
-    },
-    "openmatchTagPresentFilter": {
-      "type": "object",
-      "properties": {
-        "tag": {
-          "type": "string"
-        }
-      },
-      "title": "Filters to the tag being present on the search_fields.\n  tag: \"foo\"\nmatches:\n  [\"foo\"]\n  [\"bar\",\"foo\"]\ndoes not match:\n  [\"bar\"]\n  []"
+      "title": "Filters strings exactly equaling a value.\n  attribute: \"foo\"\n  value: \"bar\"\nmatches:\n  {\"foo\": \"bar\"}\ndoes not match:\n  {\"foo\": \"baz\"}\n  {\"foo\": true}\n  {\"foo\": 5}\n  {\"foo\": [\"bar\"]}\n  {\"foo\": null}\n  {}"
     },
     "openmatchTicket": {
       "type": "object",
       "properties": {
         "id": {
           "type": "string",
-          "description": "Id represents an auto-generated Id issued by Open Match."
+          "description": "The Ticket ID generated by Open Match."
+        },
+        "properties": {
+          "type": "object",
+          "description": "Properties contains custom info about the ticket.  Top level values can be\nused in indexing and filtering to find tickets."
         },
         "assignment": {
           "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket. \nOpen Match does not require or inspect any fields on Assignment."
-        },
-        "search_fields": {
-          "$ref": "#/definitions/openmatchSearchFields",
-          "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
+          "description": "Assignment associated with the Ticket."
         }
       },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
+      "description": "A Ticket is a basic matchmaking entity in Open Match. In order to enter\nmatchmaking using Open Match, the client should generate a Ticket, passing in\nthe properties to be associated with this Ticket. Open Match will generate an\nID for a Ticket during creation. A Ticket could be used to represent an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof properties. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
     },
     "protobufAny": {
       "type": "object",
@@ -406,6 +365,14 @@
       },
       "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n    Foo foo = ...;\n    Any any;\n    any.PackFrom(foo);\n    ...\n    if (any.UnpackTo(\u0026foo)) {\n      ...\n    }\n\nExample 2: Pack and unpack a message in Java.\n\n    Foo foo = ...;\n    Any any = Any.pack(foo);\n    ...\n    if (any.is(Foo.class)) {\n      foo = any.unpack(Foo.class);\n    }\n\n Example 3: Pack and unpack a message in Python.\n\n    foo = Foo(...)\n    any = Any()\n    any.Pack(foo)\n    ...\n    if any.Is(Foo.DESCRIPTOR):\n      any.Unpack(foo)\n      ...\n\n Example 4: Pack and unpack a message in Go\n\n     foo := \u0026pb.Foo{...}\n     any, err := ptypes.MarshalAny(foo)\n     ...\n     foo := \u0026pb.Foo{}\n     if err := ptypes.UnmarshalAny(any, foo); err != nil {\n       ...\n     }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n    package google.profile;\n    message Person {\n      string first_name = 1;\n      string last_name = 2;\n    }\n\n    {\n      \"@type\": \"type.googleapis.com/google.profile.Person\",\n      \"firstName\": \u003cstring\u003e,\n      \"lastName\": \u003cstring\u003e\n    }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n    {\n      \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n      \"value\": \"1.212s\"\n    }"
     },
+    "protobufNullValue": {
+      "type": "string",
+      "enum": [
+        "NULL_VALUE"
+      ],
+      "default": "NULL_VALUE",
+      "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\n The JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value."
+    },
     "rpcStatus": {
       "type": "object",
       "properties": {

api/evaluator.proto

@@ -56,18 +56,20 @@ option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
 };
 
 message EvaluateRequest {
-  // A Matches proposed by the Match Function representing a candidate of the final results.
+  // List of Matches to evaluate.
   Match match = 1;
 }
 
 message EvaluateResponse {
-  // A Match shortlisted by the evaluator representing one of the final results.
+  // Accepted list of Matches.
   Match match = 1;
 }
 
-// The Evaluator service implements APIs used to evaluate and shortlist matches proposed by MMFs.
+// The service implementing the Evaluator API that is called to evaluate
+// matches generated by MMFs and shortlist them to accepted results.
 service Evaluator {
-  // Evaluate evaluates a list of proposed matches based on quality, collision status, and etc, then shortlist the matches and returns the final results.
+  // Evaluate accepts a list of proposed matches, evaluates them for quality,
+  // collisions etc. and returns matches that should be accepted as results.
   rpc Evaluate(stream EvaluateRequest) returns (stream EvaluateResponse) {
     option (google.api.http) = {
       post: "/v1/evaluator/matches:evaluate"

api/evaluator.swagger.json

@@ -26,7 +26,7 @@
   "paths": {
     "/v1/evaluator/matches:evaluate": {
       "post": {
-        "summary": "Evaluate evaluates a list of proposed matches based on quality, collision status, and etc, then shortlist the matches and returns the final results.",
+        "summary": "Evaluate accepts a list of proposed matches, evaluates them for quality,\ncollisions etc. and returns matches that should be accepted as results.",
         "operationId": "Evaluate",
         "responses": {
           "200": {
@@ -67,26 +67,23 @@
           "type": "string",
           "description": "Connection information for this Assignment."
         },
+        "properties": {
+          "type": "object",
+          "description": "Other details to be sent to the players."
+        },
         "error": {
           "$ref": "#/definitions/rpcStatus",
           "description": "Error when finding an Assignment for this Ticket."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
         }
       },
-      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
+      "description": "An Assignment object represents the assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
     },
     "openmatchEvaluateRequest": {
       "type": "object",
       "properties": {
         "match": {
           "$ref": "#/definitions/openmatchMatch",
-          "description": "A Matches proposed by the Match Function representing a candidate of the final results."
+          "description": "List of Matches to evaluate."
         }
       }
     },
@@ -95,7 +92,7 @@
       "properties": {
         "match": {
           "$ref": "#/definitions/openmatchMatch",
-          "description": "A Match shortlisted by the evaluator representing one of the final results."
+          "description": "Accepted list of Matches."
         }
       }
     },
@@ -128,12 +125,9 @@
           },
           "title": "Set of Rosters that comprise this Match"
         },
-        "extensions": {
+        "properties": {
           "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
+          "description": "Match properties for this Match. Open Match does not interpret this field."
         }
       },
       "description": "A Match is used to represent a completed match object. It can be generated by\na MatchFunction as a proposal or can be returned by OpenMatch as a result in\nresponse to the FetchMatches call.\nWhen a match is returned by the FetchMatches call, it should contain at least \none ticket to be considered as valid."
@@ -155,58 +149,23 @@
       },
       "description": "A Roster is a named collection of Ticket IDs. It exists so that a Tickets\nassociated with a Match can be labelled to belong to a team, sub-team etc. It\ncan also be used to represent the current state of a Match in scenarios such\nas backfill, join-in-progress etc."
     },
-    "openmatchSearchFields": {
-      "type": "object",
-      "properties": {
-        "double_args": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "number",
-            "format": "double"
-          },
-          "description": "Float arguments.  Filterable on ranges."
-        },
-        "string_args": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "description": "String arguments.  Filterable on equality."
-        },
-        "tags": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "Filterable on presence or absence of given value."
-        }
-      },
-      "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-    },
     "openmatchTicket": {
       "type": "object",
       "properties": {
         "id": {
           "type": "string",
-          "description": "Id represents an auto-generated Id issued by Open Match."
+          "description": "The Ticket ID generated by Open Match."
+        },
+        "properties": {
+          "type": "object",
+          "description": "Properties contains custom info about the ticket.  Top level values can be\nused in indexing and filtering to find tickets."
         },
         "assignment": {
           "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket. \nOpen Match does not require or inspect any fields on Assignment."
-        },
-        "search_fields": {
-          "$ref": "#/definitions/openmatchSearchFields",
-          "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
+          "description": "Assignment associated with the Ticket."
         }
       },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
+      "description": "A Ticket is a basic matchmaking entity in Open Match. In order to enter\nmatchmaking using Open Match, the client should generate a Ticket, passing in\nthe properties to be associated with this Ticket. Open Match will generate an\nID for a Ticket during creation. A Ticket could be used to represent an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof properties. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
     },
     "protobufAny": {
       "type": "object",
@@ -223,6 +182,14 @@
       },
       "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n    Foo foo = ...;\n    Any any;\n    any.PackFrom(foo);\n    ...\n    if (any.UnpackTo(\u0026foo)) {\n      ...\n    }\n\nExample 2: Pack and unpack a message in Java.\n\n    Foo foo = ...;\n    Any any = Any.pack(foo);\n    ...\n    if (any.is(Foo.class)) {\n      foo = any.unpack(Foo.class);\n    }\n\n Example 3: Pack and unpack a message in Python.\n\n    foo = Foo(...)\n    any = Any()\n    any.Pack(foo)\n    ...\n    if any.Is(Foo.DESCRIPTOR):\n      any.Unpack(foo)\n      ...\n\n Example 4: Pack and unpack a message in Go\n\n     foo := \u0026pb.Foo{...}\n     any, err := ptypes.MarshalAny(foo)\n     ...\n     foo := \u0026pb.Foo{}\n     if err := ptypes.UnmarshalAny(any, foo); err != nil {\n       ...\n     }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n    package google.profile;\n    message Person {\n      string first_name = 1;\n      string last_name = 2;\n    }\n\n    {\n      \"@type\": \"type.googleapis.com/google.profile.Person\",\n      \"firstName\": \u003cstring\u003e,\n      \"lastName\": \u003cstring\u003e\n    }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n    {\n      \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n      \"value\": \"1.212s\"\n    }"
     },
+    "protobufNullValue": {
+      "type": "string",
+      "enum": [
+        "NULL_VALUE"
+      ],
+      "default": "NULL_VALUE",
+      "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\n The JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value."
+    },
     "rpcStatus": {
       "type": "object",
       "properties": {

api/extensions.proto

@@ -1,24 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-package openmatch;
-option go_package = "open-match.dev/open-match/pkg/pb";
-option csharp_namespace = "OpenMatch";
-
-// A DefaultEvaluationCriteria is used for a match's evaluation_input when using
-// the default evaluator.
-message DefaultEvaluationCriteria {
-  double score = 1;
-}

api/frontend.proto

@@ -56,43 +56,45 @@ option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
 };
 
 message CreateTicketRequest {
-  // A Ticket object with SearchFields defined.
+  // Ticket object with the properties of the Ticket to be created.
   Ticket ticket = 1;
 }
 
 message CreateTicketResponse {
-  // A Ticket object with TicketId generated.
+  // Ticket object for the created Ticket - with the ticket ID populated.
   Ticket ticket = 1;
 }
 
 message DeleteTicketRequest {
-  // A TicketId of a generated Ticket to be deleted.
+  // Ticket ID of the Ticket to be deleted.
   string ticket_id = 1;
 }
 
 message DeleteTicketResponse {}
 
 message GetTicketRequest {
-  // A TicketId of a generated Ticket.
+  // Ticket ID of the Ticket to fetch.
   string ticket_id = 1;
 }
 
 message GetAssignmentsRequest {
-  // A TicketId of a generated Ticket to get updates on.
+  // Ticket ID of the Ticket to get updates on.
   string ticket_id = 1;
 }
 
 message GetAssignmentsResponse {
-  // An updated Assignment of the requested Ticket.
+  // The updated Ticket object.
   Assignment assignment = 1;
 }
 
-// The Frontend service implements APIs to manage and query status of a Tickets.
+// The Frontend service enables creating Tickets for matchmaking and fetching
+// the status of these Tickets.
 service Frontend {
-  // CreateTicket assigns an unique TicketId to the input Ticket and record it in state storage.
-  // A ticket is considered as ready for matchmaking once it is created.
-  //   - If a TicketId exists in a Ticket request, an auto-generated TicketId will override this field.
-  //   - If SearchFields exist in a Ticket, CreateTicket will also index these fields such that one can query the ticket with mmlogic.QueryTickets function.
+  // CreateTicket will create a new ticket, assign a Ticket ID to it and put the
+  // Ticket in state storage. It will then look through the 'properties' field
+  // for the attributes defined as indices the matchmakaking config. If the
+  // attributes exist and are valid integers, they will be indexed. Creating a
+  // ticket adds the Ticket to the pool of Tickets considered for matchmaking.
   rpc CreateTicket(CreateTicketRequest) returns (CreateTicketResponse) {
     option (google.api.http) = {
       post: "/v1/frontend/tickets"
@@ -100,25 +102,26 @@ service Frontend {
     };
   }
 
-  // DeleteTicket immediately stops Open Match from using the Ticket for matchmaking and removes the Ticket from state storage.
-  // The client must delete the Ticket when finished matchmaking with it. 
-  //   - If SearchFields exist in a Ticket, DeleteTicket will deindex the fields lazily.
-  // Users may still be able to assign/get a ticket after calling DeleteTicket on it.
+  // DeleteTicket removes the Ticket from state storage and from corresponding
+  // configured indices and lazily removes the ticket from state storage.
+  // Deleting a ticket immediately stops the ticket from being
+  // considered for future matchmaking requests, yet when the ticket itself will be deleted
+  // is undeterministic. Users may still be able to assign/get a ticket after calling DeleteTicket on it.
   rpc DeleteTicket(DeleteTicketRequest) returns (DeleteTicketResponse) {
     option (google.api.http) = {
       delete: "/v1/frontend/tickets/{ticket_id}"
     };
   }
 
-  // GetTicket get the Ticket associated with the specified TicketId.
+  // GetTicket fetches the ticket associated with the specified Ticket ID.
   rpc GetTicket(GetTicketRequest) returns (Ticket) {
     option (google.api.http) = {
       get: "/v1/frontend/tickets/{ticket_id}"
     };
   }
 
-  // GetAssignments stream back Assignment of the specified TicketId if it is updated.
-  //   - If the Assignment is not updated, GetAssignment will retry using the configured backoff strategy. 
+  // GetAssignments streams matchmaking results from Open Match for the
+  // provided Ticket ID.
   rpc GetAssignments(GetAssignmentsRequest)
       returns (stream GetAssignmentsResponse) {
     option (google.api.http) = {

api/frontend.swagger.json

@@ -26,7 +26,7 @@
   "paths": {
     "/v1/frontend/tickets": {
       "post": {
-        "summary": "CreateTicket assigns an unique TicketId to the input Ticket and record it in state storage.\nA ticket is considered as ready for matchmaking once it is created.\n  - If a TicketId exists in a Ticket request, an auto-generated TicketId will override this field.\n  - If SearchFields exist in a Ticket, CreateTicket will also index these fields such that one can query the ticket with mmlogic.QueryTickets function.",
+        "summary": "CreateTicket will create a new ticket, assign a Ticket ID to it and put the\nTicket in state storage. It will then look through the 'properties' field\nfor the attributes defined as indices the matchmakaking config. If the\nattributes exist and are valid integers, they will be indexed. Creating a\nticket adds the Ticket to the pool of Tickets considered for matchmaking.",
         "operationId": "CreateTicket",
         "responses": {
           "200": {
@@ -59,7 +59,7 @@
     },
     "/v1/frontend/tickets/{ticket_id}": {
       "get": {
-        "summary": "GetTicket get the Ticket associated with the specified TicketId.",
+        "summary": "GetTicket fetches the ticket associated with the specified Ticket ID.",
         "operationId": "GetTicket",
         "responses": {
           "200": {
@@ -78,7 +78,7 @@
         "parameters": [
           {
             "name": "ticket_id",
-            "description": "A TicketId of a generated Ticket.",
+            "description": "Ticket ID of the Ticket to fetch.",
             "in": "path",
             "required": true,
             "type": "string"
@@ -89,7 +89,7 @@
         ]
       },
       "delete": {
-        "summary": "DeleteTicket immediately stops Open Match from using the Ticket for matchmaking and removes the Ticket from state storage.\nThe client must delete the Ticket when finished matchmaking with it. \n  - If SearchFields exist in a Ticket, DeleteTicket will deindex the fields lazily.\nUsers may still be able to assign/get a ticket after calling DeleteTicket on it.",
+        "summary": "DeleteTicket removes the Ticket from state storage and from corresponding\nconfigured indices and lazily removes the ticket from state storage.\nDeleting a ticket immediately stops the ticket from being\nconsidered for future matchmaking requests, yet when the ticket itself will be deleted\nis undeterministic. Users may still be able to assign/get a ticket after calling DeleteTicket on it.",
         "operationId": "DeleteTicket",
         "responses": {
           "200": {
@@ -108,7 +108,7 @@
         "parameters": [
           {
             "name": "ticket_id",
-            "description": "A TicketId of a generated Ticket to be deleted.",
+            "description": "Ticket ID of the Ticket to be deleted.",
             "in": "path",
             "required": true,
             "type": "string"
@@ -121,7 +121,7 @@
     },
     "/v1/frontend/tickets/{ticket_id}/assignments": {
       "get": {
-        "summary": "GetAssignments stream back Assignment of the specified TicketId if it is updated.\n  - If the Assignment is not updated, GetAssignment will retry using the configured backoff strategy.",
+        "summary": "GetAssignments streams matchmaking results from Open Match for the\nprovided Ticket ID.",
         "operationId": "GetAssignments",
         "responses": {
           "200": {
@@ -140,7 +140,7 @@
         "parameters": [
           {
             "name": "ticket_id",
-            "description": "A TicketId of a generated Ticket to get updates on.",
+            "description": "Ticket ID of the Ticket to get updates on.",
             "in": "path",
             "required": true,
             "type": "string"
@@ -160,26 +160,23 @@
           "type": "string",
           "description": "Connection information for this Assignment."
         },
+        "properties": {
+          "type": "object",
+          "description": "Other details to be sent to the players."
+        },
         "error": {
           "$ref": "#/definitions/rpcStatus",
           "description": "Error when finding an Assignment for this Ticket."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
         }
       },
-      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
+      "description": "An Assignment object represents the assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
     },
     "openmatchCreateTicketRequest": {
       "type": "object",
       "properties": {
         "ticket": {
           "$ref": "#/definitions/openmatchTicket",
-          "description": "A Ticket object with SearchFields defined."
+          "description": "Ticket object with the properties of the Ticket to be created."
         }
       }
     },
@@ -188,7 +185,7 @@
       "properties": {
         "ticket": {
           "$ref": "#/definitions/openmatchTicket",
-          "description": "A Ticket object with TicketId generated."
+          "description": "Ticket object for the created Ticket - with the ticket ID populated."
         }
       }
     },
@@ -200,62 +197,27 @@
       "properties": {
         "assignment": {
           "$ref": "#/definitions/openmatchAssignment",
-          "description": "An updated Assignment of the requested Ticket."
+          "description": "The updated Ticket object."
         }
       }
     },
-    "openmatchSearchFields": {
-      "type": "object",
-      "properties": {
-        "double_args": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "number",
-            "format": "double"
-          },
-          "description": "Float arguments.  Filterable on ranges."
-        },
-        "string_args": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "description": "String arguments.  Filterable on equality."
-        },
-        "tags": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "Filterable on presence or absence of given value."
-        }
-      },
-      "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-    },
     "openmatchTicket": {
       "type": "object",
       "properties": {
         "id": {
           "type": "string",
-          "description": "Id represents an auto-generated Id issued by Open Match."
+          "description": "The Ticket ID generated by Open Match."
+        },
+        "properties": {
+          "type": "object",
+          "description": "Properties contains custom info about the ticket.  Top level values can be\nused in indexing and filtering to find tickets."
         },
         "assignment": {
           "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket. \nOpen Match does not require or inspect any fields on Assignment."
-        },
-        "search_fields": {
-          "$ref": "#/definitions/openmatchSearchFields",
-          "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
+          "description": "Assignment associated with the Ticket."
         }
       },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
+      "description": "A Ticket is a basic matchmaking entity in Open Match. In order to enter\nmatchmaking using Open Match, the client should generate a Ticket, passing in\nthe properties to be associated with this Ticket. Open Match will generate an\nID for a Ticket during creation. A Ticket could be used to represent an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof properties. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
     },
     "protobufAny": {
       "type": "object",
@@ -272,6 +234,14 @@
       },
       "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n    Foo foo = ...;\n    Any any;\n    any.PackFrom(foo);\n    ...\n    if (any.UnpackTo(\u0026foo)) {\n      ...\n    }\n\nExample 2: Pack and unpack a message in Java.\n\n    Foo foo = ...;\n    Any any = Any.pack(foo);\n    ...\n    if (any.is(Foo.class)) {\n      foo = any.unpack(Foo.class);\n    }\n\n Example 3: Pack and unpack a message in Python.\n\n    foo = Foo(...)\n    any = Any()\n    any.Pack(foo)\n    ...\n    if any.Is(Foo.DESCRIPTOR):\n      any.Unpack(foo)\n      ...\n\n Example 4: Pack and unpack a message in Go\n\n     foo := \u0026pb.Foo{...}\n     any, err := ptypes.MarshalAny(foo)\n     ...\n     foo := \u0026pb.Foo{}\n     if err := ptypes.UnmarshalAny(any, foo); err != nil {\n       ...\n     }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n    package google.profile;\n    message Person {\n      string first_name = 1;\n      string last_name = 2;\n    }\n\n    {\n      \"@type\": \"type.googleapis.com/google.profile.Person\",\n      \"firstName\": \u003cstring\u003e,\n      \"lastName\": \u003cstring\u003e\n    }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n    {\n      \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n      \"value\": \"1.212s\"\n    }"
     },
+    "protobufNullValue": {
+      "type": "string",
+      "enum": [
+        "NULL_VALUE"
+      ],
+      "default": "NULL_VALUE",
+      "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\n The JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value."
+    },
     "rpcStatus": {
       "type": "object",
       "properties": {

api/matchfunction.proto

@@ -56,21 +56,22 @@ option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
 };
 
 message RunRequest {
-  // A MatchProfile defines constraints of Tickets in a Match and shapes the Match proposed by the MatchFunction.
+  // The MatchProfile that describes the Match that this MatchFunction needs to
+  // generate proposals for.
   MatchProfile profile = 1;
 }
 
 message RunResponse {
-  // A Proposal represents a Match candidate that satifies the constraints defined in the input Profile.
-  // A valid Proposal response will contain at least one ticket.
+  // The proposal generated by this MatchFunction Run.
+  // Note that OpenMatch will validate the proposals, a valid match should contain at least one ticket.
   Match proposal = 1;
 }
 
-// The MatchFunction service implements APIs to run user-defined matchmaking logics.
+// This proto defines the API for running Match Functions as long-lived,
+// 'serving' functions.
 service MatchFunction {
-  // DO NOT CALL THIS FUNCTION MANUALLY. USE backend.FetchMatches INSTEAD.
-  // Run pulls Tickets that satisify Profile constraints from Mmlogic, runs matchmaking logics against them, then
-  // constructs and streams back match candidates to the Backend service.
+  // This is the function that is executed when by the Open Match backend to
+  // generate Match proposals.
   rpc Run(RunRequest) returns (stream RunResponse) {
     option (google.api.http) = {
       post: "/v1/matchfunction:run"

api/matchfunction.swagger.json

@@ -26,7 +26,7 @@
   "paths": {
     "/v1/matchfunction:run": {
       "post": {
-        "summary": "DO NOT CALL THIS FUNCTION MANUALLY. USE backend.FetchMatches INSTEAD.\nRun pulls Tickets that satisify Profile constraints from Mmlogic, runs matchmaking logics against them, then\nconstructs and streams back match candidates to the Backend service.",
+        "summary": "This is the function that is executed when by the Open Match backend to\ngenerate Match proposals.",
         "operationId": "Run",
         "responses": {
           "200": {
@@ -66,26 +66,36 @@
           "type": "string",
           "description": "Connection information for this Assignment."
         },
+        "properties": {
+          "type": "object",
+          "description": "Other details to be sent to the players."
+        },
         "error": {
           "$ref": "#/definitions/rpcStatus",
           "description": "Error when finding an Assignment for this Ticket."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
         }
       },
-      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
+      "description": "An Assignment object represents the assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
     },
-    "openmatchDoubleRangeFilter": {
+    "openmatchBoolEqualsFilter": {
       "type": "object",
       "properties": {
-        "double_arg": {
+        "attribute": {
+          "type": "string"
+        },
+        "value": {
+          "type": "boolean",
+          "format": "boolean"
+        }
+      },
+      "title": "Filters boolean values.\n  attribute: \"foo\"\n  value: false\nmatches:\n  {\"foo\": false}\ndoes not match:\n  {\"foo\": true}\n  {\"foo\": \"bar\"}\n  {\"foo\": 1}\n  {\"foo\": \"false\"}\n  {\"foo\": [false]}\n  {\"foo\": null}\n  {}"
+    },
+    "openmatchFloatRangeFilter": {
+      "type": "object",
+      "properties": {
+        "attribute": {
           "type": "string",
-          "description": "Name of the ticket's search_fields.double_args this Filter operates on."
+          "description": "Name of the ticket attribute this Filter operates on."
         },
         "max": {
           "type": "number",
@@ -98,7 +108,7 @@
           "description": "Minimum value. Defaults to 0."
         }
       },
-      "title": "Filters numerical values to only those within a range.\n  double_arg: \"foo\"\n  max: 10\n  min: 5\nmatches:\n  {\"foo\": 5}\n  {\"foo\": 7.5}\n  {\"foo\": 10}\ndoes not match:\n  {\"foo\": 4}\n  {\"foo\": 10.01}\n  {\"foo\": \"7.5\"}\n  {}"
+      "title": "Filters numerical values to only those within a range.\n  attribute: \"foo\"\n  max: 10\n  min: 5\nmatches:\n  {\"foo\": 5}\n  {\"foo\": 7.5}\n  {\"foo\": 10}\ndoes not match:\n  {\"foo\": 4}\n  {\"foo\": 10.01}\n  {\"foo\": \"7.5\"}\n  {\"foo\": true}\n  {\"foo\": [7.5]}\n  {\"foo\": null}\n  {}"
     },
     "openmatchMatch": {
       "type": "object",
@@ -129,12 +139,9 @@
           },
           "title": "Set of Rosters that comprise this Match"
         },
-        "extensions": {
+        "properties": {
           "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
+          "description": "Match properties for this Match. Open Match does not interpret this field."
         }
       },
       "description": "A Match is used to represent a completed match object. It can be generated by\na MatchFunction as a proposal or can be returned by OpenMatch as a result in\nresponse to the FetchMatches call.\nWhen a match is returned by the FetchMatches call, it should contain at least \none ticket to be considered as valid."
@@ -146,6 +153,10 @@
           "type": "string",
           "description": "Name of this match profile."
         },
+        "properties": {
+          "type": "object",
+          "description": "Set of properties associated with this MatchProfile. (Optional)\nOpen Match does not interpret these properties but passes them through to\nthe MatchFunction."
+        },
         "pools": {
           "type": "array",
           "items": {
@@ -159,13 +170,6 @@
             "$ref": "#/definitions/openmatchRoster"
           },
           "description": "Set of Rosters for this match request. Could be empty Rosters used to\nindicate the composition of the generated Match or they could be partially\npre-populated Ticket list to be used in scenarios such as backfill / join\nin progress."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
         }
       },
       "description": "A MatchProfile is Open Match's representation of a Match specification. It is\nused to indicate the criteria for selecting players for a match. A\nMatchProfile is the input to the API to get matches and is passed to the\nMatchFunction. It contains all the information required by the MatchFunction\nto generate match proposals."
@@ -177,24 +181,24 @@
           "type": "string",
           "description": "A developer-chosen human-readable name for this Pool."
         },
-        "double_range_filters": {
+        "float_range_filters": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/openmatchDoubleRangeFilter"
+            "$ref": "#/definitions/openmatchFloatRangeFilter"
           },
           "description": "Set of Filters indicating the filtering criteria. Selected players must\nmatch every Filter."
         },
+        "bool_equals_filters": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/openmatchBoolEqualsFilter"
+          }
+        },
         "string_equals_filters": {
           "type": "array",
           "items": {
             "$ref": "#/definitions/openmatchStringEqualsFilter"
           }
-        },
-        "tag_present_filters": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/openmatchTagPresentFilter"
-          }
         }
       }
     },
@@ -220,7 +224,7 @@
       "properties": {
         "profile": {
           "$ref": "#/definitions/openmatchMatchProfile",
-          "description": "A MatchProfile defines constraints of Tickets in a Match and shapes the Match proposed by the MatchFunction."
+          "description": "The MatchProfile that describes the Match that this MatchFunction needs to\ngenerate proposals for."
         }
       }
     },
@@ -229,84 +233,39 @@
       "properties": {
         "proposal": {
           "$ref": "#/definitions/openmatchMatch",
-          "description": "A Proposal represents a Match candidate that satifies the constraints defined in the input Profile.\nA valid Proposal response will contain at least one ticket."
+          "description": "The proposal generated by this MatchFunction Run.\nNote that OpenMatch will validate the proposals, a valid match should contain at least one ticket."
         }
       }
     },
-    "openmatchSearchFields": {
-      "type": "object",
-      "properties": {
-        "double_args": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "number",
-            "format": "double"
-          },
-          "description": "Float arguments.  Filterable on ranges."
-        },
-        "string_args": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "description": "String arguments.  Filterable on equality."
-        },
-        "tags": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "Filterable on presence or absence of given value."
-        }
-      },
-      "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-    },
     "openmatchStringEqualsFilter": {
       "type": "object",
       "properties": {
-        "string_arg": {
-          "type": "string",
-          "description": "Name of the ticket's search_fields.string_args this Filter operates on."
+        "attribute": {
+          "type": "string"
         },
         "value": {
           "type": "string"
         }
       },
-      "title": "Filters strings exactly equaling a value.\n  string_arg: \"foo\"\n  value: \"bar\"\nmatches:\n  {\"foo\": \"bar\"}\ndoes not match:\n  {\"foo\": \"baz\"}\n  {\"bar\": \"foo\"}\n  {}"
-    },
-    "openmatchTagPresentFilter": {
-      "type": "object",
-      "properties": {
-        "tag": {
-          "type": "string"
-        }
-      },
-      "title": "Filters to the tag being present on the search_fields.\n  tag: \"foo\"\nmatches:\n  [\"foo\"]\n  [\"bar\",\"foo\"]\ndoes not match:\n  [\"bar\"]\n  []"
+      "title": "Filters strings exactly equaling a value.\n  attribute: \"foo\"\n  value: \"bar\"\nmatches:\n  {\"foo\": \"bar\"}\ndoes not match:\n  {\"foo\": \"baz\"}\n  {\"foo\": true}\n  {\"foo\": 5}\n  {\"foo\": [\"bar\"]}\n  {\"foo\": null}\n  {}"
     },
     "openmatchTicket": {
       "type": "object",
       "properties": {
         "id": {
           "type": "string",
-          "description": "Id represents an auto-generated Id issued by Open Match."
+          "description": "The Ticket ID generated by Open Match."
+        },
+        "properties": {
+          "type": "object",
+          "description": "Properties contains custom info about the ticket.  Top level values can be\nused in indexing and filtering to find tickets."
         },
         "assignment": {
           "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket. \nOpen Match does not require or inspect any fields on Assignment."
-        },
-        "search_fields": {
-          "$ref": "#/definitions/openmatchSearchFields",
-          "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
+          "description": "Assignment associated with the Ticket."
         }
       },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
+      "description": "A Ticket is a basic matchmaking entity in Open Match. In order to enter\nmatchmaking using Open Match, the client should generate a Ticket, passing in\nthe properties to be associated with this Ticket. Open Match will generate an\nID for a Ticket during creation. A Ticket could be used to represent an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof properties. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
     },
     "protobufAny": {
       "type": "object",
@@ -323,6 +282,14 @@
       },
       "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n    Foo foo = ...;\n    Any any;\n    any.PackFrom(foo);\n    ...\n    if (any.UnpackTo(\u0026foo)) {\n      ...\n    }\n\nExample 2: Pack and unpack a message in Java.\n\n    Foo foo = ...;\n    Any any = Any.pack(foo);\n    ...\n    if (any.is(Foo.class)) {\n      foo = any.unpack(Foo.class);\n    }\n\n Example 3: Pack and unpack a message in Python.\n\n    foo = Foo(...)\n    any = Any()\n    any.Pack(foo)\n    ...\n    if any.Is(Foo.DESCRIPTOR):\n      any.Unpack(foo)\n      ...\n\n Example 4: Pack and unpack a message in Go\n\n     foo := \u0026pb.Foo{...}\n     any, err := ptypes.MarshalAny(foo)\n     ...\n     foo := \u0026pb.Foo{}\n     if err := ptypes.UnmarshalAny(any, foo); err != nil {\n       ...\n     }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n    package google.profile;\n    message Person {\n      string first_name = 1;\n      string last_name = 2;\n    }\n\n    {\n      \"@type\": \"type.googleapis.com/google.profile.Person\",\n      \"firstName\": \u003cstring\u003e,\n      \"lastName\": \u003cstring\u003e\n    }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n    {\n      \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n      \"value\": \"1.212s\"\n    }"
     },
+    "protobufNullValue": {
+      "type": "string",
+      "enum": [
+        "NULL_VALUE"
+      ],
+      "default": "NULL_VALUE",
+      "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\n The JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value."
+    },
     "rpcStatus": {
       "type": "object",
       "properties": {

api/messages.proto

@@ -18,67 +18,43 @@ option go_package = "open-match.dev/open-match/pkg/pb";
 option csharp_namespace = "OpenMatch";
 
 import "google/rpc/status.proto";
-import "google/protobuf/any.proto";
+import "google/protobuf/struct.proto";
 
-// A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an
+// A Ticket is a basic matchmaking entity in Open Match. In order to enter
+// matchmaking using Open Match, the client should generate a Ticket, passing in
+// the properties to be associated with this Ticket. Open Match will generate an
+// ID for a Ticket during creation. A Ticket could be used to represent an
 // individual 'Player' or a 'Group' of players. Open Match will not interpret
 // what the Ticket represents but just treat it as a matchmaking unit with a set
-// of SearchFields. Open Match stores the Ticket in state storage and enables an
+// of properties. Open Match stores the Ticket in state storage and enables an
 // Assignment to be associated with this Ticket.
 message Ticket {
-  // Id represents an auto-generated Id issued by Open Match. 
+  // The Ticket ID generated by Open Match.
   string id = 1;
 
-  // An Assignment represents a game server assignment associated with a Ticket. 
-  // Open Match does not require or inspect any fields on Assignment.
+  // Properties contains custom info about the ticket.  Top level values can be
+  // used in indexing and filtering to find tickets.
+  google.protobuf.Struct properties = 2;
+
+  // Assignment associated with the Ticket.
   Assignment assignment = 3;
-
-  // Search fields are the fields which Open Match is aware of, and can be used
-  // when specifying filters.
-  SearchFields search_fields = 4;
-
-  // Customized information not inspected by Open Match, to be used by the match
-  // making function, evaluator, and components making calls to Open Match.
-  // Optional, depending on the requirements of the connected systems.
-  map<string, google.protobuf.Any> extensions = 5;
-
-  // Deprecated fields.
-  reserved 2;
 }
 
-// Search fields are the fields which Open Match is aware of, and can be used
-// when specifying filters.
-message SearchFields {
-  // Float arguments.  Filterable on ranges.
-  map<string, double> double_args = 1;
- 
-  // String arguments.  Filterable on equality.
-  map<string, string> string_args = 2;
- 
-  // Filterable on presence or absence of given value.
-  repeated string tags = 3;
-}
-
-// An Assignment represents a game server assignment associated with a Ticket. Open
+// An Assignment object represents the assignment associated with a Ticket. Open
 // match does not require or inspect any fields on assignment.
 message Assignment {
   // Connection information for this Assignment.
   string connection = 1;
 
+  // Other details to be sent to the players.
+  google.protobuf.Struct properties = 2;
+
   // Error when finding an Assignment for this Ticket.
   google.rpc.Status error = 3;
-
-  // Customized information not inspected by Open Match, to be used by the match
-  // making function, evaluator, and components making calls to Open Match.
-  // Optional, depending on the requirements of the connected systems.
-  map<string, google.protobuf.Any> extensions = 4;
-
-  // Deprecated fields.
-  reserved 2;
 }
 
 // Filters numerical values to only those within a range.
-//   double_arg: "foo"
+//   attribute: "foo"
 //   max: 10
 //   min: 5
 // matches:
@@ -89,10 +65,13 @@ message Assignment {
 //   {"foo": 4}
 //   {"foo": 10.01}
 //   {"foo": "7.5"}
+//   {"foo": true}
+//   {"foo": [7.5]}
+//   {"foo": null}
 //   {}
-message DoubleRangeFilter {
-  // Name of the ticket's search_fields.double_args this Filter operates on.
-  string double_arg = 1;
+message FloatRangeFilter {
+  // Name of the ticket attribute this Filter operates on.
+  string attribute = 1;
 
   // Maximum value. Defaults to positive infinity (any value above minv).
   double max = 2;
@@ -101,48 +80,54 @@ message DoubleRangeFilter {
   double min = 3;
 }
 
+// Filters boolean values.
+//   attribute: "foo"
+//   value: false
+// matches:
+//   {"foo": false}
+// does not match:
+//   {"foo": true}
+//   {"foo": "bar"}
+//   {"foo": 1}
+//   {"foo": "false"}
+//   {"foo": [false]}
+//   {"foo": null}
+//   {}
+message BoolEqualsFilter {
+  string attribute = 1;
+
+  bool value = 2;
+}
+
 // Filters strings exactly equaling a value.
-//   string_arg: "foo"
+//   attribute: "foo"
 //   value: "bar"
 // matches:
 //   {"foo": "bar"}
 // does not match:
 //   {"foo": "baz"}
-//   {"bar": "foo"}
+//   {"foo": true}
+//   {"foo": 5}
+//   {"foo": ["bar"]}
+//   {"foo": null}
 //   {}
 message StringEqualsFilter {
-  // Name of the ticket's search_fields.string_args this Filter operates on.
-  string string_arg = 1;
+  string attribute = 1;
 
   string value = 2;
 }
 
-// Filters to the tag being present on the search_fields.
-//   tag: "foo"
-// matches:
-//   ["foo"]
-//   ["bar","foo"]
-// does not match:
-//   ["bar"]
-//   []
-message TagPresentFilter {
-  string tag = 1;
-}
-
 message Pool {
   // A developer-chosen human-readable name for this Pool.
   string name = 1;
 
   // Set of Filters indicating the filtering criteria. Selected players must
   // match every Filter.
-  repeated DoubleRangeFilter double_range_filters = 2;
+  repeated FloatRangeFilter float_range_filters = 2;
+
+  repeated BoolEqualsFilter bool_equals_filters = 3;
 
   repeated StringEqualsFilter string_equals_filters = 4;
-
-  repeated TagPresentFilter tag_present_filters = 5;
-
-  // Deprecated fields.
-  reserved 3;
 }
 
 // A Roster is a named collection of Ticket IDs. It exists so that a Tickets
@@ -166,6 +151,11 @@ message MatchProfile {
   // Name of this match profile.
   string name = 1;
 
+  // Set of properties associated with this MatchProfile. (Optional)
+  // Open Match does not interpret these properties but passes them through to
+  // the MatchFunction.
+  google.protobuf.Struct properties = 2;
+
   // Set of pools to be queried when generating a match for this MatchProfile.
   // The pool names can be used in empty Rosters to specify composition of a
   // match.
@@ -176,14 +166,6 @@ message MatchProfile {
   // pre-populated Ticket list to be used in scenarios such as backfill / join
   // in progress.
   repeated Roster rosters = 4;
-
-  // Customized information not inspected by Open Match, to be used by the match
-  // making function, evaluator, and components making calls to Open Match.
-  // Optional, depending on the requirements of the connected systems.
-  map<string, google.protobuf.Any> extensions = 5;
-
-  // Deprecated fields.
-  reserved 2;
 }
 
 // A Match is used to represent a completed match object. It can be generated by
@@ -207,11 +189,6 @@ message Match {
   // Set of Rosters that comprise this Match
   repeated Roster rosters = 5;
 
-  // Customized information not inspected by Open Match, to be used by the match
-  // making function, evaluator, and components making calls to Open Match.
-  // Optional, depending on the requirements of the connected systems.
-  map<string, google.protobuf.Any> extensions = 7;
-
-  // Deprecated fields.
-  reserved 6;
+  // Match properties for this Match. Open Match does not interpret this field.
+  google.protobuf.Struct properties = 6;
 }

api/mmlogic.proto

@@ -56,21 +56,20 @@ option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
 };
 
 message QueryTicketsRequest {
-  // A Pool is consists of a set of Filters.
+  // The Pool representing the set of Filters to be queried.
   Pool pool = 1;
 }
 
 message QueryTicketsResponse {
-  // Tickets is a list of Ticket representing one or more Tickets which meet all Filter criterias.
+  // The Tickets that meet the Filter criteria requested by the Pool.
   repeated Ticket tickets = 1;
 }
 
-// The MmLogic service implements helper APIs for Match Function to query Tickets from state storage.
+// The MMLogic API provides utility functions for common MMF functionality such
+// as retreiving Tickets from state storage.
 service MmLogic {
-  // QueryTickets gets a list of Tickets that match all Filters of the input Pool.
-  //   - If the Pool contains no Filters, QueryTickets will return all Tickets in the state storage.
-  // QueryTickets pages the Tickets by `storage.pool.size` and stream back response.
-  //   - storage.pool.size is default to 1000 if not set, and has a mininum of 10 and maximum of 10000
+  // QueryTickets gets the list of Tickets that match every Filter in the
+  // specified Pool.
   rpc QueryTickets(QueryTicketsRequest) returns (stream QueryTicketsResponse) {
     option (google.api.http) = {
       post: "/v1/mmlogic/tickets:query"

api/mmlogic.swagger.json

@@ -26,7 +26,7 @@
   "paths": {
     "/v1/mmlogic/tickets:query": {
       "post": {
-        "summary": "QueryTickets gets a list of Tickets that match all Filters of the input Pool.\n  - If the Pool contains no Filters, QueryTickets will return all Tickets in the state storage.\nQueryTickets pages the Tickets by `storage.pool.size` and stream back response.\n  - storage.pool.size is default to 1000 if not set, and has a mininum of 10 and maximum of 10000",
+        "summary": "QueryTickets gets the list of Tickets that match every Filter in the\nspecified Pool.",
         "operationId": "QueryTickets",
         "responses": {
           "200": {
@@ -66,26 +66,36 @@
           "type": "string",
           "description": "Connection information for this Assignment."
         },
+        "properties": {
+          "type": "object",
+          "description": "Other details to be sent to the players."
+        },
         "error": {
           "$ref": "#/definitions/rpcStatus",
           "description": "Error when finding an Assignment for this Ticket."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
         }
       },
-      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
+      "description": "An Assignment object represents the assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
     },
-    "openmatchDoubleRangeFilter": {
+    "openmatchBoolEqualsFilter": {
       "type": "object",
       "properties": {
-        "double_arg": {
+        "attribute": {
+          "type": "string"
+        },
+        "value": {
+          "type": "boolean",
+          "format": "boolean"
+        }
+      },
+      "title": "Filters boolean values.\n  attribute: \"foo\"\n  value: false\nmatches:\n  {\"foo\": false}\ndoes not match:\n  {\"foo\": true}\n  {\"foo\": \"bar\"}\n  {\"foo\": 1}\n  {\"foo\": \"false\"}\n  {\"foo\": [false]}\n  {\"foo\": null}\n  {}"
+    },
+    "openmatchFloatRangeFilter": {
+      "type": "object",
+      "properties": {
+        "attribute": {
           "type": "string",
-          "description": "Name of the ticket's search_fields.double_args this Filter operates on."
+          "description": "Name of the ticket attribute this Filter operates on."
         },
         "max": {
           "type": "number",
@@ -98,7 +108,7 @@
           "description": "Minimum value. Defaults to 0."
         }
       },
-      "title": "Filters numerical values to only those within a range.\n  double_arg: \"foo\"\n  max: 10\n  min: 5\nmatches:\n  {\"foo\": 5}\n  {\"foo\": 7.5}\n  {\"foo\": 10}\ndoes not match:\n  {\"foo\": 4}\n  {\"foo\": 10.01}\n  {\"foo\": \"7.5\"}\n  {}"
+      "title": "Filters numerical values to only those within a range.\n  attribute: \"foo\"\n  max: 10\n  min: 5\nmatches:\n  {\"foo\": 5}\n  {\"foo\": 7.5}\n  {\"foo\": 10}\ndoes not match:\n  {\"foo\": 4}\n  {\"foo\": 10.01}\n  {\"foo\": \"7.5\"}\n  {\"foo\": true}\n  {\"foo\": [7.5]}\n  {\"foo\": null}\n  {}"
     },
     "openmatchPool": {
       "type": "object",
@@ -107,24 +117,24 @@
           "type": "string",
           "description": "A developer-chosen human-readable name for this Pool."
         },
-        "double_range_filters": {
+        "float_range_filters": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/openmatchDoubleRangeFilter"
+            "$ref": "#/definitions/openmatchFloatRangeFilter"
           },
           "description": "Set of Filters indicating the filtering criteria. Selected players must\nmatch every Filter."
         },
+        "bool_equals_filters": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/openmatchBoolEqualsFilter"
+          }
+        },
         "string_equals_filters": {
           "type": "array",
           "items": {
             "$ref": "#/definitions/openmatchStringEqualsFilter"
           }
-        },
-        "tag_present_filters": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/openmatchTagPresentFilter"
-          }
         }
       }
     },
@@ -133,7 +143,7 @@
       "properties": {
         "pool": {
           "$ref": "#/definitions/openmatchPool",
-          "description": "A Pool is consists of a set of Filters."
+          "description": "The Pool representing the set of Filters to be queried."
         }
       }
     },
@@ -145,84 +155,39 @@
           "items": {
             "$ref": "#/definitions/openmatchTicket"
           },
-          "description": "Tickets is a list of Ticket representing one or more Tickets which meet all Filter criterias."
+          "description": "The Tickets that meet the Filter criteria requested by the Pool."
         }
       }
     },
-    "openmatchSearchFields": {
-      "type": "object",
-      "properties": {
-        "double_args": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "number",
-            "format": "double"
-          },
-          "description": "Float arguments.  Filterable on ranges."
-        },
-        "string_args": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "description": "String arguments.  Filterable on equality."
-        },
-        "tags": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "Filterable on presence or absence of given value."
-        }
-      },
-      "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-    },
     "openmatchStringEqualsFilter": {
       "type": "object",
       "properties": {
-        "string_arg": {
-          "type": "string",
-          "description": "Name of the ticket's search_fields.string_args this Filter operates on."
+        "attribute": {
+          "type": "string"
         },
         "value": {
           "type": "string"
         }
       },
-      "title": "Filters strings exactly equaling a value.\n  string_arg: \"foo\"\n  value: \"bar\"\nmatches:\n  {\"foo\": \"bar\"}\ndoes not match:\n  {\"foo\": \"baz\"}\n  {\"bar\": \"foo\"}\n  {}"
-    },
-    "openmatchTagPresentFilter": {
-      "type": "object",
-      "properties": {
-        "tag": {
-          "type": "string"
-        }
-      },
-      "title": "Filters to the tag being present on the search_fields.\n  tag: \"foo\"\nmatches:\n  [\"foo\"]\n  [\"bar\",\"foo\"]\ndoes not match:\n  [\"bar\"]\n  []"
+      "title": "Filters strings exactly equaling a value.\n  attribute: \"foo\"\n  value: \"bar\"\nmatches:\n  {\"foo\": \"bar\"}\ndoes not match:\n  {\"foo\": \"baz\"}\n  {\"foo\": true}\n  {\"foo\": 5}\n  {\"foo\": [\"bar\"]}\n  {\"foo\": null}\n  {}"
     },
     "openmatchTicket": {
       "type": "object",
       "properties": {
         "id": {
           "type": "string",
-          "description": "Id represents an auto-generated Id issued by Open Match."
+          "description": "The Ticket ID generated by Open Match."
+        },
+        "properties": {
+          "type": "object",
+          "description": "Properties contains custom info about the ticket.  Top level values can be\nused in indexing and filtering to find tickets."
         },
         "assignment": {
           "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket. \nOpen Match does not require or inspect any fields on Assignment."
-        },
-        "search_fields": {
-          "$ref": "#/definitions/openmatchSearchFields",
-          "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
+          "description": "Assignment associated with the Ticket."
         }
       },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
+      "description": "A Ticket is a basic matchmaking entity in Open Match. In order to enter\nmatchmaking using Open Match, the client should generate a Ticket, passing in\nthe properties to be associated with this Ticket. Open Match will generate an\nID for a Ticket during creation. A Ticket could be used to represent an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof properties. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
     },
     "protobufAny": {
       "type": "object",
@@ -239,6 +204,14 @@
       },
       "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n    Foo foo = ...;\n    Any any;\n    any.PackFrom(foo);\n    ...\n    if (any.UnpackTo(\u0026foo)) {\n      ...\n    }\n\nExample 2: Pack and unpack a message in Java.\n\n    Foo foo = ...;\n    Any any = Any.pack(foo);\n    ...\n    if (any.is(Foo.class)) {\n      foo = any.unpack(Foo.class);\n    }\n\n Example 3: Pack and unpack a message in Python.\n\n    foo = Foo(...)\n    any = Any()\n    any.Pack(foo)\n    ...\n    if any.Is(Foo.DESCRIPTOR):\n      any.Unpack(foo)\n      ...\n\n Example 4: Pack and unpack a message in Go\n\n     foo := \u0026pb.Foo{...}\n     any, err := ptypes.MarshalAny(foo)\n     ...\n     foo := \u0026pb.Foo{}\n     if err := ptypes.UnmarshalAny(any, foo); err != nil {\n       ...\n     }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n    package google.profile;\n    message Person {\n      string first_name = 1;\n      string last_name = 2;\n    }\n\n    {\n      \"@type\": \"type.googleapis.com/google.profile.Person\",\n      \"firstName\": \u003cstring\u003e,\n      \"lastName\": \u003cstring\u003e\n    }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n    {\n      \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n      \"value\": \"1.212s\"\n    }"
     },
+    "protobufNullValue": {
+      "type": "string",
+      "enum": [
+        "NULL_VALUE"
+      ],
+      "default": "NULL_VALUE",
+      "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\n The JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value."
+    },
     "rpcStatus": {
       "type": "object",
       "properties": {

cloudbuild.yaml

@@ -49,7 +49,7 @@
 steps:
 - id: 'Docker Image: open-match-build'
   name: gcr.io/kaniko-project/executor
-  args: ['--destination=gcr.io/$PROJECT_ID/open-match-build', '--cache=true', '--cache-ttl=48h', '--dockerfile=Dockerfile.ci']
+  args: ['--destination=gcr.io/$PROJECT_ID/open-match-build', '--cache=true', '--cache-ttl=48h', '--dockerfile=Dockerfile.ci', '.']
   waitFor: ['-']
 
 - id: 'Build: Clean'
@@ -72,7 +72,7 @@ steps:
 
 - id: 'Build: Initialize Toolchain'
   name: 'gcr.io/$PROJECT_ID/open-match-build'
-  args: ['make', 'install-toolchain']
+  args: ['make', 'install-toolchain', 'push-helm-ci']
   volumes:
   - name: 'go-vol'
     path: '/go'
@@ -127,7 +127,7 @@ steps:
 
 - id: 'Test: Deploy Open Match'
   name: 'gcr.io/$PROJECT_ID/open-match-build'
-  args: ['make', 'SHORT_SHA=${SHORT_SHA}', 'OPEN_MATCH_KUBERNETES_NAMESPACE=open-match-${BUILD_ID}', 'OPEN_MATCH_RELEASE_NAME=open-match-${BUILD_ID}', 'auth-gke-cluster', 'delete-chart', 'ci-reap-namespaces', 'install-ci-chart']
+  args: ['make', 'SHORT_SHA=${SHORT_SHA}', 'OPEN_MATCH_KUBERNETES_NAMESPACE=open-match-${SHORT_SHA}', 'OPEN_MATCH_RELEASE_NAME=open-match-${SHORT_SHA}', 'auth-gke-cluster', 'delete-chart', 'ci-reap-namespaces', 'install-ci-chart']
   waitFor: ['Build: Docker Images']
 
 - id: 'Deploy: Deployment Configs'
@@ -140,7 +140,7 @@ steps:
 
 - id: 'Test: End-to-End Cluster'
   name: 'gcr.io/$PROJECT_ID/open-match-build'
-  args: ['make', 'GOPROXY=off', 'SHORT_SHA=${SHORT_SHA}', 'OPEN_MATCH_KUBERNETES_NAMESPACE=open-match-${BUILD_ID}', 'test-e2e-cluster']
+  args: ['make', 'GOPROXY=off', 'SHORT_SHA=${SHORT_SHA}', 'OPEN_MATCH_KUBERNETES_NAMESPACE=open-match-${SHORT_SHA}', 'test-e2e-cluster']
   waitFor: ['Test: Deploy Open Match', 'Build: Assets']
   volumes:
   - name: 'go-vol'
@@ -148,7 +148,7 @@ steps:
 
 - id: 'Test: Delete Open Match'
   name: 'gcr.io/$PROJECT_ID/open-match-build'
-  args: ['make', 'GCLOUD_EXTRA_FLAGS=--async', 'SHORT_SHA=${SHORT_SHA}', 'OPEN_MATCH_KUBERNETES_NAMESPACE=open-match-${BUILD_ID}', 'OPEN_MATCH_RELEASE_NAME=open-match-${BUILD_ID}', 'GCP_PROJECT_ID=${PROJECT_ID}', 'delete-chart']
+  args: ['make', 'GCLOUD_EXTRA_FLAGS=--async', 'SHORT_SHA=${SHORT_SHA}', 'OPEN_MATCH_KUBERNETES_NAMESPACE=open-match-${SHORT_SHA}', 'GCP_PROJECT_ID=${PROJECT_ID}', 'delete-chart']
   waitFor: ['Test: End-to-End Cluster']
 
 artifacts:
@@ -161,10 +161,9 @@ artifacts:
             - install/yaml/03-prometheus-chart.yaml
             - install/yaml/04-grafana-chart.yaml
             - install/yaml/05-jaeger-chart.yaml
-            - install/yaml/06-open-match-override-configmap.yaml
-            
+
 substitutions:
-    _OM_VERSION: "0.8.0-rc.1"
+    _OM_VERSION: "0.7.0"
     _GCB_POST_SUBMIT: "0"
     _GCB_LATEST_VERSION: "undefined"
 logsBucket: 'gs://open-match-build-logs/'

csharp/OpenMatch/Annotations.cs

@@ -1,54 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: third_party/protoc-gen-swagger/options/annotations.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Grpc.Gateway.ProtocGenSwagger.Options {
-
-  /// <summary>Holder for reflection information generated from third_party/protoc-gen-swagger/options/annotations.proto</summary>
-  public static partial class AnnotationsReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for third_party/protoc-gen-swagger/options/annotations.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static AnnotationsReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Cjh0aGlyZF9wYXJ0eS9wcm90b2MtZ2VuLXN3YWdnZXIvb3B0aW9ucy9hbm5v",
-            "dGF0aW9ucy5wcm90bxInZ3JwYy5nYXRld2F5LnByb3RvY19nZW5fc3dhZ2dl",
-            "ci5vcHRpb25zGiBnb29nbGUvcHJvdG9idWYvZGVzY3JpcHRvci5wcm90bxoq",
-            "cHJvdG9jLWdlbi1zd2FnZ2VyL29wdGlvbnMvb3BlbmFwaXYyLnByb3RvOmoK",
-            "EW9wZW5hcGl2Ml9zd2FnZ2VyEhwuZ29vZ2xlLnByb3RvYnVmLkZpbGVPcHRp",
-            "b25zGJIIIAEoCzIwLmdycGMuZ2F0ZXdheS5wcm90b2NfZ2VuX3N3YWdnZXIu",
-            "b3B0aW9ucy5Td2FnZ2VyOnAKE29wZW5hcGl2Ml9vcGVyYXRpb24SHi5nb29n",
-            "bGUucHJvdG9idWYuTWV0aG9kT3B0aW9ucxiSCCABKAsyMi5ncnBjLmdhdGV3",
-            "YXkucHJvdG9jX2dlbl9zd2FnZ2VyLm9wdGlvbnMuT3BlcmF0aW9uOmsKEG9w",
-            "ZW5hcGl2Ml9zY2hlbWESHy5nb29nbGUucHJvdG9idWYuTWVzc2FnZU9wdGlv",
-            "bnMYkgggASgLMi8uZ3JwYy5nYXRld2F5LnByb3RvY19nZW5fc3dhZ2dlci5v",
-            "cHRpb25zLlNjaGVtYTplCg1vcGVuYXBpdjJfdGFnEh8uZ29vZ2xlLnByb3Rv",
-            "YnVmLlNlcnZpY2VPcHRpb25zGJIIIAEoCzIsLmdycGMuZ2F0ZXdheS5wcm90",
-            "b2NfZ2VuX3N3YWdnZXIub3B0aW9ucy5UYWc6bAoPb3BlbmFwaXYyX2ZpZWxk",
-            "Eh0uZ29vZ2xlLnByb3RvYnVmLkZpZWxkT3B0aW9ucxiSCCABKAsyMy5ncnBj",
-            "LmdhdGV3YXkucHJvdG9jX2dlbl9zd2FnZ2VyLm9wdGlvbnMuSlNPTlNjaGVt",
-            "YUJDWkFnaXRodWIuY29tL2dycGMtZWNvc3lzdGVtL2dycGMtZ2F0ZXdheS9w",
-            "cm90b2MtZ2VuLXN3YWdnZXIvb3B0aW9uc2IGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { pbr::FileDescriptor.DescriptorProtoFileDescriptor, global::Grpc.Gateway.ProtocGenSwagger.Options.Openapiv2Reflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, null));
-    }
-    #endregion
-
-  }
-}
-
-#endregion Designer generated code

csharp/OpenMatch/Backend.cs

@@ -1,834 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: api/backend.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace OpenMatch {
-
-  /// <summary>Holder for reflection information generated from api/backend.proto</summary>
-  public static partial class BackendReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for api/backend.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static BackendReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChFhcGkvYmFja2VuZC5wcm90bxIJb3Blbm1hdGNoGhJhcGkvbWVzc2FnZXMu",
-            "cHJvdG8aHGdvb2dsZS9hcGkvYW5ub3RhdGlvbnMucHJvdG8aLHByb3RvYy1n",
-            "ZW4tc3dhZ2dlci9vcHRpb25zL2Fubm90YXRpb25zLnByb3RvInYKDkZ1bmN0",
-            "aW9uQ29uZmlnEgwKBGhvc3QYASABKAkSDAoEcG9ydBgCIAEoBRIsCgR0eXBl",
-            "GAMgASgOMh4ub3Blbm1hdGNoLkZ1bmN0aW9uQ29uZmlnLlR5cGUiGgoEVHlw",
-            "ZRIICgRHUlBDEAASCAoEUkVTVBABImsKE0ZldGNoTWF0Y2hlc1JlcXVlc3QS",
-            "KQoGY29uZmlnGAEgASgLMhkub3Blbm1hdGNoLkZ1bmN0aW9uQ29uZmlnEikK",
-            "CHByb2ZpbGVzGAIgAygLMhcub3Blbm1hdGNoLk1hdGNoUHJvZmlsZSI3ChRG",
-            "ZXRjaE1hdGNoZXNSZXNwb25zZRIfCgVtYXRjaBgBIAEoCzIQLm9wZW5tYXRj",
-            "aC5NYXRjaCJVChRBc3NpZ25UaWNrZXRzUmVxdWVzdBISCgp0aWNrZXRfaWRz",
-            "GAEgAygJEikKCmFzc2lnbm1lbnQYAiABKAsyFS5vcGVubWF0Y2guQXNzaWdu",
-            "bWVudCIXChVBc3NpZ25UaWNrZXRzUmVzcG9uc2Uy/QEKB0JhY2tlbmQSdwoM",
-            "RmV0Y2hNYXRjaGVzEh4ub3Blbm1hdGNoLkZldGNoTWF0Y2hlc1JlcXVlc3Qa",
-            "Hy5vcGVubWF0Y2guRmV0Y2hNYXRjaGVzUmVzcG9uc2UiJILT5JMCHiIZL3Yx",
-            "L2JhY2tlbmQvbWF0Y2hlczpmZXRjaDoBKjABEnkKDUFzc2lnblRpY2tldHMS",
-            "Hy5vcGVubWF0Y2guQXNzaWduVGlja2V0c1JlcXVlc3QaIC5vcGVubWF0Y2gu",
-            "QXNzaWduVGlja2V0c1Jlc3BvbnNlIiWC0+STAh8iGi92MS9iYWNrZW5kL3Rp",
-            "Y2tldHM6YXNzaWduOgEqQooDWiBvcGVuLW1hdGNoLmRldi9vcGVuLW1hdGNo",
-            "L3BrZy9wYqoCCU9wZW5NYXRjaJJB2AISsQEKB0JhY2tlbmQiSQoKT3BlbiBN",
-            "YXRjaBIWaHR0cHM6Ly9vcGVuLW1hdGNoLmRldhojb3Blbi1tYXRjaC1kaXNj",
-            "dXNzQGdvb2dsZWdyb3Vwcy5jb20qVgoSQXBhY2hlIDIuMCBMaWNlbnNlEkBo",
-            "dHRwczovL2dpdGh1Yi5jb20vZ29vZ2xlZm9yZ2FtZXMvb3Blbi1tYXRjaC9i",
-            "bG9iL21hc3Rlci9MSUNFTlNFMgMxLjAqAgECMhBhcHBsaWNhdGlvbi9qc29u",
-            "OhBhcHBsaWNhdGlvbi9qc29uUjsKAzQwNBI0CipSZXR1cm5lZCB3aGVuIHRo",
-            "ZSByZXNvdXJjZSBkb2VzIG5vdCBleGlzdC4SBgoEmgIBB3I9ChhPcGVuIE1h",
-            "dGNoIERvY3VtZW50YXRpb24SIWh0dHBzOi8vb3Blbi1tYXRjaC5kZXYvc2l0",
-            "ZS9kb2NzL2IGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::OpenMatch.MessagesReflection.Descriptor, global::Google.Api.AnnotationsReflection.Descriptor, global::Grpc.Gateway.ProtocGenSwagger.Options.AnnotationsReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.FunctionConfig), global::OpenMatch.FunctionConfig.Parser, new[]{ "Host", "Port", "Type" }, null, new[]{ typeof(global::OpenMatch.FunctionConfig.Types.Type) }, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.FetchMatchesRequest), global::OpenMatch.FetchMatchesRequest.Parser, new[]{ "Config", "Profiles" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.FetchMatchesResponse), global::OpenMatch.FetchMatchesResponse.Parser, new[]{ "Match" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.AssignTicketsRequest), global::OpenMatch.AssignTicketsRequest.Parser, new[]{ "TicketIds", "Assignment" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.AssignTicketsResponse), global::OpenMatch.AssignTicketsResponse.Parser, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  /// FunctionConfig specifies a MMF address and client type for Backend to establish connections with the MMF
-  /// </summary>
-  public sealed partial class FunctionConfig : pb::IMessage<FunctionConfig> {
-    private static readonly pb::MessageParser<FunctionConfig> _parser = new pb::MessageParser<FunctionConfig>(() => new FunctionConfig());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<FunctionConfig> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.BackendReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public FunctionConfig() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public FunctionConfig(FunctionConfig other) : this() {
-      host_ = other.host_;
-      port_ = other.port_;
-      type_ = other.type_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public FunctionConfig Clone() {
-      return new FunctionConfig(this);
-    }
-
-    /// <summary>Field number for the "host" field.</summary>
-    public const int HostFieldNumber = 1;
-    private string host_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Host {
-      get { return host_; }
-      set {
-        host_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "port" field.</summary>
-    public const int PortFieldNumber = 2;
-    private int port_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int Port {
-      get { return port_; }
-      set {
-        port_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "type" field.</summary>
-    public const int TypeFieldNumber = 3;
-    private global::OpenMatch.FunctionConfig.Types.Type type_ = 0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::OpenMatch.FunctionConfig.Types.Type Type {
-      get { return type_; }
-      set {
-        type_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as FunctionConfig);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(FunctionConfig other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Host != other.Host) return false;
-      if (Port != other.Port) return false;
-      if (Type != other.Type) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Host.Length != 0) hash ^= Host.GetHashCode();
-      if (Port != 0) hash ^= Port.GetHashCode();
-      if (Type != 0) hash ^= Type.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Host.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Host);
-      }
-      if (Port != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Port);
-      }
-      if (Type != 0) {
-        output.WriteRawTag(24);
-        output.WriteEnum((int) Type);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (Host.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Host);
-      }
-      if (Port != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Port);
-      }
-      if (Type != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(FunctionConfig other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Host.Length != 0) {
-        Host = other.Host;
-      }
-      if (other.Port != 0) {
-        Port = other.Port;
-      }
-      if (other.Type != 0) {
-        Type = other.Type;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Host = input.ReadString();
-            break;
-          }
-          case 16: {
-            Port = input.ReadInt32();
-            break;
-          }
-          case 24: {
-            Type = (global::OpenMatch.FunctionConfig.Types.Type) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    }
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the FunctionConfig message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static partial class Types {
-      public enum Type {
-        [pbr::OriginalName("GRPC")] Grpc = 0,
-        [pbr::OriginalName("REST")] Rest = 1,
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class FetchMatchesRequest : pb::IMessage<FetchMatchesRequest> {
-    private static readonly pb::MessageParser<FetchMatchesRequest> _parser = new pb::MessageParser<FetchMatchesRequest>(() => new FetchMatchesRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<FetchMatchesRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.BackendReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public FetchMatchesRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public FetchMatchesRequest(FetchMatchesRequest other) : this() {
-      config_ = other.config_ != null ? other.config_.Clone() : null;
-      profiles_ = other.profiles_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public FetchMatchesRequest Clone() {
-      return new FetchMatchesRequest(this);
-    }
-
-    /// <summary>Field number for the "config" field.</summary>
-    public const int ConfigFieldNumber = 1;
-    private global::OpenMatch.FunctionConfig config_;
-    /// <summary>
-    /// FunctionConfig specifies a MMF address and client type for Backend to establish connections with the MMF
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::OpenMatch.FunctionConfig Config {
-      get { return config_; }
-      set {
-        config_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "profiles" field.</summary>
-    public const int ProfilesFieldNumber = 2;
-    private static readonly pb::FieldCodec<global::OpenMatch.MatchProfile> _repeated_profiles_codec
-        = pb::FieldCodec.ForMessage(18, global::OpenMatch.MatchProfile.Parser);
-    private readonly pbc::RepeatedField<global::OpenMatch.MatchProfile> profiles_ = new pbc::RepeatedField<global::OpenMatch.MatchProfile>();
-    /// <summary>
-    /// MatchProfiles that will be sent to thhe MMF specified in the FunctionConfig.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<global::OpenMatch.MatchProfile> Profiles {
-      get { return profiles_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as FetchMatchesRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(FetchMatchesRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Config, other.Config)) return false;
-      if(!profiles_.Equals(other.profiles_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (config_ != null) hash ^= Config.GetHashCode();
-      hash ^= profiles_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (config_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Config);
-      }
-      profiles_.WriteTo(output, _repeated_profiles_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (config_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Config);
-      }
-      size += profiles_.CalculateSize(_repeated_profiles_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(FetchMatchesRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.config_ != null) {
-        if (config_ == null) {
-          Config = new global::OpenMatch.FunctionConfig();
-        }
-        Config.MergeFrom(other.Config);
-      }
-      profiles_.Add(other.profiles_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (config_ == null) {
-              Config = new global::OpenMatch.FunctionConfig();
-            }
-            input.ReadMessage(Config);
-            break;
-          }
-          case 18: {
-            profiles_.AddEntriesFrom(input, _repeated_profiles_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class FetchMatchesResponse : pb::IMessage<FetchMatchesResponse> {
-    private static readonly pb::MessageParser<FetchMatchesResponse> _parser = new pb::MessageParser<FetchMatchesResponse>(() => new FetchMatchesResponse());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<FetchMatchesResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.BackendReflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public FetchMatchesResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public FetchMatchesResponse(FetchMatchesResponse other) : this() {
-      match_ = other.match_ != null ? other.match_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public FetchMatchesResponse Clone() {
-      return new FetchMatchesResponse(this);
-    }
-
-    /// <summary>Field number for the "match" field.</summary>
-    public const int MatchFieldNumber = 1;
-    private global::OpenMatch.Match match_;
-    /// <summary>
-    /// A Match generated by the user-defined MMF with the specified MatchProfiles.
-    /// A valid Match response will contain at least one ticket.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::OpenMatch.Match Match {
-      get { return match_; }
-      set {
-        match_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as FetchMatchesResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(FetchMatchesResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Match, other.Match)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (match_ != null) hash ^= Match.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (match_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Match);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (match_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Match);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(FetchMatchesResponse other) {
-      if (other == null) {
-        return;
-      }
-      if (other.match_ != null) {
-        if (match_ == null) {
-          Match = new global::OpenMatch.Match();
-        }
-        Match.MergeFrom(other.Match);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (match_ == null) {
-              Match = new global::OpenMatch.Match();
-            }
-            input.ReadMessage(Match);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class AssignTicketsRequest : pb::IMessage<AssignTicketsRequest> {
-    private static readonly pb::MessageParser<AssignTicketsRequest> _parser = new pb::MessageParser<AssignTicketsRequest>(() => new AssignTicketsRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<AssignTicketsRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.BackendReflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public AssignTicketsRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public AssignTicketsRequest(AssignTicketsRequest other) : this() {
-      ticketIds_ = other.ticketIds_.Clone();
-      assignment_ = other.assignment_ != null ? other.assignment_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public AssignTicketsRequest Clone() {
-      return new AssignTicketsRequest(this);
-    }
-
-    /// <summary>Field number for the "ticket_ids" field.</summary>
-    public const int TicketIdsFieldNumber = 1;
-    private static readonly pb::FieldCodec<string> _repeated_ticketIds_codec
-        = pb::FieldCodec.ForString(10);
-    private readonly pbc::RepeatedField<string> ticketIds_ = new pbc::RepeatedField<string>();
-    /// <summary>
-    /// TicketIds is a list of strings representing Open Match generated Ids which apply to an Assignment.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<string> TicketIds {
-      get { return ticketIds_; }
-    }
-
-    /// <summary>Field number for the "assignment" field.</summary>
-    public const int AssignmentFieldNumber = 2;
-    private global::OpenMatch.Assignment assignment_;
-    /// <summary>
-    /// An Assignment specifies game connection related information to be associated with the TicketIds.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::OpenMatch.Assignment Assignment {
-      get { return assignment_; }
-      set {
-        assignment_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as AssignTicketsRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(AssignTicketsRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!ticketIds_.Equals(other.ticketIds_)) return false;
-      if (!object.Equals(Assignment, other.Assignment)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= ticketIds_.GetHashCode();
-      if (assignment_ != null) hash ^= Assignment.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      ticketIds_.WriteTo(output, _repeated_ticketIds_codec);
-      if (assignment_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(Assignment);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      size += ticketIds_.CalculateSize(_repeated_ticketIds_codec);
-      if (assignment_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Assignment);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(AssignTicketsRequest other) {
-      if (other == null) {
-        return;
-      }
-      ticketIds_.Add(other.ticketIds_);
-      if (other.assignment_ != null) {
-        if (assignment_ == null) {
-          Assignment = new global::OpenMatch.Assignment();
-        }
-        Assignment.MergeFrom(other.Assignment);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            ticketIds_.AddEntriesFrom(input, _repeated_ticketIds_codec);
-            break;
-          }
-          case 18: {
-            if (assignment_ == null) {
-              Assignment = new global::OpenMatch.Assignment();
-            }
-            input.ReadMessage(Assignment);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class AssignTicketsResponse : pb::IMessage<AssignTicketsResponse> {
-    private static readonly pb::MessageParser<AssignTicketsResponse> _parser = new pb::MessageParser<AssignTicketsResponse>(() => new AssignTicketsResponse());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<AssignTicketsResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.BackendReflection.Descriptor.MessageTypes[4]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public AssignTicketsResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public AssignTicketsResponse(AssignTicketsResponse other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public AssignTicketsResponse Clone() {
-      return new AssignTicketsResponse(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as AssignTicketsResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(AssignTicketsResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(AssignTicketsResponse other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code

csharp/OpenMatch/Evaluator.cs

@@ -1,336 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: api/evaluator.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace OpenMatch {
-
-  /// <summary>Holder for reflection information generated from api/evaluator.proto</summary>
-  public static partial class EvaluatorReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for api/evaluator.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static EvaluatorReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChNhcGkvZXZhbHVhdG9yLnByb3RvEglvcGVubWF0Y2gaEmFwaS9tZXNzYWdl",
-            "cy5wcm90bxocZ29vZ2xlL2FwaS9hbm5vdGF0aW9ucy5wcm90bxoscHJvdG9j",
-            "LWdlbi1zd2FnZ2VyL29wdGlvbnMvYW5ub3RhdGlvbnMucHJvdG8iMgoPRXZh",
-            "bHVhdGVSZXF1ZXN0Eh8KBW1hdGNoGAEgASgLMhAub3Blbm1hdGNoLk1hdGNo",
-            "IjMKEEV2YWx1YXRlUmVzcG9uc2USHwoFbWF0Y2gYASABKAsyEC5vcGVubWF0",
-            "Y2guTWF0Y2gyfwoJRXZhbHVhdG9yEnIKCEV2YWx1YXRlEhoub3Blbm1hdGNo",
-            "LkV2YWx1YXRlUmVxdWVzdBobLm9wZW5tYXRjaC5FdmFsdWF0ZVJlc3BvbnNl",
-            "IimC0+STAiMiHi92MS9ldmFsdWF0b3IvbWF0Y2hlczpldmFsdWF0ZToBKigB",
-            "MAFCjANaIG9wZW4tbWF0Y2guZGV2L29wZW4tbWF0Y2gvcGtnL3BiqgIJT3Bl",
-            "bk1hdGNokkHaAhKzAQoJRXZhbHVhdG9yIkkKCk9wZW4gTWF0Y2gSFmh0dHBz",
-            "Oi8vb3Blbi1tYXRjaC5kZXYaI29wZW4tbWF0Y2gtZGlzY3Vzc0Bnb29nbGVn",
-            "cm91cHMuY29tKlYKEkFwYWNoZSAyLjAgTGljZW5zZRJAaHR0cHM6Ly9naXRo",
-            "dWIuY29tL2dvb2dsZWZvcmdhbWVzL29wZW4tbWF0Y2gvYmxvYi9tYXN0ZXIv",
-            "TElDRU5TRTIDMS4wKgIBAjIQYXBwbGljYXRpb24vanNvbjoQYXBwbGljYXRp",
-            "b24vanNvblI7CgM0MDQSNAoqUmV0dXJuZWQgd2hlbiB0aGUgcmVzb3VyY2Ug",
-            "ZG9lcyBub3QgZXhpc3QuEgYKBJoCAQdyPQoYT3BlbiBNYXRjaCBEb2N1bWVu",
-            "dGF0aW9uEiFodHRwczovL29wZW4tbWF0Y2guZGV2L3NpdGUvZG9jcy9iBnBy",
-            "b3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::OpenMatch.MessagesReflection.Descriptor, global::Google.Api.AnnotationsReflection.Descriptor, global::Grpc.Gateway.ProtocGenSwagger.Options.AnnotationsReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.EvaluateRequest), global::OpenMatch.EvaluateRequest.Parser, new[]{ "Match" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.EvaluateResponse), global::OpenMatch.EvaluateResponse.Parser, new[]{ "Match" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class EvaluateRequest : pb::IMessage<EvaluateRequest> {
-    private static readonly pb::MessageParser<EvaluateRequest> _parser = new pb::MessageParser<EvaluateRequest>(() => new EvaluateRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<EvaluateRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.EvaluatorReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public EvaluateRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public EvaluateRequest(EvaluateRequest other) : this() {
-      match_ = other.match_ != null ? other.match_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public EvaluateRequest Clone() {
-      return new EvaluateRequest(this);
-    }
-
-    /// <summary>Field number for the "match" field.</summary>
-    public const int MatchFieldNumber = 1;
-    private global::OpenMatch.Match match_;
-    /// <summary>
-    /// A Matches proposed by the Match Function representing a candidate of the final results.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::OpenMatch.Match Match {
-      get { return match_; }
-      set {
-        match_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as EvaluateRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(EvaluateRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Match, other.Match)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (match_ != null) hash ^= Match.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (match_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Match);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (match_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Match);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(EvaluateRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.match_ != null) {
-        if (match_ == null) {
-          Match = new global::OpenMatch.Match();
-        }
-        Match.MergeFrom(other.Match);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (match_ == null) {
-              Match = new global::OpenMatch.Match();
-            }
-            input.ReadMessage(Match);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class EvaluateResponse : pb::IMessage<EvaluateResponse> {
-    private static readonly pb::MessageParser<EvaluateResponse> _parser = new pb::MessageParser<EvaluateResponse>(() => new EvaluateResponse());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<EvaluateResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.EvaluatorReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public EvaluateResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public EvaluateResponse(EvaluateResponse other) : this() {
-      match_ = other.match_ != null ? other.match_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public EvaluateResponse Clone() {
-      return new EvaluateResponse(this);
-    }
-
-    /// <summary>Field number for the "match" field.</summary>
-    public const int MatchFieldNumber = 1;
-    private global::OpenMatch.Match match_;
-    /// <summary>
-    /// A Match shortlisted by the evaluator representing one of the final results.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::OpenMatch.Match Match {
-      get { return match_; }
-      set {
-        match_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as EvaluateResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(EvaluateResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Match, other.Match)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (match_ != null) hash ^= Match.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (match_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Match);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (match_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Match);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(EvaluateResponse other) {
-      if (other == null) {
-        return;
-      }
-      if (other.match_ != null) {
-        if (match_ == null) {
-          Match = new global::OpenMatch.Match();
-        }
-        Match.MergeFrom(other.Match);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (match_ == null) {
-              Match = new global::OpenMatch.Match();
-            }
-            input.ReadMessage(Match);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code

csharp/OpenMatch/Frontend.cs

@@ -1,989 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: api/frontend.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace OpenMatch {
-
-  /// <summary>Holder for reflection information generated from api/frontend.proto</summary>
-  public static partial class FrontendReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for api/frontend.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static FrontendReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChJhcGkvZnJvbnRlbmQucHJvdG8SCW9wZW5tYXRjaBoSYXBpL21lc3NhZ2Vz",
-            "LnByb3RvGhxnb29nbGUvYXBpL2Fubm90YXRpb25zLnByb3RvGixwcm90b2Mt",
-            "Z2VuLXN3YWdnZXIvb3B0aW9ucy9hbm5vdGF0aW9ucy5wcm90byI4ChNDcmVh",
-            "dGVUaWNrZXRSZXF1ZXN0EiEKBnRpY2tldBgBIAEoCzIRLm9wZW5tYXRjaC5U",
-            "aWNrZXQiOQoUQ3JlYXRlVGlja2V0UmVzcG9uc2USIQoGdGlja2V0GAEgASgL",
-            "MhEub3Blbm1hdGNoLlRpY2tldCIoChNEZWxldGVUaWNrZXRSZXF1ZXN0EhEK",
-            "CXRpY2tldF9pZBgBIAEoCSIWChREZWxldGVUaWNrZXRSZXNwb25zZSIlChBH",
-            "ZXRUaWNrZXRSZXF1ZXN0EhEKCXRpY2tldF9pZBgBIAEoCSIqChVHZXRBc3Np",
-            "Z25tZW50c1JlcXVlc3QSEQoJdGlja2V0X2lkGAEgASgJIkMKFkdldEFzc2ln",
-            "bm1lbnRzUmVzcG9uc2USKQoKYXNzaWdubWVudBgBIAEoCzIVLm9wZW5tYXRj",
-            "aC5Bc3NpZ25tZW50Mu4DCghGcm9udGVuZBJwCgxDcmVhdGVUaWNrZXQSHi5v",
-            "cGVubWF0Y2guQ3JlYXRlVGlja2V0UmVxdWVzdBofLm9wZW5tYXRjaC5DcmVh",
-            "dGVUaWNrZXRSZXNwb25zZSIfgtPkkwIZIhQvdjEvZnJvbnRlbmQvdGlja2V0",
-            "czoBKhJ5CgxEZWxldGVUaWNrZXQSHi5vcGVubWF0Y2guRGVsZXRlVGlja2V0",
-            "UmVxdWVzdBofLm9wZW5tYXRjaC5EZWxldGVUaWNrZXRSZXNwb25zZSIogtPk",
-            "kwIiKiAvdjEvZnJvbnRlbmQvdGlja2V0cy97dGlja2V0X2lkfRJlCglHZXRU",
-            "aWNrZXQSGy5vcGVubWF0Y2guR2V0VGlja2V0UmVxdWVzdBoRLm9wZW5tYXRj",
-            "aC5UaWNrZXQiKILT5JMCIhIgL3YxL2Zyb250ZW5kL3RpY2tldHMve3RpY2tl",
-            "dF9pZH0SjQEKDkdldEFzc2lnbm1lbnRzEiAub3Blbm1hdGNoLkdldEFzc2ln",
-            "bm1lbnRzUmVxdWVzdBohLm9wZW5tYXRjaC5HZXRBc3NpZ25tZW50c1Jlc3Bv",
-            "bnNlIjSC0+STAi4SLC92MS9mcm9udGVuZC90aWNrZXRzL3t0aWNrZXRfaWR9",
-            "L2Fzc2lnbm1lbnRzMAFCiwNaIG9wZW4tbWF0Y2guZGV2L29wZW4tbWF0Y2gv",
-            "cGtnL3BiqgIJT3Blbk1hdGNokkHZAhKyAQoIRnJvbnRlbmQiSQoKT3BlbiBN",
-            "YXRjaBIWaHR0cHM6Ly9vcGVuLW1hdGNoLmRldhojb3Blbi1tYXRjaC1kaXNj",
-            "dXNzQGdvb2dsZWdyb3Vwcy5jb20qVgoSQXBhY2hlIDIuMCBMaWNlbnNlEkBo",
-            "dHRwczovL2dpdGh1Yi5jb20vZ29vZ2xlZm9yZ2FtZXMvb3Blbi1tYXRjaC9i",
-            "bG9iL21hc3Rlci9MSUNFTlNFMgMxLjAqAgECMhBhcHBsaWNhdGlvbi9qc29u",
-            "OhBhcHBsaWNhdGlvbi9qc29uUjsKAzQwNBI0CipSZXR1cm5lZCB3aGVuIHRo",
-            "ZSByZXNvdXJjZSBkb2VzIG5vdCBleGlzdC4SBgoEmgIBB3I9ChhPcGVuIE1h",
-            "dGNoIERvY3VtZW50YXRpb24SIWh0dHBzOi8vb3Blbi1tYXRjaC5kZXYvc2l0",
-            "ZS9kb2NzL2IGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::OpenMatch.MessagesReflection.Descriptor, global::Google.Api.AnnotationsReflection.Descriptor, global::Grpc.Gateway.ProtocGenSwagger.Options.AnnotationsReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.CreateTicketRequest), global::OpenMatch.CreateTicketRequest.Parser, new[]{ "Ticket" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.CreateTicketResponse), global::OpenMatch.CreateTicketResponse.Parser, new[]{ "Ticket" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.DeleteTicketRequest), global::OpenMatch.DeleteTicketRequest.Parser, new[]{ "TicketId" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.DeleteTicketResponse), global::OpenMatch.DeleteTicketResponse.Parser, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.GetTicketRequest), global::OpenMatch.GetTicketRequest.Parser, new[]{ "TicketId" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.GetAssignmentsRequest), global::OpenMatch.GetAssignmentsRequest.Parser, new[]{ "TicketId" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.GetAssignmentsResponse), global::OpenMatch.GetAssignmentsResponse.Parser, new[]{ "Assignment" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class CreateTicketRequest : pb::IMessage<CreateTicketRequest> {
-    private static readonly pb::MessageParser<CreateTicketRequest> _parser = new pb::MessageParser<CreateTicketRequest>(() => new CreateTicketRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<CreateTicketRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.FrontendReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public CreateTicketRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public CreateTicketRequest(CreateTicketRequest other) : this() {
-      ticket_ = other.ticket_ != null ? other.ticket_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public CreateTicketRequest Clone() {
-      return new CreateTicketRequest(this);
-    }
-
-    /// <summary>Field number for the "ticket" field.</summary>
-    public const int TicketFieldNumber = 1;
-    private global::OpenMatch.Ticket ticket_;
-    /// <summary>
-    /// A Ticket object with SearchFields defined.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::OpenMatch.Ticket Ticket {
-      get { return ticket_; }
-      set {
-        ticket_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as CreateTicketRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(CreateTicketRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Ticket, other.Ticket)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (ticket_ != null) hash ^= Ticket.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (ticket_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Ticket);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (ticket_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Ticket);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(CreateTicketRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.ticket_ != null) {
-        if (ticket_ == null) {
-          Ticket = new global::OpenMatch.Ticket();
-        }
-        Ticket.MergeFrom(other.Ticket);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (ticket_ == null) {
-              Ticket = new global::OpenMatch.Ticket();
-            }
-            input.ReadMessage(Ticket);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class CreateTicketResponse : pb::IMessage<CreateTicketResponse> {
-    private static readonly pb::MessageParser<CreateTicketResponse> _parser = new pb::MessageParser<CreateTicketResponse>(() => new CreateTicketResponse());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<CreateTicketResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.FrontendReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public CreateTicketResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public CreateTicketResponse(CreateTicketResponse other) : this() {
-      ticket_ = other.ticket_ != null ? other.ticket_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public CreateTicketResponse Clone() {
-      return new CreateTicketResponse(this);
-    }
-
-    /// <summary>Field number for the "ticket" field.</summary>
-    public const int TicketFieldNumber = 1;
-    private global::OpenMatch.Ticket ticket_;
-    /// <summary>
-    /// A Ticket object with TicketId generated.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::OpenMatch.Ticket Ticket {
-      get { return ticket_; }
-      set {
-        ticket_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as CreateTicketResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(CreateTicketResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Ticket, other.Ticket)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (ticket_ != null) hash ^= Ticket.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (ticket_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Ticket);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (ticket_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Ticket);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(CreateTicketResponse other) {
-      if (other == null) {
-        return;
-      }
-      if (other.ticket_ != null) {
-        if (ticket_ == null) {
-          Ticket = new global::OpenMatch.Ticket();
-        }
-        Ticket.MergeFrom(other.Ticket);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (ticket_ == null) {
-              Ticket = new global::OpenMatch.Ticket();
-            }
-            input.ReadMessage(Ticket);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class DeleteTicketRequest : pb::IMessage<DeleteTicketRequest> {
-    private static readonly pb::MessageParser<DeleteTicketRequest> _parser = new pb::MessageParser<DeleteTicketRequest>(() => new DeleteTicketRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<DeleteTicketRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.FrontendReflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DeleteTicketRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DeleteTicketRequest(DeleteTicketRequest other) : this() {
-      ticketId_ = other.ticketId_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DeleteTicketRequest Clone() {
-      return new DeleteTicketRequest(this);
-    }
-
-    /// <summary>Field number for the "ticket_id" field.</summary>
-    public const int TicketIdFieldNumber = 1;
-    private string ticketId_ = "";
-    /// <summary>
-    /// A TicketId of a generated Ticket to be deleted.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string TicketId {
-      get { return ticketId_; }
-      set {
-        ticketId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as DeleteTicketRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(DeleteTicketRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (TicketId != other.TicketId) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (TicketId.Length != 0) hash ^= TicketId.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (TicketId.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(TicketId);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (TicketId.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(TicketId);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(DeleteTicketRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.TicketId.Length != 0) {
-        TicketId = other.TicketId;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            TicketId = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class DeleteTicketResponse : pb::IMessage<DeleteTicketResponse> {
-    private static readonly pb::MessageParser<DeleteTicketResponse> _parser = new pb::MessageParser<DeleteTicketResponse>(() => new DeleteTicketResponse());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<DeleteTicketResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.FrontendReflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DeleteTicketResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DeleteTicketResponse(DeleteTicketResponse other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DeleteTicketResponse Clone() {
-      return new DeleteTicketResponse(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as DeleteTicketResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(DeleteTicketResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(DeleteTicketResponse other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class GetTicketRequest : pb::IMessage<GetTicketRequest> {
-    private static readonly pb::MessageParser<GetTicketRequest> _parser = new pb::MessageParser<GetTicketRequest>(() => new GetTicketRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<GetTicketRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.FrontendReflection.Descriptor.MessageTypes[4]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetTicketRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetTicketRequest(GetTicketRequest other) : this() {
-      ticketId_ = other.ticketId_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetTicketRequest Clone() {
-      return new GetTicketRequest(this);
-    }
-
-    /// <summary>Field number for the "ticket_id" field.</summary>
-    public const int TicketIdFieldNumber = 1;
-    private string ticketId_ = "";
-    /// <summary>
-    /// A TicketId of a generated Ticket.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string TicketId {
-      get { return ticketId_; }
-      set {
-        ticketId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as GetTicketRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(GetTicketRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (TicketId != other.TicketId) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (TicketId.Length != 0) hash ^= TicketId.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (TicketId.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(TicketId);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (TicketId.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(TicketId);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(GetTicketRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.TicketId.Length != 0) {
-        TicketId = other.TicketId;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            TicketId = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class GetAssignmentsRequest : pb::IMessage<GetAssignmentsRequest> {
-    private static readonly pb::MessageParser<GetAssignmentsRequest> _parser = new pb::MessageParser<GetAssignmentsRequest>(() => new GetAssignmentsRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<GetAssignmentsRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.FrontendReflection.Descriptor.MessageTypes[5]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetAssignmentsRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetAssignmentsRequest(GetAssignmentsRequest other) : this() {
-      ticketId_ = other.ticketId_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetAssignmentsRequest Clone() {
-      return new GetAssignmentsRequest(this);
-    }
-
-    /// <summary>Field number for the "ticket_id" field.</summary>
-    public const int TicketIdFieldNumber = 1;
-    private string ticketId_ = "";
-    /// <summary>
-    /// A TicketId of a generated Ticket to get updates on.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string TicketId {
-      get { return ticketId_; }
-      set {
-        ticketId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as GetAssignmentsRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(GetAssignmentsRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (TicketId != other.TicketId) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (TicketId.Length != 0) hash ^= TicketId.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (TicketId.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(TicketId);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (TicketId.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(TicketId);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(GetAssignmentsRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.TicketId.Length != 0) {
-        TicketId = other.TicketId;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            TicketId = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class GetAssignmentsResponse : pb::IMessage<GetAssignmentsResponse> {
-    private static readonly pb::MessageParser<GetAssignmentsResponse> _parser = new pb::MessageParser<GetAssignmentsResponse>(() => new GetAssignmentsResponse());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<GetAssignmentsResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.FrontendReflection.Descriptor.MessageTypes[6]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetAssignmentsResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetAssignmentsResponse(GetAssignmentsResponse other) : this() {
-      assignment_ = other.assignment_ != null ? other.assignment_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetAssignmentsResponse Clone() {
-      return new GetAssignmentsResponse(this);
-    }
-
-    /// <summary>Field number for the "assignment" field.</summary>
-    public const int AssignmentFieldNumber = 1;
-    private global::OpenMatch.Assignment assignment_;
-    /// <summary>
-    /// An updated Assignment of the requested Ticket.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::OpenMatch.Assignment Assignment {
-      get { return assignment_; }
-      set {
-        assignment_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as GetAssignmentsResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(GetAssignmentsResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Assignment, other.Assignment)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (assignment_ != null) hash ^= Assignment.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (assignment_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Assignment);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (assignment_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Assignment);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(GetAssignmentsResponse other) {
-      if (other == null) {
-        return;
-      }
-      if (other.assignment_ != null) {
-        if (assignment_ == null) {
-          Assignment = new global::OpenMatch.Assignment();
-        }
-        Assignment.MergeFrom(other.Assignment);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (assignment_ == null) {
-              Assignment = new global::OpenMatch.Assignment();
-            }
-            input.ReadMessage(Assignment);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code

csharp/OpenMatch/Matchfunction.cs

@@ -1,336 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: api/matchfunction.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace OpenMatch {
-
-  /// <summary>Holder for reflection information generated from api/matchfunction.proto</summary>
-  public static partial class MatchfunctionReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for api/matchfunction.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static MatchfunctionReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChdhcGkvbWF0Y2hmdW5jdGlvbi5wcm90bxIJb3Blbm1hdGNoGhJhcGkvbWVz",
-            "c2FnZXMucHJvdG8aHGdvb2dsZS9hcGkvYW5ub3RhdGlvbnMucHJvdG8aLHBy",
-            "b3RvYy1nZW4tc3dhZ2dlci9vcHRpb25zL2Fubm90YXRpb25zLnByb3RvIjYK",
-            "ClJ1blJlcXVlc3QSKAoHcHJvZmlsZRgBIAEoCzIXLm9wZW5tYXRjaC5NYXRj",
-            "aFByb2ZpbGUiMQoLUnVuUmVzcG9uc2USIgoIcHJvcG9zYWwYASABKAsyEC5v",
-            "cGVubWF0Y2guTWF0Y2gyaQoNTWF0Y2hGdW5jdGlvbhJYCgNSdW4SFS5vcGVu",
-            "bWF0Y2guUnVuUmVxdWVzdBoWLm9wZW5tYXRjaC5SdW5SZXNwb25zZSIggtPk",
-            "kwIaIhUvdjEvbWF0Y2hmdW5jdGlvbjpydW46ASowAUKRA1ogb3Blbi1tYXRj",
-            "aC5kZXYvb3Blbi1tYXRjaC9wa2cvcGKqAglPcGVuTWF0Y2iSQd8CErgBCg5N",
-            "YXRjaCBGdW5jdGlvbiJJCgpPcGVuIE1hdGNoEhZodHRwczovL29wZW4tbWF0",
-            "Y2guZGV2GiNvcGVuLW1hdGNoLWRpc2N1c3NAZ29vZ2xlZ3JvdXBzLmNvbSpW",
-            "ChJBcGFjaGUgMi4wIExpY2Vuc2USQGh0dHBzOi8vZ2l0aHViLmNvbS9nb29n",
-            "bGVmb3JnYW1lcy9vcGVuLW1hdGNoL2Jsb2IvbWFzdGVyL0xJQ0VOU0UyAzEu",
-            "MCoCAQIyEGFwcGxpY2F0aW9uL2pzb246EGFwcGxpY2F0aW9uL2pzb25SOwoD",
-            "NDA0EjQKKlJldHVybmVkIHdoZW4gdGhlIHJlc291cmNlIGRvZXMgbm90IGV4",
-            "aXN0LhIGCgSaAgEHcj0KGE9wZW4gTWF0Y2ggRG9jdW1lbnRhdGlvbhIhaHR0",
-            "cHM6Ly9vcGVuLW1hdGNoLmRldi9zaXRlL2RvY3MvYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::OpenMatch.MessagesReflection.Descriptor, global::Google.Api.AnnotationsReflection.Descriptor, global::Grpc.Gateway.ProtocGenSwagger.Options.AnnotationsReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.RunRequest), global::OpenMatch.RunRequest.Parser, new[]{ "Profile" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.RunResponse), global::OpenMatch.RunResponse.Parser, new[]{ "Proposal" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class RunRequest : pb::IMessage<RunRequest> {
-    private static readonly pb::MessageParser<RunRequest> _parser = new pb::MessageParser<RunRequest>(() => new RunRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<RunRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.MatchfunctionReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public RunRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public RunRequest(RunRequest other) : this() {
-      profile_ = other.profile_ != null ? other.profile_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public RunRequest Clone() {
-      return new RunRequest(this);
-    }
-
-    /// <summary>Field number for the "profile" field.</summary>
-    public const int ProfileFieldNumber = 1;
-    private global::OpenMatch.MatchProfile profile_;
-    /// <summary>
-    /// A MatchProfile defines constraints of Tickets in a Match and shapes the Match proposed by the MatchFunction.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::OpenMatch.MatchProfile Profile {
-      get { return profile_; }
-      set {
-        profile_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as RunRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(RunRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Profile, other.Profile)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (profile_ != null) hash ^= Profile.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (profile_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Profile);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (profile_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Profile);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(RunRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.profile_ != null) {
-        if (profile_ == null) {
-          Profile = new global::OpenMatch.MatchProfile();
-        }
-        Profile.MergeFrom(other.Profile);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (profile_ == null) {
-              Profile = new global::OpenMatch.MatchProfile();
-            }
-            input.ReadMessage(Profile);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class RunResponse : pb::IMessage<RunResponse> {
-    private static readonly pb::MessageParser<RunResponse> _parser = new pb::MessageParser<RunResponse>(() => new RunResponse());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<RunResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.MatchfunctionReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public RunResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public RunResponse(RunResponse other) : this() {
-      proposal_ = other.proposal_ != null ? other.proposal_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public RunResponse Clone() {
-      return new RunResponse(this);
-    }
-
-    /// <summary>Field number for the "proposal" field.</summary>
-    public const int ProposalFieldNumber = 1;
-    private global::OpenMatch.Match proposal_;
-    /// <summary>
-    /// A Proposal represents a Match candidate that satifies the constraints defined in the input Profile.
-    /// A valid Proposal response will contain at least one ticket.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::OpenMatch.Match Proposal {
-      get { return proposal_; }
-      set {
-        proposal_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as RunResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(RunResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Proposal, other.Proposal)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (proposal_ != null) hash ^= Proposal.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (proposal_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Proposal);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (proposal_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Proposal);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(RunResponse other) {
-      if (other == null) {
-        return;
-      }
-      if (other.proposal_ != null) {
-        if (proposal_ == null) {
-          Proposal = new global::OpenMatch.Match();
-        }
-        Proposal.MergeFrom(other.Proposal);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (proposal_ == null) {
-              Proposal = new global::OpenMatch.Match();
-            }
-            input.ReadMessage(Proposal);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code

csharp/OpenMatch/Mmlogic.cs

@@ -1,322 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: api/mmlogic.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace OpenMatch {
-
-  /// <summary>Holder for reflection information generated from api/mmlogic.proto</summary>
-  public static partial class MmlogicReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for api/mmlogic.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static MmlogicReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChFhcGkvbW1sb2dpYy5wcm90bxIJb3Blbm1hdGNoGhJhcGkvbWVzc2FnZXMu",
-            "cHJvdG8aHGdvb2dsZS9hcGkvYW5ub3RhdGlvbnMucHJvdG8aLHByb3RvYy1n",
-            "ZW4tc3dhZ2dlci9vcHRpb25zL2Fubm90YXRpb25zLnByb3RvIjQKE1F1ZXJ5",
-            "VGlja2V0c1JlcXVlc3QSHQoEcG9vbBgBIAEoCzIPLm9wZW5tYXRjaC5Qb29s",
-            "IjoKFFF1ZXJ5VGlja2V0c1Jlc3BvbnNlEiIKB3RpY2tldHMYASADKAsyES5v",
-            "cGVubWF0Y2guVGlja2V0MoIBCgdNbUxvZ2ljEncKDFF1ZXJ5VGlja2V0cxIe",
-            "Lm9wZW5tYXRjaC5RdWVyeVRpY2tldHNSZXF1ZXN0Gh8ub3Blbm1hdGNoLlF1",
-            "ZXJ5VGlja2V0c1Jlc3BvbnNlIiSC0+STAh4iGS92MS9tbWxvZ2ljL3RpY2tl",
-            "dHM6cXVlcnk6ASowAUKYA1ogb3Blbi1tYXRjaC5kZXYvb3Blbi1tYXRjaC9w",
-            "a2cvcGKqAglPcGVuTWF0Y2iSQeYCEr8BChVNTSBMb2dpYyAoRGF0YSBMYXll",
-            "cikiSQoKT3BlbiBNYXRjaBIWaHR0cHM6Ly9vcGVuLW1hdGNoLmRldhojb3Bl",
-            "bi1tYXRjaC1kaXNjdXNzQGdvb2dsZWdyb3Vwcy5jb20qVgoSQXBhY2hlIDIu",
-            "MCBMaWNlbnNlEkBodHRwczovL2dpdGh1Yi5jb20vZ29vZ2xlZm9yZ2FtZXMv",
-            "b3Blbi1tYXRjaC9ibG9iL21hc3Rlci9MSUNFTlNFMgMxLjAqAgECMhBhcHBs",
-            "aWNhdGlvbi9qc29uOhBhcHBsaWNhdGlvbi9qc29uUjsKAzQwNBI0CipSZXR1",
-            "cm5lZCB3aGVuIHRoZSByZXNvdXJjZSBkb2VzIG5vdCBleGlzdC4SBgoEmgIB",
-            "B3I9ChhPcGVuIE1hdGNoIERvY3VtZW50YXRpb24SIWh0dHBzOi8vb3Blbi1t",
-            "YXRjaC5kZXYvc2l0ZS9kb2NzL2IGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::OpenMatch.MessagesReflection.Descriptor, global::Google.Api.AnnotationsReflection.Descriptor, global::Grpc.Gateway.ProtocGenSwagger.Options.AnnotationsReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.QueryTicketsRequest), global::OpenMatch.QueryTicketsRequest.Parser, new[]{ "Pool" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::OpenMatch.QueryTicketsResponse), global::OpenMatch.QueryTicketsResponse.Parser, new[]{ "Tickets" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class QueryTicketsRequest : pb::IMessage<QueryTicketsRequest> {
-    private static readonly pb::MessageParser<QueryTicketsRequest> _parser = new pb::MessageParser<QueryTicketsRequest>(() => new QueryTicketsRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<QueryTicketsRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.MmlogicReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public QueryTicketsRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public QueryTicketsRequest(QueryTicketsRequest other) : this() {
-      pool_ = other.pool_ != null ? other.pool_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public QueryTicketsRequest Clone() {
-      return new QueryTicketsRequest(this);
-    }
-
-    /// <summary>Field number for the "pool" field.</summary>
-    public const int PoolFieldNumber = 1;
-    private global::OpenMatch.Pool pool_;
-    /// <summary>
-    /// A Pool is consists of a set of Filters.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::OpenMatch.Pool Pool {
-      get { return pool_; }
-      set {
-        pool_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as QueryTicketsRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(QueryTicketsRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Pool, other.Pool)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (pool_ != null) hash ^= Pool.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (pool_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Pool);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (pool_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Pool);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(QueryTicketsRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.pool_ != null) {
-        if (pool_ == null) {
-          Pool = new global::OpenMatch.Pool();
-        }
-        Pool.MergeFrom(other.Pool);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (pool_ == null) {
-              Pool = new global::OpenMatch.Pool();
-            }
-            input.ReadMessage(Pool);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class QueryTicketsResponse : pb::IMessage<QueryTicketsResponse> {
-    private static readonly pb::MessageParser<QueryTicketsResponse> _parser = new pb::MessageParser<QueryTicketsResponse>(() => new QueryTicketsResponse());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<QueryTicketsResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::OpenMatch.MmlogicReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public QueryTicketsResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public QueryTicketsResponse(QueryTicketsResponse other) : this() {
-      tickets_ = other.tickets_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public QueryTicketsResponse Clone() {
-      return new QueryTicketsResponse(this);
-    }
-
-    /// <summary>Field number for the "tickets" field.</summary>
-    public const int TicketsFieldNumber = 1;
-    private static readonly pb::FieldCodec<global::OpenMatch.Ticket> _repeated_tickets_codec
-        = pb::FieldCodec.ForMessage(10, global::OpenMatch.Ticket.Parser);
-    private readonly pbc::RepeatedField<global::OpenMatch.Ticket> tickets_ = new pbc::RepeatedField<global::OpenMatch.Ticket>();
-    /// <summary>
-    /// Tickets is a list of Ticket representing one or more Tickets which meet all Filter criterias.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<global::OpenMatch.Ticket> Tickets {
-      get { return tickets_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as QueryTicketsResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(QueryTicketsResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!tickets_.Equals(other.tickets_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= tickets_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      tickets_.WriteTo(output, _repeated_tickets_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      size += tickets_.CalculateSize(_repeated_tickets_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(QueryTicketsResponse other) {
-      if (other == null) {
-        return;
-      }
-      tickets_.Add(other.tickets_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            tickets_.AddEntriesFrom(input, _repeated_tickets_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code

csharp/OpenMatch/OpenMatch.csproj

@@ -9,8 +9,4 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Google.Api.CommonProtos" Version="1.7.0" />
-  </ItemGroup>
-
 </Project>

docs/governance/templates/release.md

@@ -7,17 +7,16 @@ Check the [README](https://github.com/googleforgames/open-match/tree/release-{ve
 Release Notes
 -------------
 
-**Feature Highlights**
-{ highlight here the most notable changes and themes at a high level}
+{ insert enhancements from the changelog and/or security and breaking changes }
 
 **Breaking Changes**
-{ detail any behaviors or API surfaces which worked in a previous version which will no longer work correctly }
-
-**Security Fixes**
-{ list any changes which fix vulnerabilities in open match }
+ * API Changed #PR
 
 **Enhancements**
-{ go into details on improvements and changes }
+ * New Harness #PR
+
+**Security Fixes**
+ * Reduced privileges required for MMF. #PR
 
 See [CHANGELOG](https://github.com/googleforgames/open-match/blob/release-{version}/CHANGELOG.md) for more details on changes.
 
@@ -39,7 +38,7 @@ docker pull gcr.io/open-match-public-images/openmatch-mmf-go-soloduel:{version}
 docker pull gcr.io/open-match-public-images/openmatch-mmf-go-pool:{version}
 
 # Test Clients
-docker pull gcr.io/open-match-public-images/openmatch-demo-first-match:{version}
+docker pull gcr.io/open-match-public-images/openmatch-demo:{version}
 ```
 
 _This software is currently alpha, and subject to change. Not to be used in production systems._
@@ -54,8 +53,8 @@ To deploy Open Match in your Kubernetes cluster run the following commands:
 kubectl create clusterrolebinding myname-cluster-admin-binding --clusterrole=cluster-admin --user=$(YOUR_KUBERNETES_USER_NAME)
 # Place all Open Match components in their own namespace.
 kubectl create namespace open-match
-# Install Open Match services.
-kubectl apply -f https://github.com/googleforgames/open-match/releases/download/v{version}/01-open-match-core.yaml --namespace open-match
+# Install Open Match and monitoring services.
+kubectl apply -f https://github.com/googleforgames/open-match/releases/download/v{version}/install.yaml --namespace open-match
 # Install the demo.
-kubectl apply -f https://github.com/googleforgames/open-match/releases/download/v{version}/02-open-match-demo.yaml --namespace open-match
+kubectl apply -f https://github.com/googleforgames/open-match/releases/download/v{version}/install-demo.yaml --namespace open-match
 ```

docs/governance/templates/release.sh

@@ -12,7 +12,7 @@ SOURCE_VERSION=$1
 DEST_VERSION=$2
 SOURCE_PROJECT_ID=open-match-build
 DEST_PROJECT_ID=open-match-public-images
-IMAGE_NAMES="openmatch-backend openmatch-frontend openmatch-mmlogic openmatch-synchronizer openmatch-minimatch openmatch-demo-first-match openmatch-mmf-go-soloduel openmatch-mmf-go-pool openmatch-evaluator-go-simple openmatch-swaggerui openmatch-reaper"
+IMAGE_NAMES="openmatch-backend openmatch-frontend openmatch-mmlogic openmatch-synchronizer openmatch-minimatch openmatch-demo openmatch-mmf-go-soloduel openmatch-mmf-go-pool openmatch-evaluator-go-simple openmatch-swaggerui openmatch-reaper"
 
 for name in $IMAGE_NAMES
 do

examples/consts.go

@@ -12,14 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+// Package examples defines the constants that some of the examples may share.
+package examples
 
-import (
-	"open-match.dev/open-match/pkg/pb"
+const (
+	MatchScore = "match_score"
 )
-
-// Ticket generates a Ticket with data using the package configuration.
-func makeTicket() *pb.Ticket {
-	// Add logic to populate Ticket data and generate Ticket.
-	return nil
-}

examples/demo/components/clients/clients.go

@@ -20,11 +20,12 @@ import (
 	"math/rand"
 	"time"
 
-	"google.golang.org/grpc"
-
 	"open-match.dev/open-match/examples/demo/components"
 	"open-match.dev/open-match/examples/demo/updater"
+	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/pkg/pb"
+	"open-match.dev/open-match/pkg/structs"
 )
 
 func Run(ds *components.DemoShared) {
@@ -34,7 +35,7 @@ func Run(ds *components.DemoShared) {
 		name := fmt.Sprintf("fakeplayer_%d", i)
 		go func() {
 			for !isContextDone(ds.Ctx) {
-				runScenario(ds.Ctx, name, u.ForField(name))
+				runScenario(ds.Ctx, ds.Cfg, name, u.ForField(name))
 			}
 		}()
 	}
@@ -54,7 +55,7 @@ type status struct {
 	Assignment *pb.Assignment
 }
 
-func runScenario(ctx context.Context, name string, update updater.SetFunc) {
+func runScenario(ctx context.Context, cfg config.View, name string, update updater.SetFunc) {
 	defer func() {
 		r := recover()
 		if r != nil {
@@ -80,8 +81,7 @@ func runScenario(ctx context.Context, name string, update updater.SetFunc) {
 	s.Status = "Connecting to Open Match frontend"
 	update(s)
 
-	// See https://open-match.dev/site/docs/guides/api/
-	conn, err := grpc.Dial("om-frontend.open-match.svc.cluster.local:50504", grpc.WithInsecure())
+	conn, err := rpc.GRPCClientFromConfig(cfg, "api.frontend")
 	if err != nil {
 		panic(err)
 	}
@@ -95,7 +95,12 @@ func runScenario(ctx context.Context, name string, update updater.SetFunc) {
 	var ticketId string
 	{
 		req := &pb.CreateTicketRequest{
-			Ticket: &pb.Ticket{},
+			Ticket: &pb.Ticket{
+				Properties: structs.Struct{
+					"name":      structs.String(name),
+					"mode.demo": structs.Number(1),
+				}.S(),
+			},
 		}
 
 		resp, err := fe.CreateTicket(ctx, req)

examples/demo/components/components.go

@@ -18,9 +18,11 @@ import (
 	"context"
 
 	"open-match.dev/open-match/examples/demo/updater"
+	"open-match.dev/open-match/internal/config"
 )
 
 type DemoShared struct {
 	Ctx    context.Context
+	Cfg    config.View
 	Update updater.SetFunc
 }

examples/demo/components/director/director.go

@@ -17,12 +17,12 @@ package director
 import (
 	"context"
 	"fmt"
-	"google.golang.org/grpc"
 	"io"
 	"math/rand"
 	"time"
 
 	"open-match.dev/open-match/examples/demo/components"
+	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/pkg/pb"
 )
 
@@ -66,8 +66,7 @@ func run(ds *components.DemoShared) {
 	s.Status = "Connecting to backend"
 	ds.Update(s)
 
-	// See https://open-match.dev/site/docs/guides/api/
-	conn, err := grpc.Dial("om-backend.open-match.svc.cluster.local:50505", grpc.WithInsecure())
+	conn, err := rpc.GRPCClientFromConfig(ds.Cfg, "api.backend")
 	if err != nil {
 		panic(err)
 	}
@@ -82,8 +81,8 @@ func run(ds *components.DemoShared) {
 	{
 		req := &pb.FetchMatchesRequest{
 			Config: &pb.FunctionConfig{
-				Host: "om-function.open-match.svc.cluster.local",
-				Port: 50502,
+				Host: ds.Cfg.GetString("api.functions.hostname"),
+				Port: int32(ds.Cfg.GetInt("api.functions.grpcport")),
 				Type: pb.FunctionConfig_GRPC,
 			},
 			Profiles: []*pb.MatchProfile{
@@ -92,6 +91,13 @@ func run(ds *components.DemoShared) {
 					Pools: []*pb.Pool{
 						{
 							Name: "Everyone",
+							FloatRangeFilters: []*pb.FloatRangeFilter{
+								{
+									Attribute: "mode.demo",
+									Min:       -100,
+									Max:       100,
+								},
+							},
 						},
 					},
 				},

examples/demo/demo.go

@@ -20,20 +20,37 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"log"
 	"net/http"
 
+	"github.com/sirupsen/logrus"
 	"golang.org/x/net/websocket"
 	"open-match.dev/open-match/examples/demo/bytesub"
 	"open-match.dev/open-match/examples/demo/components"
 	"open-match.dev/open-match/examples/demo/updater"
+	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/logging"
 	"open-match.dev/open-match/internal/telemetry"
 )
 
+var (
+	logger = logrus.WithFields(logrus.Fields{
+		"app":       "openmatch",
+		"component": "examples.demo",
+	})
+)
+
 // Run starts the provided components, and hosts a webserver for observing the
 // output of those components.
 func Run(comps map[string]func(*components.DemoShared)) {
-	log.Print("Initializing Server")
+	cfg, err := config.Read()
+	if err != nil {
+		logger.WithFields(logrus.Fields{
+			"error": err.Error(),
+		}).Fatalf("cannot read configuration.")
+	}
+	logging.ConfigureLogging(cfg)
+
+	logger.Info("Initializing Server")
 
 	fileServe := http.FileServer(http.Dir("/app/static"))
 	http.Handle("/static/", http.StripPrefix("/static/", fileServe))
@@ -62,16 +79,17 @@ func Run(comps map[string]func(*components.DemoShared)) {
 		bs.Subscribe(ws.Request().Context(), ws)
 	}))
 
-	log.Print("Starting Server")
+	logger.Info("Starting Server")
 
 	for name, f := range comps {
 		go f(&components.DemoShared{
 			Ctx:    context.Background(),
+			Cfg:    cfg,
 			Update: u.ForField(name),
 		})
 	}
 
-	address := fmt.Sprintf(":%d", 51507)
-	err := http.ListenAndServe(address, nil)
-	log.Printf("HTTP server closed: %s", err.Error())
+	address := fmt.Sprintf(":%d", cfg.GetInt("api.demo.httpport"))
+	err = http.ListenAndServe(address, nil)
+	logger.WithError(err).Warning("HTTP server closed.")
 }

examples/evaluator/golang/simple/evaluate/evaluator.go

@@ -15,99 +15,40 @@
 package evaluate
 
 import (
-	"math"
-	"sort"
-
-	"github.com/golang/protobuf/ptypes"
-	"github.com/sirupsen/logrus"
+	"open-match.dev/open-match/examples"
 	harness "open-match.dev/open-match/pkg/harness/evaluator/golang"
 	"open-match.dev/open-match/pkg/pb"
 )
 
-type matchInp struct {
-	match *pb.Match
-	inp   *pb.DefaultEvaluationCriteria
-}
-
 // Evaluate is where your custom evaluation logic lives.
 // This sample evaluator sorts and deduplicates the input matches.
 func Evaluate(p *harness.EvaluatorParams) ([]*pb.Match, error) {
-	matches := make([]*matchInp, 0, len(p.Matches))
-	nilEvlautionInputs := 0
+	scoreInDescendingOrder := func(a, b *pb.Match) bool {
+		return a.GetProperties().GetFields()[examples.MatchScore].GetNumberValue() > b.GetProperties().GetFields()[examples.MatchScore].GetNumberValue()
+	}
+	by(scoreInDescendingOrder).Sort(p.Matches)
 
-	for _, m := range p.Matches {
-		// Evaluation criteria is optional, but sort it lower than any matches which
-		// provided criteria.
-		inp := &pb.DefaultEvaluationCriteria{
-			Score: math.Inf(-1),
-		}
+	results := []*pb.Match{}
+	dedup := map[string]bool{}
 
-		if a, ok := m.Extensions["evaluation_input"]; ok {
-			err := ptypes.UnmarshalAny(a, inp)
-			if err != nil {
-				p.Logger.WithFields(logrus.Fields{
-					"match_id": m.MatchId,
-					"error":    err,
-				}).Error("Failed to unmarshal match's DefaultEvaluationCriteria.  Rejecting match.")
-				continue
+	for _, match := range p.Matches {
+		if isNonCollidingMatch(match, dedup) {
+			for _, ticket := range match.GetTickets() {
+				dedup[ticket.GetId()] = true
 			}
-		} else {
-			nilEvlautionInputs++
-		}
-		matches = append(matches, &matchInp{
-			match: m,
-			inp:   inp,
-		})
-	}
-
-	if nilEvlautionInputs > 0 {
-		p.Logger.WithFields(logrus.Fields{
-			"count": nilEvlautionInputs,
-		}).Info("Some matches don't have the optional field evaluation_input set.")
-	}
-
-	sort.Sort(byScore(matches))
-
-	d := decollider{
-		ticketsUsed: map[string]struct{}{},
-	}
-
-	for _, m := range matches {
-		d.maybeAdd(m)
-	}
-
-	return d.results, nil
-}
-
-type decollider struct {
-	results     []*pb.Match
-	ticketsUsed map[string]struct{}
-}
-
-func (d *decollider) maybeAdd(m *matchInp) {
-	for _, t := range m.match.GetTickets() {
-		if _, ok := d.ticketsUsed[t.Id]; ok {
-			return
+			results = append(results, match)
 		}
 	}
 
-	for _, t := range m.match.GetTickets() {
-		d.ticketsUsed[t.Id] = struct{}{}
+	return results, nil
+}
+
+func isNonCollidingMatch(match *pb.Match, validTickets map[string]bool) bool {
+	for _, ticket := range match.GetTickets() {
+		id := ticket.GetId()
+		if _, ok := validTickets[id]; ok {
+			return false
+		}
 	}
-
-	d.results = append(d.results, m.match)
-}
-
-type byScore []*matchInp
-
-func (m byScore) Len() int {
-	return len(m)
-}
-
-func (m byScore) Swap(i, j int) {
-	m[i], m[j] = m[j], m[i]
-}
-
-func (m byScore) Less(i, j int) bool {
-	return m[i].inp.Score > m[j].inp.Score
+	return true
 }

examples/evaluator/golang/simple/evaluate/evaluator_test.go

@@ -17,22 +17,13 @@ package evaluate
 import (
 	"testing"
 
-	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/ptypes"
-	"github.com/golang/protobuf/ptypes/any"
 	"github.com/stretchr/testify/assert"
+	"open-match.dev/open-match/examples"
 	harness "open-match.dev/open-match/pkg/harness/evaluator/golang"
 	"open-match.dev/open-match/pkg/pb"
+	"open-match.dev/open-match/pkg/structs"
 )
 
-func mustAny(m proto.Message) *any.Any {
-	result, err := ptypes.MarshalAny(m)
-	if err != nil {
-		panic(err)
-	}
-	return result
-}
-
 func TestEvaluate(t *testing.T) {
 	ticket1 := &pb.Ticket{Id: "1"}
 	ticket2 := &pb.Ticket{Id: "2"}
@@ -40,38 +31,30 @@ func TestEvaluate(t *testing.T) {
 
 	ticket12Score1 := &pb.Match{
 		Tickets: []*pb.Ticket{ticket1, ticket2},
-		Extensions: map[string]*any.Any{
-			"evaluation_input": mustAny(&pb.DefaultEvaluationCriteria{
-				Score: 1,
-			}),
-		},
+		Properties: structs.Struct{
+			examples.MatchScore: structs.Number(1),
+		}.S(),
 	}
 
 	ticket12Score10 := &pb.Match{
 		Tickets: []*pb.Ticket{ticket2, ticket1},
-		Extensions: map[string]*any.Any{
-			"evaluation_input": mustAny(&pb.DefaultEvaluationCriteria{
-				Score: 10,
-			}),
-		},
+		Properties: structs.Struct{
+			examples.MatchScore: structs.Number(10),
+		}.S(),
 	}
 
 	ticket123Score5 := &pb.Match{
 		Tickets: []*pb.Ticket{ticket1, ticket2, ticket3},
-		Extensions: map[string]*any.Any{
-			"evaluation_input": mustAny(&pb.DefaultEvaluationCriteria{
-				Score: 5,
-			}),
-		},
+		Properties: structs.Struct{
+			examples.MatchScore: structs.Number(5),
+		}.S(),
 	}
 
 	ticket3Score50 := &pb.Match{
 		Tickets: []*pb.Ticket{ticket3},
-		Extensions: map[string]*any.Any{
-			"evaluation_input": mustAny(&pb.DefaultEvaluationCriteria{
-				Score: 50,
-			}),
-		},
+		Properties: structs.Struct{
+			examples.MatchScore: structs.Number(50),
+		}.S(),
 	}
 
 	tests := []struct {

examples/evaluator/golang/simple/evaluate/sort_match.go

@@ -0,0 +1,53 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package evaluate
+
+import (
+	"sort"
+
+	"open-match.dev/open-match/pkg/pb"
+)
+
+// by is the type of a "less" function that defines the ordering of its Planet arguments.
+type by func(p1, p2 *pb.Match) bool
+
+// matchSorter joins a By function and a slice of Matches to be sorted.
+type matchSorter struct {
+	matches []*pb.Match
+	by      func(a, b *pb.Match) bool // Closure used in the Less method.
+}
+
+// Sort is a method on the function type, By, that sorts the argument slice according to the function.
+func (by by) Sort(matches []*pb.Match) {
+	sort.Sort(&matchSorter{
+		matches: matches,
+		by:      by, // The Sort method's receiver is the function (closure) that defines the sort order.
+	})
+}
+
+// Len is part of sort.Interface.
+func (s *matchSorter) Len() int {
+	return len(s.matches)
+}
+
+// Swap is part of sort.Interface.
+func (s *matchSorter) Swap(i, j int) {
+	s.matches[i], s.matches[j] = s.matches[j], s.matches[i]
+}
+
+// Less is part of sort.Interface. It is implemented by calling the "by" closure in the sorter.
+func (s *matchSorter) Less(i, j int) bool {
+	return s.by(s.matches[i], s.matches[j])
+}

examples/functions/golang/pool/mmf/matchfunction.go

@@ -20,12 +20,11 @@
 package mmf
 
 import (
-	"github.com/golang/protobuf/ptypes"
-	"github.com/golang/protobuf/ptypes/any"
-	"github.com/pkg/errors"
 	"github.com/rs/xid"
+	"open-match.dev/open-match/examples"
 	mmfHarness "open-match.dev/open-match/pkg/harness/function/golang"
 	"open-match.dev/open-match/pkg/pb"
+	"open-match.dev/open-match/pkg/structs"
 )
 
 var (
@@ -47,22 +46,15 @@ func MakeMatches(params *mmfHarness.MatchFunctionParams) ([]*pb.Match, error) {
 				roster.TicketIds = append(roster.GetTicketIds(), ticket.GetId())
 			}
 
-			evaluationInput, err := ptypes.MarshalAny(&pb.DefaultEvaluationCriteria{
-				Score: scoreCalculator(tickets),
-			})
-			if err != nil {
-				return nil, errors.Wrap(err, "Failed to marshal DefaultEvaluationCriteria.")
-			}
-
 			result = append(result, &pb.Match{
 				MatchId:       xid.New().String(),
 				MatchProfile:  params.ProfileName,
 				MatchFunction: matchName,
 				Tickets:       tickets,
 				Rosters:       []*pb.Roster{roster},
-				Extensions: map[string]*any.Any{
-					"evaluation_input": evaluationInput,
-				},
+				Properties: structs.Struct{
+					examples.MatchScore: structs.Number(scoreCalculator(tickets)),
+				}.S(),
 			})
 		}
 	}
@@ -70,14 +62,12 @@ func MakeMatches(params *mmfHarness.MatchFunctionParams) ([]*pb.Match, error) {
 	return result, nil
 }
 
-// This match function defines the quality of a match as the sum of the Double
-// Args values of all tickets per match.  This is for testing purposes, and not
-// an example of a good score calculation.
+// This match function defines the quality of a match as the sum of the attribute values of all tickets per match
 func scoreCalculator(tickets []*pb.Ticket) float64 {
 	matchScore := 0.0
 	for _, ticket := range tickets {
-		for _, v := range ticket.GetSearchFields().GetDoubleArgs() {
-			matchScore += v
+		for _, v := range ticket.GetProperties().GetFields() {
+			matchScore += v.GetNumberValue()
 		}
 	}
 	return matchScore

examples/functions/golang/pool/mmf/matchfunction_test.go

@@ -17,13 +17,13 @@ package mmf
 import (
 	"testing"
 
+	"open-match.dev/open-match/examples"
 	"open-match.dev/open-match/pkg/pb"
 
-	"github.com/golang/protobuf/ptypes"
-	"github.com/golang/protobuf/ptypes/any"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	mmfHarness "open-match.dev/open-match/pkg/harness/function/golang"
+	"open-match.dev/open-match/pkg/structs"
 )
 
 func TestMakeMatches(t *testing.T) {
@@ -32,38 +32,30 @@ func TestMakeMatches(t *testing.T) {
 	tickets := []*pb.Ticket{
 		{
 			Id: "1",
-			SearchFields: &pb.SearchFields{
-				DoubleArgs: map[string]float64{
-					"level":   10,
-					"defense": 100,
-				},
-			},
+			Properties: structs.Struct{
+				"level":   structs.Number(10),
+				"defense": structs.Number(100),
+			}.S(),
 		},
 		{
 			Id: "2",
-			SearchFields: &pb.SearchFields{
-				DoubleArgs: map[string]float64{
-					"level":   10,
-					"defense": 50,
-				},
-			},
+			Properties: structs.Struct{
+				"level":  structs.Number(10),
+				"attack": structs.Number(50),
+			}.S(),
 		},
 		{
 			Id: "3",
-			SearchFields: &pb.SearchFields{
-				DoubleArgs: map[string]float64{
-					"level":   10,
-					"defense": 522,
-				},
-			},
+			Properties: structs.Struct{
+				"level": structs.Number(10),
+				"speed": structs.Number(522),
+			}.S(),
 		}, {
 			Id: "4",
-			SearchFields: &pb.SearchFields{
-				DoubleArgs: map[string]float64{
-					"level": 10,
-					"mana":  1,
-				},
-			},
+			Properties: structs.Struct{
+				"level": structs.Number(10),
+				"mana":  structs.Number(1),
+			}.S(),
 		},
 	}
 
@@ -90,7 +82,7 @@ func TestMakeMatches(t *testing.T) {
 			MatchFunction: match.MatchFunction,
 			Tickets:       match.Tickets,
 			Rosters:       match.Rosters,
-			Extensions:    match.Extensions,
+			Properties:    match.Properties,
 		})
 	}
 
@@ -100,21 +92,14 @@ func TestMakeMatches(t *testing.T) {
 			tids = append(tids, ticket.GetId())
 		}
 
-		evaluationInput, err := ptypes.MarshalAny(&pb.DefaultEvaluationCriteria{
-			Score: scoreCalculator(tickets),
-		})
-		if err != nil {
-			t.Fatal(err)
-		}
-
 		return &pb.Match{
 			MatchProfile:  p.ProfileName,
 			MatchFunction: matchName,
 			Tickets:       tickets,
 			Rosters:       []*pb.Roster{{Name: poolName, TicketIds: tids}},
-			Extensions: map[string]*any.Any{
-				"evaluation_input": evaluationInput,
-			},
+			Properties: structs.Struct{
+				examples.MatchScore: structs.Number(scoreCalculator(tickets)),
+			}.S(),
 		}
 	}
 

examples/functions/golang/rosterbased/main.go

@@ -20,15 +20,16 @@
 package main
 
 import (
-	"open-match.dev/open-match/examples/functions/golang/rosterbased/mmf"
-)
-
-var (
-	// Replace these values with the approriate values for your Open Match setup.
-	mmlogicAddress = "om-mmlogic.open-match.svc.cluster.local:50503" // Address of the MMLogic Endpoint.
-	serverPort     = 50502                                           // Port of the server where the match function is hosted.
+	rosterbased "open-match.dev/open-match/examples/functions/golang/rosterbased/mmf"
+	mmfHarness "open-match.dev/open-match/pkg/harness/function/golang"
 )
 
 func main() {
-	mmf.Start(mmlogicAddress, serverPort)
+	// Invoke the harness to setup a GRPC service that handles requests to run the
+	// match function. The harness itself queries open match for player pools for
+	// the specified request and passes the pools to the match function to generate
+	// proposals.
+	mmfHarness.RunMatchFunction(&mmfHarness.FunctionSettings{
+		Func: rosterbased.MakeMatches,
+	})
 }

examples/functions/golang/rosterbased/mmf/matchfunction.go

@@ -21,7 +21,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"open-match.dev/open-match/pkg/matchfunction"
+	mmfHarness "open-match.dev/open-match/pkg/harness/function/golang"
 	"open-match.dev/open-match/pkg/pb"
 )
 
@@ -29,40 +29,12 @@ var (
 	matchName       = "roster-based-matchfunction"
 	emptyRosterSpot = "EMPTY_ROSTER_SPOT"
 	logger          = logrus.WithFields(logrus.Fields{
-		"app":       "matchfunction",
+		"app":       "openmatch",
 		"component": "mmf.rosterbased",
 	})
 )
 
-// Run is this match function's implementation of the gRPC call defined in api/matchfunction.proto.
-func (s *MatchFunctionService) Run(req *pb.RunRequest, stream pb.MatchFunction_RunServer) error {
-	// Fetch tickets for the pools specified in the Match Profile.
-	poolTickets, err := matchfunction.QueryPools(stream.Context(), s.mmlogicClient, req.GetProfile().GetPools())
-	if err != nil {
-		return err
-	}
-
-	// Generate proposals.
-	proposals, err := makeMatches(req.GetProfile(), poolTickets)
-	if err != nil {
-		return err
-	}
-
-	logger.WithFields(logrus.Fields{
-		"proposals": proposals,
-	}).Trace("proposals returned by match function")
-
-	// Stream the generated proposals back to Open Match.
-	for _, proposal := range proposals {
-		if err := stream.Send(&pb.RunResponse{Proposal: proposal}); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func makeMatches(p *pb.MatchProfile, poolTickets map[string][]*pb.Ticket) ([]*pb.Match, error) {
+func MakeMatches(p *mmfHarness.MatchFunctionParams) ([]*pb.Match, error) {
 	// This roster based match function expects the match profile to have a
 	// populated roster specifying the empty slots for each pool name and also
 	// have the ticket pools referenced in the roster. It generates matches by
@@ -73,16 +45,14 @@ func makeMatches(p *pb.MatchProfile, poolTickets map[string][]*pb.Ticket) ([]*pb
 	}
 
 	var matches []*pb.Match
-	count := 0
 	for {
 		insufficientTickets := false
 		matchTickets := []*pb.Ticket{}
 		matchRosters := []*pb.Roster{}
-
 		// Loop through each pool wanted in the rosters and pick the number of
 		// wanted players from the respective Pool.
 		for poolName, want := range wantTickets {
-			have, ok := poolTickets[poolName]
+			have, ok := p.PoolNameToTickets[poolName]
 			if !ok {
 				// A wanted Pool was not found in the Pools specified in the profile.
 				insufficientTickets = true
@@ -97,7 +67,7 @@ func makeMatches(p *pb.MatchProfile, poolTickets map[string][]*pb.Ticket) ([]*pb
 
 			// Populate the wanted tickets from the Tickets in the corresponding Pool.
 			matchTickets = append(matchTickets, have[0:want]...)
-			poolTickets[poolName] = have[want:]
+			p.PoolNameToTickets[poolName] = have[want:]
 			var ids []string
 			for _, ticket := range matchTickets {
 				ids = append(ids, ticket.Id)
@@ -115,14 +85,12 @@ func makeMatches(p *pb.MatchProfile, poolTickets map[string][]*pb.Ticket) ([]*pb
 		}
 
 		matches = append(matches, &pb.Match{
-			MatchId:       fmt.Sprintf("profile-%v-time-%v-%v", p.GetName(), time.Now().Format("2006-01-02T15:04:05.00"), count),
-			MatchProfile:  p.GetName(),
+			MatchId:       fmt.Sprintf("profile-%v-time-%v", p.ProfileName, time.Now().Format("2006-01-02T15:04:05.00")),
+			MatchProfile:  p.ProfileName,
 			MatchFunction: matchName,
 			Tickets:       matchTickets,
 			Rosters:       matchRosters,
 		})
-
-		count++
 	}
 
 	return matches, nil

examples/functions/golang/rosterbased/mmf/server.go

@@ -1,73 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package mmf
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/sirupsen/logrus"
-	"google.golang.org/grpc"
-	"open-match.dev/open-match/pkg/pb"
-)
-
-// matchFunctionService implements pb.MatchFunctionServer, the server generated
-// by compiling the protobuf, by fulfilling the pb.MatchFunctionServer interface.
-type MatchFunctionService struct {
-	grpc          *grpc.Server
-	mmlogicClient pb.MmLogicClient
-	port          int
-}
-
-// Start creates and starts the Match Function server and also connects to Open
-// Match's mmlogic service. This connection is used at runtime to fetch tickets
-// for pools specified in MatchProfile.
-func Start(mmlogicAddr string, serverPort int) error {
-	conn, err := grpc.Dial(mmlogicAddr, grpc.WithInsecure())
-	if err != nil {
-		logger.Fatalf("Failed to connect to Open Match, got %v", err)
-	}
-	defer conn.Close()
-
-	mmfService := MatchFunctionService{
-		mmlogicClient: pb.NewMmLogicClient(conn),
-	}
-
-	server := grpc.NewServer()
-	pb.RegisterMatchFunctionServer(server, &mmfService)
-	ln, err := net.Listen("tcp", fmt.Sprintf(":%d", serverPort))
-	if err != nil {
-		logger.WithFields(logrus.Fields{
-			"error": err.Error(),
-			"port":  serverPort,
-		}).Error("net.Listen() error")
-		return err
-	}
-
-	logger.WithFields(logrus.Fields{
-		"port": serverPort,
-	}).Info("TCP net listener initialized")
-
-	logger.Info("Serving gRPC endpoint")
-	err = server.Serve(ln)
-	if err != nil {
-		logger.WithFields(logrus.Fields{
-			"error": err.Error(),
-		}).Error("gRPC serve() error")
-		return err
-	}
-
-	return nil
-}

examples/k8s-resources/om-evaluator.yaml

@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: om-evaluator
-  namespace: open-match
-spec:
-  containers:
-  - name: om-evaluator
-    image: "gcr.io/open-match-build/openmatch-evaluator-go-simple"
-    imagePullPolicy: Always
-    ports:
-    - name: grpc
-      containerPort: 50508
-    - name: http
-      containerPort: 51508
-  hostname: om-evaluator

examples/k8s-resources/om-function.yaml

@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: om-function
-  namespace: open-match
-spec:
-  containers:
-  - name: om-function
-    image: "gcr.io/open-match-build/openmatch-mmf-go-soloduel"
-    imagePullPolicy: Always
-    ports:
-    - name: grpc
-      containerPort: 50502
-    - name: http
-      containerPort: 51502
-  hostname: om-function

examples/scale/profiles/greedy.go

@@ -16,7 +16,6 @@ package profiles
 
 import (
 	"open-match.dev/open-match/internal/config"
-	"open-match.dev/open-match/internal/testing/e2e"
 	"open-match.dev/open-match/pkg/pb"
 )
 
@@ -30,9 +29,9 @@ func greedyProfiles(cfg config.View) []*pb.MatchProfile {
 			Pools: []*pb.Pool{
 				{
 					Name: "all",
-					DoubleRangeFilters: []*pb.DoubleRangeFilter{
+					FloatRangeFilters: []*pb.FloatRangeFilter{
 						{
-							DoubleArg: e2e.DoubleArgMMR,
+							Attribute: "mmr.rating",
 							Min:       float64(cfg.GetInt("testConfig.minRating")),
 							Max:       float64(cfg.GetInt("testConfig.maxRating")),
 						},

examples/scale/profiles/multifilter.go

@@ -18,7 +18,6 @@ import (
 	"fmt"
 
 	"open-match.dev/open-match/internal/config"
-	"open-match.dev/open-match/internal/testing/e2e"
 	"open-match.dev/open-match/pkg/pb"
 )
 
@@ -52,14 +51,14 @@ func multifilterProfiles(cfg config.View) []*pb.MatchProfile {
 				poolName := fmt.Sprintf("%s_%s_%s", region, rating.name, latency.name)
 				p := &pb.Pool{
 					Name: poolName,
-					DoubleRangeFilters: []*pb.DoubleRangeFilter{
+					FloatRangeFilters: []*pb.FloatRangeFilter{
 						{
-							DoubleArg: e2e.DoubleArgMMR,
+							Attribute: "mmr.rating",
 							Min:       float64(rating.min),
 							Max:       float64(rating.max),
 						},
 						{
-							DoubleArg: region,
+							Attribute: region,
 							Min:       float64(latency.min),
 							Max:       float64(latency.max),
 						},

examples/scale/profiles/multipool.go

@@ -19,7 +19,6 @@ import (
 	"math"
 
 	"open-match.dev/open-match/internal/config"
-	"open-match.dev/open-match/internal/testing/e2e"
 	"open-match.dev/open-match/pkg/pb"
 )
 
@@ -55,20 +54,20 @@ func multipoolProfiles(cfg config.View) []*pb.MatchProfile {
 					poolName := fmt.Sprintf("%s_%s_%s_%s", region, rating.name, latency.name, character)
 					p := &pb.Pool{
 						Name: poolName,
-						DoubleRangeFilters: []*pb.DoubleRangeFilter{
-							// TODO: Use StringEqualsFilter for the character args.
+						FloatRangeFilters: []*pb.FloatRangeFilter{
+							// TODO: Use StringEqualsFilter for the character attribute.
 							{
-								DoubleArg: character,
+								Attribute: character,
 								Min:       0,
 								Max:       math.MaxFloat64,
 							},
 							{
-								DoubleArg: e2e.DoubleArgMMR,
+								Attribute: "mmr.rating",
 								Min:       float64(rating.min),
 								Max:       float64(rating.max),
 							},
 							{
-								DoubleArg: region,
+								Attribute: region,
 								Min:       float64(latency.min),
 								Max:       float64(latency.max),
 							},

examples/scale/tickets/tickets.go

@@ -16,12 +16,13 @@ package tickets
 
 import (
 	"math/rand"
+	"time"
 
 	"open-match.dev/open-match/internal/config"
 
 	"github.com/sirupsen/logrus"
-	"open-match.dev/open-match/internal/testing/e2e"
 	"open-match.dev/open-match/pkg/pb"
+	"open-match.dev/open-match/pkg/structs"
 )
 
 var (
@@ -39,18 +40,15 @@ func Ticket(cfg config.View) *pb.Ticket {
 	max := cfg.GetFloat64("testConfig.maxRating")
 	latencyMap := latency(regions)
 	ticket := &pb.Ticket{
-		SearchFields: &pb.SearchFields{
-			DoubleArgs: map[string]float64{
-				e2e.DoubleArgMMR: normalDist(40, min, max, 20),
-			},
-			StringArgs: map[string]string{
-				e2e.Role: characters[rand.Intn(len(characters))],
-			},
-		},
+		Properties: structs.Struct{
+			"mmr.rating": structs.Number(normalDist(40, min, max, 20)),
+			// TODO: Use string attribute value for the character attribute.
+			characters[rand.Intn(len(characters))]: structs.Number(float64(time.Now().Unix())),
+		}.S(),
 	}
 
 	for _, r := range regions {
-		ticket.SearchFields.DoubleArgs[r] = latencyMap[r]
+		ticket.Properties.Fields[r] = structs.Number(latencyMap[r])
 	}
 
 	return ticket

go.mod

@@ -14,8 +14,7 @@ module open-match.dev/open-match
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// When updating Go version, update Dockerfile.ci, Dockerfile.base-build, and go.mod
-go 1.13.1
+go 1.12
 
 require (
 	cloud.google.com/go v0.40.0 // indirect
@@ -28,7 +27,6 @@ require (
 	github.com/alicebob/miniredis/v2 v2.8.1-0.20190618082157-e29950035715
 	github.com/cenkalti/backoff v2.1.1+incompatible
 	github.com/fsnotify/fsnotify v1.4.7
-	github.com/gogo/protobuf v1.3.0 // indirect
 	github.com/golang/protobuf v1.3.2
 	github.com/gomodule/redigo v1.7.1-0.20190322064113-39e2c31b7ca3
 	github.com/google/gofuzz v1.0.0 // indirect

go.sum

@@ -71,14 +71,13 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/gogo/protobuf v1.3.0 h1:G8O7TerXerS4F6sx9OV7/nRfJdnXgHZu/S/7F2SN+UE=
-github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -129,7 +128,6 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -284,7 +282,6 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=

install/helm/README.md

@@ -17,6 +17,12 @@ You may control the behavior of Open Match by overriding the configs in `install
 # 2. Configs under the subchart name - e.g. `open-match-test` only affects the settings in that subchart.
 # 3. Otherwise, the configs are for core components (templates in the parent chart) only.
 
+# Setup Open Match with customized ticket indices
+ticketIndices:
++ - myfirstindice
++ - mysecondice
++ - ...
+
 # Overrides spec.type of a specific Kubernetes Service
 # Equivalent helm cli flag --set swaggerui.portType=LoadBalancer
 swaggerui:
@@ -66,4 +72,4 @@ open-match-customize:
 +     image: [YOUR_EVALUATOR_IMAGE_NAME]
 ```
 
-Please see [Helm - Chart Template Guide](https://helm.sh/docs/chart_template_guide/#the-chart-template-developer-s-guide "Chart Template Guide") for the advanced usages and our [Makefile](https://github.com/googleforgames/open-match/blob/master/Makefile#L358 "Makefile")  for how we use the helm charts to deploy Open Match.
+Please see [Helm - Chart Template Guide](https://helm.sh/docs/chart_template_guide/#the-chart-template-developer-s-guide "Chart Template Guide") for the advanced usages and our [Makefile](https://github.com/googleforgames/open-match/blob/master/Makefile#L358 "Makefile")  for how we use the helm charts to deploy Open Match.

install/helm/open-match/Chart.yaml

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 apiVersion: v1
-appVersion: "0.8.0-rc.1"
-version: 0.8.0-rc.1
+appVersion: "0.7.0"
+version: 0.7.0
 name: open-match
 description: Flexible, extensible, and scalable video game matchmaking.
 keywords:

install/helm/open-match/requirements.lock

@@ -14,8 +14,5 @@ dependencies:
 - name: open-match-test
   repository: file://./subcharts/open-match-test
   version: 0.0.0-dev
-- name: open-match-scale
-  repository: file://./subcharts/open-match-scale
-  version: 0.0.0-dev
-digest: sha256:58df48dae8d884f81dc06a3a2150082d68b271fc204abb19da12d1bf892647e1
-generated: "2019-09-18T01:18:15.939673104-07:00"
+digest: sha256:14faae8b59e808749ad29fc675a009daf72a3d0f22bcb7b954ba92660cb60779
+generated: "2019-08-02T15:52:25.299281406-07:00"

install/helm/open-match/requirements.yaml

@@ -33,7 +33,4 @@ dependencies:
     version: 0.0.0-dev
     condition: open-match-test.enabled
     repository: "file://./subcharts/open-match-test"
-  - name: open-match-scale
-    version: 0.0.0-dev
-    condition: open-match-scale.enabled
-    repository: "file://./subcharts/open-match-scale"
+

install/helm/open-match/subcharts/open-match-customize/templates/customize-configmap.yaml

@@ -23,7 +23,7 @@ metadata:
     component: config
     release: {{ .Release.Name }}
 data:
-  matchmaker_config_override.yaml: |-
+  matchmaker_config.yaml: |-
     api:
       mmlogic:
         hostname: "{{ .Values.mmlogic.hostName }}"

install/helm/open-match/subcharts/open-match-customize/templates/evaluator.yaml

@@ -27,11 +27,6 @@ spec:
     app: {{ template "openmatch.name" . }}
     component: evaluator
     release: {{ .Release.Name }}
-{{- $portType := coalesce .Values.global.kubernetes.service.portType .Values.evaluator.portType -}}
-{{- if eq $portType "ClusterIP" }}
-  clusterIP: None
-{{- end }}
-  type: {{ $portType }}
   ports:
   - name: grpc
     protocol: TCP
@@ -48,12 +43,12 @@ metadata:
   annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
 spec:
   scaleTargetRef:
-    apiVersion: apps/v1
+    apiVersion: extensions/v1beta1
     kind: Deployment
     name: {{ .Values.evaluator.hostName }}
   {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ .Values.evaluator.hostName }}
@@ -88,7 +83,7 @@ spec:
         volumeMounts:
           {{- include "openmatch.volumemounts.configs" . | nindent 10 }}
           {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
-        image: "{{ .Values.global.image.registry }}/{{ .Values.evaluator.image}}:{{ .Values.global.image.tag }}"
+        image: "{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ .Values.evaluator.image}}:{{ coalesce .Values.global.image.tag .Values.image.tag }}"
         ports:
         - name: grpc
           containerPort: {{ .Values.evaluator.grpcPort }}

install/helm/open-match/subcharts/open-match-customize/templates/matchfunctions.yaml

@@ -27,11 +27,6 @@ spec:
     app: {{ template "openmatch.name" . }}
     component: matchfunction
     release: {{ .Release.Name }}
-{{- $portType := coalesce .Values.global.kubernetes.service.portType .Values.function.portType -}}
-{{- if eq $portType "ClusterIP" }}
-  clusterIP: None
-{{- end }}
-  type: {{ $portType }}
   ports:
   - name: grpc
     protocol: TCP
@@ -48,12 +43,12 @@ metadata:
   annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
 spec:
   scaleTargetRef:
-    apiVersion: apps/v1
+    apiVersion: extensions/v1beta1
     kind: Deployment
     name: {{ .Values.function.hostName }}
   {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ .Values.function.hostName }}
@@ -89,7 +84,7 @@ spec:
         volumeMounts:
           {{- include "openmatch.volumemounts.configs" . | nindent 10 }}
           {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
-        image: "{{ .Values.global.image.registry }}/{{ .Values.function.image}}:{{ .Values.global.image.tag }}"
+        image: "{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ .Values.function.image}}:{{ coalesce .Values.global.image.tag .Values.image.tag }}"
         ports:
         - name: grpc
           containerPort: {{ .Values.function.grpcPort }}

install/helm/open-match/subcharts/open-match-customize/values.yaml

@@ -18,19 +18,18 @@
 
 function:
   replicas: 3
-  portType: ClusterIP
   image: openmatch-mmf-go-soloduel
 
 evaluator:
   replicas: 3
-  portType: ClusterIP
   image: openmatch-evaluator-go-simple
 
+image:
+  registry: gcr.io/open-match-public-images
+  tag: 0.7.0
+  pullPolicy: Always
+
 configs:
-  # TODO: Remove this bit after deprecating the harness dependency on configmap
-  om-configmap-default:
-    volumeName: om-config-volume-default
-    mountPath: /app/config/default
   customize-configmap:
+    mountPath: /app/config/om
     volumeName: customize-config-volume
-    mountPath: /app/config/override

install/helm/open-match/subcharts/open-match-demo/templates/demo.yaml

@@ -32,7 +32,7 @@ spec:
     protocol: TCP
     port: {{ .Values.demo.httpPort }}
 ---
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ .Values.demo.hostName }}
@@ -67,7 +67,7 @@ spec:
         volumeMounts:
           {{- include "openmatch.volumemounts.configs" . | nindent 10 }}
           {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
-        image: "{{ .Values.global.image.registry }}/{{ .Values.demo.image}}:{{ .Values.global.image.tag }}"
+        image: "{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ .Values.demo.image}}:{{ coalesce .Values.global.image.tag .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
         - name: http

install/helm/open-match/subcharts/open-match-demo/values.yaml

@@ -25,7 +25,7 @@ demo:
 
 image:
   registry: gcr.io/open-match-public-images
-  tag: 0.0.0-dev
+  tag: 0.7.0
   pullPolicy: Always
 
 # TODO: Split tls configs into a separate config file. For now Open Match assumes core components share the same secure mode

install/helm/open-match/subcharts/open-match-scale/templates/scale-backend.yaml

@@ -31,7 +31,7 @@ spec:
     protocol: TCP
     port: {{ .Values.scaleBackend.httpPort }}
 ---
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ .Values.scaleBackend.hostName }}
@@ -66,7 +66,7 @@ spec:
         volumeMounts:
           {{- include "openmatch.volumemounts.configs" . | nindent 10 }}
           {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
-        image: "{{ .Values.global.image.registry }}/{{ .Values.scaleBackend.image}}:{{ .Values.global.image.tag }}"
+        image: "{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ .Values.scaleBackend.image}}:{{ coalesce .Values.global.image.tag .Values.image.tag }}"
         ports:
         - name: http
           containerPort: {{ .Values.scaleBackend.httpPort }}

install/helm/open-match/subcharts/open-match-scale/templates/scale-frontend.yaml

@@ -31,7 +31,7 @@ spec:
     protocol: TCP
     port: {{ .Values.scaleFrontend.httpPort }}
 ---
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ .Values.scaleFrontend.hostName }}
@@ -66,7 +66,7 @@ spec:
         volumeMounts:
           {{- include "openmatch.volumemounts.configs" . | nindent 10 }}
           {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
-        image: "{{ .Values.global.image.registry }}/{{ .Values.scaleFrontend.image}}:{{ .Values.global.image.tag }}"
+        image: "{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ .Values.scaleFrontend.image}}:{{ coalesce .Values.global.image.tag .Values.image.tag }}"
         ports:
         - name: http
           containerPort: {{ .Values.scaleFrontend.httpPort }}

install/helm/open-match/subcharts/open-match-scale/values.yaml

@@ -24,6 +24,11 @@ scaleBackend:
   replicas: 1
   image: openmatch-scale-backend
 
+image:
+  registry: gcr.io/open-match-public-images
+  tag: 0.7.0
+  pullPolicy: Always
+
 configs:
   scale-configmap:
     mountPath: /app/config/om
@@ -38,8 +43,8 @@ testConfig:
     - region.europe-west3
     - region.europe-west4
   characters:
-    - cleric
-    - knight
+    - char.cleric
+    - char.knight
   minRating: 0
   maxRating: 100
   ticketsPerMatch: 8

install/helm/open-match/subcharts/open-match-telemetry/dashboards/redis-clients.json

@@ -1,169 +0,0 @@
-{
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": "-- Grafana --",
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "gnetId": null,
-    "graphTooltip": 0,
-    "id": 5,
-    "links": [],
-    "panels": [
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "fill": 1,
-        "gridPos": {
-          "h": 9,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 2,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "rightSide": true,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "nullPointMode": "null",
-        "options": {},
-        "percentage": false,
-        "pointradius": 2,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "histogram_quantile(0.1, sum(rate(redis_connectlatency_bucket[5m])) by (component, le))",
-            "format": "time_series",
-            "instant": false,
-            "intervalFactor": 1,
-            "legendFormat": "{{component}} 10 percentile",
-            "refId": "A"
-          },
-          {
-            "expr": "histogram_quantile(0.5, sum(rate(redis_connectlatency_bucket[5m])) by (component, le))",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "{{component}} 50 percentile",
-            "refId": "B"
-          },
-          {
-            "expr": "histogram_quantile(0.75, sum(rate(redis_connectlatency_bucket[5m])) by (component, le))",
-            "format": "time_series",
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "{{component}} 75 percentile",
-            "refId": "C"
-          },
-          {
-            "expr": "histogram_quantile(0.95, sum(rate(redis_connectlatency_bucket[5m])) by (component, le))",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "{{component}} 95 percentile",
-            "refId": "D"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "Panel Title",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "ms",
-            "label": null,
-            "logBase": 32,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      }
-    ],
-    "schemaVersion": 18,
-    "style": "dark",
-    "tags": [],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {
-      "refresh_intervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "time_options": [
-        "5m",
-        "15m",
-        "1h",
-        "6h",
-        "12h",
-        "24h",
-        "2d",
-        "7d",
-        "30d"
-      ]
-    },
-    "timezone": "",
-    "title": "Redis Connection Latency",
-    "uid": "v42hNvTZk",
-    "version": 1
-  }

install/helm/open-match/subcharts/open-match-telemetry/requirements.yaml

@@ -24,6 +24,6 @@ dependencies:
     repository: https://kubernetes-charts.storage.googleapis.com/
     condition: global.telemetry.grafana.enabled,grafana.enabled
   - name: jaeger
-    version: 0.13.3
+    version: 0.12.0
     repository: https://kubernetes-charts-incubator.storage.googleapis.com/
     condition: global.telemetry.jaeger.enabled,jaeger.enabled

install/helm/open-match/subcharts/open-match-telemetry/values.yaml

@@ -16,6 +16,11 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+image:
+  registry: gcr.io/open-match-public-images
+  tag: 0.7.0
+  pullPolicy: Always
+
 # https://github.com/helm/charts/tree/master/stable/prometheus
 prometheus:
   alertmanager:
@@ -148,23 +153,3 @@ grafana:
         url: http://open-match-prometheus-server.{{ .Release.Namespace }}.svc.cluster.local:80/
         access: proxy
         isDefault: true
-
-jaeger:
-  enabled: true
-  # Configs for the cassandra schema job
-  schema:
-    pullPolicy: Always
-    mode: prod
-    activeDeadlineSeconds: 200
-  cassandra:
-    image:
-      tag: latest
-    config:
-      cluster_size: 2
-    resources:
-      requests:
-        memory: 4Gi
-        cpu: 2
-      limits:
-        memory: 4Gi
-        cpu: 2

install/helm/open-match/subcharts/open-match-test/templates/e2e-job.yaml

@@ -9,6 +9,9 @@ metadata:
     component: e2e-job
     release: {{ .Release.Name }}
 spec:
+  selector:
+    app: {{ template "openmatch.name" . }}
+    component: e2e-job
   # Specifies the number of retries before marking this job failed. Defaults to 6 if not specified.
   backoffLimit: 3
   # Specifies the desired number of successfully finished pods the job should be run with.
@@ -27,10 +30,8 @@ spec:
         component: e2e-job
         release: {{ .Release.Name }}
     spec:
-      serviceAccountName: open-match-test-service
-      automountServiceAccountToken: true
       containers:
-      - image: "{{ .Values.global.image.registry }}/{{ .Values.e2etest.image }}:{{ .Values.global.image.tag }}"
+      - image: "{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ .Values.e2etest.image }}:{{ coalesce .Values.global.image.tag .Values.image.tag }}"
         name: e2e-job
         env:
         - name: NAMESPACE

install/helm/open-match/subcharts/open-match-test/templates/stress-master.yaml

@@ -42,7 +42,7 @@ spec:
     targetPort: loc-master-p2
     protocol: TCP
 ---
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
@@ -71,8 +71,8 @@ spec:
       serviceAccountName: {{ .Values.kubernetes.serviceAccount }}
       containers:
       - name: {{ .Values.stresstest.masterName }}
-        image: "{{ .Values.global.image.registry }}/{{ .Values.stresstest.image}}:{{ .Values.global.image.tag }}"
-        imagePullPolicy: {{ .Values.global.image.pullPolicy }}
+        image: "{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ .Values.stresstest.image}}:{{ coalesce .Values.global.image.tag .Values.image.tag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
         - name: loc-master-web
           containerPort: 8089

install/helm/open-match/subcharts/open-match-test/templates/stress-slaves.yaml

@@ -14,7 +14,7 @@
 
 {{- if .Values.stresstest.enabled }}
 kind: Deployment
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 metadata:
   name: {{ .Values.stresstest.slavesName }}
   namespace: {{ .Release.Namespace }}
@@ -41,8 +41,8 @@ spec:
       serviceAccountName: {{ .Values.kubernetes.serviceAccount }}
       containers:
       - name: {{ .Values.stresstest.slavesName }}
-        image: "{{ .Values.global.image.registry }}/{{ .Values.stresstest.image}}:{{ .Values.global.image.tag }}"
-        imagePullPolicy: {{ .Values.global.image.pullPolicy }}
+        image: "{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ .Values.stresstest.image}}:{{ coalesce .Values.global.image.tag .Values.image.tag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         command: ["python3"]
         # TODO: template the secure mode
         args:

install/helm/open-match/subcharts/open-match-test/values.yaml

@@ -33,3 +33,8 @@ e2etest:
 
 kubernetes:
   serviceAccount: stress-test-uploader
+
+image:
+  registry: gcr.io/open-match-public-images
+  tag: 0.7.0
+  pullPolicy: Always

install/helm/open-match/templates/_helpers.tpl

@@ -41,7 +41,7 @@ prometheus.io/path: {{ .prometheus.endpoint }}
 {{- end -}}
 
 {{- define "openmatch.container.common" -}}
-imagePullPolicy: {{ .Values.global.image.pullPolicy }}
+imagePullPolicy: {{ .Values.image.pullPolicy }}
 resources:
   requests:
     memory: 100Mi
@@ -49,14 +49,14 @@ resources:
 {{- end -}}
 
 {{- define "openmatch.volumemounts.configs" -}}
-{{- range $configName, $configValues := .Values.configs }}
+{{- range $configName, $configValues := (mergeOverwrite .Values.configs .Values.global.configs) }}
 - name: {{ $configValues.volumeName }}
   mountPath: {{ $configValues.mountPath }}
 {{- end }}
 {{- end -}}
 
 {{- define "openmatch.volumes.configs" -}}
-{{- range $configName, $configValues := .Values.configs }}
+{{- range $configName, $configValues := (mergeOverwrite .Values.configs .Values.global.configs) }}
 - name: {{ $configValues.volumeName }}
   configMap:
     name: {{ $configName }}
@@ -119,6 +119,6 @@ readinessProbe:
 
 {{- define "openmatch.HorizontalPodAutoscaler.spec.common" -}}
 minReplicas: 1
-maxReplicas: 30
+maxReplicas: 10
 targetCPUUtilizationPercentage: 50
 {{- end -}}

install/helm/open-match/templates/backend.yaml

@@ -28,11 +28,7 @@ spec:
     app: {{ template "openmatch.name" . }}
     component: backend
     release: {{ .Release.Name }}
-{{- $portType := coalesce .Values.global.kubernetes.service.portType .Values.backend.portType -}}
-{{- if eq $portType "ClusterIP" }}
-  clusterIP: None
-{{- end }}
-  type: {{ $portType }}
+  type: {{ coalesce .Values.global.kubernetes.service.portType .Values.backend.portType }}
   ports:
   - name: grpc
     protocol: TCP
@@ -48,12 +44,12 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   scaleTargetRef:
-    apiVersion: apps/v1
+    apiVersion: extensions/v1beta1
     kind: Deployment
     name: {{ .Values.backend.hostName }}
   {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ .Values.backend.hostName }}
@@ -91,7 +87,7 @@ spec:
           {{- include "openmatch.volumemounts.configs" . | nindent 10 }}
           {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
           {{- include "openmatch.volumemounts.withredis" . | nindent 10}}
-        image: "{{ .Values.global.image.registry }}/{{ .Values.backend.image}}:{{ .Values.global.image.tag }}"
+        image: "{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ .Values.backend.image}}:{{ coalesce .Values.global.image.tag .Values.image.tag }}"
         ports:
         - name: grpc
           containerPort: {{ .Values.backend.grpcPort }}

install/helm/open-match/templates/frontend.yaml

@@ -28,11 +28,7 @@ spec:
     app: {{ template "openmatch.name" . }}
     component: frontend
     release: {{ .Release.Name }}
-{{- $portType := coalesce .Values.global.kubernetes.service.portType .Values.frontend.portType -}}
-{{- if eq $portType "ClusterIP" }}
-  clusterIP: None
-{{- end }}
-  type: {{ $portType }}
+  type: {{ coalesce .Values.global.kubernetes.service.portType .Values.frontend.portType }}
   ports:
   - name: grpc
     protocol: TCP
@@ -48,12 +44,12 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   scaleTargetRef:
-    apiVersion: apps/v1
+    apiVersion: extensions/v1beta1
     kind: Deployment
     name: {{ .Values.frontend.hostName }}
   {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ .Values.frontend.hostName }}
@@ -91,7 +87,7 @@ spec:
           {{- include "openmatch.volumemounts.configs" . | nindent 10 }}
           {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
           {{- include "openmatch.volumemounts.withredis" . | nindent 10}}
-        image: "{{ .Values.global.image.registry }}/{{ .Values.frontend.image}}:{{ .Values.global.image.tag }}"
+        image: "{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ .Values.frontend.image}}:{{ coalesce .Values.global.image.tag .Values.image.tag }}"
         ports:
         - name: grpc
           containerPort: {{ .Values.frontend.grpcPort }}

install/helm/open-match/templates/global-configmap.yaml

@@ -0,0 +1,56 @@
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{- if index .Values "open-match-core" "enabled" }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: global-configmap
+  namespace: {{ .Release.Namespace }}
+  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
+  labels:
+    app: {{ template "openmatch.name" . }}
+    component: config
+    release: {{ .Release.Name }}
+data:
+  global_config.yaml: |-
+    telemetry:
+      zpages:
+        enable: "{{ .Values.global.telemetry.zpages.enabled }}"
+      jaeger:
+        enable: "{{ .Values.global.telemetry.jaeger.enabled }}"
+        agentEndpoint: "{{ .Values.global.telemetry.jaeger.agentEndpoint }}"
+        collectorEndpoint: "{{ .Values.global.telemetry.jaeger.collectorEndpoint }}"
+      prometheus:
+        enable: "{{ .Values.global.telemetry.prometheus.enabled }}"
+        endpoint: "{{ .Values.global.telemetry.prometheus.endpoint }}"
+        serviceDiscovery: "{{ .Values.global.telemetry.prometheus.serviceDiscovery }}"
+      stackdriver:
+        enable: "{{ .Values.global.telemetry.stackdriver.enabled }}"
+        gcpProjectId: "{{ .Values.global.gcpProjectId }}"
+        metricPrefix: "{{ .Values.global.telemetry.stackdriver.metricPrefix }}"
+      zipkin:
+        enable: "{{ .Values.global.telemetry.zipkin.enabled }}"
+        endpoint: "{{ .Values.global.telemetry.zipkin.endpoint }}"
+        reporterEndpoint: "{{ .Values.global.telemetry.zipkin.reporterEndpoint }}"
+      reportingPeriod: "{{ .Values.global.telemetry.reportingPeriod }}"
+{{- if .Values.global.tls.enabled }}
+    api:
+      tls:
+        trustedCertificatePath: "{{.Values.global.tls.rootca.mountPath}}/public.cert"
+        certificatefile: "{{.Values.global.tls.server.mountPath}}/public.cert"
+        privatekey: "{{.Values.global.tls.server.mountPath}}/private.key"
+        rootcertificatefile: "{{.Values.global.tls.rootca.mountPath}}/public.cert"
+{{- end -}}
+{{- end }}

install/helm/open-match/templates/mmlogic.yaml

@@ -28,11 +28,7 @@ spec:
     app: {{ template "openmatch.name" . }}
     component: mmlogic
     release: {{ .Release.Name }}
-{{- $portType := coalesce .Values.global.kubernetes.service.portType .Values.mmlogic.portType -}}
-{{- if eq $portType "ClusterIP" }}
-  clusterIP: None
-{{- end }}
-  type: {{ $portType }}
+  type: {{ coalesce .Values.global.kubernetes.service.portType .Values.mmlogic.portType }}
   ports:
   - name: grpc
     protocol: TCP
@@ -48,12 +44,12 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   scaleTargetRef:
-    apiVersion: apps/v1
+    apiVersion: extensions/v1beta1
     kind: Deployment
     name: {{ .Values.mmlogic.hostName }}
   {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ .Values.mmlogic.hostName }}
@@ -91,7 +87,7 @@ spec:
           {{- include "openmatch.volumemounts.configs" . | nindent 10 }}
           {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
           {{- include "openmatch.volumemounts.withredis" . | nindent 10}}
-        image: "{{ .Values.global.image.registry }}/{{ .Values.mmlogic.image}}:{{ .Values.global.image.tag }}"
+        image: "{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ .Values.mmlogic.image}}:{{ coalesce .Values.global.image.tag .Values.image.tag }}"
         ports:
         - name: grpc
           containerPort: {{ .Values.mmlogic.grpcPort }}

install/helm/open-match/templates/om-configmap-override.yaml

@@ -1,37 +0,0 @@
-# Copyright 2019 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if index .Values "open-match-override" }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: om-configmap-override
-  namespace: {{ .Release.Namespace }}
-  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
-  labels:
-    app: {{ template "openmatch.name" . }}
-    component: config
-    release: {{ .Release.Name }}
-data:
-  matchmaker_config_override.yaml: |-
-    api:
-      evaluator:
-        hostname: "{{ .Values.evaluator.hostName }}"
-        grpcport: "{{ .Values.evaluator.grpcPort }}"
-        httpport: "{{ .Values.evaluator.httpPort }}"
-    synchronizer:
-      enabled: true
-      registrationIntervalMs: 3000ms
-      proposalCollectionIntervalMs: 2000ms
-{{- end }}

install/helm/open-match/templates/om-configmap.yaml

@@ -16,7 +16,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: om-configmap-default
+  name: om-configmap
   namespace: {{ .Release.Namespace }}
   annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
   labels:
@@ -24,10 +24,10 @@ metadata:
     component: config
     release: {{ .Release.Name }}
 data:
-  matchmaker_config_default.yaml: |-
+  matchmaker_config.yaml: |-
     logging:
       level: debug
-      {{- if .Values.global.telemetry.stackdriverMetrics.enabled }}
+      {{- if .Values.global.telemetry.stackdriver.enabled }}
       format: stackdriver
       {{- else }}
       format: text
@@ -68,18 +68,20 @@ data:
       swaggerui:
         hostname: "{{ .Values.swaggerui.hostName }}"
         httpport: "{{ .Values.swaggerui.httpPort }}"
-{{- if .Values.global.tls.enabled }}
-      tls:
-        trustedCertificatePath: "{{.Values.global.tls.rootca.mountPath}}/public.cert"
-        certificatefile: "{{.Values.global.tls.server.mountPath}}/public.cert"
-        privatekey: "{{.Values.global.tls.server.mountPath}}/private.key"
-        rootcertificatefile: "{{.Values.global.tls.rootca.mountPath}}/public.cert"
-{{- end }}
+      evaluator:
+        hostname: "{{ .Values.evaluator.hostName }}"
+        grpcport: "{{ .Values.evaluator.grpcPort }}"
+        httpport: "{{ .Values.evaluator.httpPort }}"
 
+    synchronizer:
+      enabled: true
+      registrationIntervalMs: 3000ms
+      proposalCollectionIntervalMs: 2000ms
+    
     storage:
       page:
         size: 10000
-
+    
     redis:
       hostname: {{ .Values.redis.fullnameOverride }}-master.{{ .Release.Namespace }}.svc.cluster.local
       port: {{ .Values.redis.redisPort }}
@@ -88,33 +90,16 @@ data:
       passwordPath: {{ .Values.redis.secretMountPath }}/redis-password
 {{- end }}
       pool:
-        maxIdle: 5000
+        maxIdle: 3
         maxActive: 0
         idleTimeout: 60s
         healthCheckTimeout: 100ms
       ignoreLists:
-        ttl: {{ .Values.redis.ignoreLists.ttl }}
+        ttl: 1000ms
       expiration: 43200
-
-    telemetry:
-      zpages:
-        enable: "{{ .Values.global.telemetry.zpages.enabled }}"
-      jaeger:
-        enable: "{{ .Values.global.telemetry.jaeger.enabled }}"
-        samplerFraction: {{ .Values.global.telemetry.jaeger.samplerFraction }}
-        agentEndpoint: "{{ .Values.global.telemetry.jaeger.agentEndpoint }}"
-        collectorEndpoint: "{{ .Values.global.telemetry.jaeger.collectorEndpoint }}"
-      prometheus:
-        enable: "{{ .Values.global.telemetry.prometheus.enabled }}"
-        endpoint: "{{ .Values.global.telemetry.prometheus.endpoint }}"
-        serviceDiscovery: "{{ .Values.global.telemetry.prometheus.serviceDiscovery }}"
-      stackdriverMetrics:
-        enable: "{{ .Values.global.telemetry.stackdriverMetrics.enabled }}"
-        gcpProjectId: "{{ .Values.global.gcpProjectId }}"
-        prefix: "{{ .Values.global.telemetry.stackdriverMetrics.prefix }}"
-      zipkin:
-        enable: "{{ .Values.global.telemetry.zipkin.enabled }}"
-        endpoint: "{{ .Values.global.telemetry.zipkin.endpoint }}"
-        reporterEndpoint: "{{ .Values.global.telemetry.zipkin.reporterEndpoint }}"
-      reportingPeriod: "{{ .Values.global.telemetry.reportingPeriod }}"
+    
+    ticketIndices:
+    {{- range .Values.ticketIndices }}
+      - {{ . }}
+    {{- end }}
 {{- end }}

install/helm/open-match/templates/podsecuritypolicy.yaml

@@ -14,45 +14,10 @@
 
 {{- if index .Values "open-match-core" "enabled" }}
 {{- if empty .Values.ci }}
-# om-redis-podsecuritypolicy is the least restricted PSP used to create privileged pods to disable THP in host kernel.
-apiVersion: policy/v1beta1
-kind: PodSecurityPolicy
-metadata:
-  name: om-redis-podsecuritypolicy
-  namespace: {{ .Release.Namespace }}
-  annotations:
-    {{- include "openmatch.chartmeta" . | nindent 4 }}
-    seccomp.security.alpha.kubernetes.io/allowedProfileNames: '*'
-spec:
-  privileged: true
-  allowPrivilegeEscalation: true
-  allowedCapabilities:
-  - '*'
-  volumes:
-  - '*'
-  hostNetwork: true
-  hostPorts:
-  # Redis
-  - min: 6379
-    max: 6379
-  - min: 9121
-    max: 9121
-  hostIPC: true
-  hostPID: true
-  runAsUser:
-    rule: 'RunAsAny'
-  seLinux:
-    rule: 'RunAsAny'
-  supplementalGroups:
-    rule: 'RunAsAny'
-  fsGroup:
-    rule: 'RunAsAny'
----
-# om-core-podsecuritypolicy does not allow creating privileged pods and restrict binded pods to use the specified port ranges.
 apiVersion: extensions/v1beta1
 kind: PodSecurityPolicy
 metadata:
-  name: om-core-podsecuritypolicy
+  name: om-podsecuritypolicy
   namespace: {{ .Release.Namespace }}
   annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
   labels:
@@ -77,6 +42,11 @@ spec:
     max: 50510
   - min: 51500
     max: 51510
+  # Redis
+  - min: 6379
+    max: 6379
+  - min: 9121
+    max: 9121
   # Cassandra
   - min: 7000
     max: 7001

install/helm/open-match/templates/service-account.yaml

@@ -13,19 +13,6 @@
 # limitations under the License.
 
 {{- if index .Values "open-match-core" "enabled" }}
-{{- if index .Values "usingHelmTemplate" }}
-# Include this namespace only when doing `helm template`.
-# helm 2 use namespace to manage its release so `helm install` with this namespace will be broken.
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: {{ .Release.Namespace }}
-  labels:
-    app: {{ template "openmatch.name" . }}
-    release: {{ .Release.Name }}
-{{- end }}
----
-# Create a universal service account for open-match-core services.
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -35,19 +22,7 @@ metadata:
   labels:
     app: {{ template "openmatch.name" . }}
     release: {{ .Release.Name }}
-automountServiceAccountToken: true
----
-# Create a service account for open-match-test services.
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: open-match-test-service
-  namespace: {{ .Release.Namespace }}
-  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
-  labels:
-    app: {{ template "openmatch.name" . }}
-    release: {{ .Release.Name }}
-automountServiceAccountToken: true
+automountServiceAccountToken: false
 ---
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
@@ -59,66 +34,16 @@ metadata:
     app: {{ template "openmatch.name" . }}
     release: {{ .Release.Name }}
 rules:
-# Define om-service-role to use om-core-podsecuritypolicy
 - apiGroups:
   - extensions
   resources:
   - podsecuritypolicies
   resourceNames:
-  - om-core-podsecuritypolicy
+  - om-podsecuritypolicy
   verbs:
   - use
 ---
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: om-test-role
-  namespace: {{ .Release.Namespace }}
-  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
-  labels:
-    app: {{ template "openmatch.name" . }}
-    release: {{ .Release.Name }}
-rules:
-# Define om-test-role to use om-core-podsecuritypolicy
-- apiGroups:
-  - extensions
-  resources:
-  - podsecuritypolicies
-  resourceNames:
-  - om-core-podsecuritypolicy
-  verbs:
-  - use
-# Grant om-test-role get & list permission for k8s endpoints and pods resources
-# Required for e2e in-cluster testing.
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  - pods
-  verbs:
-  - get
-  - list
----
-# This applies om-test-role to the open-match-test-service account under the release namespace. 
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: om-test-role-binding
-  namespace: {{ .Release.Namespace }}
-  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
-  labels:
-    app: {{ template "openmatch.name" . }}
-    release: {{ .Release.Name }}
-subjects:
-- kind: ServiceAccount
-  name: open-match-test-service
-  namespace: {{ .Release.Namespace }}
-roleRef:
-  kind: Role
-  name: om-test-role
-  apiGroup: rbac.authorization.k8s.io
----
-# This applies om-service-role to the open-match unprivileged service account under the release namespace. 
+# This applies psp/restricted to all authenticated users
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -136,43 +61,4 @@ roleRef:
   kind: Role
   name: om-service-role
   apiGroup: rbac.authorization.k8s.io
----
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: om-redis-role
-  namespace: {{ .Release.Namespace }}
-  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
-  labels:
-    app: {{ template "openmatch.name" . }}
-    release: {{ .Release.Name }}
-rules:
-# Define om-redis-role to use om-redis-podsecuritypolicy
-- apiGroups:
-  - extensions
-  resources:
-  - podsecuritypolicies
-  resourceNames:
-  - om-redis-podsecuritypolicy
-  verbs:
-  - use
----
-# This applies om-redis role to the om-redis privileged service account under the release namespace.
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: om-redis-role-binding
-  namespace: {{ .Release.Namespace }}
-  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
-  labels:
-    app: {{ template "openmatch.name" . }}
-    release: {{ .Release.Name }}
-subjects:
-- kind: ServiceAccount
-  name: {{ .Values.redis.serviceAccount.name }} # Redis service account
-  namespace: {{ .Release.Namespace }}
-roleRef:
-  kind: Role
-  name: om-redis-role
-  apiGroup: rbac.authorization.k8s.io
 {{- end }}

install/helm/open-match/templates/swaggerui.yaml

@@ -33,7 +33,7 @@ spec:
     protocol: TCP
     port: {{ .Values.swaggerui.httpPort }}
 ---
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ .Values.swaggerui.hostName }}
@@ -68,7 +68,7 @@ spec:
         volumeMounts:
           {{- include "openmatch.volumemounts.configs" . | nindent 10 }}
           {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
-        image: "{{ .Values.global.image.registry }}/{{ .Values.swaggerui.image}}:{{ .Values.global.image.tag }}"
+        image: "{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ .Values.swaggerui.image}}:{{ coalesce .Values.global.image.tag .Values.image.tag }}"
         ports:
         - name: http
           containerPort: {{ .Values.swaggerui.httpPort }}

install/helm/open-match/templates/synchronizer.yaml

@@ -37,7 +37,7 @@ spec:
     protocol: TCP
     port: {{ .Values.synchronizer.httpPort }}
 ---
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: {{ .Values.synchronizer.hostName }}
@@ -70,12 +70,12 @@ spec:
         {{- include "openmatch.volumes.withredis" . | nindent 8 }}
       serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
       containers:
-      - name: {{ .Values.synchronizer.hostName }}
+      - name: {{ .Values.mmlogic.hostName }}
         volumeMounts:
           {{- include "openmatch.volumemounts.configs" . | nindent 10 }}
           {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
           {{- include "openmatch.volumemounts.withredis" . | nindent 10}}
-        image: "{{ .Values.global.image.registry }}/{{ .Values.synchronizer.image}}:{{ .Values.global.image.tag }}"
+        image: "{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ .Values.synchronizer.image}}:{{ coalesce .Values.global.image.tag .Values.image.tag }}"
         ports:
         - name: grpc
           containerPort: {{ .Values.synchronizer.grpcPort }}

install/helm/open-match/values.yaml

@@ -47,7 +47,7 @@ swaggerui: &swaggerui
   hostName: om-swaggerui
   httpPort: 51500
   portType: ClusterIP
-  replicas: 1
+  replicas: 3
   image: openmatch-swaggerui
 mmlogic: &mmlogic
   hostName: om-mmlogic
@@ -91,18 +91,35 @@ function: &function
 # Specifies a unified image registry, image tag, and imagePullPolicy for all components defined above.
 image:
   registry: gcr.io/open-match-public-images
-  tag: 0.8.0-rc.1
+  tag: 0.7.0
   pullPolicy: Always
 
+# Specifies the supported customizable indices per Match
+ticketIndices:
+- char.cleric
+- char.knight
+- char.paladin
+- map.aleroth
+- map.oasis
+- mmr.rating
+- mode.battleroyale
+- mode.ctf
+- mode.demo
+- region.europe-east1
+- region.europe-west1
+- region.europe-west2
+- region.europe-west3
+- region.europe-west4
+- role.dps
+- role.support
+- role.tank
+
 # Specifies the location and name of the Open Match application-level config volumes.
   # Used in template: `openmatch.volumemounts.configs` and `openmatch.volumes.configs` under `templates/_helpers.tpl` file.
 configs:
-  om-configmap-default:
-    volumeName: om-config-volume-default
-    mountPath: /app/config/default
-  om-configmap-override:
-    volumeName: om-config-volume-override
-    mountPath: /app/config/override
+  om-configmap:
+    volumeName: om-config-volume
+    mountPath: /app/config/om
 
 # Override Redis settings
 # https://hub.helm.sh/charts/stable/redis
@@ -113,30 +130,10 @@ redis:
   usePassword: true
   usePasswordFile: true
   secretMountPath: /opt/bitnami/redis/secrets
-  ignoreLists:
-    ttl: 60000ms
   master:
     disableCommands: [] # don't disable 'FLUSH-' commands
   metrics:
     enabled: true
-  cluster:
-    slaveCount: 2
-  serviceAccount:
-    create: true
-    name: open-match-redis-service
-  sysctlImage:
-    enabled: true
-    mountHostSys: true
-    # Redis may require some changes in the kernel of the host machine to work as expected,
-    # in particular increasing the somaxconn value and disabling transparent huge pages.
-    # https://github.com/helm/charts/tree/master/stable/redis#host-kernel-settings
-    command:
-      - /bin/sh
-      - -c
-      - |-
-        install_packages procps
-        sysctl -w net.core.somaxconn=10000
-        echo never > /host-sys/kernel/mm/transparent_hugepage/enabled
 
 ###############################################################################################################################
 #                               Open Match configurations for the subcharts
@@ -158,7 +155,7 @@ redis:
 open-match-core:
   enabled: true
 
-# Controls if users need to install the demo in Open Match.
+# Contols if users need to install the demo in Open Match.
 open-match-demo:
   # Switch the value between true/false to turn on/off this subchart
   enabled: true
@@ -166,17 +163,18 @@ open-match-demo:
   frontend: *frontend
   backend: *backend
 
-# Controls if users need to install scale testing setup for Open Match.
+# Contols if users need to install scale testing setup for Open Match.
 open-match-scale:
   # Switch the value between true/false to turn on/off this subchart
   enabled: false
   frontend: *frontend
   backend: *backend
 
-# Controls if users need to install the monitoring tools in Open Match.
+# Contols if users need to install the monitoring tools in Open Match.
+# By default, the stackdriver is enabled such that users are able to see the logs in a GKE cluster.
 open-match-telemetry:
   # Switch the value between true/false to turn on/off this subchart
-  enabled: false
+  enabled: true
 
 # Controls if users need to install their own MMFs and Evaluator in Open Match.
 open-match-customize:
@@ -227,12 +225,17 @@ global:
     rpc:
       enabled: false
 
+  # Specifies the location and name of the Open Match cluster-level config volumes.
+  # Used in template: `openmatch.volumemounts.configs` and `openmatch.volumes.configs` under `templates/_helpers.tpl` file.
+  configs:
+    global-configmap:
+      volumeName: global-config-volume
+      mountPath: /app/config/global
+
   # Use this field if you need to override the image registry and image tag for all services defined in this chart
   image:
-    registry: gcr.io/open-match-public-images
-    tag: 0.0.0-dev
-    pullPolicy: Always
-
+    registry:
+    tag:
 
   # Expose the telemetry configurations to all subcharts because prometheus, for example,
   # requires pod-level annotation to customize its scrape path.
@@ -242,16 +245,16 @@ global:
       enabled: true
     jaeger:
       enabled: false
-      samplerFraction: 1 # Configures a sampler that samples a given fraction of traces.
       agentEndpoint: "open-match-jaeger-agent:6831"
       collectorEndpoint: "http://open-match-jaeger-collector:14268/api/traces"
     prometheus:
       enabled: false
       endpoint: "/metrics"
       serviceDiscovery: true
-    stackdriverMetrics:
-      enabled: false
-      prefix: "open_match"
+    # By default, the stackdriver is enabled such that users are able to see the logs in a GKE cluster.
+    stackdriver:
+      enabled: true
+      metricPrefix: "open_match"
     zipkin:
       enabled: false
       endpoint: "/zipkin"

internal/api/synchronizer.proto

@@ -81,7 +81,7 @@ service Synchronizer {
   // Register associates this request with the current synchronization cycle and
   // returns an identifier for this registration. The caller returns this
   // identifier back in the evaluation request. This enables synchronizer to
-  // identify stale evaluation requests belonging to a prior cycle.
+  // identify stale evaluation requests belonging to a prior window.
   rpc Register(RegisterRequest) returns (RegisterResponse) {
     option (google.api.http) = {
       get: "/v1/synchronizer/register"

internal/app/backend/backend_service.go

@@ -55,10 +55,12 @@ var (
 	mTicketsAssigned = telemetry.Counter("backend/tickets_assigned", "tickets assigned")
 )
 
-// FetchMatches triggers a MatchFunction with the specified MatchProfiles, while each MatchProfile
-// returns a set of match proposals. FetchMatches method streams the results back to the caller.
-// FetchMatches immediately returns an error if it encounters any execution failures.
-//   - If the synchronizer is enabled, FetchMatch will then call the synchronizer to deduplicate proposals with overlapped tickets.
+// FetchMatches triggers execution of the specfied MatchFunction for each of the
+// specified MatchProfiles. Each MatchFunction execution returns a set of
+// proposals which are then evaluated to generate results. FetchMatches method
+// streams these results back to the caller.
+// FetchMatches returns nil unless the context is canceled. FetchMatches moves to the next response candidate if it encounters
+// any internal execution failures.
 func (s *backendService) FetchMatches(req *pb.FetchMatchesRequest, stream pb.Backend_FetchMatchesServer) error {
 	if req.GetConfig() == nil {
 		return status.Error(codes.InvalidArgument, ".config is required")
@@ -97,8 +99,7 @@ func (s *backendService) FetchMatches(req *pb.FetchMatchesRequest, stream pb.Bac
 		case <-stream.Context().Done():
 			return stream.Context().Err()
 		default:
-			err = stream.Send(&pb.FetchMatchesResponse{Match: result})
-			telemetry.RecordUnitMeasurement(stream.Context(), mMatchesFetched)
+			err := stream.Send(&pb.FetchMatchesResponse{Match: result})
 			if err != nil {
 				logger.WithError(err).Error("failed to stream back the response")
 				return err
@@ -106,6 +107,7 @@ func (s *backendService) FetchMatches(req *pb.FetchMatchesRequest, stream pb.Bac
 		}
 	}
 
+	telemetry.IncrementCounterN(stream.Context(), mMatchesFetched, len(results))
 	return nil
 }
 
@@ -268,7 +270,8 @@ func matchesFromGRPCMMF(ctx context.Context, profile *pb.MatchProfile, client pb
 	return proposals, nil
 }
 
-// AssignTickets overwrites the Assignment field of the input TicketIds.
+// AssignTickets sets the specified Assignment on the Tickets for the Ticket
+// ids passed.
 func (s *backendService) AssignTickets(ctx context.Context, req *pb.AssignTicketsRequest) (*pb.AssignTicketsResponse, error) {
 	err := doAssignTickets(ctx, req, s.store)
 	if err != nil {
@@ -276,7 +279,7 @@ func (s *backendService) AssignTickets(ctx context.Context, req *pb.AssignTicket
 		return nil, err
 	}
 
-	telemetry.RecordNUnitMeasurement(ctx, mTicketsAssigned, int64(len(req.TicketIds)))
+	telemetry.IncrementCounterN(ctx, mTicketsAssigned, len(req.TicketIds))
 	return &pb.AssignTicketsResponse{}, nil
 }
 
@@ -295,11 +298,5 @@ func doAssignTickets(ctx context.Context, req *pb.AssignTicketsRequest, store st
 		}
 	}
 
-	if err = store.DeleteTicketsFromIgnoreList(ctx, req.GetTicketIds()); err != nil {
-		logger.WithFields(logrus.Fields{
-			"ticket_ids": req.GetTicketIds(),
-		}).Error(err)
-	}
-
 	return nil
 }

internal/app/backend/backend_service_test.go

@@ -29,6 +29,7 @@ import (
 	statestoreTesting "open-match.dev/open-match/internal/statestore/testing"
 	utilTesting "open-match.dev/open-match/internal/util/testing"
 	"open-match.dev/open-match/pkg/pb"
+	"open-match.dev/open-match/pkg/structs"
 	certgenTesting "open-match.dev/open-match/tools/certgen/testing"
 )
 
@@ -173,19 +174,15 @@ func TestDoAssignTickets(t *testing.T) {
 	fakeTickets := []*pb.Ticket{
 		{
 			Id: "1",
-			SearchFields: &pb.SearchFields{
-				DoubleArgs: map[string]float64{
-					fakeProperty: 1,
-				},
-			},
+			Properties: structs.Struct{
+				fakeProperty: structs.Number(1),
+			}.S(),
 		},
 		{
 			Id: "2",
-			SearchFields: &pb.SearchFields{
-				DoubleArgs: map[string]float64{
-					fakeProperty: 2,
-				},
-			},
+			Properties: structs.Struct{
+				fakeProperty: structs.Number(2),
+			}.S(),
 		},
 	}
 
@@ -236,7 +233,7 @@ func TestDoAssignTickets(t *testing.T) {
 				// Make sure tickets are correctly indexed.
 				var wantFilteredTickets []*pb.Ticket
 				pool := &pb.Pool{
-					DoubleRangeFilters: []*pb.DoubleRangeFilter{{DoubleArg: fakeProperty, Min: 0, Max: 3}},
+					FloatRangeFilters: []*pb.FloatRangeFilter{{Attribute: fakeProperty, Min: 0, Max: 3}},
 				}
 				err := store.FilterTickets(ctx, pool, 10, func(filterTickets []*pb.Ticket) error {
 					wantFilteredTickets = filterTickets
@@ -262,6 +259,7 @@ func TestDoAssignTickets(t *testing.T) {
 		t.Run(test.description, func(t *testing.T) {
 			ctx, cancel := context.WithCancel(utilTesting.NewContext(t))
 			cfg := viper.New()
+			cfg.Set("ticketIndices", []string{fakeProperty})
 			store, closer := statestoreTesting.NewStoreServiceForTesting(t, cfg)
 			defer closer()
 
@@ -281,7 +279,7 @@ func TestDoAssignTickets(t *testing.T) {
 				// Make sure tickets are deindexed after assignment
 				var wantFilteredTickets []*pb.Ticket
 				pool := &pb.Pool{
-					DoubleRangeFilters: []*pb.DoubleRangeFilter{{DoubleArg: fakeProperty, Min: 0, Max: 2}},
+					FloatRangeFilters: []*pb.FloatRangeFilter{{Attribute: fakeProperty, Min: 0, Max: 2}},
 				}
 				store.FilterTickets(ctx, pool, 10, func(filterTickets []*pb.Ticket) error {
 					wantFilteredTickets = filterTickets

internal/app/backend/synchronizer_client.go

@@ -5,13 +5,10 @@ import (
 	"io"
 	"sync"
 
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/internal/ipb"
 	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/internal/telemetry"
-	"open-match.dev/open-match/internal/util"
 	"open-match.dev/open-match/pkg/pb"
 )
 
@@ -62,9 +59,8 @@ func (sc *synchronizerClient) evaluate(ctx context.Context, id string, proposals
 		return nil, err
 	}
 
-	ctx, err := util.AppendSynchronizerContextID(ctx, id)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "%v", err)
+	if len(proposals) == 0 {
+		return proposals, nil
 	}
 
 	stream, err := sc.synchronizer.EvaluateProposals(ctx)
@@ -73,7 +69,6 @@ func (sc *synchronizerClient) evaluate(ctx context.Context, id string, proposals
 			return nil, err
 		}
 	}
-
 	if err = stream.CloseSend(); err != nil {
 		logger.Errorf("failed to close the send stream: %s", err.Error())
 	}
@@ -91,7 +86,7 @@ func (sc *synchronizerClient) evaluate(ctx context.Context, id string, proposals
 		results = append(results, resp.GetMatch())
 	}
 
-	telemetry.RecordNUnitMeasurement(ctx, mMatchEvaluations, int64(len(results)))
+	telemetry.IncrementCounterN(ctx, mMatchEvaluations, len(results))
 	return results, nil
 }
 

internal/app/frontend/frontend_service.go

@@ -20,7 +20,6 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/rs/xid"
 	"github.com/sirupsen/logrus"
-	"go.opencensus.io/trace"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"open-match.dev/open-match/internal/config"
@@ -47,10 +46,9 @@ var (
 	mTicketAssignmentsRetrieved = telemetry.Counter("frontend/tickets_assignments_retrieved", "ticket assignments retrieved")
 )
 
-// CreateTicket assigns an unique TicketId to the input Ticket and record it in state storage.
-// A ticket is considered as ready for matchmaking once it is created.
-//   - If a TicketId exists in a Ticket request, an auto-generated TicketId will override this field.
-//   - If SearchFields exist in a Ticket, CreateTicket will also index these fields such that one can query the ticket with mmlogic.QueryTickets function.
+// CreateTicket will create a new ticket, assign an id to it and put it in state
+// storage. It will index the Ticket attributes based on the indexing configuration.
+// Indexing a Ticket adds the it to the pool of Tickets considered for matchmaking.
 func (s *frontendService) CreateTicket(ctx context.Context, req *pb.CreateTicketRequest) (*pb.CreateTicketResponse, error) {
 	// Perform input validation.
 	if req.GetTicket() == nil {
@@ -86,20 +84,21 @@ func doCreateTicket(ctx context.Context, req *pb.CreateTicketRequest, store stat
 		return nil, err
 	}
 
-	telemetry.RecordUnitMeasurement(ctx, mTicketsCreated)
+	telemetry.IncrementCounter(ctx, mTicketsCreated)
 	return &pb.CreateTicketResponse{Ticket: ticket}, nil
 }
 
-// DeleteTicket immediately stops Open Match from using the Ticket for matchmaking and removes the Ticket from state storage.
-// The client must delete the Ticket when finished matchmaking with it.
-//   - If SearchFields exist in a Ticket, DeleteTicket will deindex the fields lazily.
-// Users may still be able to assign/get a ticket after calling DeleteTicket on it.
+// DeleteTicket removes the Ticket from state storage and from corresponding
+// configured indices and lazily removes the ticket from state storage.
+// Deleting a ticket immediately stops the ticket from being
+// considered for future matchmaking requests, yet when the ticket itself will be deleted
+// is undeterministic. Users may still be able to assign/get a ticket after calling DeleteTicket on it.
 func (s *frontendService) DeleteTicket(ctx context.Context, req *pb.DeleteTicketRequest) (*pb.DeleteTicketResponse, error) {
 	err := doDeleteTicket(ctx, req.GetTicketId(), s.store)
 	if err != nil {
 		return nil, err
 	}
-	telemetry.RecordUnitMeasurement(ctx, mTicketsDeleted)
+	telemetry.IncrementCounter(ctx, mTicketsDeleted)
 	return &pb.DeleteTicketResponse{}, nil
 }
 
@@ -117,21 +116,13 @@ func doDeleteTicket(ctx context.Context, id string, store statestore.Service) er
 	//'lazy' ticket delete that should be called after a ticket
 	// has been deindexed.
 	go func() {
-		ctx, span := trace.StartSpan(context.Background(), "open-match/frontend.DeleteTicketLazy")
-		defer span.End()
-		err := store.DeleteTicket(ctx, id)
+		err := store.DeleteTicket(context.Background(), id)
 		if err != nil {
 			logger.WithFields(logrus.Fields{
 				"error": err.Error(),
 				"id":    id,
 			}).Error("failed to delete the ticket")
-		}
-		err = store.DeleteTicketsFromIgnoreList(ctx, []string{id})
-		if err != nil {
-			logger.WithFields(logrus.Fields{
-				"error": err.Error(),
-				"id":    id,
-			}).Error("failed to delete the ticket from ignorelist")
+			return
 		}
 		// TODO: If other redis queues are implemented or we have custom index fields
 		// created by Open Match, those need to be cleaned up here.
@@ -139,9 +130,9 @@ func doDeleteTicket(ctx context.Context, id string, store statestore.Service) er
 	return nil
 }
 
-// GetTicket get the Ticket associated with the specified TicketId.
+// GetTicket returns the Ticket associated with the specified Ticket id.
 func (s *frontendService) GetTicket(ctx context.Context, req *pb.GetTicketRequest) (*pb.Ticket, error) {
-	telemetry.RecordUnitMeasurement(ctx, mTicketsRetrieved)
+	telemetry.IncrementCounter(ctx, mTicketsRetrieved)
 	return doGetTickets(ctx, req.GetTicketId(), s.store)
 }
 
@@ -158,8 +149,8 @@ func doGetTickets(ctx context.Context, id string, store statestore.Service) (*pb
 	return ticket, nil
 }
 
-// GetAssignments stream back Assignment of the specified TicketId if it is updated.
-//   - If the Assignment is not updated, GetAssignment will retry using the configured backoff strategy.
+// GetTicketUpdates streams matchmaking results from Open Match for the
+// provided Ticket id.
 func (s *frontendService) GetAssignments(req *pb.GetAssignmentsRequest, stream pb.Frontend_GetAssignmentsServer) error {
 	ctx := stream.Context()
 	for {
@@ -168,7 +159,7 @@ func (s *frontendService) GetAssignments(req *pb.GetAssignmentsRequest, stream p
 			return ctx.Err()
 		default:
 			sender := func(assignment *pb.Assignment) error {
-				telemetry.RecordUnitMeasurement(ctx, mTicketAssignmentsRetrieved)
+				telemetry.IncrementCounter(ctx, mTicketAssignmentsRetrieved)
 				return stream.Send(&pb.GetAssignmentsResponse{Assignment: assignment})
 			}
 			return doGetAssignments(ctx, req.GetTicketId(), sender, s.store)