Skip to content
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

Jump to bottom

FSx Backup Volume addition #21960

Merged
merged 6 commits into from
Dec 10, 2021
Merged

FSx Backup Volume addition #21960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f0ed50e
initial update
awsaxeman Nov 30, 2021
4728e73
added documentation
awsaxeman Nov 30, 2021
0d8adc7
fix lint
awsaxeman Nov 30, 2021
9287b79
fix
awsaxeman Dec 1, 2021
4f5f681
fixed random name
awsaxeman Dec 8, 2021
89633a7
Update 21960.txt
ewbankkit Dec 10, 2021
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
3 changes: 3 additions & 0 deletions .changelog/21960.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_fsx_backup: Add `volume_id` argument to support Amazon FSx for NetApp ONTAP backup
```
34 changes: 30 additions & 4 deletions internal/service/fsx/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func ResourceBackup() *schema.Resource {
},
"file_system_id": {
Type: schema.TypeString,
Required: true,
Optional: true,
ForceNew: true,
},
"kms_key_id": {
Expand All @@ -56,6 +56,11 @@ func ResourceBackup() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"volume_id": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
},

CustomizeDiff: customdiff.Sequence(
Expand All @@ -71,7 +76,22 @@ func resourceBackupCreate(d *schema.ResourceData, meta interface{}) error {

input := &fsx.CreateBackupInput{
ClientRequestToken: aws.String(resource.UniqueId()),
FileSystemId: aws.String(d.Get("file_system_id").(string)),
}

if v, ok := d.GetOk("file_system_id"); ok {
input.FileSystemId = aws.String(v.(string))
}

if v, ok := d.GetOk("volume_id"); ok {
input.VolumeId = aws.String(v.(string))
}

if input.FileSystemId == nil && input.VolumeId == nil {
return fmt.Errorf("error creating FSx Backup: %s", "must specify either file_system_id or volume_id")
}

if input.FileSystemId != nil && input.VolumeId != nil {
return fmt.Errorf("error creating FSx Backup: %s", "can only specify either file_system_id or volume_id")
}

if len(tags) > 0 {
Expand Down Expand Up @@ -126,13 +146,19 @@ func resourceBackupRead(d *schema.ResourceData, meta interface{}) error {
d.Set("arn", backup.ResourceARN)
d.Set("type", backup.Type)

fs := backup.FileSystem
d.Set("file_system_id", fs.FileSystemId)
if backup.FileSystem != nil {
fs := backup.FileSystem
d.Set("file_system_id", fs.FileSystemId)
}

d.Set("kms_key_id", backup.KmsKeyId)

d.Set("owner_id", backup.OwnerId)

if backup.Volume != nil {
d.Set("volume_id", backup.Volume.VolumeId)
}

tags := KeyValueTags(backup.Tags).IgnoreAWS().IgnoreConfig(ignoreTagsConfig)

//lintignore:AWSR002
Expand Down
196 changes: 181 additions & 15 deletions internal/service/fsx/backup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ package fsx_test
import (
"fmt"
"regexp"
"strings"
"testing"

"github.com/aws/aws-sdk-go/service/fsx"
sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
Expand All @@ -17,6 +19,7 @@ import (
func TestAccFSxBackup_basic(t *testing.T) {
var backup fsx.Backup
resourceName := "aws_fsx_backup.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t); acctest.PreCheckPartitionHasService(fsx.EndpointsID, t) },
Expand All @@ -25,12 +28,72 @@ func TestAccFSxBackup_basic(t *testing.T) {
CheckDestroy: testAccCheckFsxBackupDestroy,
Steps: []resource.TestStep{
{
Config: testAccBackupBasicConfig(),
Config: testAccBackupBasicConfig(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckFsxBackupExists(resourceName, &backup),
acctest.MatchResourceAttrRegionalARN(resourceName, "arn", "fsx", regexp.MustCompile(`backup/.+`)),
acctest.CheckResourceAttrAccountID(resourceName, "owner_id"),
resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccFSxBackup_ontapBasic(t *testing.T) {
var backup fsx.Backup
resourceName := "aws_fsx_backup.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
//FSX ONTAP Volume Names can't use dash only underscore
vName := strings.Replace(sdkacctest.RandomWithPrefix(acctest.ResourcePrefix), "-", "_", -1)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t); acctest.PreCheckPartitionHasService(fsx.EndpointsID, t) },
ErrorCheck: acctest.ErrorCheck(t, fsx.EndpointsID),
Providers: acctest.Providers,
CheckDestroy: testAccCheckFsxBackupDestroy,
Steps: []resource.TestStep{
{
Config: testAccBackupONTAPBasicConfig(rName, vName),
Check: resource.ComposeTestCheckFunc(
testAccCheckFsxBackupExists(resourceName, &backup),
acctest.MatchResourceAttrRegionalARN(resourceName, "arn", "fsx", regexp.MustCompile(`backup/.+`)),
acctest.CheckResourceAttrAccountID(resourceName, "owner_id"),
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccFSxBackup_windowsBasic(t *testing.T) {
var backup fsx.Backup
resourceName := "aws_fsx_backup.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t); acctest.PreCheckPartitionHasService(fsx.EndpointsID, t) },
ErrorCheck: acctest.ErrorCheck(t, fsx.EndpointsID),
Providers: acctest.Providers,
CheckDestroy: testAccCheckFsxBackupDestroy,
Steps: []resource.TestStep{
{
Config: testAccBackupWindowsBasicConfig(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckFsxBackupExists(resourceName, &backup),
acctest.MatchResourceAttrRegionalARN(resourceName, "arn", "fsx", regexp.MustCompile(`backup/.+`)),
acctest.CheckResourceAttrAccountID(resourceName, "owner_id"),
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
),
},
{
Expand All @@ -45,6 +108,7 @@ func TestAccFSxBackup_basic(t *testing.T) {
func TestAccFSxBackup_disappears(t *testing.T) {
var backup fsx.Backup
resourceName := "aws_fsx_backup.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t); acctest.PreCheckPartitionHasService(fsx.EndpointsID, t) },
Expand All @@ -53,7 +117,7 @@ func TestAccFSxBackup_disappears(t *testing.T) {
CheckDestroy: testAccCheckFsxBackupDestroy,
Steps: []resource.TestStep{
{
Config: testAccBackupBasicConfig(),
Config: testAccBackupBasicConfig(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckFsxBackupExists(resourceName, &backup),
acctest.CheckResourceDisappears(acctest.Provider, tffsx.ResourceBackup(), resourceName),
Expand All @@ -67,6 +131,7 @@ func TestAccFSxBackup_disappears(t *testing.T) {
func TestAccFSxBackup_Disappears_filesystem(t *testing.T) {
var backup fsx.Backup
resourceName := "aws_fsx_backup.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t); acctest.PreCheckPartitionHasService(fsx.EndpointsID, t) },
Expand All @@ -75,7 +140,7 @@ func TestAccFSxBackup_Disappears_filesystem(t *testing.T) {
CheckDestroy: testAccCheckFsxBackupDestroy,
Steps: []resource.TestStep{
{
Config: testAccBackupBasicConfig(),
Config: testAccBackupBasicConfig(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckFsxBackupExists(resourceName, &backup),
acctest.CheckResourceDisappears(acctest.Provider, tffsx.ResourceLustreFileSystem(), "aws_fsx_lustre_file_system.test"),
Expand All @@ -89,6 +154,7 @@ func TestAccFSxBackup_Disappears_filesystem(t *testing.T) {
func TestAccFSxBackup_tags(t *testing.T) {
var backup fsx.Backup
resourceName := "aws_fsx_backup.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t); acctest.PreCheckPartitionHasService(fsx.EndpointsID, t) },
Expand All @@ -97,7 +163,7 @@ func TestAccFSxBackup_tags(t *testing.T) {
CheckDestroy: testAccCheckFsxBackupDestroy,
Steps: []resource.TestStep{
{
Config: testAccBackupTags1Config("key1", "value1"),
Config: testAccBackupTags1Config(rName, "key1", "value1"),
Check: resource.ComposeTestCheckFunc(
testAccCheckFsxBackupExists(resourceName, &backup),
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
Expand All @@ -110,7 +176,7 @@ func TestAccFSxBackup_tags(t *testing.T) {
ImportStateVerify: true,
},
{
Config: testAccBackupTags2Config("key1", "value1updated", "key2", "value2"),
Config: testAccBackupTags2Config(rName, "key1", "value1updated", "key2", "value2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckFsxBackupExists(resourceName, &backup),
resource.TestCheckResourceAttr(resourceName, "tags.%", "2"),
Expand All @@ -119,7 +185,7 @@ func TestAccFSxBackup_tags(t *testing.T) {
),
},
{
Config: testAccBackupTags1Config("key2", "value2"),
Config: testAccBackupTags1Config(rName, "key2", "value2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckFsxBackupExists(resourceName, &backup),
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
Expand Down Expand Up @@ -215,25 +281,125 @@ resource "aws_subnet" "test1" {
availability_zone = data.aws_availability_zones.available.names[0]
}

resource "aws_subnet" "test2" {
vpc_id = aws_vpc.test.id
cidr_block = "10.0.2.0/24"
availability_zone = data.aws_availability_zones.available.names[1]
}
`)
}

