refactor: Move server code (cmd/server/ -> server/) (argoproj#2071)

w7374520 · Jan 27, 2020 · c4f49cf · c4f49cf
1 parent 2542454
commit c4f49cf
Show file tree

Hide file tree

Showing 70 changed files with 338 additions and 335 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -1,5 +1,5 @@
 ignore:
- - "cmd/server/static/files.go"
+ - "server/static/files.go"
  - "pkg/client"
 coverage:
  status:

diff --git a/.golangci.yml b/.golangci.yml
@@ -6,7 +6,7 @@ run:
  - vendor
  - ui
  skip-files:
- - cmd/server/static/files.go
+ - server/static/files.go
 linters:
  enable:
  - goimports
@@ -17,4 +17,4 @@ service:
  golangci-lint-version: 1.21.x
  project-path: github.com/argoproj/argo
  prepare:
- - make vendor cmd/server/static/files.go CI=true
+ - make vendor server/static/files.go CI=true
diff --git a/Makefile b/Makefile
@@ -89,26 +89,26 @@ $(HOME)/go/bin/staticfiles:
  # Install the "staticfiles" tool
  go get bou.ke/staticfiles
 
-cmd/server/static/files.go: $(HOME)/go/bin/staticfiles ui/dist/app
+server/static/files.go: $(HOME)/go/bin/staticfiles ui/dist/app
  # Pack UI into a Go file.
- staticfiles -o cmd/server/static/files.go ui/dist/app
+ staticfiles -o server/static/files.go ui/dist/app
 
-dist/argo: vendor cmd/server/static/files.go $(CLI_PKGS)
+dist/argo: vendor server/static/files.go $(CLI_PKGS)
  go build -v -i -ldflags '${LDFLAGS}' -o dist/argo ./cmd/argo
 
-dist/argo-linux-amd64: vendor cmd/server/static/files.go $(CLI_PKGS)
+dist/argo-linux-amd64: vendor server/static/files.go $(CLI_PKGS)
  CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -i -ldflags '${LDFLAGS}' -o dist/argo-linux-amd64 ./cmd/argo
 
-dist/argo-linux-ppc64le: vendor cmd/server/static/files.go $(CLI_PKGS)
+dist/argo-linux-ppc64le: vendor server/static/files.go $(CLI_PKGS)
  CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -v -i -ldflags '${LDFLAGS}' -o dist/argo-linux-ppc64le ./cmd/argo
 
-dist/argo-linux-s390x: vendor cmd/server/static/files.go $(CLI_PKGS)
+dist/argo-linux-s390x: vendor server/static/files.go $(CLI_PKGS)
  CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -v -i -ldflags '${LDFLAGS}' -o dist/argo-linux-s390x ./cmd/argo
 
-dist/argo-darwin-amd64: vendor cmd/server/static/files.go $(CLI_PKGS)
+dist/argo-darwin-amd64: vendor server/static/files.go $(CLI_PKGS)
  CGO_ENABLED=0 GOOS=darwin go build -v -i -ldflags '${LDFLAGS}' -o dist/argo-darwin-amd64 ./cmd/argo
 
-dist/argo-windows-amd64: vendor cmd/server/static/files.go $(CLI_PKGS)
+dist/argo-windows-amd64: vendor server/static/files.go $(CLI_PKGS)
  CGO_ENABLED=0 GOARCH=amd64 GOOS=windows go build -v -i -ldflags '${LDFLAGS}' -o dist/argo-windows-amd64 ./cmd/argo
 
 .PHONY: cli-image
@@ -220,7 +220,7 @@ manifests/quick-start-postgres.yaml: dist/VERSION $(MANIFESTS)
 # lint/test/etc
 
 .PHONY: lint
-lint: cmd/server/static/files.go
+lint: server/static/files.go
  # Lint Go files
  golangci-lint run --fix --verbose
 ifeq ($(CI),false)
@@ -229,7 +229,7 @@ ifeq ($(CI),false)
 endif
 
 .PHONY: test
-test: cmd/server/static/files.go vendor
+test: server/static/files.go vendor
  # Run unit tests
 ifeq ($(CI),false)
  go test `go list ./... | grep -v 'test/e2e'`

diff --git a/cmd/argo/commands/archive/delete.go b/cmd/argo/commands/archive/delete.go
@@ -7,7 +7,7 @@ import (
  "github.com/spf13/cobra"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflowarchive"
+ "github.com/argoproj/argo/server/workflowarchive"
 )
 
 func NewDeleteCommand() *cobra.Command {

diff --git a/cmd/argo/commands/archive/get.go b/cmd/argo/commands/archive/get.go
@@ -11,7 +11,7 @@ import (
  "sigs.k8s.io/yaml"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflowarchive"
+ "github.com/argoproj/argo/server/workflowarchive"
 )
 
 func NewGetCommand() *cobra.Command {

diff --git a/cmd/argo/commands/archive/list.go b/cmd/argo/commands/archive/list.go
@@ -12,7 +12,7 @@ import (
  "sigs.k8s.io/yaml"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflowarchive"
+ "github.com/argoproj/argo/server/workflowarchive"
 )
 
 func NewListCommand() *cobra.Command {

diff --git a/cmd/argo/commands/common.go b/cmd/argo/commands/common.go
@@ -14,10 +14,10 @@ import (
  "k8s.io/client-go/rest"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- wfApiServer "github.com/argoproj/argo/cmd/server/workflow"
  wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
  "github.com/argoproj/argo/pkg/client/clientset/versioned"
  "github.com/argoproj/argo/pkg/client/clientset/versioned/typed/workflow/v1alpha1"
+ wfApiServer "github.com/argoproj/argo/server/workflow"
  "github.com/argoproj/argo/workflow/templateresolution"
 )
 

diff --git a/cmd/argo/commands/delete.go b/cmd/argo/commands/delete.go
@@ -8,7 +8,7 @@ import (
  "time"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflow"
+ "github.com/argoproj/argo/server/workflow"
 
  argotime "github.com/argoproj/pkg/time"
  "github.com/spf13/cobra"

diff --git a/cmd/argo/commands/get.go b/cmd/argo/commands/get.go
@@ -14,8 +14,8 @@ import (
  "sigs.k8s.io/yaml"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflow"
  wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
+ "github.com/argoproj/argo/server/workflow"
  "github.com/argoproj/argo/workflow/packer"
 )
 

diff --git a/cmd/argo/commands/lint.go b/cmd/argo/commands/lint.go
@@ -11,8 +11,8 @@ import (
  "google.golang.org/grpc"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- apiServer "github.com/argoproj/argo/cmd/server/workflow"
  "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
+ apiServer "github.com/argoproj/argo/server/workflow"
  cmdutil "github.com/argoproj/argo/util/cmd"
  "github.com/argoproj/argo/workflow/validate"
 )

diff --git a/cmd/argo/commands/list.go b/cmd/argo/commands/list.go
@@ -19,9 +19,9 @@ import (
  "k8s.io/apimachinery/pkg/selection"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflow"
  wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
  "github.com/argoproj/argo/pkg/client/clientset/versioned/typed/workflow/v1alpha1"
+ "github.com/argoproj/argo/server/workflow"
  "github.com/argoproj/argo/workflow/common"
  "github.com/argoproj/argo/workflow/packer"
  "github.com/argoproj/argo/workflow/util"

diff --git a/cmd/argo/commands/logs.go b/cmd/argo/commands/logs.go
@@ -27,9 +27,9 @@ import (
  "github.com/argoproj/pkg/errors"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- apiv1 "github.com/argoproj/argo/cmd/server/workflow"
  "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
  workflowv1 "github.com/argoproj/argo/pkg/client/clientset/versioned/typed/workflow/v1alpha1"
+ apiv1 "github.com/argoproj/argo/server/workflow"
  "github.com/argoproj/argo/workflow/packer"
 )
 

diff --git a/cmd/argo/commands/resubmit.go b/cmd/argo/commands/resubmit.go
@@ -9,8 +9,8 @@ import (
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflow"
  "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
+ "github.com/argoproj/argo/server/workflow"
  apiUtil "github.com/argoproj/argo/util/api"
  "github.com/argoproj/argo/workflow/util"
 )

diff --git a/cmd/argo/commands/resume.go b/cmd/argo/commands/resume.go
@@ -8,7 +8,7 @@ import (
  "github.com/spf13/cobra"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflow"
+ "github.com/argoproj/argo/server/workflow"
  "github.com/argoproj/argo/workflow/util"
 )
 

diff --git a/cmd/argo/commands/retry.go b/cmd/argo/commands/retry.go
@@ -10,7 +10,7 @@ import (
  "github.com/argoproj/pkg/errors"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflow"
+ "github.com/argoproj/argo/server/workflow"
  "github.com/argoproj/argo/workflow/packer"
  "github.com/argoproj/argo/workflow/util"
 )

diff --git a/cmd/argo/commands/server.go b/cmd/argo/commands/server.go
@@ -12,8 +12,8 @@ import (
  _ "k8s.io/client-go/plugin/pkg/client/auth"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/apiserver"
  wfclientset "github.com/argoproj/argo/pkg/client/clientset/versioned"
+ "github.com/argoproj/argo/server/apiserver"
 )
 
 func NewServerCommand() *cobra.Command {

diff --git a/cmd/argo/commands/submit.go b/cmd/argo/commands/submit.go
@@ -13,8 +13,8 @@ import (
  argoJson "github.com/argoproj/pkg/json"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- apiwf "github.com/argoproj/argo/cmd/server/workflow"
  wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
+ apiwf "github.com/argoproj/argo/server/workflow"
  apiUtil "github.com/argoproj/argo/util/api"
  "github.com/argoproj/argo/workflow/common"
  "github.com/argoproj/argo/workflow/util"

diff --git a/cmd/argo/commands/suspend.go b/cmd/argo/commands/suspend.go
@@ -8,7 +8,7 @@ import (
  "github.com/spf13/cobra"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflow"
+ "github.com/argoproj/argo/server/workflow"
  "github.com/argoproj/argo/workflow/util"
 )
 

diff --git a/cmd/argo/commands/template/common.go b/cmd/argo/commands/template/common.go
@@ -9,10 +9,10 @@ import (
  "k8s.io/client-go/rest"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- wftmplApiServer "github.com/argoproj/argo/cmd/server/workflowtemplate"
  wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
  "github.com/argoproj/argo/pkg/client/clientset/versioned"
  "github.com/argoproj/argo/pkg/client/clientset/versioned/typed/workflow/v1alpha1"
+ wftmplApiServer "github.com/argoproj/argo/server/workflowtemplate"
  "github.com/argoproj/argo/workflow/templateresolution"
 )
 

diff --git a/cmd/argo/commands/template/create.go b/cmd/argo/commands/template/create.go
@@ -8,8 +8,8 @@ import (
  "github.com/spf13/cobra"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflowtemplate"
  wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
+ "github.com/argoproj/argo/server/workflowtemplate"
  "github.com/argoproj/argo/workflow/common"
  "github.com/argoproj/argo/workflow/templateresolution"
  "github.com/argoproj/argo/workflow/util"

diff --git a/cmd/argo/commands/template/delete.go b/cmd/argo/commands/template/delete.go
@@ -12,7 +12,7 @@ import (
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflowtemplate"
+ "github.com/argoproj/argo/server/workflowtemplate"
 
  "github.com/argoproj/argo/pkg/client/clientset/versioned/typed/workflow/v1alpha1"
 )

diff --git a/cmd/argo/commands/template/get.go b/cmd/argo/commands/template/get.go
@@ -13,8 +13,8 @@ import (
  "github.com/argoproj/pkg/humanize"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflowtemplate"
  wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
+ "github.com/argoproj/argo/server/workflowtemplate"
 )
 
 func NewGetCommand() *cobra.Command {

diff --git a/cmd/argo/commands/template/lint.go b/cmd/argo/commands/template/lint.go
@@ -11,8 +11,8 @@ import (
  "google.golang.org/grpc"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflowtemplate"
  wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
+ "github.com/argoproj/argo/server/workflowtemplate"
  cmdutil "github.com/argoproj/argo/util/cmd"
  "github.com/argoproj/argo/workflow/validate"
 )

diff --git a/cmd/argo/commands/template/list.go b/cmd/argo/commands/template/list.go
@@ -12,9 +12,9 @@ import (
  "k8s.io/apimachinery/pkg/labels"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflowtemplate"
  wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
  "github.com/argoproj/argo/pkg/client/clientset/versioned/typed/workflow/v1alpha1"
+ "github.com/argoproj/argo/server/workflowtemplate"
 )
 
 type listFlags struct {

diff --git a/cmd/argo/commands/terminate.go b/cmd/argo/commands/terminate.go
@@ -8,7 +8,7 @@ import (
  "github.com/spf13/cobra"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflow"
+ "github.com/argoproj/argo/server/workflow"
  "github.com/argoproj/argo/workflow/util"
 )
 

diff --git a/cmd/argo/commands/wait.go b/cmd/argo/commands/wait.go
@@ -13,7 +13,7 @@ import (
  "k8s.io/apimachinery/pkg/fields"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflow"
+ "github.com/argoproj/argo/server/workflow"
 
  wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
 )

diff --git a/cmd/argo/commands/watch.go b/cmd/argo/commands/watch.go
@@ -6,7 +6,7 @@ import (
  "time"
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
- "github.com/argoproj/argo/cmd/server/workflow"
+ "github.com/argoproj/argo/server/workflow"
 
  "github.com/argoproj/pkg/errors"
  "github.com/spf13/cobra"

diff --git a/docs/rest-api.md b/docs/rest-api.md
@@ -17,9 +17,9 @@ To view the API:
 
 1. Open [https://editor.swagger.io/](https://editor.swagger.io/)
 2. Copy and paste either:
- 1. ../cmd/server/workflow/workflow.swagger.json
- 2. ../cmd/server/workflowtemplate/workflow-template.swagger.json 
- 1. ../cmd/server/workflowarchive/archived-workflows.swagger.json
+ 1. ../server/workflow/workflow.swagger.json
+ 2. ../server/workflowtemplate/workflow-template.swagger.json 
+ 1. ../server/workflowarchive/archived-workflows.swagger.json
 
 > v2.4 and before
 

diff --git a/cmd/server/.gitignore → server/.gitignore b/cmd/server/.gitignore → server/.gitignore
diff --git a/cmd/server/apiserver/argoserver.go → server/apiserver/argoserver.go b/cmd/server/apiserver/argoserver.go → server/apiserver/argoserver.go
@@ -6,6 +6,15 @@ import (
  "net/http"
  "time"
 
+ "github.com/argoproj/argo/server/artifacts"
+ "github.com/argoproj/argo/server/auth"
+ "github.com/argoproj/argo/server/cronworkflow"
+ "github.com/argoproj/argo/server/info"
+ "github.com/argoproj/argo/server/static"
+ "github.com/argoproj/argo/server/workflow"
+ "github.com/argoproj/argo/server/workflowarchive"
+ "github.com/argoproj/argo/server/workflowtemplate"
+
  grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
  grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus"
  "github.com/grpc-ecosystem/grpc-gateway/runtime"
@@ -20,14 +29,6 @@ import (
  "k8s.io/client-go/rest"
  "sigs.k8s.io/yaml"
 
- "github.com/argoproj/argo/cmd/server/artifacts"
- "github.com/argoproj/argo/cmd/server/auth"
- "github.com/argoproj/argo/cmd/server/cronworkflow"
- "github.com/argoproj/argo/cmd/server/info"
- "github.com/argoproj/argo/cmd/server/static"
- "github.com/argoproj/argo/cmd/server/workflow"
- "github.com/argoproj/argo/cmd/server/workflowarchive"
- "github.com/argoproj/argo/cmd/server/workflowtemplate"
  "github.com/argoproj/argo/errors"
  "github.com/argoproj/argo/persist/sqldb"
  "github.com/argoproj/argo/pkg/apiclient"

diff --git a/cmd/server/artifacts/artifact_server.go → server/artifacts/artifact_server.go b/cmd/server/artifacts/artifact_server.go → server/artifacts/artifact_server.go
@@ -14,9 +14,9 @@ import (
  "google.golang.org/grpc/status"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
- "github.com/argoproj/argo/cmd/server/auth"
  "github.com/argoproj/argo/persist/sqldb"
  wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
+ "github.com/argoproj/argo/server/auth"
  artifact "github.com/argoproj/argo/workflow/artifacts"
  "github.com/argoproj/argo/workflow/packer"
 )

diff --git a/cmd/server/artifacts/resources.go → server/artifacts/resources.go b/cmd/server/artifacts/resources.go → server/artifacts/resources.go
diff --git a/cmd/server/auth/authorizer.go → server/auth/authorizer.go b/cmd/server/auth/authorizer.go → server/auth/authorizer.go
diff --git a/cmd/server/auth/authorizer_test.go → server/auth/authorizer_test.go b/cmd/server/auth/authorizer_test.go → server/auth/authorizer_test.go
diff --git a/cmd/server/auth/gatekeeper.go → server/auth/gatekeeper.go b/cmd/server/auth/gatekeeper.go → server/auth/gatekeeper.go
diff --git a/cmd/server/auth/gatekeeper_test.go → server/auth/gatekeeper_test.go b/cmd/server/auth/gatekeeper_test.go → server/auth/gatekeeper_test.go