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.

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

feat(efs_file_system): lifecycle_policy transition_to_archive #35096

Merged
merged 4 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changelog/35096.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:enhancement
resource/aws_efs_file_system: Add `lifecycle_policy.transition_to_archive` argument
```

```release-note:enhancement
data-source/aws_efs_file_system: Add `lifecycle_policy.transition_to_archive` attribute
```
13 changes: 13 additions & 0 deletions internal/service/efs/file_system.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ func ResourceFileSystem() *schema.Resource {
MaxItems: 2,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"transition_to_archive": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringInSlice(efs.TransitionToArchiveRules_Values(), false),
},
"transition_to_ia": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -475,6 +480,10 @@ func flattenFileSystemLifecyclePolicies(apiObjects []*efs.LifecyclePolicy) []int

tfMap := make(map[string]interface{})

if apiObject.TransitionToArchive != nil {
tfMap["transition_to_archive"] = aws.StringValue(apiObject.TransitionToArchive)
}

if apiObject.TransitionToIA != nil {
tfMap["transition_to_ia"] = aws.StringValue(apiObject.TransitionToIA)
}
Expand All @@ -501,6 +510,10 @@ func expandFileSystemLifecyclePolicies(tfList []interface{}) []*efs.LifecyclePol

apiObject := &efs.LifecyclePolicy{}

if v, ok := tfMap["transition_to_archive"].(string); ok && v != "" {
apiObject.TransitionToArchive = aws.String(v)
}

if v, ok := tfMap["transition_to_ia"].(string); ok && v != "" {
apiObject.TransitionToIA = aws.String(v)
}
Expand Down
4 changes: 4 additions & 0 deletions internal/service/efs/file_system_data_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ func DataSourceFileSystem() *schema.Resource {
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"transition_to_archive": {
Type: schema.TypeString,
Computed: true,
},
"transition_to_ia": {
Type: schema.TypeString,
Computed: true,
Expand Down
45 changes: 42 additions & 3 deletions internal/service/efs/file_system_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,9 @@ func TestAccEFSFileSystem_lifecyclePolicy(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckFileSystem(ctx, resourceName, &desc),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.#", "1"),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.0.transition_to_archive", ""),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.0.transition_to_ia", efs.TransitionToIARulesAfter30Days),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.0.transition_to_primary_storage_class", ""),
),
},
{
Expand All @@ -367,6 +369,8 @@ func TestAccEFSFileSystem_lifecyclePolicy(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckFileSystem(ctx, resourceName, &desc),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.#", "1"),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.0.transition_to_archive", ""),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.0.transition_to_ia", ""),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.0.transition_to_primary_storage_class", efs.TransitionToPrimaryStorageClassRulesAfter1Access),
),
},
Expand All @@ -387,8 +391,30 @@ func TestAccEFSFileSystem_lifecyclePolicy(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckFileSystem(ctx, resourceName, &desc),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.#", "2"),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.0.transition_to_archive", ""),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.0.transition_to_ia", ""),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.0.transition_to_primary_storage_class", efs.TransitionToPrimaryStorageClassRulesAfter1Access),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.1.transition_to_archive", ""),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.1.transition_to_ia", efs.TransitionToIARulesAfter30Days),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.1.transition_to_primary_storage_class", ""),
),
},
{
Config: testAccFileSystemConfig_lifecyclePolicyTransitionToArchive(
"transition_to_ia",
efs.TransitionToIARulesAfter30Days,
"transition_to_archive",
efs.TransitionToArchiveRulesAfter60Days,
),
Check: resource.ComposeTestCheckFunc(
testAccCheckFileSystem(ctx, resourceName, &desc),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.#", "2"),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.0.transition_to_archive", ""),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.0.transition_to_ia", efs.TransitionToIARulesAfter30Days),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.0.transition_to_primary_storage_class", ""),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.1.transition_to_archive", efs.TransitionToArchiveRulesAfter60Days),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.1.transition_to_ia", ""),
resource.TestCheckResourceAttr(resourceName, "lifecycle_policy.1.transition_to_primary_storage_class", ""),
),
},
},
Expand Down Expand Up @@ -426,9 +452,6 @@ func testAccCheckFileSystem(ctx context.Context, n string, v *efs.FileSystemDesc
if !ok {
return fmt.Errorf("Not found: %s", n)
}
if rs.Primary.ID == "" {
return fmt.Errorf("No EFS file system ID is set")
}

conn := acctest.Provider.Meta().(*conns.AWSClient).EFSConn(ctx)

Expand Down Expand Up @@ -624,6 +647,22 @@ resource "aws_efs_file_system" "test" {
`, lpName1, lpVal1, lpName2, lpVal2)
}

func testAccFileSystemConfig_lifecyclePolicyTransitionToArchive(lpName1, lpVal1, lpName2, lpVal2 string) string {
return fmt.Sprintf(`
resource "aws_efs_file_system" "test" {
throughput_mode = "elastic"

lifecycle_policy {
%[1]s = %[2]q
}

lifecycle_policy {
%[3]s = %[4]q
}
}
`, lpName1, lpVal1, lpName2, lpVal2)
}

const testAccFileSystemConfig_removedLifecyclePolicy = `
resource "aws_efs_file_system" "test" {}
`
1 change: 1 addition & 0 deletions website/docs/r/efs_file_system.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ user guide for more information.

* `transition_to_ia` - (Optional) Indicates how long it takes to transition files to the IA storage class. Valid values: `AFTER_1_DAY`, `AFTER_7_DAYS`, `AFTER_14_DAYS`, `AFTER_30_DAYS`, `AFTER_60_DAYS`, or `AFTER_90_DAYS`.
* `transition_to_primary_storage_class` - (Optional) Describes the policy used to transition a file from infequent access storage to primary storage. Valid values: `AFTER_1_ACCESS`.
* `transition_to_archive` - (Optional) Indicates how long it takes to transition files to the archive storage class. Requires transition_to_ia, Elastic Throughput and General Purpose performance mode. Valid values: `AFTER_1_DAY`, `AFTER_7_DAYS`, `AFTER_14_DAYS`, `AFTER_30_DAYS`, `AFTER_60_DAYS`, or `AFTER_90_DAYS`.

## Attribute Reference

Expand Down
Loading