func testAccBackupLustreBaseConfig(rName string) string {
return acctest.ConfigCompose(testAccBackupBaseConfig(), fmt.Sprintf(`
resource "aws_fsx_lustre_file_system" "test" {
storage_capacity = 1200
subnet_ids = [aws_subnet.test1.id]
deployment_type = "PERSISTENT_1"
per_unit_storage_throughput = 50

tags = {
Name = %[1]q
}
}
`)
`, rName))
}

func testAccBackupONTAPBaseConfig(rName string, vName string) string {
return acctest.ConfigCompose(testAccBackupBaseConfig(), fmt.Sprintf(`
resource "aws_fsx_ontap_file_system" "test" {
storage_capacity = 1024
subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id]
deployment_type = "MULTI_AZ_1"
throughput_capacity = 512
preferred_subnet_id = aws_subnet.test1.id

tags = {
Name = %[1]q
}
}

resource "aws_fsx_ontap_storage_virtual_machine" "test" {
file_system_id = aws_fsx_ontap_file_system.test.id
name = %[1]q
}

resource "aws_fsx_ontap_volume" "test" {
name = %[2]q
junction_path = "/%[1]s"
size_in_megabytes = 1024
storage_efficiency_enabled = true
storage_virtual_machine_id = aws_fsx_ontap_storage_virtual_machine.test.id
}
`, rName, vName))
}

func testAccBackupWindowsBaseConfig(rName string) string {
return acctest.ConfigCompose(testAccBackupBaseConfig(), fmt.Sprintf(`
resource "aws_directory_service_directory" "test" {
edition = "Standard"
name = "corp.notexample.com"
password = "SuperSecretPassw0rd"
type = "MicrosoftAD"

vpc_settings {
subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id]
vpc_id = aws_vpc.test.id
}
}

