Proctor version 2

.dockerignore

@@ -0,0 +1,10 @@
+.env
+scripts/proctor.rb
+_output/*
+
+*.swp
+*.swo
+.idea
+.DS_Store
+.vscode/
+dist/

.env.test

@@ -1,34 +1,38 @@
-export ENVIRONMENT=test
 export PROCTOR_KUBE_CONFIG=out-of-cluster
+export PROCTOR_KUBE_CONTEXT=minikube
 export PROCTOR_LOG_LEVEL=debug
 export PROCTOR_APP_PORT=5000
 export PROCTOR_DEFAULT_NAMESPACE=default
 export PROCTOR_REDIS_ADDRESS=localhost:6379
+export PROCTOR_REDIS_PASSWORD=
 export PROCTOR_REDIS_MAX_ACTIVE_CONNECTIONS=10
 export PROCTOR_KUBE_JOB_ACTIVE_DEADLINE_SECONDS=60
 export PROCTOR_KUBE_JOB_RETRIES=0
+export PROCTOR_KUBE_SERVICE_ACCOUNT_NAME=default
 export PROCTOR_LOGS_STREAM_READ_BUFFER_SIZE=140
 export PROCTOR_LOGS_STREAM_WRITE_BUFFER_SIZE=4096
-export PROCTOR_KUBE_CLUSTER_HOST_NAME=localhost:8001
-export PROCTOR_KUBE_POD_LIST_WAIT_TIME=5
-export PROCTOR_KUBE_CA_CERT_ENCODED=LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCmNlcnRpZmljYXRlCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-export PROCTOR_KUBE_BASIC_AUTH_ENCODED=YWRtaW46cGFzc3dvcmQK
+export PROCTOR_KUBE_WAIT_FOR_RESOURCE_POLL_COUNT=5
+export PROCTOR_KUBE_LOG_PROCESS_WAIT_TIME=60
 export PROCTOR_POSTGRES_USER=postgres
 export PROCTOR_POSTGRES_PASSWORD=
 export PROCTOR_POSTGRES_HOST=localhost
 export PROCTOR_POSTGRES_PORT=5432
 export PROCTOR_POSTGRES_DATABASE=proctord_test
 export PROCTOR_POSTGRES_MAX_CONNECTIONS=50
 export PROCTOR_POSTGRES_CONNECTIONS_MAX_LIFETIME=30
-export PROCTOR_NEW_RELIC_APP_NAME="PROCTORD"
-export PROCTOR_NEW_RELIC_LICENCE_KEY="nrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnr"
-export PROCTOR_MIN_CLIENT_VERSION="v0.2.0"
-export PROCTOR_SCHEDULED_JOBS_FETCH_INTERVAL_IN_MINS="5"
-export PROCTOR_MAIL_USERNAME="[email protected]"
-export PROCTOR_MAIL_PASSWORD="password"
-export PROCTOR_MAIL_SERVER_HOST="smtp.mail.com"
-export PROCTOR_MAIL_SERVER_PORT="123"
-export PROCTOR_JOB_POD_ANNOTATIONS="{\"key.one\":\"true\"}"
-export PROCTOR_SENTRY_DSN="foo"
-export PROCTOR_DOCS_PATH="/path/to/docs/dir"
-
+export PROCTOR_NEW_RELIC_APP_NAME=PROCTORD
+export PROCTOR_NEW_RELIC_LICENCE_KEY=0123456789012345678901234567890123456789
+export PROCTOR_MIN_CLIENT_VERSION=v2.0.0
+export PROCTOR_SCHEDULED_JOBS_FETCH_INTERVAL_IN_MINS=5
+export [email protected]
+export PROCTOR_MAIL_PASSWORD=password
+export PROCTOR_MAIL_SERVER_HOST=smtp.mail.com
+export PROCTOR_MAIL_SERVER_PORT=123
+export PROCTOR_JOB_POD_ANNOTATIONS={\"key.one\":\"true\"}
+export PROCTOR_DOCS_PATH=/path/to/docs/dir
+export PROCTOR_AUTH_PLUGIN_BINARY=
+export PROCTOR_AUTH_PLUGIN_EXPORTED=GateAuth
+export PROCTOR_AUTH_ENABLED=false
+export PROCTOR_NOTIFICATION_PLUGIN_BINARY=
+export PROCTOR_NOTIFICATION_PLUGIN_EXPORTED=SlackNotification
+export PROCTOR_REQUIRED_ADMIN_GROUP=proctor_admin

.gitignore

@@ -1,16 +1,12 @@
-
-
 homebrew-gojek
 scripts/proctor.rb
 _output/*
 
-proctord
 .env
 
-proctord
-
 *.swp
 *.swo
 .idea
 .DS_Store
-.vscode/
+.vscode/
+dist/

.goreleaser.yml

@@ -1,10 +1,27 @@
 # This is an example goreleaser.yaml file with some sane defaults.
 # Make sure to check the documentation at http://goreleaser.com
 builds:
-- env:
-  - CGO_ENABLED=0
-archive:
-  replacements:
+  -
+    id: "proctor-server"
+    main: ./cmd/server/main.go
+    binary: proctor-server
+    goos:
+      - darwin
+      - linux
+    env:
+      - CGO_ENABLED=0
+  -
+    id: "proctor-cli"
+    main: ./cmd/cli/main.go
+    binary: proctor2
+    goos:
+      - darwin
+      - linux
+      - windows
+    env:
+      - CGO_ENABLED=0
+archives:
+- replacements:
     darwin: Darwin
     linux: Linux
     windows: Windows

.travis.yml

@@ -2,14 +2,14 @@ dist: trusty
 sudo: required
 language: go
 go:
-- "1.12"
+  - "1.12"
 
 services:
   - redis-server
   - postgresql
 
 before_script:
-- sudo service redis-server start
+  - sudo service redis-server start
 
 stages:
   - test
@@ -18,7 +18,4 @@ jobs:
   include:
     - stage: test
       script:
-        - make db.setup test-with-race
-
-after_success:
-  - scripts/release.sh
+        - make db.setup test

AUTHORS.md

@@ -1,4 +1,6 @@
 # Proctor Team
 
 * [Akshat](//github.com/olttwa)
+* [Jasoet](//github.com/jasoet)
+* [Bimo Horizon](//github.com/bimozx)
 

CONTRIBUTING.md

@@ -1,6 +1,6 @@
  Proctor - Contributing
 
-Proctor `github.com/gojektech/proctor` is an open-source project.
+Proctor `github.com/gojek/proctor` is an open-source project.
 It is licensed using the [Apache License 2.0][1].
 We appreciate pull requests; here are our guidelines:
 
@@ -36,7 +36,7 @@ Much Thanks! ❤❤❤
 GO-JEK Tech
 
 [1]: http://www.apache.org/licenses/LICENSE-2.0
-[2]: https://github.com/gojektech/proctor/issues
+[2]: https://github.com/gojek/proctor/issues
 [3]: https://golang.org/doc/effective_go.html
 [4]: http://gun.io/blog/how-to-github-fork-branch-and-pull-request
 [5]: https://chris.beams.io/posts/git-commit/

Dockerfile

@@ -0,0 +1,18 @@
+FROM golang:1.12 AS builder
+WORKDIR /go/src/app
+COPY . .
+RUN make plugin.auth
+RUN make plugin.slack
+RUN make server
+
+FROM ubuntu:latest
+RUN apt-get update
+RUN apt-get install -y ca-certificates
+WORKDIR /app/
+COPY --from=builder /go/src/app/_output/bin/server .
+COPY --from=builder /go/src/app/_output/bin/plugin/auth.so .
+COPY --from=builder /go/src/app/_output/bin/plugin/slack.so .
+COPY --from=builder /go/src/app/migrations ./migrations
+
+ENTRYPOINT ["./server"]
+CMD ["s"]

Makefile

@@ -9,10 +9,14 @@ export $(shell sed 's/=.*//' .env.test)
 SRC_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 OUT_DIR := $(SRC_DIR)/_output
 BIN_DIR := $(OUT_DIR)/bin
