Set Content-Type to "application/json" where applicable in API

Closes concourse/concourse#1111.
SHyx0rmZ · Apr 18, 2018 · 84e8772 · 84e8772
1 parent bd7423f
commit 84e8772
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 0 deletions.
diff --git a/api/buildserver/create.go b/api/buildserver/create.go
@@ -38,6 +38,7 @@ func (s *Server) CreateBuild(team db.Team) http.Handler {
 
 		go engineBuild.Resume(hLog)
 
+		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
 		err = json.NewEncoder(w).Encode(present.Build(build))

diff --git a/api/buildserver/get.go b/api/buildserver/get.go
@@ -12,6 +12,7 @@ func (s *Server) GetBuild(build db.Build) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		logger := s.logger.Session("get-build")
 
+		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
 		err := json.NewEncoder(w).Encode(present.Build(build))

diff --git a/api/buildserver/plan.go b/api/buildserver/plan.go
@@ -12,6 +12,7 @@ func (s *Server) GetBuildPlan(build db.Build) http.Handler {
 	hLog := s.logger.Session("get-build-plan")
 
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
 		err := json.NewEncoder(w).Encode(atc.PublicBuildPlan{
 			Schema: build.Engine(),
 			Plan:   build.PublicPlan(),

diff --git a/api/buildserver/preparation.go b/api/buildserver/preparation.go
@@ -25,6 +25,7 @@ func (s *Server) GetBuildPreparation(build db.Build) http.Handler {
 			return
 		}
 
+		w.Header().Set("Content-Type", "application/json")
 		err = json.NewEncoder(w).Encode(present.BuildPreparation(prep))
 		if err != nil {
 			logger.Error("failed-to-encode-build-preparation", err)

diff --git a/api/buildserver/resources.go b/api/buildserver/resources.go
@@ -36,6 +36,7 @@ func (s *Server) BuildResources(build db.Build) http.Handler {
 			Outputs: atcOutputs,
 		}
 
+		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 		err = json.NewEncoder(w).Encode(output)
 		if err != nil {

diff --git a/api/configserver/get.go b/api/configserver/get.go
@@ -78,6 +78,7 @@ func (s *Server) GetConfig(w http.ResponseWriter, r *http.Request) {
 	}
 
 	w.Header().Set(atc.ConfigVersionHeader, fmt.Sprintf("%d", pipeline.ConfigVersion()))
+	w.Header().Set("Content-Type", "application/json")
 
 	err = json.NewEncoder(w).Encode(atc.ConfigResponse{
 		Config:    &config,

diff --git a/api/configserver/save.go b/api/configserver/save.go
@@ -134,6 +134,8 @@ func (s *Server) SaveConfig(w http.ResponseWriter, r *http.Request) {
 
 	session.Info("saved")
 
+	w.Header().Set("Content-Type", "application/json")
+
 	if created {
 		w.WriteHeader(http.StatusCreated)
 	} else {

diff --git a/api/infoserver/info.go b/api/infoserver/info.go
@@ -10,6 +10,7 @@ import (
 func (s *Server) Info(w http.ResponseWriter, r *http.Request) {
 	logger := s.logger.Session("info")
 
+	w.Header().Set("Content-Type", "application/json")
 	err := json.NewEncoder(w).Encode(atc.Info{Version: s.version, WorkerVersion: s.workerVersion})
 	if err != nil {
 		logger.Error("failed-to-encode-info", err)

diff --git a/api/jobserver/get.go b/api/jobserver/get.go
@@ -34,6 +34,7 @@ func (s *Server) GetJob(pipeline db.Pipeline) http.Handler {
 
 		teamName := r.FormValue(":team_name")
 
+		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
 		err = json.NewEncoder(w).Encode(present.Job(

diff --git a/api/jobserver/get_build.go b/api/jobserver/get_build.go
@@ -38,6 +38,7 @@ func (s *Server) GetJobBuild(pipeline db.Pipeline) http.Handler {
 			return
 		}
 
+		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
 		err = json.NewEncoder(w).Encode(present.Build(build))

diff --git a/api/jobserver/list_inputs.go b/api/jobserver/list_inputs.go
@@ -71,6 +71,7 @@ func (s *Server) ListJobInputs(pipeline db.Pipeline) http.Handler {
 			presentedBuildInputs[i] = present.BuildInput(input, config, resource.Source())
 		}
 
+		w.Header().Set("Content-Type", "application/json")
 		err = json.NewEncoder(w).Encode(presentedBuildInputs)
 		if err != nil {
 			logger.Error("failed-to-encode-build-inputs", err)

diff --git a/api/pipelineserver/build.go b/api/pipelineserver/build.go
@@ -38,6 +38,7 @@ func (s *Server) CreateBuild(pipelineDB db.Pipeline) http.Handler {
 
 		go engineBuild.Resume(logger)
 
+		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 
 		err = json.NewEncoder(w).Encode(present.Build(build))

diff --git a/api/resourceserver/get.go b/api/resourceserver/get.go
@@ -36,6 +36,7 @@ func (s *Server) GetResource(pipeline db.Pipeline) http.Handler {
 			teamName,
 		)
 
+		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 
 		err = json.NewEncoder(w).Encode(resource)

diff --git a/api/resourceserver/list.go b/api/resourceserver/list.go
@@ -37,6 +37,7 @@ func (s *Server) ListResources(pipeline db.Pipeline) http.Handler {
 			)
 		}
 
+		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 		err = json.NewEncoder(w).Encode(presentedResources)
 		if err != nil {

diff --git a/api/teamserver/list.go b/api/teamserver/list.go
@@ -23,6 +23,7 @@ func (s *Server) ListTeams(w http.ResponseWriter, r *http.Request) {
 		presentedTeams[i] = present.Team(team)
 	}
 
+	w.Header().Set("Content-Type", "application/json")
 	err = json.NewEncoder(w).Encode(presentedTeams)
 	if err != nil {
 		hLog.Error("failed-to-encode-teams", err)

diff --git a/api/teamserver/set.go b/api/teamserver/set.go
@@ -91,6 +91,7 @@ func (s *Server) SetTeam(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 	} else if acc.IsAdmin() {
 		hLog.Debug("creating team")
@@ -101,6 +102,7 @@ func (s *Server) SetTeam(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
+		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusCreated)
 	} else {
 		w.WriteHeader(http.StatusForbidden)

diff --git a/api/volumeserver/list.go b/api/volumeserver/list.go
@@ -35,6 +35,7 @@ func (s *Server) ListVolumes(team db.Team) http.Handler {
 			}
 		}
 
+		w.Header().Set("Content-Type", "application/json")
 		err = json.NewEncoder(w).Encode(presentedVolumes)
 		if err != nil {
 			hLog.Error("failed-to-encode-volumes", err)

diff --git a/api/workerserver/heartbeat.go b/api/workerserver/heartbeat.go
@@ -64,6 +64,7 @@ func (s *Server) HeartbeatWorker(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
 	err = json.NewEncoder(w).Encode(present.Worker(savedWorker))
 	if err != nil {

diff --git a/api/workerserver/list.go b/api/workerserver/list.go
@@ -29,6 +29,7 @@ func (s *Server) ListWorkers(w http.ResponseWriter, r *http.Request) {
 		atcWorkers[i] = present.Worker(savedWorker)
 	}
 
+	w.Header().Set("Content-Type", "application/json")
 	err = json.NewEncoder(w).Encode(atcWorkers)
 	if err != nil {
 		logger.Error("failed-to-encode-workers", err)