func testAccBackupBasicConfig() string {
return acctest.ConfigCompose(testAccBackupBaseConfig(), `
resource "aws_fsx_windows_file_system" "test" {
active_directory_id = aws_directory_service_directory.test.id
automatic_backup_retention_days = 0
skip_final_backup = true
storage_capacity = 32
subnet_ids = [aws_subnet.test1.id]
throughput_capacity = 8

tags = {
Name = %[1]q
}
}
`, rName))
}

func testAccBackupBasicConfig(rName string) string {
return acctest.ConfigCompose(testAccBackupLustreBaseConfig(rName), fmt.Sprintf(`
resource "aws_fsx_backup" "test" {
file_system_id = aws_fsx_lustre_file_system.test.id

tags = {
Name = %[1]q
}
}
`)
`, rName))
}

func testAccBackupTags1Config(tagKey1, tagValue1 string) string {
return acctest.ConfigCompose(testAccBackupBaseConfig(), fmt.Sprintf(`
func testAccBackupONTAPBasicConfig(rName string, vName string) string {
return acctest.ConfigCompose(testAccBackupONTAPBaseConfig(rName, vName), fmt.Sprintf(`
resource "aws_fsx_backup" "test" {
volume_id = aws_fsx_ontap_volume.test.id

tags = {
Name = %[1]q
}
}
`, rName))
}

func testAccBackupWindowsBasicConfig(rName string) string {
return acctest.ConfigCompose(testAccBackupWindowsBaseConfig(rName), fmt.Sprintf(`
resource "aws_fsx_backup" "test" {
file_system_id = aws_fsx_windows_file_system.test.id

tags = {
Name = %[1]q
}
}
`, rName))
}

func testAccBackupTags1Config(rName string, tagKey1, tagValue1 string) string {
return acctest.ConfigCompose(testAccBackupLustreBaseConfig(rName), fmt.Sprintf(`
resource "aws_fsx_backup" "test" {
file_system_id = aws_fsx_lustre_file_system.test.id

Expand All @@ -244,8 +410,8 @@ resource "aws_fsx_backup" "test" {
`, tagKey1, tagValue1))
}

func testAccBackupTags2Config(tagKey1, tagValue1, tagKey2, tagValue2 string) string {
return acctest.ConfigCompose(testAccBackupBaseConfig(), fmt.Sprintf(`
func testAccBackupTags2Config(rName string, tagKey1, tagValue1, tagKey2, tagValue2 string) string {
return acctest.ConfigCompose(testAccBackupLustreBaseConfig(rName), fmt.Sprintf(`
resource "aws_fsx_backup" "test" {
file_system_id = aws_fsx_lustre_file_system.test.id

Expand Down
Loading