WIP: Consul and Etcd save+restore

.gitignore

@@ -5,6 +5,8 @@
 /tarmak_local_build
 /wing_linux_amd64
 /wing_linux_amd64_unversioned
+/tagging_control_linux_amd64
+/tagging_control.zip
 /dist/
 /bin/
 .DS_Store

Gopkg.toml

@@ -110,11 +110,11 @@ required = [
 
 [[constraint]]
   name = "github.com/terraform-providers/terraform-provider-aws"
-  version = "1.35.0"
+  version = "1.43.2"
 
 [[override]]
   name = "github.com/aws/aws-sdk-go"
-  version = "v1.15.31"
+  version = "v1.15.72"
 
 [[constraint]]
   name = "github.com/terraform-providers/terraform-provider-random"

Makefile

@@ -63,7 +63,7 @@ verify: generate go_verify verify_boilerplate verify_codegen verify_vendor verif
 
 test: go_test ## runs all defined tests, no puppet tests
 
-generate: go_generate ## generates mocks and assets files
+generate: go_build_tagging_control go_generate ## generates mocks and assets files
 
 build: generate go_build ## runs generate, and then go_build targets
 
@@ -87,6 +87,9 @@ clean:
 go_vet:
 	go vet $$(go list ./pkg/... ./cmd/...| grep -v pkg/wing/client/clientset/internalversion/fake | grep -v pkg/wing/client/clientset/versioned/fake)
 
+go_build_tagging_control:
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags netgo -ldflags '-w -X main.version=$(CI_COMMIT_TAG) -X main.commit=$(CI_COMMIT_SHA) -X main.date=$(shell date -u +%Y-%m-%dT%H:%M:%SZ)' -o tagging_control_linux_amd64	./cmd/tagging_control/.
+
 go_build:
 	# Build a wing binary
 	CGO_ENABLED=0 GOOS=linux  GOARCH=amd64 go build -tags netgo -ldflags '-w -X main.version=$(CI_COMMIT_TAG) -X main.commit=$(CI_COMMIT_SHA) -X main.date=$(shell date -u +%Y-%m-%dT%H:%M:%SZ)' -o wing_linux_amd64 ./cmd/wing

cmd/tagging_control/cmd/handle.go

@@ -0,0 +1,25 @@
+// Copyright Jetstack Ltd. See LICENSE for details.
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/aws/aws-lambda-go/lambda"
+	"github.com/spf13/cobra"
+
+	"github.com/jetstack/tarmak/pkg/tagging_control"
+)
+
+var handleCmd = &cobra.Command{
+	Use:   "handle",
+	Short: "Launch lambda request handler",
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Printf("running tagging_control lambda function request handler...\n")
+
+		lambda.Start(tagging_control.HandleRequests)
+	},
+}
+
+func init() {
+	RootCmd.AddCommand(handleCmd)
+}

cmd/tagging_control/cmd/root.go

@@ -0,0 +1,25 @@
+// Copyright Jetstack Ltd. See LICENSE for details.
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+var RootCmd = &cobra.Command{
+	Use:               "tagging_control",
+	Short:             "lambda function used to tag AWS instances with their ssh public keys",
+	Run:               handleCmd.Run,
+	DisableAutoGenTag: true,
+}
+
+// Execute adds all child commands to the root command and sets flags appropriately.
+// This is called by main.main(). It only needs to happen once to the rootCmd.
+func Execute() {
+	if err := RootCmd.Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}

cmd/tagging_control/cmd/version.go

@@ -0,0 +1,42 @@
+// Copyright Jetstack Ltd. See LICENSE for details.
+package cmd
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+
+	"github.com/spf13/cobra"
+)
+
+var Version struct {
+	Version   string
+	BuildDate string
+	Commit    string
+}
+
+var AppName string = "tarmak"
+
+func init() {
+	RootCmd.AddCommand(versionCmd)
+}
+
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: fmt.Sprint("Print the version number of ", AppName),
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Printf("%s", AppName)
+
+		v := reflect.ValueOf(Version)
+
+		for i := 0; i < v.NumField(); i++ {
+			fmt.Printf(
+				" %s: %s",
+				strings.ToLower(v.Type().Field(i).Name),
+				v.Field(i).Interface(),
+			)
+		}
+
+		fmt.Println("")
+	},
+}

cmd/tagging_control/cmd/zip.go

@@ -0,0 +1,37 @@
+// Copyright Jetstack Ltd. See LICENSE for details.
+package cmd
+
+import (
+	"errors"
+	"fmt"
+	"github.com/spf13/cobra"
+
+	"github.com/jetstack/tarmak/pkg/tarmak/utils/zip"
+)
+
+var zipCmd = &cobra.Command{
+	Use:   "zip [dst] [src...]",
+	Short: "zip utility",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		if len(args) < 2 {
+			return errors.New("zip expecting files: [dst] [src...]")
+		}
+
+		dst := args[0]
+		src := args[1:]
+
+		fmt.Printf("deflating %s into %s...\n", src, dst)
+
+		if err := zip.Zip(src, dst, true); err != nil {
+			return fmt.Errorf("zip failed: %s", err)
+		}
+
+		fmt.Print("done.\n")
+
+		return nil
+	},
+}
+
+func init() {
+	RootCmd.AddCommand(zipCmd)
+}

cmd/tagging_control/main.go

@@ -0,0 +1,19 @@
+// Copyright Jetstack Ltd. See LICENSE for details.
+package main
+
+import (
+	"github.com/jetstack/tarmak/cmd/tagging_control/cmd"
+)
+
+var (
+	version string = "dev"
+	commit  string = "unknown"
+	date    string = ""
+)
+
+func main() {
+	cmd.Version.Version = version
+	cmd.Version.Commit = commit
+	cmd.Version.BuildDate = date
+	cmd.Execute()
+}

cmd/tarmak/cmd/cluster.go

@@ -115,6 +115,31 @@ func clusterKubeconfigFlags(fs *flag.FlagSet) {
 	)
 }
 
+func clusterSnapshotEtcdRestoreFlags(fs *flag.FlagSet) {
+	store := &globalFlags.Cluster.Snapshot.Etcd.Restore
+
+	fs.StringVar(
+		&store.K8sMain,
+		consts.RestoreK8sMainFlagName,
+		"",
+		"location of k8s-main snapshot backup",
+	)
+
+	fs.StringVar(
+		&store.K8sEvents,
+		consts.RestoreK8sEventsFlagName,
+		"",
+		"location of k8s-events snapshot backup",
+	)
+
+	fs.StringVar(
+		&store.Overlay,
+		consts.RestoreOverlayFlagName,
+		"",
+		"location of overlay snapshot backup",
+	)
+}
+
 func init() {
 	RootCmd.AddCommand(clusterCmd)
 }