Support AWS S3 Server-Side Encryption (#597)
* Support AWS S3 Server-Side Encryption * Improve documentation for aws-s3-server-side-encryption
This commit is contained in:
committed by
Kota Kanbe
parent
7971bdf7f7
commit
562ff7807d
@@ -71,10 +71,11 @@ type ReportCmd struct {
|
||||
|
||||
gzip bool
|
||||
|
||||
awsProfile string
|
||||
awsS3Bucket string
|
||||
awsS3ResultsDir string
|
||||
awsRegion string
|
||||
awsProfile string
|
||||
awsRegion string
|
||||
awsS3Bucket string
|
||||
awsS3ResultsDir string
|
||||
awsS3ServerSideEncryption string
|
||||
|
||||
azureAccount string
|
||||
azureKey string
|
||||
@@ -126,6 +127,7 @@ func (*ReportCmd) Usage() string {
|
||||
[-aws-region=us-west-2]
|
||||
[-aws-s3-bucket=bucket_name]
|
||||
[-aws-s3-results-dir=/bucket/path/to/results]
|
||||
[-aws-s3-server-side-encryption=AES256]
|
||||
[-azure-account=account]
|
||||
[-azure-key=key]
|
||||
[-azure-container=container]
|
||||
@@ -275,6 +277,7 @@ func (p *ReportCmd) SetFlags(f *flag.FlagSet) {
|
||||
f.StringVar(&p.awsRegion, "aws-region", "us-east-1", "AWS region to use")
|
||||
f.StringVar(&p.awsS3Bucket, "aws-s3-bucket", "", "S3 bucket name")
|
||||
f.StringVar(&p.awsS3ResultsDir, "aws-s3-results-dir", "", "/bucket/path/to/results")
|
||||
f.StringVar(&p.awsS3ServerSideEncryption, "aws-s3-server-side-encryption", "", "The Server-side encryption algorithm used when storing the reports in S3 (e.g., AES256, aws:kms).")
|
||||
|
||||
f.BoolVar(&p.toAzureBlob,
|
||||
"to-azure-blob",
|
||||
@@ -371,6 +374,7 @@ func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}
|
||||
c.Conf.AwsProfile = p.awsProfile
|
||||
c.Conf.S3Bucket = p.awsS3Bucket
|
||||
c.Conf.S3ResultsDir = p.awsS3ResultsDir
|
||||
c.Conf.S3ServerSideEncryption = p.awsS3ServerSideEncryption
|
||||
if err := report.CheckIfBucketExists(); err != nil {
|
||||
util.Log.Errorf("Check if there is a bucket beforehand: %s, err: %s", c.Conf.S3Bucket, err)
|
||||
return subcommands.ExitUsageError
|
||||
|
||||
Reference in New Issue
Block a user