add log statement for PutObjectAcl

cr https://cr.amazon.com/r/6653749/

Author: shengmiw

agent/plugins/pluginutil/pluginutil.go

@@ -51,7 +51,7 @@ type UploadOutputToS3BucketExecuter func(log log.T, pluginID string, orchestrati
 
 // S3Uploader is an interface for objects that can upload data to s3.
 type S3Uploader interface {
-	S3Upload(bucketName string, bucketKey string, filePath string) error
+	S3Upload(log log.T, bucketName string, bucketKey string, filePath string) error
 	UploadS3TestFile(log log.T, bucketName, key string) error
 	IsS3ErrorRelatedToAccessDenied(errMsg string) bool
 	IsS3ErrorRelatedToWrongBucketRegion(errMsg string) bool
@@ -238,7 +238,7 @@ func (p *DefaultPlugin) UploadOutputToS3Bucket(log log.T, pluginID string, orche
 
 					s3Key := fileutil.BuildS3Path(outputS3KeyPrefix, pluginID, p.StdoutFileName)
 					log.Debugf("Uploading %v to s3://%v/%v", localPath, outputS3BucketName, s3Key)
-					err := p.Uploader.S3Upload(outputS3BucketName, s3Key, localPath)
+					err := p.Uploader.S3Upload(log, outputS3BucketName, s3Key, localPath)
 					if err != nil {
 
 						log.Errorf("failed uploading %v to s3://%v/%v err:%v", localPath, outputS3BucketName, s3Key, err)
@@ -254,7 +254,7 @@ func (p *DefaultPlugin) UploadOutputToS3Bucket(log log.T, pluginID string, orche
 
 					s3Key := fileutil.BuildS3Path(outputS3KeyPrefix, pluginID, p.StderrFileName)
 					log.Debugf("Uploading %v to s3://%v/%v", localPath, outputS3BucketName, s3Key)
-					err := p.Uploader.S3Upload(outputS3BucketName, s3Key, localPath)
+					err := p.Uploader.S3Upload(log, outputS3BucketName, s3Key, localPath)
 					if err != nil {
 						log.Errorf("failed uploading %v to s3://%v/%v err:%v", localPath, outputS3BucketName, s3Key, err)
 						if p.UploadToS3Sync {

agent/s3util/s3util.go

@@ -55,16 +55,16 @@ func (m *Manager) SetS3ClientRegion(region string) {
 }
 
 // S3Upload uploads a file to s3.
-func (m *Manager) S3Upload(bucketName string, objectKey string, filePath string) (err error) {
+func (m *Manager) S3Upload(log log.T, bucketName string, objectKey string, filePath string) (err error) {
 	file, err := os.Open(filePath)
 	if err != nil {
 		return
 	}
-	return m.S3UploadFromReader(bucketName, objectKey, file)
+	return m.S3UploadFromReader(log, bucketName, objectKey, file)
 }
 
 // S3UploadFromReader uploads data to s3 from an io.ReadSeeker.
-func (m *Manager) S3UploadFromReader(bucketName string, objectKey string, content io.ReadSeeker) (err error) {
+func (m *Manager) S3UploadFromReader(log log.T, bucketName string, objectKey string, content io.ReadSeeker) (err error) {
 	params := &s3.PutObjectInput{
 		Bucket:      aws.String(bucketName),
 		Key:         aws.String(objectKey),
@@ -78,9 +78,11 @@ func (m *Manager) S3UploadFromReader(bucketName string, objectKey string, conten
 			ACL:    aws.String("bucket-owner-full-control"),
 		}
 		// gracefully ignore the error, since the S3 putAcl policy may not be set
-		m.S3.PutObjectAcl(aclParams)
+		if _, aclErr := m.S3.PutObjectAcl(aclParams); aclErr != nil {
+			log.Infof("PutAcl: bucket-owner-full-control failed, error: %v", aclErr)
+		}
 	}
-	
+
 	return
 }
 

agent/s3util/test_s3util.go

@@ -29,7 +29,7 @@ type MockS3Uploader struct {
 var logger = log.NewMockLog()
 
 // S3Upload mocks the method with the same name.
-func (uploader *MockS3Uploader) S3Upload(bucketName string, bucketKey string, contentPath string) error {
+func (uploader *MockS3Uploader) S3Upload(log log.T, bucketName string, bucketKey string, contentPath string) error {
 	args := uploader.Called(bucketName, bucketKey, contentPath)
 	logger.Debugf("===========MockS3Upload Uploading %v to s3://%v/%v returns %v", contentPath, bucketName, bucketKey, args.Error(0))
 

agent/update/processor/context.go

@@ -239,7 +239,7 @@ func (c *contextManager) uploadOutput(log log.T, context *UpdateContext) (err er
 		stdoutPath := updateutil.UpdateStdOutPath(context.Current.UpdateRoot, context.Current.StdoutFileName)
 		s3Key := path.Join(context.Current.OutputS3KeyPrefix, context.Current.StdoutFileName)
 		log.Debugf("Uploading %v to s3://%v/%v", stdoutPath, context.Current.OutputS3BucketName, s3Key)
-		err = uploader.S3Upload(context.Current.OutputS3BucketName, s3Key, stdoutPath)
+		err = uploader.S3Upload(log, context.Current.OutputS3BucketName, s3Key, stdoutPath)
 		if err != nil {
 			log.Errorf("failed uploading %v to s3://%v/%v \n err:%v",
 				stdoutPath,
@@ -252,7 +252,7 @@ func (c *contextManager) uploadOutput(log log.T, context *UpdateContext) (err er
 		stderrPath := updateutil.UpdateStdOutPath(context.Current.UpdateRoot, context.Current.StderrFileName)
 		s3Key = path.Join(context.Current.OutputS3KeyPrefix, context.Current.StderrFileName)
 		log.Debugf("Uploading %v to s3://%v/%v", stderrPath, context.Current.OutputS3BucketName, s3Key)
-		err = uploader.S3Upload(context.Current.OutputS3BucketName, s3Key, stderrPath)
+		err = uploader.S3Upload(log, context.Current.OutputS3BucketName, s3Key, stderrPath)
 		if err != nil {
 			log.Errorf("failed uploading %v to s3://%v/%v \n err:%v", stderrPath, context.Current.StderrFileName, s3Key, err)
 		}