Merge pull request #31536 from trevorrea/main

r/aws_transfer_server: Add support for TransferSecurityPolicy-2023-05
hashicorp · May 30, 2023 · 2287d0e · 2287d0e
2 parents 950fea6 + 2c07c5e
commit 2287d0e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/.changelog/31536.txt b/.changelog/31536.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_transfer_server: Add support for `TransferSecurityPolicy-2023-05` `security_policy_name` value
+```
diff --git a/internal/service/transfer/enum.go b/internal/service/transfer/enum.go
@@ -5,6 +5,7 @@ const (
 	SecurityPolicyName2020_06      = "TransferSecurityPolicy-2020-06"
 	SecurityPolicyNameFIPS_2020_06 = "TransferSecurityPolicy-FIPS-2020-06"
 	SecurityPolicyName2022_03      = "TransferSecurityPolicy-2022-03"
+	SecurityPolicyName2023_05      = "TransferSecurityPolicy-2023-05"
 )
 
 func SecurityPolicyName_Values() []string {
@@ -13,5 +14,6 @@ func SecurityPolicyName_Values() []string {
 		SecurityPolicyName2020_06,
 		SecurityPolicyNameFIPS_2020_06,
 		SecurityPolicyName2022_03,
+		SecurityPolicyName2023_05,
 	}
 }
diff --git a/internal/service/transfer/server_test.go b/internal/service/transfer/server_test.go
@@ -244,6 +244,13 @@ func testAccServer_securityPolicy(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "security_policy_name", "TransferSecurityPolicy-2022-03"),
 				),
 			},
+			{
+				Config: testAccServerConfig_securityPolicy(rName, "TransferSecurityPolicy-2023-05"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckServerExists(ctx, resourceName, &conf),
+					resource.TestCheckResourceAttr(resourceName, "security_policy_name", "TransferSecurityPolicy-2023-05"),
+				),
+			},
 		},
 	})
 }

diff --git a/website/docs/r/transfer_server.html.markdown b/website/docs/r/transfer_server.html.markdown
@@ -109,7 +109,7 @@ The following arguments are supported:
 * `post_authentication_login_banner`- (Optional) Specify a string to display when users connect to a server. This string is displayed after the user authenticates. The SFTP protocol does not support post-authentication display banners.
 * `pre_authentication_login_banner`- (Optional) Specify a string to display when users connect to a server. This string is displayed before the user authenticates.
 * `protocol_details`- (Optional) The protocol settings that are configured for your server.
-* `security_policy_name` - (Optional) Specifies the name of the security policy that is attached to the server. Possible values are `TransferSecurityPolicy-2018-11`, `TransferSecurityPolicy-2020-06`, `TransferSecurityPolicy-FIPS-2020-06` and `TransferSecurityPolicy-2022-03`. Default value is: `TransferSecurityPolicy-2018-11`.
+* `security_policy_name` - (Optional) Specifies the name of the security policy that is attached to the server. Possible values are `TransferSecurityPolicy-2018-11`, `TransferSecurityPolicy-2020-06`, `TransferSecurityPolicy-FIPS-2020-06`, `TransferSecurityPolicy-2022-03` and `TransferSecurityPolicy-2023-05`. Default value is: `TransferSecurityPolicy-2018-11`.
 * `tags` - (Optional) A map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level.
 * `workflow_details` - (Optional) Specifies the workflow details. See Workflow Details below.