Merge pull request #25 from ckaznocha/add_dcos_api_token

Add dcos api token

Author: ckaznocha

README.md

@@ -18,6 +18,8 @@ A [Concourse](https://concourse.ci/) resource to deploy applications to [Maratho
 
 *   `basic_auth`: *Optional.* Use if you are using HTTP Basic Auth to protect your Marathon instance. Takes `user_name` and `password`
 
+*   `api_token`: *Optional.* Use if you are using DC/OS and need to set an HTTP API token.
+
 ## Behavior
 
 ### `check`: Extract versions of an app from Marathon.

cmd/marathon-resource/behaviors/behaviors.go

@@ -22,6 +22,7 @@ type Source struct {
 	AppID     string              `json:"app_id"`
 	URI       string              `json:"uri"`
 	BasicAuth *marathon.AuthCreds `json:"basic_auth"`
+	APIToken  string              `json:"api_token"`
 }
 
 //Version maps to a concousre version

cmd/marathon-resource/behaviors/behaviors_test.go

@@ -29,24 +29,24 @@ func TestOut(t *testing.T) {
 		mockMarathoner.EXPECT().CheckDeployment("foo").Times(3).Return(false, nil),
 		mockMarathoner.EXPECT().CheckDeployment("bing").Times(1).Return(false, nil),
 		mockMarathoner.EXPECT().CheckDeployment("foo").Times(3).Return(false, nil),
-		mockMarathoner.EXPECT().CheckDeployment("bing").Times(1).Return(false, errors.New("Something bad happened")),
+		mockMarathoner.EXPECT().CheckDeployment("bing").Times(1).Return(false, errors.New("something bad happened")),
 		mockMarathoner.EXPECT().CheckDeployment("baz").Times(2).Return(true, nil),
-		mockMarathoner.EXPECT().CheckDeployment("quux").Times(1).Return(false, errors.New("Something bad happened")),
+		mockMarathoner.EXPECT().CheckDeployment("quux").Times(1).Return(false, errors.New("something bad happened")),
 		mockMarathoner.EXPECT().CheckDeployment("zork").Times(2).Return(true, nil),
 	)
 	gomock.InOrder(
 		mockMarathoner.EXPECT().DeleteDeployment("baz").Times(1).Return(nil),
-		mockMarathoner.EXPECT().DeleteDeployment("zork").Times(1).Return(errors.New("No way!")),
+		mockMarathoner.EXPECT().DeleteDeployment("zork").Times(1).Return(errors.New("no way")),
 	)
 	gomock.InOrder(
 		mockMarathoner.EXPECT().RestartApp(gomock.Any()).Times(1).Return(gomarathon.DeploymentID{DeploymentID: "bing", Version: "bar"}, nil),
-		mockMarathoner.EXPECT().RestartApp(gomock.Any()).Times(1).Return(gomarathon.DeploymentID{}, errors.New("No way!")),
+		mockMarathoner.EXPECT().RestartApp(gomock.Any()).Times(1).Return(gomarathon.DeploymentID{}, errors.New("no way")),
 		mockMarathoner.EXPECT().RestartApp(gomock.Any()).Times(1).Return(gomarathon.DeploymentID{DeploymentID: "bing", Version: "bar"}, nil),
 	)
 	gomock.InOrder(
 		mockMarathoner.EXPECT().LatestVersions(gomock.Any(), "").Times(1).Return([]string{"bar"}, nil),
 		mockMarathoner.EXPECT().LatestVersions(gomock.Any(), "").Times(2).Return([]string{"baz"}, nil),
-		mockMarathoner.EXPECT().LatestVersions(gomock.Any(), "").Times(1).Return([]string{}, errors.New("No way!")),
+		mockMarathoner.EXPECT().LatestVersions(gomock.Any(), "").Times(1).Return([]string{}, errors.New("no way")),
 		mockMarathoner.EXPECT().LatestVersions(gomock.Any(), "").Times(1).Return([]string{"baz"}, nil),
 		mockMarathoner.EXPECT().LatestVersions(gomock.Any(), "").Times(1).Return([]string{"baz"}, nil),
 	)

cmd/marathon-resource/main.go

@@ -42,7 +42,7 @@ func main() {
 		logger.WithError(err).Fatalf("Malformed URI %s", input.Source.URI)
 	}
 
-	m := marathon.NewMarathoner(&http.Client{}, uri, input.Source.BasicAuth, logger)
+	m := marathon.NewMarathoner(&http.Client{}, uri, input.Source.BasicAuth, input.Source.APIToken, logger)
 
 	switch os.Args[1] {
 	case check:

cmd/marathon-resource/marathon/marathon.go

@@ -39,10 +39,11 @@ type (
 		DeleteDeployment(deploymentID string) error
 	}
 	marathon struct {
-		client doer
-		url    *url.URL
-		auth   *AuthCreds
-		logger logrus.FieldLogger
+		client   doer
+		url      *url.URL
+		auth     *AuthCreds
+		apiToken string
+		logger   logrus.FieldLogger
 	}
 
 	//AuthCreds will be used for HTTP basic auth
@@ -57,8 +58,15 @@ func NewMarathoner(
 	client doer,
 	uri *url.URL,
 	auth *AuthCreds,
+	apiToken string,
 	logger logrus.FieldLogger) Marathoner {
-	return &marathon{client: client, url: uri, logger: logger}
+	return &marathon{
+		client:   client,
+		url:      uri,
+		auth:     auth,
+		apiToken: apiToken,
+		logger:   logger,
+	}
 }
 
 func (m *marathon) handleReq(
@@ -78,6 +86,10 @@ func (m *marathon) handleReq(
 	if m.auth != nil {
 		req.SetBasicAuth(m.auth.UserName, m.auth.Password)
 	}
+	if m.apiToken != "" {
+		req.Header.Set("Authorization", fmt.Sprintf("token=%s", m.apiToken))
+	}
+
 	m.logger.WithFields(
 		logrus.Fields{
 			"Method": req.Method,

cmd/marathon-resource/marathon/marathon_test.go

@@ -472,10 +472,10 @@ func Test_newMarathoner(t *testing.T) {
 		args args
 		want Marathoner
 	}{
-		{"Works", args{http.DefaultClient, &url.URL{}, logger}, &marathon{http.DefaultClient, &url.URL{}, nil, logger}},
+		{"Works", args{http.DefaultClient, &url.URL{}, logger}, &marathon{http.DefaultClient, &url.URL{}, nil, "", logger}},
 	}
 	for _, tt := range tests {
-		if got := NewMarathoner(tt.args.client, tt.args.uri, nil, logger); !reflect.DeepEqual(got, tt.want) {
+		if got := NewMarathoner(tt.args.client, tt.args.uri, nil, "", logger); !reflect.DeepEqual(got, tt.want) {
 			t.Errorf("%q. NewMarathoner() = %v, want %v", tt.name, got, tt.want)
 		}
 	}