[WIP] v1.0.0

Author: ChrisRx

.drone.yml

@@ -22,13 +22,13 @@ steps:
     event:
       - push
 
-- name: manager-testing
+- name: e2e
   image: golang:1.14
   volumes:
   - name: gocache
     path: /go
   commands:
-  - go test -v ./pkg/manager -test.long
+  - make test-e2e
   when:
     branch:
       - master

.goreleaser.yml

@@ -26,9 +26,9 @@ builds:
     - all=-trimpath={{.Env.GOPATH}}
   ldflags:
      - -s -w
-     - -X "github.com/criticalstack/e2d/pkg/buildinfo.Date={{.Date}}"
-     - -X "github.com/criticalstack/e2d/pkg/buildinfo.GitSHA={{.ShortCommit}}"
-     - -X "github.com/criticalstack/e2d/pkg/buildinfo.Version={{.Tag}}"
+     - -X "github.com/criticalstack/e2d/internal/buildinfo.Date={{.Date}}"
+     - -X "github.com/criticalstack/e2d/internal/buildinfo.GitSHA={{.ShortCommit}}"
+     - -X "github.com/criticalstack/e2d/internal/buildinfo.Version={{.Tag}}"
 archives:
 - replacements:
     darwin: Darwin
@@ -55,7 +55,7 @@ nfpms:
   - /etc/systemd/system/e2d.service.d
   - /var/lib/etcd
   files: 
-    deploy/e2d.service: /etc/systemd/system/e2d.service
+    build/e2d.service: /etc/systemd/system/e2d.service
 checksum:
   name_template: 'checksums.txt'
 snapshot:

Makefile

@@ -1,23 +1,10 @@
-# If you update this file, please follow
-# https://suva.sh/posts/well-documented-makefiles
-
 .DEFAULT_GOAL:=help
 
-ifeq ($(GOPROXY),)
-export GOPROXY = direct
-endif
-
-# Directories.
-TOOLS_DIR := hack/tools
+BIN_DIR       ?= bin
+TOOLS_DIR     := hack/tools
 TOOLS_BIN_DIR := $(TOOLS_DIR)/bin
-BIN_DIR := bin
-
-# Binaries.
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
 
-# Golang build env
-LDFLAGS := -s -w
-
 GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD | sed 's/\///g')
 GIT_COMMIT = $(shell git rev-parse HEAD)
 GIT_SHA    = $(shell git rev-parse --short HEAD)
@@ -28,29 +15,36 @@ ifneq ($(GIT_TAG),)
 	VERSION = $(GIT_TAG)
 endif
 
-LDFLAGS += -X "github.com/criticalstack/e2d/pkg/buildinfo.Date=$(shell date -u +'%Y-%m-%dT%TZ')"
-LDFLAGS += -X "github.com/criticalstack/e2d/pkg/buildinfo.GitSHA=$(GIT_SHA)"
-LDFLAGS += -X "github.com/criticalstack/e2d/pkg/buildinfo.Version=$(VERSION)"
+LDFLAGS := -s -w
+LDFLAGS += -X "github.com/criticalstack/e2d/internal/buildinfo.Date=$(shell date -u +'%Y-%m-%dT%TZ')"
+LDFLAGS += -X "github.com/criticalstack/e2d/internal/buildinfo.GitSHA=$(GIT_SHA)"
+LDFLAGS += -X "github.com/criticalstack/e2d/internal/buildinfo.Version=$(VERSION)"
 GOFLAGS = -gcflags "all=-trimpath=$(PWD)" -asmflags "all=-trimpath=$(PWD)"
 
 GO_BUILD_ENV_VARS := GO111MODULE=on CGO_ENABLED=0
 
-.PHONY: build test test-manager clean
+##@ Building
 
-build: clean ## Build the e2d golang binary
+.PHONY: e2d
+
+e2d: ## Build the e2d golang binary
 	$(GO_BUILD_ENV_VARS) go build -o bin/e2d $(GOFLAGS) -ldflags '$(LDFLAGS)' ./cmd/e2d
 
-test: ## Run all tests
-	go test ./...
+.PHONY: update-codegen
+update-codegen: ## Update generated code (slow)
+	@echo "Updating generated code files ..."
+	@echo "  *** This can be slow and does not need to run every build ***"
+	@hack/tools/update-codegen.sh
 
-test-manager: ## Test the manager package
-	go test ./pkg/manager -test.long
+##@ Testing
 
