minor naming changes

updated docker-compose defaults
changed audit message from command to action

Signed-off-by: Logan Hendricks <llhendricks88@gmail.com>

atc/auditor/auditor.go

@@ -82,7 +82,7 @@ func (a *auditor) ValidateAction(action string) bool {
 func (a *auditor) Audit(action string, userName string, r *http.Request) {
 		err := r.ParseForm()
 		if err == nil &&  a.ValidateAction(action) {
-			a.logger.Info("audit", lager.Data{"command": action, "user": userName, "parameters": r.Form})
+			a.logger.Info("audit", lager.Data{"action": action, "user": userName, "parameters": r.Form})
 		}
 }
 

atc/auditor/auditor_test.go

@@ -91,7 +91,7 @@ var _ = Describe("Audit", func() {
 			It("Create a log including the action", func() {
 				aud.Audit(dummyAction, userName, req)
 				logs := logger.Logs()
-				Expect(logs[0].Data["command"]).To(Equal(dummyAction))
+				Expect(logs[0].Data["action"]).To(Equal(dummyAction))
 			})
 		})
 
@@ -148,7 +148,7 @@ var _ = Describe("Audit", func() {
 			It("Create a log including the action", func() {
 				aud.Audit(dummyAction, userName, req)
 				logs := logger.Logs()
-				Expect(logs[0].Data["command"]).To(Equal(dummyAction))
+				Expect(logs[0].Data["action"]).To(Equal(dummyAction))
 			})
 		})
 
@@ -204,7 +204,7 @@ var _ = Describe("Audit", func() {
 			It("Create a log including the action", func() {
 				aud.Audit(dummyAction, userName, req)
 				logs := logger.Logs()
-				Expect(logs[0].Data["command"]).To(Equal(dummyAction))
+				Expect(logs[0].Data["action"]).To(Equal(dummyAction))
 			})
 		})
 
@@ -261,7 +261,7 @@ var _ = Describe("Audit", func() {
 			It("Create a log including the action", func() {
 				aud.Audit(dummyAction, userName, req)
 				logs := logger.Logs()
-				Expect(logs[0].Data["command"]).To(Equal(dummyAction))
+				Expect(logs[0].Data["action"]).To(Equal(dummyAction))
 			})
 		})
 
@@ -319,7 +319,7 @@ var _ = Describe("Audit", func() {
 			It("Create a log including the action", func() {
 				aud.Audit(dummyAction, userName, req)
 				logs := logger.Logs()
-				Expect(logs[0].Data["command"]).To(Equal(dummyAction))
+				Expect(logs[0].Data["action"]).To(Equal(dummyAction))
 			})
 		})
 
@@ -377,7 +377,7 @@ var _ = Describe("Audit", func() {
 			It("Create a log including the action", func() {
 				aud.Audit(dummyAction, userName, req)
 				logs := logger.Logs()
-				Expect(logs[0].Data["command"]).To(Equal(dummyAction))
+				Expect(logs[0].Data["action"]).To(Equal(dummyAction))
 			})
 		})
 
@@ -434,7 +434,7 @@ var _ = Describe("Audit", func() {
 			It("Create a log including the action", func() {
 				aud.Audit(dummyAction, userName, req)
 				logs := logger.Logs()
-				Expect(logs[0].Data["command"]).To(Equal(dummyAction))
+				Expect(logs[0].Data["action"]).To(Equal(dummyAction))
 			})
 		})
 
@@ -490,7 +490,7 @@ var _ = Describe("Audit", func() {
 			It("Create a log including the action", func() {
 				aud.Audit(dummyAction, userName, req)
 				logs := logger.Logs()
-				Expect(logs[0].Data["command"]).To(Equal(dummyAction))
+				Expect(logs[0].Data["action"]).To(Equal(dummyAction))
 			})
 		})
 
@@ -546,7 +546,7 @@ var _ = Describe("Audit", func() {
 			It("Create a log including the action", func() {
 				aud.Audit(dummyAction, userName, req)
 				logs := logger.Logs()
-				Expect(logs[0].Data["command"]).To(Equal(dummyAction))
+				Expect(logs[0].Data["action"]).To(Equal(dummyAction))
 			})
 		})
 

docker-compose.yml

@@ -28,10 +28,6 @@ services:
       CONCOURSE_EXTERNAL_URL: http://localhost:8080
       CONCOURSE_ADD_LOCAL_USER: test:test,guest:guest
       CONCOURSE_MAIN_TEAM_LOCAL_USER: test
-      CONCOURSE_ENABLE_BUILD_AUDITING: 'true'
-      CONCOURSE_ENABLE_JOB_AUDITING: 'true'
-      CONCOURSE_ENABLE_PIPELINE_AUDITING: 'true'
-      CONCOURSE_ENABLE_TEAM_AUDITING: 'true'
       CONCOURSE_CLUSTER_NAME: dev
 
   worker: