fix: ParallelSteps swagger.json

Makefile

@@ -77,8 +77,8 @@ CONTROLLER_PKGS := $(shell echo cmd/workflow-controller && go list -f '{{ join
 MANIFESTS := $(shell find manifests -mindepth 2 -type f)
 E2E_MANIFESTS := $(shell find test/e2e/manifests -mindepth 2 -type f)
 E2E_EXECUTOR ?= pns
-# the sort puts _.primary first in the list
-SWAGGER_FILES := $(shell find pkg -name '*.swagger.json' | sort)
+# The sort puts _.primary first in the list. 'env LC_COLLATE=C' makes sure underscore comes first in both Mac and Linux.
+SWAGGER_FILES := $(shell find pkg -name '*.swagger.json' | env LC_COLLATE=C sort)
 
 .PHONY: build
 build: status clis executor-image controller-image manifests/install.yaml manifests/namespace-install.yaml manifests/quick-start-postgres.yaml manifests/quick-start-mysql.yaml
@@ -203,8 +203,11 @@ endif
 
 # generation
 
+$(HOME)/go/bin/mockery:
+ go get github.com/vektra/mockery/.../
+
 .PHONY: codegen
-codegen:
+codegen: $(HOME)/go/bin/mockery
  # Generate code
  # We need the folder for compatibility
  go mod vendor

api/openapi-spec/swagger.json

@@ -2210,14 +2210,9 @@
  }
  },
  "io.argoproj.workflow.v1alpha1.ParallelSteps": {
- "type": "object",
- "properties": {
- "steps": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/io.argoproj.workflow.v1alpha1.WorkflowStep"
- }
- }
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/io.argoproj.io.argoproj.workflow.v1alpha1.v1alpha1.WorkflowStep"
  }
  },
  "io.argoproj.workflow.v1alpha1.Parameter": {

docs/CONTRIBUTING.md

@@ -6,6 +6,9 @@
 * Yarn. `brew install yarn`
 * Docker
 * [Kustomize](https://github.com/kubernetes-sigs/kustomize/blob/master/docs/INSTALL.md)
+* [protoc](https://google.github.io/proto-lens/installing-protoc.html) `brew install protoc`
+* `jq`
+* [Swagger codegen](https://swagger.io/docs/open-source-tools/swagger-codegen/) `brew install swagger-codegen`
 * Kubernetes Cluster (we recommend Docker for Desktop + K3D, as this will allow you to test RBAC set-up, and is also fast)
 
 Useful:

go.mod

@@ -73,7 +73,7 @@ require (
  github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
  github.com/yudai/pp v2.0.1+incompatible // indirect
  golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d
- golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa
+ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
  golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
  golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 // indirect
  golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect

go.sum

@@ -449,8 +449,8 @@ golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=

hack/generate-proto.sh

@@ -3,8 +3,10 @@ set -eux -o pipefail
 go get k8s.io/code-generator/cmd/[email protected]
 go get github.com/grpc-ecosystem/grpc-gateway/[email protected]
 go get github.com/grpc-ecosystem/grpc-gateway/[email protected]
+go get github.com/gogo/protobuf/[email protected]
 go get github.com/gogo/protobuf/[email protected]
 go get github.com/gogo/protobuf/[email protected]
+go get golang.org/x/tools/cmd/goimports
 go install k8s.io/code-generator/cmd/go-to-protobuf
 go-to-protobuf \
  --go-header-file=./hack/custom-boilerplate.go.txt \

pkg/apiclient/_.primary.swagger.json

@@ -30,6 +30,12 @@
  "definitions": {
  "io.k8s.apimachinery.pkg.runtime.Object": {
  "title": "This is a hack do deal with this problem: https://github.com/kubernetes/kube-openapi/issues/174"
+ },
+ "github.com.argoproj.argo.pkg.apis.workflow.v1alpha1.ParallelSteps": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/io.argoproj.workflow.v1alpha1.WorkflowStep"
+ }
  }
  }
 }