Merge pull request #2 from hootsuite/slack-integration

Slack integration

CHANGELOG.md

@@ -1,3 +1,21 @@
+# v0.1.3
+## Features
+* Environment variables are passed through to `extra_arguments`. ([#150](https://github.com/hootsuite/atlantis/pull/150))
+* Tested hundreds of lines of code. Test coverage now at 60%. ([https://codecov.io/gh/hootsuite/atlantis](https://codecov.io/gh/hootsuite/atlantis))
+
+## Bug Fixes
+* Modules in list of changed files weren't being filtered. ([#193](https://github.com/hootsuite/atlantis/pull/193))
+* Nil pointer error in bootstrap mode. ([#181](https://github.com/hootsuite/atlantis/pull/181))
+
+## Downloads
+* [atlantis_darwin_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.3/atlantis_darwin_amd64.zip)
+* [atlantis_linux_386.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.3/atlantis_linux_386.zip)
+* [atlantis_linux_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.3/atlantis_linux_amd64.zip)
+* [atlantis_linux_arm.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.3/atlantis_linux_arm.zip)
+
+## Backwards Incompatibilities / Notes:
+None
+
 # v0.1.2 
 ## Features
 * all flags passed to `atlantis plan` or `atlantis apply` will now be passed through to `terraform`. ([#131](https://github.com/hootsuite/atlantis/pull/131))

Dockerfile

@@ -28,9 +28,9 @@ RUN apk add --no-cache ca-certificates gnupg curl git unzip bash openssh libcap
         rm -rf /root/.gnupg && rm -rf /var/cache/apk/*
 
 # install terraform binaries
-ENV DEFAULT_TERRAFORM_VERSION=0.10.7
+ENV DEFAULT_TERRAFORM_VERSION=0.10.8
 
-RUN AVAILABLE_TERRAFORM_VERSIONS="0.8.8 0.9.11 0.10.7" && \
+RUN AVAILABLE_TERRAFORM_VERSIONS="0.8.8 0.9.11 0.10.8" && \
     for VERSION in ${AVAILABLE_TERRAFORM_VERSIONS}; do curl -LOk https://releases.hashicorp.com/terraform/${VERSION}/terraform_${VERSION}_linux_amd64.zip && \
     mkdir -p /usr/local/bin/tf/versions/${VERSION} && \
     unzip terraform_${VERSION}_linux_amd64.zip -d /usr/local/bin/tf/versions/${VERSION} && \

Gopkg.toml

@@ -88,3 +88,7 @@
 [[constraint]]
   branch = "v2"
   name = "gopkg.in/yaml.v2"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/lkysow/go-gitlab"

Makefile

@@ -51,7 +51,7 @@ gometalint: ## Run every linter ever
 	# gotype and gotypex are disabled because they don't pass on CI and https://github.com/alecthomas/gometalinter/issues/206
 	# gocyclo is temporarily disabled because we don't pass it right now
 	# golint is temporarily disabled because we need to add comments everywhere first
-	gometalinter --disable gotype --disable gotypex --disable=gocyclo --disable golint --enable=megacheck --enable=unparam --deadline=120s --vendor -t --line-length=120 $$(find . -type f -name '*.go' ! -path "./vendor/*" ! -path "./server/static/bindata_assetfs.go" ! -path "**/mocks/*" | xargs -I '{}' dirname '{}' | sort -u)
+	gometalinter --disable gotype --disable gotypex --disable=gocyclo --disable golint --enable=megacheck --enable=unparam --deadline=300s --vendor -t --line-length=120 $$(find . -type f -name '*.go' ! -path "./vendor/*" ! -path "./server/static/bindata_assetfs.go" ! -path "**/mocks/*" | xargs -I '{}' dirname '{}' | sort -u)
 
 gometalint-install: ## Install gometalint
 	go get -u github.com/alecthomas/gometalinter

cmd/bootstrap.go

@@ -18,7 +18,9 @@ func (b *BootstrapCmd) Init() *cobra.Command {
 		Short: "Start a guided tour of Atlantis",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			err := bootstrap.Start()
-			fmt.Fprintf(os.Stderr, "\033[31mError: %s\033[39m\n\n", err.Error())
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "\033[31mError: %s\033[39m\n\n", err.Error())
+			}
 			return err
 		},
 	}

cmd/root.go

@@ -1,5 +1,5 @@
 // Package cmd holds all our cli commands.
-// These are different from the commands that get run via GitHub comments
+// These are different from the commands that get run via pull request comments.
 package cmd
 
 import (

cmd/server.go

@@ -25,6 +25,10 @@ const (
 	GHTokenFlag         = "gh-token"
 	GHUserFlag          = "gh-user"
 	GHWebHookSecret     = "gh-webhook-secret"
+	GitlabHostnameFlag  = "gitlab-hostname"
+	GitlabTokenFlag     = "gitlab-token"
+	GitlabUserFlag      = "gitlab-user"
+	GitlabWebHookSecret = "gitlab-webhook-secret"
 	LogLevelFlag        = "log-level"
 	PortFlag            = "port"
 	RequireApprovalFlag = "require-approval"
@@ -49,19 +53,42 @@ var stringFlags = []stringFlag{
 		description: "Hostname of your Github Enterprise installation. If using github.com, no need to set.",
 		value:       "github.com",
 	},
+	{
+		name:        GHUserFlag,
+		description: "GitHub username of API user.",
+	},
 	{
 		name:        GHTokenFlag,
-		description: "[REQUIRED] GitHub token of API user. Can also be specified via the ATLANTIS_GH_TOKEN environment variable.",
+		description: "GitHub token of API user. Can also be specified via the ATLANTIS_GH_TOKEN environment variable.",
 		env:         "ATLANTIS_GH_TOKEN",
 	},
 	{
-		name:        GHUserFlag,
-		description: "[REQUIRED] GitHub username of API user.",
+		name: GHWebHookSecret,
+		description: "Optional secret used to validate GitHub webhooks (see https://developer.github.com/webhooks/securing/)." +
+			" If not specified, Atlantis won't be able to validate that the incoming webhook call came from GitHub. " +
+			"Can also be specified via the ATLANTIS_GH_WEBHOOK_SECRET environment variable.",
+		env: "ATLANTIS_GH_WEBHOOK_SECRET",
+	},
+	{
+		name:        GitlabHostnameFlag,
+		description: "Hostname of your GitLab Enterprise installation. If using gitlab.com, no need to set.",
+		value:       "gitlab.com",
 	},
 	{
-		name:        GHWebHookSecret,
-		description: "Optional secret used for GitHub webhooks (see https://developer.github.com/webhooks/securing/). If not specified, Atlantis won't validate the incoming webhook call.",
-		env:         "ATLANTIS_GH_WEBHOOK_SECRET",
+		name:        GitlabUserFlag,
+		description: "GitLab username of API user.",
+	},
+	{
+		name:        GitlabTokenFlag,
+		description: "GitLab token of API user. Can also be specified via the ATLANTIS_GITLAB_TOKEN environment variable.",
+		env:         "ATLANTIS_GITLAB_TOKEN",
+	},
+	{
+		name: GitlabWebHookSecret,
+		description: "Optional secret used to validate GitLab webhooks." +
+			" If not specified, Atlantis won't be able to validate that the incoming webhook call came from GitLab. " +
+			"Can also be specified via the ATLANTIS_GITLAB_WEBHOOK_SECRET environment variable.",
+		env: "ATLANTIS_GITLAB_WEBHOOK_SECRET",
 	},
 	{
 		name:        LogLevelFlag,
@@ -206,7 +233,7 @@ func (s *ServerCmd) run() error {
 	if err := setDataDir(&config); err != nil {
 		return err
 	}
-	sanitizeGithubUser(&config)
+	trimAtSymbolFromUsers(&config)
 
 	// Config looks good. Start the server.
 	server, err := s.ServerCreator.NewServer(config)
@@ -221,11 +248,23 @@ func validate(config server.Config) error {
 	if logLevel != "debug" && logLevel != "info" && logLevel != "warn" && logLevel != "error" {
 		return errors.New("invalid log level: not one of debug, info, warn, error")
 	}
-	if config.GithubUser == "" {
-		return fmt.Errorf("--%s must be set", GHUserFlag)
+	vcsErr := fmt.Errorf("--%s/--%s or --%s/--%s must be set", GHUserFlag, GHTokenFlag, GitlabUserFlag, GitlabTokenFlag)
+
+	// The following combinations are valid.
+	// 1. github user and token
+	// 2. gitlab user and token
+	// 3. all 4 set
+	// We validate using contradiction (I think).
+	if config.GithubUser != "" && config.GithubToken == "" || config.GithubToken != "" && config.GithubUser == "" {
+		return vcsErr
+	}
+	if config.GitlabUser != "" && config.GitlabToken == "" || config.GitlabToken != "" && config.GitlabUser == "" {
+		return vcsErr
 	}
-	if config.GithubToken == "" {
-		return fmt.Errorf("--%s must be set", GHTokenFlag)
+	// At this point, we know that there can't be a single user/token without
+	// its pair, but we haven't checked if any user/token is set at all.
+	if config.GithubUser == "" && config.GitlabUser == "" {
+		return vcsErr
 	}
 	return nil
 }
@@ -256,9 +295,10 @@ func setDataDir(config *server.Config) error {
 	return nil
 }
 
-// sanitizeGithubUser trims @ from the front of the github username if it exists.
-func sanitizeGithubUser(config *server.Config) {
+// trimAtSymbolFromUsers trims @ from the front of the github and gitlab usernames
+func trimAtSymbolFromUsers(config *server.Config) {
 	config.GithubUser = strings.TrimPrefix(config.GithubUser, "@")
+	config.GitlabUser = strings.TrimPrefix(config.GitlabUser, "@")
 }
 
 // withErrPrint prints out any errors to a terminal in red.