Add github actions runner setup for all platforms

.gitignore

@@ -2,4 +2,5 @@
 out/
 .run*
 manifest.json
-ami-id
+ami-id
+Pulumi*.yaml

Makefile

@@ -7,11 +7,12 @@ TKN_IMG ?= quay.io/redhat-developer/mapt:v${VERSION}-tkn
 # Go and compilation related variables
 GOPATH ?= $(shell go env GOPATH)
 BUILD_DIR ?= out
-SOURCE_DIRS = cmd pkg test
+SOURCE_DIRS = cmd pkg
+SOURCES := $(shell find . -name "*.go" -not -path "./vendor/*")
 # https://golang.org/cmd/link/
 # LDFLAGS := $(VERSION_VARIABLES) -extldflags='-static' ${GO_EXTRA_LDFLAGS}
 LDFLAGS := $(VERSION_VARIABLES) ${GO_EXTRA_LDFLAGS}
-GCFLAGS := all=-N -l 
+GCFLAGS := all=-N -l
 
 TOOLS_DIR := tools
 include tools/tools.mk
@@ -33,12 +34,12 @@ check: build test lint
 
 .PHONY: install
 install: $(SOURCES)
-	go install -ldflags="$(LDFLAGS)" $(GO_EXTRA_BUILDFLAGS) ./cmd
+	go install -ldflags="$(LDFLAGS)" $(GO_EXTRA_BUILDFLAGS) ./cmd/mapt
 
 $(BUILD_DIR)/mapt: $(SOURCES)
-	GOOS=linux GOARCH=amd64 go build -gcflags="$(GCFLAGS)" -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/mapt $(GO_EXTRA_BUILDFLAGS) ./cmd
+	GOOS=linux GOARCH=amd64 go build -gcflags="$(GCFLAGS)" -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/mapt $(GO_EXTRA_BUILDFLAGS) ./cmd/mapt
 
-.PHONY: build 
+.PHONY: build
 build: $(BUILD_DIR)/mapt
 
 .PHONY: test
@@ -77,4 +78,4 @@ tkn-push: install-out-of-tree-tools
 		-f tkn/infra-aws-mac.yaml \
 		-f tkn/infra-aws-rhel.yaml \
 		-f tkn/infra-aws-windows-server.yaml \
-		-f tkn/infra-azure-windows-desktop.yaml
+		-f tkn/infra-azure-windows-desktop.yaml

README.md

@@ -31,4 +31,19 @@ Features:
 * a airgap
 * s spot
 * p proxy
-* v vpn
+* v vpn
+
+## Github Self hosted runner
+
+`mapt` can setup a deployed machine as a Self Hosted runner on most of the Platform and Provider combinations
+it supports.
+
+Use the following flags with `mapt <provider> <platform> create` command:
+
+```
+--install-ghactions-runner <bool>   Install and setup Github Actions runner in the instance
+--ghactions-runner-name <string>    Name for the Github Actions Runner
+--ghactions-runner-repo <string>    Full URL of the repository where the Github Actions Runner should be registered
+--ghactions-runner-token <string>   Token needed for registering the Github Actions Runner token
+```
+

cmd/cmd/aws/aws.go → cmd/mapt/cmd/aws/aws.go

@@ -1,7 +1,7 @@
 package aws
 
 import (
-	"github.com/redhat-developer/mapt/cmd/cmd/aws/hosts"
+	"github.com/redhat-developer/mapt/cmd/mapt/cmd/aws/hosts"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )

cmd/cmd/aws/hosts/fedora.go → cmd/mapt/cmd/aws/hosts/fedora.go

