Merge branch 'concourse:master' into master

concourse · Jul 28, 2023 · cf75373 · cf75373
2 parents 2e0a47a + 3793327
commit cf75373
Show file tree

Hide file tree

Showing 533 changed files with 6,509 additions and 3,970 deletions.
diff --git a/atc/api/accessor/handler.go b/atc/api/accessor/handler.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"github.com/concourse/concourse/atc"
 	"github.com/concourse/concourse/atc/auditor"
 )

diff --git a/atc/api/accessor/handler_test.go b/atc/api/accessor/handler_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"github.com/concourse/concourse/atc"
 	"github.com/concourse/concourse/atc/api/accessor"
 	"github.com/concourse/concourse/atc/api/accessor/accessorfakes"

diff --git a/atc/api/accessor/teams_cacher.go b/atc/api/accessor/teams_cacher.go
@@ -3,7 +3,7 @@ package accessor
 import (
 	"time"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"github.com/concourse/concourse/atc"
 	"github.com/concourse/concourse/atc/db"
 	"github.com/patrickmn/go-cache"

diff --git a/atc/api/accessor/teams_cacher_test.go b/atc/api/accessor/teams_cacher_test.go
@@ -3,7 +3,7 @@ package accessor_test
 import (
 	"time"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"github.com/concourse/concourse/atc/api/accessor"
 	"github.com/concourse/concourse/atc/api/accessor/accessorfakes"
 

diff --git a/atc/api/accessor/verifier.go b/atc/api/accessor/verifier.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/concourse/concourse/atc/db"
-	"gopkg.in/square/go-jose.v2/jwt"
+	"github.com/go-jose/go-jose/v3/jwt"
 )
 
 var (

diff --git a/atc/api/accessor/verifier_test.go b/atc/api/accessor/verifier_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/concourse/concourse/atc/db"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"gopkg.in/square/go-jose.v2/jwt"
+	"github.com/go-jose/go-jose/v3/jwt"
 
 	"github.com/concourse/concourse/atc/api/accessor"
 )

diff --git a/atc/api/api_suite_test.go b/atc/api/api_suite_test.go
@@ -1,7 +1,6 @@
 package api_test
 
 import (
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -12,8 +11,8 @@ import (
 	"github.com/concourse/concourse/atc"
 
 	"code.cloudfoundry.org/clock/fakeclock"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 
 	"github.com/concourse/concourse/atc/api"
 	"github.com/concourse/concourse/atc/api/accessor"
@@ -154,7 +153,7 @@ var _ = BeforeEach(func() {
 	fakeClock = fakeclock.NewFakeClock(time.Unix(123, 456))
 
 	var err error
-	cliDownloadsDir, err = ioutil.TempDir("", "cli-downloads")
+	cliDownloadsDir, err = os.MkdirTemp("", "cli-downloads")
 	Expect(err).NotTo(HaveOccurred())
 
 	constructedEventHandler = &fakeEventHandlerFactory{}

diff --git a/atc/api/artifacts_test.go b/atc/api/artifacts_test.go
@@ -3,7 +3,7 @@ package api_test
 import (
 	"context"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"time"
@@ -111,7 +111,7 @@ var _ = Describe("ArtifactRepository API", func() {
 			})
 
 			It("returns the artifact record", func() {
-				body, err := ioutil.ReadAll(response.Body)
+				body, err := io.ReadAll(response.Body)
 				Expect(err).NotTo(HaveOccurred())
 
 				Expect(body).To(MatchJSON(`{
@@ -253,7 +253,7 @@ var _ = Describe("ArtifactRepository API", func() {
 					It("streams out the contents of the volume from the root path", func() {
 						tarStream := runtimetest.VolumeContent{}
 
-						err := tarStream.StreamIn(context.Background(), ".", baggageclaim.GzipEncoding, response.Body)
+						err := tarStream.StreamIn(context.Background(), ".", baggageclaim.GzipEncoding, 0, response.Body)
 						Expect(err).ToNot(HaveOccurred())
 
 						Expect(tarStream).To(Equal(volume.Content))

diff --git a/atc/api/artifactserver/create.go b/atc/api/artifactserver/create.go
@@ -2,8 +2,8 @@ package artifactserver
 
 import (
 	"encoding/json"
-	"net/http"
 	"fmt"
+	"net/http"
 
 	"github.com/concourse/concourse/atc/api/present"
 	"github.com/concourse/concourse/atc/compression"
@@ -31,14 +31,14 @@ func (s *Server) CreateArtifact(team db.Team) http.Handler {
 		volume, artifact, err := s.workerPool.CreateVolumeForArtifact(ctx, workerSpec)
 		if err != nil {
 			hLog.Error("failed-to-create-volume", err)
-			http.Error(w, fmt.Sprintf("%v",err), http.StatusInternalServerError)
+			http.Error(w, fmt.Sprintf("%v", err), http.StatusInternalServerError)
 			return
 		}
 
-		err = volume.StreamIn(r.Context(), "/", compression.NewGzipCompression(), r.Body)
+		err = volume.StreamIn(r.Context(), "/", compression.NewGzipCompression(), 0, r.Body)
 		if err != nil {
 			hLog.Error("failed-to-stream-volume-contents", err)
-			http.Error(w, fmt.Sprintf("%v",err), http.StatusInternalServerError)
+			http.Error(w, fmt.Sprintf("%v", err), http.StatusInternalServerError)
 			return
 		}
 

diff --git a/atc/api/artifactserver/server.go b/atc/api/artifactserver/server.go
@@ -3,7 +3,7 @@ package artifactserver
 import (
 	"context"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"github.com/concourse/concourse/atc/db"
 	"github.com/concourse/concourse/atc/runtime"
 	"github.com/concourse/concourse/atc/worker"

diff --git a/atc/api/auth/auth_suite_test.go b/atc/api/auth/auth_suite_test.go
@@ -3,7 +3,7 @@ package auth_test
 import (
 	"testing"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )

diff --git a/atc/api/auth/check_admin_handler_test.go b/atc/api/auth/check_admin_handler_test.go
@@ -3,7 +3,6 @@ package auth_test
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 
@@ -104,7 +103,7 @@ var _ = Describe("CheckAdminHandler", func() {
 				})
 
 				It("proxies to the handler", func() {
-					responseBody, err := ioutil.ReadAll(response.Body)
+					responseBody, err := io.ReadAll(response.Body)
 					Expect(err).NotTo(HaveOccurred())
 					Expect(string(responseBody)).To(Equal("simple hello"))
 				})
@@ -124,7 +123,7 @@ var _ = Describe("CheckAdminHandler", func() {
 
 			It("rejects the request", func() {
 				Expect(response.StatusCode).To(Equal(http.StatusUnauthorized))
-				responseBody, err := ioutil.ReadAll(response.Body)
+				responseBody, err := io.ReadAll(response.Body)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(string(responseBody)).To(Equal("nope\n"))
 			})

diff --git a/atc/api/auth/check_authentication_handler_test.go b/atc/api/auth/check_authentication_handler_test.go
@@ -3,7 +3,6 @@ package auth_test
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 
@@ -92,7 +91,7 @@ var _ = Describe("AuthenticationHandler", func() {
 				})
 
 				It("proxies to the handler", func() {
-					responseBody, err := ioutil.ReadAll(response.Body)
+					responseBody, err := io.ReadAll(response.Body)
 					Expect(err).NotTo(HaveOccurred())
 					Expect(string(responseBody)).To(Equal("simple hello"))
 				})
@@ -108,7 +107,7 @@ var _ = Describe("AuthenticationHandler", func() {
 				})
 
 				It("rejects the request", func() {
-					responseBody, err := ioutil.ReadAll(response.Body)
+					responseBody, err := io.ReadAll(response.Body)
 					Expect(err).NotTo(HaveOccurred())
 					Expect(string(responseBody)).To(Equal("nope\n"))
 				})
@@ -155,7 +154,7 @@ var _ = Describe("AuthenticationHandler", func() {
 					})
 
 					It("rejects the request", func() {
-						responseBody, err := ioutil.ReadAll(response.Body)
+						responseBody, err := io.ReadAll(response.Body)
 						Expect(err).NotTo(HaveOccurred())
 						Expect(string(responseBody)).To(Equal("nope\n"))
 					})
@@ -171,7 +170,7 @@ var _ = Describe("AuthenticationHandler", func() {
 					})
 
 					It("proxies to the handler", func() {
-						responseBody, err := ioutil.ReadAll(response.Body)
+						responseBody, err := io.ReadAll(response.Body)
 						Expect(err).NotTo(HaveOccurred())
 						Expect(string(responseBody)).To(Equal("simple hello"))
 					})
@@ -188,7 +187,7 @@ var _ = Describe("AuthenticationHandler", func() {
 				})
 
 				It("proxies to the handler", func() {
-					responseBody, err := ioutil.ReadAll(response.Body)
+					responseBody, err := io.ReadAll(response.Body)
 					Expect(err).NotTo(HaveOccurred())
 					Expect(string(responseBody)).To(Equal("simple hello"))
 				})

diff --git a/atc/api/auth/check_authorization_handler_test.go b/atc/api/auth/check_authorization_handler_test.go
@@ -3,7 +3,6 @@ package auth_test
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -105,7 +104,7 @@ var _ = Describe("CheckAuthorizationHandler", func() {
 				})
 
 				It("proxies to the handler", func() {
-					responseBody, err := ioutil.ReadAll(response.Body)
+					responseBody, err := io.ReadAll(response.Body)
 					Expect(err).NotTo(HaveOccurred())
 					Expect(string(responseBody)).To(Equal("simple hello"))
 				})
@@ -118,7 +117,7 @@ var _ = Describe("CheckAuthorizationHandler", func() {
 
 				It("returns 403", func() {
 					Expect(response.StatusCode).To(Equal(http.StatusForbidden))
-					responseBody, err := ioutil.ReadAll(response.Body)
+					responseBody, err := io.ReadAll(response.Body)
 					Expect(err).NotTo(HaveOccurred())
 					Expect(string(responseBody)).To(Equal("nope\n"))
 				})
@@ -132,7 +131,7 @@ var _ = Describe("CheckAuthorizationHandler", func() {
 
 			It("returns 401", func() {
 				Expect(response.StatusCode).To(Equal(http.StatusUnauthorized))
-				responseBody, err := ioutil.ReadAll(response.Body)
+				responseBody, err := io.ReadAll(response.Body)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(string(responseBody)).To(Equal("nope\n"))
 			})

diff --git a/atc/api/auth/csrf_validation_handler.go b/atc/api/auth/csrf_validation_handler.go
@@ -3,7 +3,7 @@ package auth
 import (
 	"net/http"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 
 	"github.com/concourse/concourse/skymarshal/token"
 )

diff --git a/atc/api/auth/csrf_validation_handler_test.go b/atc/api/auth/csrf_validation_handler_test.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 
 	"github.com/concourse/concourse/atc/api/auth"
 	"github.com/concourse/concourse/skymarshal/token/tokenfakes"

diff --git a/atc/api/auth/web_auth_handler_test.go b/atc/api/auth/web_auth_handler_test.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 

diff --git a/atc/api/builds_test.go b/atc/api/builds_test.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"time"
 
@@ -125,7 +125,7 @@ var _ = Describe("Builds API", func() {
 					})
 
 					It("returns the created build", func() {
-						body, err := ioutil.ReadAll(response.Body)
+						body, err := io.ReadAll(response.Body)
 						Expect(err).NotTo(HaveOccurred())
 
 						Expect(body).To(MatchJSON(`{
@@ -263,7 +263,7 @@ var _ = Describe("Builds API", func() {
 				})
 
 				It("returns all builds", func() {
-					body, err := ioutil.ReadAll(response.Body)
+					body, err := io.ReadAll(response.Body)
 					Expect(err).NotTo(HaveOccurred())
 
 					Expect(body).To(MatchJSON(`[
@@ -398,7 +398,7 @@ var _ = Describe("Builds API", func() {
 				})
 
 				It("returns all builds", func() {
-					body, err := ioutil.ReadAll(response.Body)
+					body, err := io.ReadAll(response.Body)
 					Expect(err).NotTo(HaveOccurred())
 
 					Expect(body).To(MatchJSON(`[
@@ -623,7 +623,7 @@ var _ = Describe("Builds API", func() {
 							buildID := dbBuildFactory.BuildForAPIArgsForCall(0)
 							Expect(buildID).To(Equal(1))
 
-							body, err := ioutil.ReadAll(response.Body)
+							body, err := io.ReadAll(response.Body)
 							Expect(err).NotTo(HaveOccurred())
 
 							Expect(body).To(MatchJSON(`{
@@ -762,7 +762,7 @@ var _ = Describe("Builds API", func() {
 					})
 
 					It("returns the build with it's input and output versioned resources", func() {
-						body, err := ioutil.ReadAll(response.Body)
+						body, err := io.ReadAll(response.Body)
 						Expect(err).NotTo(HaveOccurred())
 
 						Expect(body).To(MatchJSON(`{
@@ -895,7 +895,7 @@ var _ = Describe("Builds API", func() {
 				})
 
 				It("serves the request via the event handler", func() {
-					body, err := ioutil.ReadAll(response.Body)
+					body, err := io.ReadAll(response.Body)
 					Expect(err).NotTo(HaveOccurred())
 
 					Expect(string(body)).To(Equal("fake event handler factory was here"))
@@ -957,7 +957,7 @@ var _ = Describe("Builds API", func() {
 							})
 
 							It("serves the request via the event handler", func() {
-								body, err := ioutil.ReadAll(response.Body)
+								body, err := io.ReadAll(response.Body)
 								Expect(err).NotTo(HaveOccurred())
 
 								Expect(string(body)).To(Equal("fake event handler factory was here"))
@@ -1271,7 +1271,7 @@ var _ = Describe("Builds API", func() {
 				})
 
 				It("returns the build preparation", func() {
-					body, err := ioutil.ReadAll(response.Body)
+					body, err := io.ReadAll(response.Body)
 					Expect(err).NotTo(HaveOccurred())
 
 					Expect(body).To(MatchJSON(`{
@@ -1491,7 +1491,7 @@ var _ = Describe("Builds API", func() {
 					})
 
 					It("returns the plan", func() {
-						body, err := ioutil.ReadAll(response.Body)
+						body, err := io.ReadAll(response.Body)
 						Expect(err).NotTo(HaveOccurred())
 
 						Expect(body).To(MatchJSON(`{

diff --git a/atc/api/buildserver/create.go b/atc/api/buildserver/create.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"github.com/concourse/concourse/atc"
 	"github.com/concourse/concourse/atc/api/present"
 	"github.com/concourse/concourse/atc/db"