-clean: ## Cleanup the project folders
-	@rm -rf ./bin/*
-	@rm -rf hack/tools/bin
+.PHONY: test test-e2e lint lint-full
+
+test: ## Run all tests
+	@go test $(shell go list ./... | grep -v e2e)
 
-.PHONY: lint
+test-e2e: ## Run e2e tests
+	@go test ./e2e -parallel=16 -count=1
 
 lint: $(GOLANGCI_LINT) ## Lint codebase
 	$(GOLANGCI_LINT) run -v
@@ -60,15 +54,20 @@ lint-full: $(GOLANGCI_LINT) ## Run slower linters to detect possible issues
 
 ##@ Helpers
 
-.PHONY: help
+.PHONY: help clean
 
 $(GOLANGCI_LINT): $(TOOLS_DIR)/go.mod # Build golangci-lint from tools folder.
 	cd $(TOOLS_DIR); go build -tags=tools -o $(BIN_DIR)/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
 
+clean: ## Cleanup the project folders
+	@rm -rf ./bin/*
+	@rm -rf hack/tools/bin
+
 help:  ## Display this help
-	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
+	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
 
+# TODO: move to hack/tools
 generate:
 	protoc -I pkg/manager/e2dpb \
 		-I vendor/ \

README.md

@@ -1,6 +1,6 @@
 # e2d
 
-[![GoDoc](https://godoc.org/github.com/criticalstack/e2d?status.svg)](https://godoc.org/github.com/criticalstack/e2d)
+[![PkgGoDev](https://pkg.go.dev/badge/github.com/criticalstack/e2d)](https://pkg.go.dev/github.com/criticalstack/e2d)
 [![Build Status](https://cloud.drone.io/api/badges/criticalstack/e2d/status.svg)](https://cloud.drone.io/criticalstack/e2d)
 
 e2d is a command-line tool for deploying and managing etcd clusters, both in the cloud or on bare-metal. It also includes [e2db](https://github.com/criticalstack/e2d/tree/master/pkg/e2db), an ORM-like abstraction for working with etcd.

deploy/criticalstack.repo build/criticalstack.repodeploy/criticalstack.repo renamed to build/criticalstack.repo

@@ -2,7 +2,8 @@
 Description=e2d
 
 [Service]
-ExecStart=/usr/local/bin/e2d run
+Environment="E2D_CONFIG_ARGS=--config=/etc/e2d.yaml"
+ExecStart=/usr/local/bin/e2d run $E2D_CONFIG_ARGS
 EnvironmentFile=-/etc/e2d.conf
 Restart=on-failure
 RestartSec=30

deploy/e2d.service build/e2d.servicedeploy/e2d.service renamed to build/e2d.service

@@ -0,0 +1,20 @@
+package certs
+
+import (
+	"github.com/spf13/cobra"
+
+	certsgenerate "github.com/criticalstack/e2d/cmd/e2d/app/certs/generate"
+	certsinit "github.com/criticalstack/e2d/cmd/e2d/app/certs/init"
+)
+
+func NewCommand() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "certs",
+		Short: "manage e2d certs",
+	}
+	cmd.AddCommand(
+		certsinit.NewCommand(),
+		certsgenerate.NewCommand(),
+	)
+	return cmd
+}

cmd/e2d/app/certs/certs.go

@@ -0,0 +1,73 @@
+package generate
+
+import (
+	"path/filepath"
+	"strings"
+
+	"github.com/spf13/cobra"
+
+	"github.com/criticalstack/e2d/pkg/log"
+	"github.com/criticalstack/e2d/pkg/manager"
+)
+
+var opts struct {
+	CertDir  string
+	AltNames string
+}
+
+func NewCommand() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:     "generate [flags] [arg]\n\nValidArgs:\n  all, server, peer, client",
+		Short:   "generate certificates/private keys",
+		Aliases: []string{"gen"},
+		Args:    cobra.ExactValidArgs(1),
+		ValidArgs: []string{
+			"all",
+			"server",
+			"peer",
+			"client",
+		},
+		SilenceErrors: true,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			var names []string
+			if opts.AltNames != "" {
+				names = strings.Split(opts.AltNames, ",")
+			}
+			ca, err := manager.LoadCertificateAuthority(filepath.Join(opts.CertDir, "ca.crt"), filepath.Join(opts.CertDir, "ca.key"), names...)
+			if err != nil {
+				return err
+			}
+			switch args[0] {
+			case "all":
+				if err := ca.WriteAll(); err != nil {
+					return err
+				}
+				log.Info("generated all certificates successfully.")
+				return nil
+			case "server":
+				if err := ca.WriteServerCertAndKey(); err != nil {
+					return err
+				}
+				log.Info("generated server certificates successfully.")
+				return nil
+			case "peer":
+				if err := ca.WritePeerCertAndKey(); err != nil {
+					return err
+				}
+				log.Info("generated peer certificates successfully.")
+				return nil
+			case "client":
+				if err := ca.WriteClientCertAndKey(); err != nil {
+					return err
+				}
+				log.Info("generated client certificates successfully.")
+				return nil
+			}
+			return nil
+		},
+	}
+
+	cmd.Flags().StringVar(&opts.CertDir, "cert-dir", "", "")
+	cmd.Flags().StringVar(&opts.AltNames, "alt-names", "", "")
+	return cmd
+}

cmd/e2d/app/certs/generate/generate.go

@@ -0,0 +1,32 @@
+package init
+
+import (
+	"os"
+
+	"github.com/spf13/cobra"
+
+	"github.com/criticalstack/e2d/pkg/manager"
+)
+
+var opts struct {
+	CertDir string
+}
+
+func NewCommand() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:           "init",
+		Short:         "initialize a new CA",
+		Args:          cobra.NoArgs,
+		SilenceErrors: true,
+		SilenceUsage:  true,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if err := os.MkdirAll(opts.CertDir, 0755); err != nil && !os.IsExist(err) {
+				return err
+			}
+			return manager.WriteNewCA(opts.CertDir)
+		},
+	}
+
+	cmd.Flags().StringVar(&opts.CertDir, "cert-dir", "", "")
+	return cmd
+}