Skip to content

feat: add support for managedPrivateNetwork in AwsS3Data storage transfer jobs #13655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: add support for managedPrivateNetwork in AwsS3Data storage transfer jobs #13655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,11 @@ func awsS3DataSchema() *schema.Resource {
ExactlyOneOf: awsS3AuthKeys,
Description: `The Amazon Resource Name (ARN) of the role to support temporary credentials via 'AssumeRoleWithWebIdentity'. For more information about ARNs, see [IAM ARNs](https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html#identifiers-arns). When a role ARN is provided, Transfer Service fetches temporary credentials for the session using a 'AssumeRoleWithWebIdentity' call for the provided role using the [GoogleServiceAccount][] for this project.`,
},
"private_network": {
Type: schema.TypeBool,
Optional: true,
Description: `Egress bytes over a Google-managed private network. This network is shared between other users of Storage Transfer Service.`,
},
},
}
}
Expand Down Expand Up @@ -1316,18 +1321,20 @@ func expandAwsS3Data(awsS3Datas []interface{}) *storagetransfer.AwsS3Data {

awsS3Data := awsS3Datas[0].(map[string]interface{})
return &storagetransfer.AwsS3Data{
BucketName: awsS3Data["bucket_name"].(string),
AwsAccessKey: expandAwsAccessKeys(awsS3Data["aws_access_key"].([]interface{})),
RoleArn: awsS3Data["role_arn"].(string),
Path: awsS3Data["path"].(string),
BucketName: awsS3Data["bucket_name"].(string),
AwsAccessKey: expandAwsAccessKeys(awsS3Data["aws_access_key"].([]interface{})),
RoleArn: awsS3Data["role_arn"].(string),
Path: awsS3Data["path"].(string),
ManagedPrivateNetwork: awsS3Data["private_network"].(bool),
}
}

func flattenAwsS3Data(awsS3Data *storagetransfer.AwsS3Data, d *schema.ResourceData) []map[string]interface{} {
data := map[string]interface{}{
"bucket_name": awsS3Data.BucketName,
"path": awsS3Data.Path,
"role_arn": awsS3Data.RoleArn,
"bucket_name": awsS3Data.BucketName,
"path": awsS3Data.Path,
"role_arn": awsS3Data.RoleArn,
"private_network": awsS3Data.ManagedPrivateNetwork,
}
if _, exist := d.GetOk("transfer_spec.0.aws_s3_data_source.0.aws_access_key"); exist{
data["aws_access_key"] = flattenAwsAccessKeys(d)
Expand Down
1 change: 1 addition & 0 deletions ...ird_party/terraform/services/storagetransfer/resource_storage_transfer_job_meta.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ fields:
- field: 'transfer_spec.aws_s3_data_source.aws_access_key.secret_access_key'
- field: 'transfer_spec.aws_s3_data_source.bucket_name'
- field: 'transfer_spec.aws_s3_data_source.path'
- field: 'transfer_spec.aws_s3_data_source.private_network'
- field: 'transfer_spec.aws_s3_data_source.role_arn'
- field: 'transfer_spec.azure_blob_storage_data_source.azure_credentials.sas_token'
- field: 'transfer_spec.azure_blob_storage_data_source.container'
Expand Down
2 changes: 2 additions & 0 deletions mmv1/third_party/terraform/website/docs/r/storage_transfer_job.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,8 @@ A duration in seconds with up to nine fractional digits, terminated by 's'. Exam

* `role_arn` - (Optional) The Amazon Resource Name (ARN) of the role to support temporary credentials via 'AssumeRoleWithWebIdentity'. For more information about ARNs, see [IAM ARNs](https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html#identifiers-arns). When a role ARN is provided, Transfer Service fetches temporary credentials for the session using a 'AssumeRoleWithWebIdentity' call for the provided role using the [GoogleServiceAccount][] for this project.

* `private_network` - (Optional) Egress bytes over a Google-managed private network. This network is shared between other users of Storage Transfer Service. Defaults to false.

The `aws_access_key` block supports:

* `access_key_id` - (Required) AWS Key ID.
Expand Down
Loading