Add assume_aws_role_arn that uses EC2 instance profile

README.md

@@ -19,6 +19,11 @@ version numbers.
 * `aws_role_arn`: *Optional.* The AWS role ARN to be assumed by the user
   identified by `access_key_id` and `secret_access_key`.
 
+* `assume_aws_role_arn`: *Optional.* The AWS role ARN to be assumed using the
+    Concourse workers EC2 instance credentials. The workers instance role must
+    have permissions to assume the role. **This is different from the
+    `aws_role_arn` and takes precedence over it**
+
 * `region_name`: *Optional.* The region the bucket is in. Defaults to
   `us-east-1`.
 

check/check_suite_test.go

@@ -1,7 +1,6 @@
 package check_test
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -37,7 +36,7 @@ func TestCheck(t *testing.T) {
 
 func Fixture(filename string) string {
 	path := filepath.Join("fixtures", filename)
-	contents, err := ioutil.ReadFile(path)
+	contents, err := os.ReadFile(path)
 	if err != nil {
 		panic(err)
 	}

check/command_test.go

@@ -1,7 +1,6 @@
 package check_test
 
 import (
-	"io/ioutil"
 	"os"
 
 	. "github.com/onsi/ginkgo"
@@ -25,7 +24,7 @@ var _ = Describe("Check Command", func() {
 
 		BeforeEach(func() {
 			var err error
-			tmpPath, err = ioutil.TempDir("", "check_command")
+			tmpPath, err = os.MkdirTemp("", "check_command")
 			Ω(err).ShouldNot(HaveOccurred())
 
 			request = Request{

cmd/check/main.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"os"
 
-	"github.com/concourse/s3-resource"
+	s3resource "github.com/concourse/s3-resource"
 	"github.com/concourse/s3-resource/check"
 )
 
@@ -16,18 +16,22 @@ func main() {
 		request.Source.AccessKeyID,
 		request.Source.SecretAccessKey,
 		request.Source.SessionToken,
+		request.Source.AssumeAwsRoleARN,
 		request.Source.RegionName,
 		request.Source.Endpoint,
 		request.Source.DisableSSL,
 		request.Source.SkipSSLVerification,
 	)
 
-	client := s3resource.NewS3Client(
+	client, err := s3resource.NewS3Client(
 		os.Stderr,
 		awsConfig,
 		request.Source.UseV2Signing,
 		request.Source.AwsRoleARN,
 	)
+	if err != nil {
+		s3resource.Fatal("failed to create new S3 client", err)
+	}
 
 	command := check.NewCommand(client)
 	response, err := command.Run(request)

cmd/in/main.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/concourse/s3-resource"
+	s3resource "github.com/concourse/s3-resource"
 	"github.com/concourse/s3-resource/in"
 )
 
@@ -28,6 +28,7 @@ func main() {
 		request.Source.AccessKeyID,
 		request.Source.SecretAccessKey,
 		request.Source.SessionToken,
+		request.Source.AssumeAwsRoleARN,
 		request.Source.RegionName,
 		request.Source.Endpoint,
 		request.Source.DisableSSL,
@@ -50,12 +51,15 @@ func main() {
 		awsConfig.Endpoint = aws.String(fmt.Sprintf("%s://%s", cloudfrontUrl.Scheme, fqdn))
 	}
 
-	client := s3resource.NewS3Client(
+	client, err := s3resource.NewS3Client(
 		os.Stderr,
 		awsConfig,
 		request.Source.UseV2Signing,
 		request.Source.AwsRoleARN,
 	)
+	if err != nil {
+		s3resource.Fatal("failed to create new S3 client", err)
+	}
 
 	command := in.NewCommand(client)
 

cmd/out/main.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"os"
 
-	"github.com/concourse/s3-resource"
+	s3resource "github.com/concourse/s3-resource"
 	"github.com/concourse/s3-resource/out"
 )
 
@@ -23,18 +23,22 @@ func main() {
 		request.Source.AccessKeyID,
 		request.Source.SecretAccessKey,
 		request.Source.SessionToken,
+		request.Source.AssumeAwsRoleARN,
 		request.Source.RegionName,
 		request.Source.Endpoint,
 		request.Source.DisableSSL,
 		request.Source.SkipSSLVerification,
 	)
 
-	client := s3resource.NewS3Client(
+	client, err := s3resource.NewS3Client(
 		os.Stderr,
 		awsConfig,
 		request.Source.UseV2Signing,
 		request.Source.AwsRoleARN,
 	)
+	if err != nil {
+		s3resource.Fatal("failed to create new S3 client", err)
+	}
 
 	command := out.NewCommand(os.Stderr, client)
 	response, err := command.Run(sourceDir, request)

in/command.go

@@ -4,13 +4,12 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
 	"strconv"
 
-	"github.com/concourse/s3-resource"
+	s3resource "github.com/concourse/s3-resource"
 	"github.com/concourse/s3-resource/versions"
 )
 
@@ -179,11 +178,11 @@ func (command *Command) Run(destinationDir string, request Request) (Response, e
 }
 
 func (command *Command) writeURLFile(destDir string, url string) error {
-	return ioutil.WriteFile(filepath.Join(destDir, "url"), []byte(url), 0644)
+	return os.WriteFile(filepath.Join(destDir, "url"), []byte(url), 0644)
 }
 
 func (command *Command) writeVersionFile(versionNumber string, destDir string) error {
-	return ioutil.WriteFile(filepath.Join(destDir, "version"), []byte(versionNumber), 0644)
+	return os.WriteFile(filepath.Join(destDir, "version"), []byte(versionNumber), 0644)
 }
 
 func (command *Command) downloadFile(bucketName string, remotePath string, versionID string, destinationDir string, destinationFile string) error {
@@ -209,7 +208,7 @@ func (command *Command) downloadTags(bucketName string, remotePath string, versi
 }
 
 func (command *Command) createInitialFile(destDir string, destFile string, data []byte) error {
-	return ioutil.WriteFile(filepath.Join(destDir, destFile), []byte(data), 0644)
+	return os.WriteFile(filepath.Join(destDir, destFile), []byte(data), 0644)
 }
 
 func (command *Command) metadata(remotePath string, private bool, url string) []s3resource.MetadataPair {
@@ -241,7 +240,7 @@ func extractArchive(mime, filename string) error {
 	}
 
 	if mime == "application/gzip" || mime == "application/x-gzip" {
-		fileInfos, err := ioutil.ReadDir(destDir)
+		fileInfos, err := os.ReadDir(destDir)
 		if err != nil {
 			return fmt.Errorf("failed to read dir: %s", err)
 		}

in/command_test.go

@@ -5,7 +5,6 @@ import (
 	"archive/zip"
 	"compress/gzip"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"path"
@@ -15,7 +14,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/concourse/s3-resource"
+	s3resource "github.com/concourse/s3-resource"
 	. "github.com/concourse/s3-resource/in"
 
 	"github.com/concourse/s3-resource/fakes"
@@ -34,7 +33,7 @@ var _ = Describe("In Command", func() {
 
 		BeforeEach(func() {
 			var err error
-			tmpPath, err = ioutil.TempDir("", "in_command")
+			tmpPath, err = os.MkdirTemp("", "in_command")
 			Ω(err).ShouldNot(HaveOccurred())
 
 			destDir = filepath.Join(tmpPath, "destination")
@@ -154,7 +153,7 @@ var _ = Describe("In Command", func() {
 				Ω(err).ShouldNot(HaveOccurred())
 
 				Ω(urlPath).Should(ExistOnFilesystem())
-				contents, err := ioutil.ReadFile(urlPath)
+				contents, err := os.ReadFile(urlPath)
 				Ω(err).ShouldNot(HaveOccurred())
 				Ω(string(contents)).Should(Equal("http://google.com"))
 
@@ -178,7 +177,7 @@ var _ = Describe("In Command", func() {
 					Ω(err).ShouldNot(HaveOccurred())
 
 					Ω(urlPath).Should(ExistOnFilesystem())
-					contents, err := ioutil.ReadFile(urlPath)
+					contents, err := os.ReadFile(urlPath)
 					Ω(err).ShouldNot(HaveOccurred())
 					Ω(string(contents)).Should(Equal("http://google.com"))
 
@@ -199,7 +198,7 @@ var _ = Describe("In Command", func() {
 				Ω(err).ShouldNot(HaveOccurred())
 
 				Ω(versionFile).Should(ExistOnFilesystem())
-				contents, err := ioutil.ReadFile(versionFile)
+				contents, err := os.ReadFile(versionFile)
 				Ω(err).ShouldNot(HaveOccurred())
 				Ω(string(contents)).Should(Equal("1.3"))
 			})
@@ -262,7 +261,7 @@ var _ = Describe("In Command", func() {
 					s3client.DownloadFileStub = func(bucketName string, remotePath string, versionID string, localPath string) error {
 						src := filepath.Join(tmpPath, "some-file")
 
-						err := ioutil.WriteFile(src, []byte("some-contents"), os.ModePerm)
+						err := os.WriteFile(src, []byte("some-contents"), os.ModePerm)
 						Expect(err).NotTo(HaveOccurred())
 
 						err = createTarball([]string{src}, tmpPath, localPath)
@@ -279,7 +278,7 @@ var _ = Describe("In Command", func() {
 					_, err := command.Run(destDir, request)
 					Expect(err).NotTo(HaveOccurred())
 
-					bs, err := ioutil.ReadFile(filepath.Join(destDir, "some-file"))
+					bs, err := os.ReadFile(filepath.Join(destDir, "some-file"))
 					Expect(err).NotTo(HaveOccurred())
 
 					Expect(bs).To(Equal([]byte("some-contents")))
@@ -289,10 +288,10 @@ var _ = Describe("In Command", func() {
 			Context("when the file is a zip", func() {
 				BeforeEach(func() {
 					s3client.DownloadFileStub = func(bucketName string, remotePath string, versionID string, localPath string) error {
-						inDir, err := ioutil.TempDir(tmpPath, "zip-dir")
+						inDir, err := os.MkdirTemp(tmpPath, "zip-dir")
 						Expect(err).NotTo(HaveOccurred())
 
-						err = ioutil.WriteFile(path.Join(inDir, "some-file"), []byte("some-contents"), os.ModePerm)
+						err = os.WriteFile(path.Join(inDir, "some-file"), []byte("some-contents"), os.ModePerm)
 						Expect(err).NotTo(HaveOccurred())
 
 						err = zipit(path.Join(inDir, "/"), localPath, "")
@@ -306,7 +305,7 @@ var _ = Describe("In Command", func() {
 					_, err := command.Run(destDir, request)
 					Expect(err).NotTo(HaveOccurred())
 
-					bs, err := ioutil.ReadFile(filepath.Join(destDir, "some-file"))
+					bs, err := os.ReadFile(filepath.Join(destDir, "some-file"))
 					Expect(err).NotTo(HaveOccurred())
 
 					Expect(bs).To(Equal([]byte("some-contents")))
@@ -338,7 +337,7 @@ var _ = Describe("In Command", func() {
 					_, err := command.Run(destDir, request)
 					Expect(err).NotTo(HaveOccurred())
 
-					bs, err := ioutil.ReadFile(filepath.Join(destDir, "a-file-1.3"))
+					bs, err := os.ReadFile(filepath.Join(destDir, "a-file-1.3"))
 					Expect(err).NotTo(HaveOccurred())
 
 					Expect(string(bs)).To(Equal("some-contents"))
@@ -356,12 +355,12 @@ var _ = Describe("In Command", func() {
 
 						someFile1 := filepath.Join(tmpPath, "some-dir", "some-file")
 
-						err = ioutil.WriteFile(someFile1, []byte("some-contents"), os.ModePerm)
+						err = os.WriteFile(someFile1, []byte("some-contents"), os.ModePerm)
 						Expect(err).NotTo(HaveOccurred())
 
 						someFile2 := filepath.Join(tmpPath, "some-file")
 
-						err = ioutil.WriteFile(someFile2, []byte("some-other-contents"), os.ModePerm)
+						err = os.WriteFile(someFile2, []byte("some-other-contents"), os.ModePerm)
 						Expect(err).NotTo(HaveOccurred())
 
 						tarPath := filepath.Join(tmpPath, "some-tar")
@@ -395,11 +394,11 @@ var _ = Describe("In Command", func() {
 
 					Expect(filepath.Join(destDir, "some-dir", "some-file")).To(BeARegularFile())
 
-					bs, err := ioutil.ReadFile(filepath.Join(destDir, "some-dir", "some-file"))
+					bs, err := os.ReadFile(filepath.Join(destDir, "some-dir", "some-file"))
 					Expect(err).NotTo(HaveOccurred())
 					Expect(bs).To(Equal([]byte("some-contents")))
 
-					bs, err = ioutil.ReadFile(filepath.Join(destDir, "some-file"))
+					bs, err = os.ReadFile(filepath.Join(destDir, "some-file"))
 					Expect(err).NotTo(HaveOccurred())
 					Expect(bs).To(Equal([]byte("some-other-contents")))
 				})
@@ -408,7 +407,7 @@ var _ = Describe("In Command", func() {
 			Context("when the file is not an archive", func() {
 				BeforeEach(func() {
 					s3client.DownloadFileStub = func(bucketName string, remotePath string, versionID string, localPath string) error {
-						err := ioutil.WriteFile(localPath, []byte("some-contents"), os.ModePerm)
+						err := os.WriteFile(localPath, []byte("some-contents"), os.ModePerm)
 						Expect(err).NotTo(HaveOccurred())
 
 						return nil
@@ -438,7 +437,7 @@ var _ = Describe("In Command", func() {
 
 				contentFile := filepath.Join(destDir, initialFilename)
 				Ω(contentFile).Should(BeARegularFile())
-				contents, err := ioutil.ReadFile(contentFile)
+				contents, err := os.ReadFile(contentFile)
 				Ω(err).ShouldNot(HaveOccurred())
 				Ω(string(contents)).Should(Equal(request.Source.InitialContentText))
 			})
@@ -454,7 +453,7 @@ var _ = Describe("In Command", func() {
 
 					contentFile := filepath.Join(destDir, initialFilename)
 					Ω(contentFile).Should(BeARegularFile())
-					contents, err := ioutil.ReadFile(contentFile)
+					contents, err := os.ReadFile(contentFile)
 					Ω(err).ShouldNot(HaveOccurred())
 					Ω(string(contents)).Should(Equal("the hard questions are hard 🙈"))
 				})
@@ -496,7 +495,7 @@ var _ = Describe("In Command", func() {
 
 				contentFile := filepath.Join(destDir, initialFilename)
 				Ω(contentFile).Should(BeARegularFile())
-				contents, err := ioutil.ReadFile(contentFile)
+				contents, err := os.ReadFile(contentFile)
 				Ω(err).ShouldNot(HaveOccurred())
 				Ω(string(contents)).Should(Equal(request.Source.InitialContentText))
 			})
@@ -519,7 +518,7 @@ var _ = Describe("In Command", func() {
 
 				contentFile := filepath.Join(destDir, filename)
 				Ω(contentFile).Should(BeARegularFile())
-				contents, err := ioutil.ReadFile(contentFile)
+				contents, err := os.ReadFile(contentFile)
 				Ω(err).ShouldNot(HaveOccurred())
 				Ω(string(contents)).Should(Equal(request.Source.InitialContentText))
 			})
@@ -535,7 +534,7 @@ var _ = Describe("In Command", func() {
 
 					contentFile := filepath.Join(destDir, filename)
 					Ω(contentFile).Should(BeARegularFile())
-					contents, err := ioutil.ReadFile(contentFile)
+					contents, err := os.ReadFile(contentFile)
 					Ω(err).ShouldNot(HaveOccurred())
 					Ω(string(contents)).Should(Equal("the hard questions are hard 🙈"))
 				})
@@ -577,7 +576,7 @@ var _ = Describe("In Command", func() {
 
 				contentFile := filepath.Join(destDir, filename)
 				Ω(contentFile).Should(BeARegularFile())
-				contents, err := ioutil.ReadFile(contentFile)
+				contents, err := os.ReadFile(contentFile)
 				Ω(err).ShouldNot(HaveOccurred())
 				Ω(string(contents)).Should(Equal(request.Source.InitialContentText))
 			})