From efca7c29a08f1669b2f32f60e3385dfc02b9a1a0 Mon Sep 17 00:00:00 2001
From: "Mark St.Godard" <markstgodard@gmail.com>
Date: Wed, 28 Jun 2017 21:19:22 -0500
Subject: [PATCH] Fly and GitLab OAuth integration

- Add missing import to ensure fly CLI picks up the new gitlab oauth
options
---
 integration/set_team_test.go | 54 ++++++++++++++++++++++++++++++++++++
 main.go                      |  1 +
 2 files changed, 55 insertions(+)

diff --git a/integration/set_team_test.go b/integration/set_team_test.go
index 68a3a97..cd6079f 100644
--- a/integration/set_team_test.go
+++ b/integration/set_team_test.go
@@ -164,6 +164,60 @@ var _ = Describe("Fly CLI", func() {
 			})
 		})
 
+		Describe("gitlab auth", func() {
+			Context("ClientID omitted", func() {
+				BeforeEach(func() {
+					cmdParams = []string{"--gitlab-auth-client-secret", "brock123"}
+				})
+
+				It("returns an error", func() {
+					sess, err := gexec.Start(flyCmd, nil, nil)
+					Expect(err).ToNot(HaveOccurred())
+					Eventually(sess.Err).Should(gbytes.Say("must specify --gitlab-auth-client-id and --gitlab-auth-client-secret to use GitLab OAuth."))
+					Eventually(sess).Should(gexec.Exit(1))
+				})
+			})
+
+			Context("ClientSecret omitted", func() {
+				BeforeEach(func() {
+					cmdParams = []string{"--gitlab-auth-client-id", "Brock Samson"}
+				})
+
+				It("returns an error", func() {
+					sess, err := gexec.Start(flyCmd, nil, nil)
+					Expect(err).ToNot(HaveOccurred())
+					Eventually(sess.Err).Should(gbytes.Say("must specify --gitlab-auth-client-id and --gitlab-auth-client-secret to use GitLab OAuth."))
+					Eventually(sess).Should(gexec.Exit(1))
+				})
+			})
+
+			Context("ClientID and ClientSecret omitted", func() {
+				BeforeEach(func() {
+					cmdParams = []string{"--gitlab-auth-group", "my-gitlab-group"}
+				})
+
+				It("returns an error", func() {
+					sess, err := gexec.Start(flyCmd, nil, nil)
+					Expect(err).ToNot(HaveOccurred())
+					Eventually(sess.Err).Should(gbytes.Say("must specify --gitlab-auth-client-id and --gitlab-auth-client-secret to use GitLab OAuth."))
+					Eventually(sess).Should(gexec.Exit(1))
+				})
+			})
+
+			Context("group is omitted", func() {
+				BeforeEach(func() {
+					cmdParams = []string{"--gitlab-auth-client-id", "Brock Samson", "--gitlab-auth-client-secret", "brock123"}
+				})
+
+				It("returns an error", func() {
+					sess, err := gexec.Start(flyCmd, nil, nil)
+					Expect(err).ToNot(HaveOccurred())
+					Eventually(sess.Err).Should(gbytes.Say("the following is required for gitlab-auth: groups"))
+					Eventually(sess).Should(gexec.Exit(1))
+				})
+			})
+		})
+
 		Describe("uaa auth", func() {
 			Context("ClientID omitted", func() {
 				BeforeEach(func() {
diff --git a/main.go b/main.go
index 2f8f47b..aa850ee 100644
--- a/main.go
+++ b/main.go
@@ -14,6 +14,7 @@ import (
 
 	_ "github.com/concourse/atc/auth/genericoauth"
 	_ "github.com/concourse/atc/auth/github"
+	_ "github.com/concourse/atc/auth/gitlab"
 	_ "github.com/concourse/atc/auth/uaa"
 )