+PLUGIN_DIR := $(BIN_DIR)/plugin
+FTEST_DIR := test/procs
+CONFIG_DIR := test/config
 GOPROXY ?= https://proxy.golang.org
 GO111MODULE := on
+CONFIG_LOCATION := $(SRC_DIR)
 
-$(@info $(shell mkdir -p $(OUT_DIR) $(BIN_DIR)))
+$(@info $(shell mkdir -p $(OUT_DIR) $(BIN_DIR) $(PLUGIN_DIR))
 
 .PHONY: build
 build: test-with-race server cli
@@ -23,23 +27,51 @@ test-with-race: test
 
 .PHONY: test
 test:
-	go test $(RACE_FLAG) -coverprofile=$(OUT_DIR)/coverage.out ./...
+	ENABLE_INTEGRATION_TEST=false \
+	go test -race -coverprofile=$(OUT_DIR)/coverage.out ./...
+
+.PHONY: itest
+itest: plugin.auth plugin.slack
+	PROCTOR_AUTH_PLUGIN_BINARY=$(PLUGIN_DIR)/auth.so \
+	PROCTOR_NOTIFICATION_PLUGIN_BINARY=$(PLUGIN_DIR)/slack.so \
+	ENABLE_INTEGRATION_TEST=true \
+	go test -p 1 -race -coverprofile=$(OUT_DIR)/coverage.out ./...
+
+.PHONY: plugin.itest
+plugin.itest: plugin.auth plugin.slack
+	PROCTOR_AUTH_PLUGIN_BINARY=$(PLUGIN_DIR)/auth.so \
+	PROCTOR_NOTIFICATION_PLUGIN_BINARY=$(PLUGIN_DIR)/slack.so \
+	ENABLE_PLUGIN_INTEGRATION_TEST=true \
+	go test -race -coverprofile=$(OUT_DIR)/coverage.out ./...
 
 .PHONY: server
 server:
-	go build -o $(BIN_DIR)/server ./exec/server/server.go
+	PROCTOR_AUTH_PLUGIN_BINARY=$(PLUGIN_DIR)/auth.so \
+	go build -race -o $(BIN_DIR)/server ./cmd/server/main.go
 
-.PHONY: start-server
-start-server:
-	$(BIN_DIR)/server s
+.PHONY: plugin.auth
+plugin.auth:
+	go build -race -buildmode=plugin -o $(PLUGIN_DIR)/auth.so ./plugins/gate-auth-plugin/auth.go
+
+.PHONY: plugin.slack
+plugin.slack:
+	go build -race -buildmode=plugin -o $(PLUGIN_DIR)/slack.so ./plugins/slack-notification-plugin/slack_notification.go
 
 .PHONY: cli
 cli:
-	go build -o $(BIN_DIR)/cli ./exec/cli/cli.go
+	go build -race -o $(BIN_DIR)/cli ./cmd/cli/main.go
+
+build-all: server cli plugin.auth plugin.slack
+
+.PHONY: start-server
+start-server:
+	PROCTOR_AUTH_PLUGIN_BINARY=$(PLUGIN_DIR)/auth.so \
+	PROCTOR_NOTIFICATION_PLUGIN_BINARY=$(PLUGIN_DIR)/slack.so \
+	$(BIN_DIR)/server s
 
 generate:
-	go get github.com/go-bindata/go-bindata
-	$(GOPATH)/bin/go-bindata -pkg config -o config/data.go data/config_template.yaml
+	go get -u github.com/go-bindata/go-bindata/...
+	$(GOPATH)/bin/go-bindata -pkg config -o internal/app/cli/config/data.go internal/app/cli/config_template.yaml
 
 db.setup: db.create db.migrate
 
@@ -54,3 +86,50 @@ db.rollback: server
 
 db.teardown:
 	-PGPASSWORD=$(PROCTOR_POSTGRES_PASSWORD) psql -h $(PROCTOR_POSTGRES_HOST) -p $(PROCTOR_POSTGRES_PORT) -c 'drop database $(PROCTOR_POSTGRES_DATABASE);' -U $(PROCTOR_POSTGRES_USER)
+	redis-cli FLUSHALL
+
+.PHONY: ftest.package.procs
+ftest.package.procs:
+	PROCTOR_JOBS_PATH=$(FTEST_DIR) \
+	ruby ./test/package_procs.rb
+
+.PHONY: ftest.update.metadata
+ftest.update.metadata:
+	PROCTOR_JOBS_PATH=$(FTEST_DIR) \
+	PROCTOR_URI=http://localhost:$(PROCTOR_APP_PORT)/metadata \
+	ruby ./test/update_metadata.rb
+
+.PHONY: ftest.update.secret
+ftest.update.secret:
+	curl -X POST \
+	  http://localhost:5000/secret \
+	  -H 'Content-Type: application/json' \
+	  -d '{"job_name": "say-hello-world","secrets": {"SAMPLE_SECRET_ONE": "Secret One :*","SAMPLE_SECRET_TWO": "Secret Two :V"}}'
+
+.PHONY: ftest.proctor.list
+ftest.proctor.list:
+	LOCAL_CONFIG_DIR=$(CONFIG_DIR) $(BIN_DIR)/cli list
+
+.PHONY: ftest.proctor.describe
+ftest.proctor.describe:
+	LOCAL_CONFIG_DIR=$(CONFIG_DIR) $(BIN_DIR)/cli describe say-hello-world
+
+.PHONY: ftest.proctor.template
+ftest.proctor.template:
+	LOCAL_CONFIG_DIR=$(CONFIG_DIR) $(BIN_DIR)/cli template say-hello-world say-hello-world.yaml
+
+.PHONY: ftest.proctor.execute
+ftest.proctor.execute:
+	LOCAL_CONFIG_DIR=$(CONFIG_DIR) $(BIN_DIR)/cli execute say-hello-world SAMPLE_ARG_ONE=foo SAMPLE_ARG_TWO=bar
+
+.PHONY: ftest.proctor.execute-with-yaml
+ftest.proctor.execute-with-yaml:
+	LOCAL_CONFIG_DIR=$(CONFIG_DIR) $(BIN_DIR)/cli execute say-hello-world -f $(FTEST_DIR)/say-hello-world/say_hello_world.yaml
+
+.PHONY: ftest.proctor.logs
+ftest.proctor.logs:
+	LOCAL_CONFIG_DIR=$(CONFIG_DIR) $(BIN_DIR)/cli logs $(EXECUTION_ID)
+
+.PHONY: ftest.proctor.status
+ftest.proctor.status:
+	LOCAL_CONFIG_DIR=$(CONFIG_DIR) $(BIN_DIR)/cli status $(EXECUTION_ID)