@@ -1,7 +1,7 @@
 package hosts
 
 import (
-	params "github.com/redhat-developer/mapt/cmd/cmd/constants"
+	params "github.com/redhat-developer/mapt/cmd/mapt/cmd/constants"
 	maptContext "github.com/redhat-developer/mapt/pkg/manager/context"
 	"github.com/redhat-developer/mapt/pkg/provider/aws/action/fedora"
 	"github.com/redhat-developer/mapt/pkg/util/logging"

cmd/cmd/aws/hosts/mac.go → cmd/mapt/cmd/aws/hosts/mac.go

@@ -1,7 +1,7 @@
 package hosts
 
 import (
-	params "github.com/redhat-developer/mapt/cmd/cmd/constants"
+	params "github.com/redhat-developer/mapt/cmd/mapt/cmd/constants"
 	maptContext "github.com/redhat-developer/mapt/pkg/manager/context"
 	"github.com/redhat-developer/mapt/pkg/provider/aws/action/mac"
 	"github.com/redhat-developer/mapt/pkg/util/logging"

cmd/cmd/aws/hosts/rhel.go → cmd/mapt/cmd/aws/hosts/rhel.go

@@ -1,9 +1,10 @@
 package hosts
 
 import (
-	params "github.com/redhat-developer/mapt/cmd/cmd/constants"
+	params "github.com/redhat-developer/mapt/cmd/mapt/cmd/constants"
 	maptContext "github.com/redhat-developer/mapt/pkg/manager/context"
 	"github.com/redhat-developer/mapt/pkg/provider/aws/action/rhel"
+	"github.com/redhat-developer/mapt/pkg/util/ghactions"
 	"github.com/redhat-developer/mapt/pkg/util/logging"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -61,18 +62,30 @@ func getRHELCreate() *cobra.Command {
 				viper.GetString(params.ConnectionDetailsOutput),
 				viper.GetStringMapString(params.Tags))
 
+			// Initialize gh actions runner if needed
+			if viper.IsSet(params.InstallGHActionsRunner) {
+				err := ghactions.InitGHRunnerArgs(viper.GetString(params.GHActionsRunnerToken),
+					viper.GetString(params.GHActionsRunnerName),
+					viper.GetString(params.GHActionsRunnerRepo))
+				if err != nil {
+					logging.Error(err)
+				}
+			}
+
 			// Run create
 			if err := rhel.Create(
 				&rhel.Request{
-					Prefix:       "main",
-					Version:      viper.GetString(rhelVersion),
-					Arch:         viper.GetString(rhelArch),
-					VMType:       viper.GetStringSlice(vmTypes),
-					SubsUsername: viper.GetString(subsUsername),
-					SubsUserpass: viper.GetString(subsUserpass),
-					ProfileSNC:   viper.IsSet(profileSNC),
-					Spot:         viper.IsSet(spot),
-					Airgap:       viper.IsSet(airgap)}); err != nil {
+					Prefix:               "main",
+					Version:              viper.GetString(rhelVersion),
+					Arch:                 viper.GetString(rhelArch),
+					VMType:               viper.GetStringSlice(vmTypes),
+					SubsUsername:         viper.GetString(subsUsername),
+					SubsUserpass:         viper.GetString(subsUserpass),
+					ProfileSNC:           viper.IsSet(profileSNC),
+					Spot:                 viper.IsSet(spot),
+					Airgap:               viper.IsSet(airgap),
+					SetupGHActionsRunner: viper.GetBool(params.InstallGHActionsRunner),
+				}); err != nil {
 				logging.Error(err)
 			}
 			return nil
@@ -89,6 +102,7 @@ func getRHELCreate() *cobra.Command {
 	flagSet.Bool(airgap, false, airgapDesc)
 	flagSet.Bool(spot, false, spotDesc)
 	flagSet.Bool(profileSNC, false, profileSNCDesc)
+	flagSet.AddFlagSet(params.GetGHActionsFlagset())
 	c.PersistentFlags().AddFlagSet(flagSet)
 	// if err := c.MarkFlagRequired(subsUsername); err != nil {
 	// 	logging.Error(err)

cmd/cmd/aws/hosts/windows.go → cmd/mapt/cmd/aws/hosts/windows.go

@@ -1,9 +1,10 @@
 package hosts
 
 import (
-	params "github.com/redhat-developer/mapt/cmd/cmd/constants"
+	params "github.com/redhat-developer/mapt/cmd/mapt/cmd/constants"
 	maptContext "github.com/redhat-developer/mapt/pkg/manager/context"
 	"github.com/redhat-developer/mapt/pkg/provider/aws/action/windows"
+	"github.com/redhat-developer/mapt/pkg/util/ghactions"
 	"github.com/redhat-developer/mapt/pkg/util/logging"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -61,17 +62,29 @@ func getWindowsCreate() *cobra.Command {
 				viper.GetString(params.ConnectionDetailsOutput),
 				viper.GetStringMapString(params.Tags))
 
+			// Initialize gh actions runner if needed
+			if viper.IsSet(params.InstallGHActionsRunner) {
+				err := ghactions.InitGHRunnerArgs(viper.GetString(params.GHActionsRunnerToken),
+					viper.GetString(params.GHActionsRunnerName),
+					viper.GetString(params.GHActionsRunnerRepo))
+				if err != nil {
+					logging.Error(err)
+				}
+			}
+
 			// Run create
 			if err := windows.Create(
 				&windows.Request{
-					Prefix:      "main",
-					AMIName:     viper.GetString(amiName),
-					AMIUser:     viper.GetString(amiUsername),
-					AMIOwner:    viper.GetString(amiOwner),
-					AMILang:     viper.GetString(amiLang),
-					AMIKeepCopy: viper.IsSet(amiKeepCopy),
-					Spot:        viper.IsSet(spot),
-					Airgap:      viper.IsSet(airgap)}); err != nil {
+					Prefix:               "main",
+					AMIName:              viper.GetString(amiName),
+					AMIUser:              viper.GetString(amiUsername),
+					AMIOwner:             viper.GetString(amiOwner),
+					AMILang:              viper.GetString(amiLang),
+					AMIKeepCopy:          viper.IsSet(amiKeepCopy),
+					Spot:                 viper.IsSet(spot),
+					Airgap:               viper.IsSet(airgap),
+					SetupGHActionsRunner: viper.IsSet(params.InstallGHActionsRunner),
+				}); err != nil {
 				logging.Error(err)
 			}
 			return nil
@@ -87,6 +100,7 @@ func getWindowsCreate() *cobra.Command {
 	flagSet.Bool(airgap, false, airgapDesc)
 	flagSet.Bool(spot, false, spotDesc)
 	flagSet.Bool(amiKeepCopy, false, amiKeepCopyDesc)
+	flagSet.AddFlagSet(params.GetGHActionsFlagset())
 	c.PersistentFlags().AddFlagSet(flagSet)
 	return c
 }

cmd/cmd/aws/replica/replica.go → cmd/mapt/cmd/aws/replica/replica.go

@@ -1,7 +1,7 @@
 package replica
 
 import (
-	params "github.com/redhat-developer/mapt/cmd/cmd/constants"
+	params "github.com/redhat-developer/mapt/cmd/mapt/cmd/constants"
 	amireplication "github.com/redhat-developer/mapt/pkg/provider/aws/modules/ami"
 	"github.com/redhat-developer/mapt/pkg/util/logging"
 	"github.com/spf13/cobra"

cmd/cmd/azure/azure.go → cmd/mapt/cmd/azure/azure.go

@@ -1,7 +1,7 @@
 package azure
 
 import (
-	"github.com/redhat-developer/mapt/cmd/cmd/azure/hosts"
+	"github.com/redhat-developer/mapt/cmd/mapt/cmd/azure/hosts"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )

cmd/cmd/azure/hosts/windows.go → cmd/mapt/cmd/azure/hosts/windows.go

@@ -3,10 +3,11 @@ package hosts
 import (
 	"fmt"
 
-	params "github.com/redhat-developer/mapt/cmd/cmd/constants"
+	params "github.com/redhat-developer/mapt/cmd/mapt/cmd/constants"
 	maptContext "github.com/redhat-developer/mapt/pkg/manager/context"
 	azureWindows "github.com/redhat-developer/mapt/pkg/provider/azure/action/windows"
 	spotprice "github.com/redhat-developer/mapt/pkg/provider/azure/module/spot-price"
+	"github.com/redhat-developer/mapt/pkg/util/ghactions"
 	"github.com/redhat-developer/mapt/pkg/util/logging"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -74,6 +75,7 @@ func getCreate() *cobra.Command {
 				viper.GetString(params.ConnectionDetailsOutput),
 				viper.GetStringMapString(params.Tags))
 
+			// ParseEvictionRate
 			var spotToleranceValue = spotprice.DefaultEvictionRate
 			if viper.IsSet(paramSpotTolerance) {
 				var ok bool
@@ -83,19 +85,30 @@ func getCreate() *cobra.Command {
 					return fmt.Errorf("%s is not a valid spot tolerance value", viper.GetString(paramSpotTolerance))
 				}
 			}
-			// ParseEvictionRate
+
+			// Initialize gh actions runner if needed
+			if viper.IsSet(params.InstallGHActionsRunner) {
+				err := ghactions.InitGHRunnerArgs(viper.GetString(params.GHActionsRunnerToken),
+					viper.GetString(params.GHActionsRunnerName),
+					viper.GetString(params.GHActionsRunnerRepo))
+				if err != nil {
+					logging.Error(err)
+				}
+			}
+
 			if err := azureWindows.Create(
 				&azureWindows.WindowsRequest{
-					Prefix:        "",
-					Location:      viper.GetString(paramLocation),
-					VMSize:        viper.GetString(paramVMSize),
-					Version:       viper.GetString(paramVersion),
-					Feature:       viper.GetString(paramFeature),
-					Username:      viper.GetString(paramUsername),
-					AdminUsername: viper.GetString(paramAdminUsername),
-					Profiles:      viper.GetStringSlice(paramProfile),
-					Spot:          viper.IsSet(paramSpot),
-					SpotTolerance: spotToleranceValue}); err != nil {
+					Prefix:               viper.GetString(params.ProjectName),
+					Location:             viper.GetString(paramLocation),
+					VMSize:               viper.GetString(paramVMSize),
+					Version:              viper.GetString(paramVersion),
+					Feature:              viper.GetString(paramFeature),
+					Username:             viper.GetString(paramUsername),
+					AdminUsername:        viper.GetString(paramAdminUsername),
+					Profiles:             viper.GetStringSlice(paramProfile),
+					SetupGHActionsRunner: viper.IsSet(params.InstallGHActionsRunner),
+					Spot:                 viper.IsSet(paramSpot),
+					SpotTolerance:        spotToleranceValue}); err != nil {
 				logging.Error(err)
 			}
 			return nil
@@ -113,6 +126,7 @@ func getCreate() *cobra.Command {
 	flagSet.StringSliceP(paramProfile, "", []string{}, paramProfileDesc)
 	flagSet.Bool(paramSpot, false, paramSpotDesc)
 	flagSet.StringP(paramSpotTolerance, "", defaultSpotTolerance, paramSpotToleranceDesc)
+	flagSet.AddFlagSet(params.GetGHActionsFlagset())
 	c.PersistentFlags().AddFlagSet(flagSet)
 	return c
 }

cmd/cmd/constants/constants.go → cmd/mapt/cmd/constants/constants.go

@@ -1,5 +1,7 @@
 package constants
 
+import "github.com/spf13/pflag"
+
 const (
 	ProjectName                 string = "project-name"
 	ProjectNameDesc             string = "project name to identify the instance of the stack"
@@ -29,7 +31,25 @@ const (
 	AMISourceRegionDesc         string = "region for the ami to be copied worldwide"
 	Tags                        string = "tags"
 	TagsDesc                    string = "tags to add on each resource (--tags name1=value1,name2=value2)"
+	InstallGHActionsRunnerDesc  string = "Install and setup Github Actions runner in the instance"
+	GHActionsRunnerTokenDesc    string = "Token needed for registering the Github Actions Runner token"
+	GHActionsRunnerNameDesc     string = "Name for the Github Actions Runner"
+	GHActionsRunnerRepoDesc     string = "Full URL of the repository where the Github Actions Runner should be registered"
 
 	CreateCmdName  string = "create"
 	DestroyCmdName string = "destroy"
+
+	InstallGHActionsRunner string = "install-ghactions-runner"
+	GHActionsRunnerToken   string = "ghactions-runner-token"
+	GHActionsRunnerName    string = "ghactions-runner-name"
+	GHActionsRunnerRepo    string = "ghactions-runner-repo"
 )
+
+func GetGHActionsFlagset() *pflag.FlagSet {
+	flagSet := pflag.NewFlagSet(CreateCmdName, pflag.ExitOnError)
+	flagSet.Bool(InstallGHActionsRunner, false, InstallGHActionsRunnerDesc)
+	flagSet.StringP(GHActionsRunnerToken, "", "", GHActionsRunnerTokenDesc)
+	flagSet.StringP(GHActionsRunnerName, "", "", GHActionsRunnerNameDesc)
+	flagSet.StringP(GHActionsRunnerRepo, "", "", GHActionsRunnerRepoDesc)
+	return flagSet
+}

cmd/cmd/root.go → cmd/mapt/cmd/root.go

@@ -7,18 +7,18 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/redhat-developer/mapt/cmd/cmd/aws"
-	"github.com/redhat-developer/mapt/cmd/cmd/azure"
-	params "github.com/redhat-developer/mapt/cmd/cmd/constants"
+	"github.com/redhat-developer/mapt/cmd/mapt/cmd/aws"
+	"github.com/redhat-developer/mapt/cmd/mapt/cmd/azure"
+	params "github.com/redhat-developer/mapt/cmd/mapt/cmd/constants"
 	"github.com/redhat-developer/mapt/pkg/util/logging"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )
 
 const (
 	commandName      = "mapt"
-	descriptionShort = "PoC for pulumi"
-	descriptionLong  = "PoC for pulumi"
+	descriptionShort = "Multi Architecture Provisioning Tool"
+	descriptionLong  = "MAPT is a tool for creating pre-configured machines (baremetal or VMs) on cloud providers"
 
 	defaultErrorExitCode = 1
 )

cmd/mapt/main.go

@@ -0,0 +1,7 @@
+package main
+
+import "github.com/redhat-developer/mapt/cmd/mapt/cmd"
+
+func main() {
+	cmd.Execute()
+}