update sdk version, update replaced version

pull and use new ErrorDetail protodef
2023-07-05 15:46:26 -04:00 · 2023-07-05 13:09:47 -04:00
36 changed files with 1470 additions and 3661 deletions
@@ -5,32 +5,15 @@ Boundary](https://www.boundaryproject.io/).
 ## Credential Rotation
-This is the following priority for the credential chain:
+Although credentials are stored encrypted within Boundary, by default this
 static, assume role, environment variables.
 ### Static Credentials
 Although static credentials are stored encrypted within Boundary, by default this
 plugin will attempt to rotate credentials when they are supplied through the
 `secrets` object. The given credentials will be used to create a new credential,
 and then the given credential will be revoked. In this way, after rotation,
-only Boundary knows the client secret in use by this plugin. More information
+only Boundary knows the client secret in use by this plugin.
 about AWS static credentials can be found [here](https://docs.aws.amazon.com/sdkref/latest/guide/feature-static-credentials.html).
-Credential rotation can be turned off by setting the
+Credential rotation can be turned off by setting the 
 `disable_credential_rotation` attribute to `true`.
 ### Assume Role Credentials
 This plugin will attempt to assume a role when a `role_arn` is supplied through the
 `attributes` object. More information about assume an AWS role can be found [here](https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html). This feature only works when the plugin is running on a self managed Boundary [worker](https://developer.hashicorp.com/boundary/tutorials/hcp-administration/hcp-manage-workers).
 ### Environment Credentials
 This plugin will attempt to retrieve credentials from environment variables. More
 information about environment variables for AWS credentials can be found [here](https://docs.aws.amazon.com/sdkref/latest/guide/feature-static-credentials.html). This feature only works when the plugin is running on
 a self managed Boundary [worker](https://developer.hashicorp.com/boundary/tutorials/hcp-administration/hcp-manage-workers).
 ## Dynamic Hosts
 This plugin supports dynamically sourcing hosts from Amazon EC2.
@@ -48,7 +31,7 @@ The plugin fetches hosts through the
 [DescribeInstances](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstances.html)
 call.
-[Getting Started](plugin/service/host/README.md)
+[Getting Started](https://github.com/hashicorp/boundary-plugin-aws/plugin/service/host/README.md)
 ## Storage Bucket
@@ -60,7 +43,7 @@ these storage bucket resources can in turn be associated to targets within
 Boundary.
 At creation, update or deletion of a storage bucket of this type, configuration of the
-plugin is performed via the attribute/secret values passed to the create, update, or
+plugin is performed via the attribute/secret values passed to the create, update, or 
 delete calls actions. The values passed in to the plugin here are the attributes set
 on on a storage bucket in boundary.
@@ -76,4 +59,4 @@ The plugin fetches metadata about the files through the
 [HeadObject](https://docs.aws.amazon.com/AmazonS3/latest/API/API_HeadObject.html)
 call.
-[Getting Started](plugin/service/storage/README.md)
+[Getting Started](https://github.com/hashicorp/boundary-plugin-aws/plugin/service/storage/README.md)
@@ -2,40 +2,40 @@ module github.com/hashicorp/boundary-plugin-aws
 go 1.20
 replace github.com/hashicorp/boundary/sdk => github.com/hashicorp/boundary/sdk v0.0.35-0.20230705165757-c7e98a6f1782
 require (
 	github.com/aws/aws-sdk-go v1.44.80
-	github.com/aws/aws-sdk-go-v2 v1.20.1
+	github.com/aws/aws-sdk-go-v2 v1.17.7
-	github.com/aws/aws-sdk-go-v2/service/ec2 v1.99.0
+	github.com/aws/aws-sdk-go-v2/config v1.18.19
-	github.com/aws/aws-sdk-go-v2/service/iam v1.22.2
+	github.com/aws/aws-sdk-go-v2/credentials v1.13.18
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.38.2
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.31.1
 	github.com/aws/aws-sdk-go-v2/service/sts v1.21.2
 	github.com/aws/smithy-go v1.14.1
 	github.com/google/go-cmp v0.5.9
 	github.com/google/uuid v1.3.0
-	github.com/hashicorp/boundary/sdk v0.0.33
+	github.com/hashicorp/boundary/sdk v0.0.35
-	github.com/hashicorp/go-secure-stdlib/awsutil/v2 v2.0.0
+	github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6
 	github.com/hashicorp/terraform-json v0.14.0
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.8.2
 	google.golang.org/grpc v1.53.0
 	google.golang.org/protobuf v1.28.1
 )
 require (
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.18.33 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.13.32 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.33 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.12.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.13.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.18.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2 // indirect
+	github.com/aws/smithy-go v1.13.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.14.1 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
@@ -54,6 +54,7 @@ require (
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/pointerstructure v1.2.1 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/zclconf/go-cty v1.10.0 // indirect
 	golang.org/x/crypto v0.8.0 // indirect
@@ -4,61 +4,55 @@ github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj
 github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk=
 github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
 github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
 github.com/aws/aws-sdk-go v1.30.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/aws/aws-sdk-go v1.44.80 h1:jEXGecSgPdvM5KnyDsSgFhZSm7WwaTp4h544Im4SfhI=
 github.com/aws/aws-sdk-go v1.44.80/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
-github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
+github.com/aws/aws-sdk-go-v2 v1.17.7 h1:CLSjnhJSTSogvqUGhIC6LqFKATMRexcxLZ0i/Nzk9Eg=
-github.com/aws/aws-sdk-go-v2 v1.20.1 h1:rZBf5DWr7YGrnlTK4kgDQGn1ltqOg5orCYb/UhOFZkg=
+github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
-github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12 h1:lN6L3LrYHeZ6xCxaIYtoWCx4GMLk4nRknsh29OMSqHY=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12/go.mod h1:TDCkEAkMTXxTs0oLBGBKpBZbk3NLh8EvAfF0Q3x8/0c=
+github.com/aws/aws-sdk-go-v2/config v1.18.19 h1:AqFK6zFNtq4i1EYu+eC7lcKHYnZagMn6SW171la0bGw=
-github.com/aws/aws-sdk-go-v2/config v1.18.33 h1:JKcw5SFxFW/rpM4mOPjv0VQ11E2kxW13F3exWOy7VZU=
+github.com/aws/aws-sdk-go-v2/config v1.18.19/go.mod h1:XvTmGMY8d52ougvakOv1RpiTLPz9dlG/OQHsKU/cMmY=
-github.com/aws/aws-sdk-go-v2/config v1.18.33/go.mod h1:hXO/l9pgY3K5oZJldamP0pbZHdPqqk+4/maa7DSD3cA=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.18 h1:EQMdtHwz0ILTW1hoP+EwuWhwCG1hD6l3+RWFQABET4c=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.32 h1:lIH1eKPcCY1ylR4B6PkBGRWMHO3aVenOKJHWiS4/G2w=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.32/go.mod h1:lL8U3v/Y79YRG69WlAho0OHIKUXCyFvSXaIvfo81sls=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1 h1:gt57MN3liKiyGopcqgNzJb2+d9MJaKT/q1OksHNXVE4=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8 h1:DK/9C+UN/X+1+Wm8pqaDksQr2tSLzq+8X1/rI/ZxKEQ=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8/go.mod h1:ce7BgLQfYr5hQFdy67oX2svto3ufGtm6oBvmsHScI1Q=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31 h1:sJLYcS+eZn5EeNINGHSCRAwUJMFVqklwkH36Vbyai7M=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38 h1:c8ed/T9T2K5I+h/JzmF5tpI46+OODQ74dzmdo+QnaMg=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25 h1:1mnRASEKnkqsntcxHaysxwgVoUUp5dkiB+l3llKnqyg=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32 h1:p5luUImdIqywn6JpQsW3tq5GNOxKmOnEpybzPx+d1lk=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 h1:hNeAAymUY5gu11WrrmFb3CVIp9Dar9hbo44yzzcQpzA=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32/go.mod h1:XGhIBZDEgfqmFIugclZ6FU7v75nHhBDtzuB4xB/tEi4=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 h1:DWYZIsyqagnWL00f8M/SOr9fN063OEQWn9LLTbdYXsk=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39 h1:fc0ukRAiP1syoSGZYu+DaE+FulSYhTiJ8WpVu5jElU4=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23/go.mod h1:uIiFgURZbACBEQJfqTZPb/jxO7R+9LeoHUFudtIdeQI=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39/go.mod h1:WLAW8PT7+JhjZfLSWe7WEJaJu0GNo0cKc2Zyo003RBs=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 h1:y2+VQzC6Zh2ojtV2LoC0MNwHWc6qXv/j2vrQtlftkdA=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.1 h1:vUh7dBFNS3oFCtVv6CiYKh5hP9ls8+kIpKLeFruIBLk=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.1/go.mod h1:sFMeinkhj/SZKQM8BxtvNtSPjJEo0Xrz+w3g2e4FSKI=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 h1:CeuSeq/8FnYpPtnuIeLQEEvDv9zUjneuYi8EghMBdwQ=
-github.com/aws/aws-sdk-go-v2/service/ec2 v1.99.0 h1:NXi4pNJWjAaiI56P1Rl8DC9A4jMNRE00WNBsDua5WRg=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26/go.mod h1:2UqAAwMUXKeRkAHIlDJqvMVgOWkUi/AUXPk/YIe+Dg4=
-github.com/aws/aws-sdk-go-v2/service/ec2 v1.99.0/go.mod h1:L3ZT0N/vBsw77mOAawXmRnREpEjcHd2v5Hzf7AkIH8M=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25 h1:5LHn8JQ0qvjD9L9JhMtylnkcw7j05GDZqM9Oin6hpr0=
-github.com/aws/aws-sdk-go-v2/service/iam v1.22.2 h1:DPFxx/6Zwes/MiadlDteVqDKov7yQ5v9vuwfhZuJm1s=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU=
-github.com/aws/aws-sdk-go-v2/service/iam v1.22.2/go.mod h1:cQTMNdo/Z5t1DDRsUnx0a2j6cPnytMBidUYZw2zks28=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 h1:e2ooMhpYGhDnBfSvIyusvAwX7KexuZaHbQY2Dyei7VU=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.13 h1:iV/W5OMBys+66OeXJi/7xIRrKZNsu0ylsLGu+6nbmQE=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0/go.mod h1:bh2E0CXKZsQN+faiKVqC40vfNMAWheoULBCnEgO9K+8=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.13/go.mod h1:ReJb6xYmtGyu9KoFtRreWegbN9dZqvZIIv4vWnhcsyI=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.31.1 h1:PJH4I+qYjPXclKRbVCW47iYUvtXEh1u6YmDhn5J8VQE=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.33 h1:QviNkc+vGSuEHx8P+pVNKOdWLXBPIwMFv7p0fphgE4U=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.31.1/go.mod h1:ncltU6n4Nof5uJttDtcNQ537uNuwYqsZZQcpkd2/GUQ=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.33/go.mod h1:fABTUmOrAgAalG2i9WJpjBvlnk7UK8YmnYaxN+Q2CwE=
+github.com/aws/aws-sdk-go-v2/service/sso v1.12.6 h1:5V7DWLBd7wTELVz5bPpwzYy/sikk0gsgZfj40X+l5OI=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27/go.mod h1:EOwBD4J4S5qYszS5/3DpkejfuK+Z5/1uzICfPaZLtqw=
+github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32 h1:dGAseBFEYxth10V23b5e2mAS+tX7oVbfYHD6dnDdAsg=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6 h1:B8cauxOH1W1v7rd8RdI/MWnoR4Ze0wIHWrb90qczxj4=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32/go.mod h1:4jwAWKEkCR0anWk5+1RbfSg1R5Gzld7NLiuaq5bTR/Y=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.1 h1:PT6PBCycRwhpEW5hJnRiceCeoWJ+r3bdgXtV+VKG7Pk=
+github.com/aws/aws-sdk-go-v2/service/sts v1.18.7 h1:bWNgNdRko2x6gqa0blfATqAZKZokPIeM1vfmQt2pnvM=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.1/go.mod h1:TqoxCLwT2nrxrBGA+z7t6OWM7LBkgRckK3gOjYE+7JA=
+github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.38.2 h1:v346f1h8sUBKXnEbrv43L37MTBlFHyKXQPIZHNAaghA=
+github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.38.2/go.mod h1:cwCATiyNrXK9P2FsWdZ89g9mpsYv2rhk0UA/KByl5fY=
 github.com/aws/aws-sdk-go-v2/service/sso v1.13.2 h1:A2RlEMo4SJSwbNoUUgkxTAEMduAy/8wG3eB2b2lP4gY=
 github.com/aws/aws-sdk-go-v2/service/sso v1.13.2/go.mod h1:ju+nNXUunfIFamXUIZQiICjnO/TPlOmWcYhZcSy7xaE=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2 h1:OJELEgyaT2kmaBGZ+myyZbTTLobfe3ox3FSh5eYK9Qs=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2/go.mod h1:ubDBBaDFs1GHijSOTi8ljppML15GLG0HxhILtbjNNYQ=
 github.com/aws/aws-sdk-go-v2/service/sts v1.21.2 h1:ympg1+Lnq33XLhcK/xTG4yZHPs1Oyxu+6DEWbl7qOzA=
 github.com/aws/aws-sdk-go-v2/service/sts v1.21.2/go.mod h1:FQ/DQcOfESELfJi5ED+IPPAjI5xC6nxtSolVVB773jM=
 github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
 github.com/aws/smithy-go v1.14.1 h1:EFKMUmH/iHMqLiwoEDx2rRjRQpI1YCn5jTysoaDujFs=
 github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
 github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
 github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-test/deep v1.0.4 h1:u2CU3YKy9I2pmu9pX0eq50wCgjfGIt539SqR7FbHiho=
 github.com/go-test/deep v1.0.4/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -75,8 +69,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hashicorp/boundary/sdk v0.0.33 h1:kHaVZ3b9j1QvYlG+vhAgrbXh8/+Rq2qlUIs8fKMQH7k=
+github.com/hashicorp/boundary/sdk v0.0.35-0.20230705165757-c7e98a6f1782 h1:MuBxNJCn7At92jVlc17GMOghSkTy+33/DOBh/JvaVxU=
-github.com/hashicorp/boundary/sdk v0.0.33/go.mod h1:jn9j5mM8v2pOk8aLeJNIszdm7WBf4gRSP68iy8Iu5Q0=
+github.com/hashicorp/boundary/sdk v0.0.35-0.20230705165757-c7e98a6f1782/go.mod h1:jn9j5mM8v2pOk8aLeJNIszdm7WBf4gRSP68iy8Iu5Q0=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -86,6 +80,7 @@ github.com/hashicorp/eventlogger/filters/encrypt v0.1.8-0.20230428153751-cca4458
 github.com/hashicorp/eventlogger/filters/encrypt v0.1.8-0.20230428153751-cca445805f24/go.mod h1:EQPLoX6CONA9BSYUovTQBHfPGE91g7wOxv03sO29FzY=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
 github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.4 h1:8z+Zi0uLYXONkxwWb/D7O5t1IUucB6Ft3uvSOa950bM=
@@ -94,8 +89,8 @@ github.com/hashicorp/go-kms-wrapping/v2 v2.0.9/go.mod h1:NtMaPhqSlfQ72XWDD2g80o8
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-plugin v1.4.9 h1:ESiK220/qE0aGxWdzKIvRH69iLiuN/PjoLTm69RoWtU=
-github.com/hashicorp/go-secure-stdlib/awsutil/v2 v2.0.0 h1:ca5TSI4AgaOncPpyzLDtCGjVEtKukONpeM95vFxXCOQ=
+github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6 h1:W9WN8p6moV1fjKLkeqEgkAMu5rauy9QeYDAmIaPuuiA=
-github.com/hashicorp/go-secure-stdlib/awsutil/v2 v2.0.0/go.mod h1:7CUvZtfTp2U0CYQCLzMtS2ngckjAZePSfwrE2aeDP1M=
+github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6/go.mod h1:MpCPSPGLDILGb4JMm94/mMi3YysIqsXzGCzkEZjcjXg=
 github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
 github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 h1:ET4pqyjiGmY09R5y+rSd70J2w45CtbWDNvGqWp/R3Ng=
 github.com/hashicorp/go-secure-stdlib/configutil/v2 v2.0.9 h1:YZ01/aiARPneDUryzjiPGvr3pmjCSC+1WBZKI1P7I7k=
@@ -119,6 +114,7 @@ github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE
 github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
 github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
 github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f h1:E87tDTVS5W65euzixn7clSzK66puSt1H4I5SC0EmHH4=
 github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
@@ -126,15 +122,20 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfC
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
@@ -152,10 +153,12 @@ github.com/mitchellh/pointerstructure v1.2.1/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8oh
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0=
 github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
@@ -164,12 +167,18 @@ github.com/sebdah/goldie v1.0.0/go.mod h1:jXP4hmWywNEwZzhMuv2ccnqTSFpuq8iyQhtQdk
 github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
 github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
@@ -196,6 +205,7 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
@@ -205,9 +215,12 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -9,7 +9,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/endpoints"
 	"github.com/hashicorp/boundary-plugin-aws/internal/errors"
 	"github.com/hashicorp/boundary-plugin-aws/internal/values"
-	"github.com/hashicorp/go-secure-stdlib/awsutil/v2"
+	"github.com/hashicorp/go-secure-stdlib/awsutil"
 	"google.golang.org/protobuf/types/known/structpb"
 )
@@ -20,47 +20,33 @@ type CredentialAttributes struct {
 	// DisableCredentialRotation disables the rotation of aws secrets associated with the plugin
 	DisableCredentialRotation bool
 	// RoleArn is the role arn associated with the aws credentials
 	RoleArn string
 	// RoleExternalId is the external id associated with the aws credentials
 	RoleExternalId string
 	// RoleSessionName is the session name associated with the aws credentials
 	RoleSessionName string
 	// RoleTags is the tags associated with the aws credentials
 	RoleTags map[string]string
 }
-// GetCredentialsConfig parses values out of a protobuf struct secrets and returns a
+// GetCredentialsConfig parses values out of a protobuf struct input and returns a
 // CredentialsConfig used for configuring an AWS session. An error is returned if
 // any of the following fields are missing from the protobuf struct input or have
 // invalid value types: access_key_id, secret_access_key. An error is returned if
 // any unrecognized fields are found in the protobuf struct input.
-func GetCredentialsConfig(secrets *structpb.Struct, attrs *CredentialAttributes, required bool) (*awsutil.CredentialsConfig, error) {
+func GetCredentialsConfig(in *structpb.Struct, region string) (*awsutil.CredentialsConfig, error) {
-	// initialize secrets if it is nil
+	unknownFields := values.StructFields(in)
 	// secrets can be nil because static credentials are optional
 	if secrets == nil {
 		secrets = &structpb.Struct{
 			Fields: make(map[string]*structpb.Value),
 		}
 	}
 	unknownFields := values.StructFields(secrets)
 	badFields := make(map[string]string)
-	accessKey, err := values.GetStringValue(secrets, ConstAccessKeyId, required)
+	accessKey, err := values.GetStringValue(in, ConstAccessKeyId, true)
 	if err != nil {
 		badFields[fmt.Sprintf("secrets.%s", ConstAccessKeyId)] = err.Error()
 	}
 	delete(unknownFields, ConstAccessKeyId)
-	secretKey, err := values.GetStringValue(secrets, ConstSecretAccessKey, required)
+	secretKey, err := values.GetStringValue(in, ConstSecretAccessKey, true)
 	if err != nil {
 		badFields[fmt.Sprintf("secrets.%s", ConstSecretAccessKey)] = err.Error()
 	}
 	delete(unknownFields, ConstSecretAccessKey)
 	if region == "" {
 		badFields[fmt.Sprintf("attributes.%s", ConstRegion)] = err.Error()
 	}
 	// the creds_last_rotated_time field will be found in the input struct for
 	// persisted secrets, this value is not needed for creating the CredentialsConfig
 	delete(unknownFields, ConstCredsLastRotatedTime)
@@ -68,56 +54,15 @@ func GetCredentialsConfig(secrets *structpb.Struct, attrs *CredentialAttributes,
 		badFields[fmt.Sprintf("secrets.%s", s)] = "unrecognized field"
 	}
 	opts := []awsutil.Option{}
 	// logic for parsing the credential type
 	// supported types:
 	//		- user static credential
 	//		- ec2 assume role dynamic credential
 	//		- enviornment variables credential
 	switch {
 	// static credentials and dynamic credentials cannot be used together
 	case accessKey != "" && secretKey != "" && attrs.RoleArn != "":
 		badFields[fmt.Sprintf("secrets.%s", ConstAccessKeyId)] = "conflicts with role_arn value"
 		badFields[fmt.Sprintf("secrets.%s", ConstSecretAccessKey)] = "conflicts with role_arn value"
 		badFields[fmt.Sprintf("attributes.%s", ConstRoleArn)] = "conflicts with access_key_id and secret_access_key values"
 	// static credential is missing it's secret_access_key
 	case accessKey != "" && secretKey == "":
 		badFields[fmt.Sprintf("secrets.%s", ConstSecretAccessKey)] = "missing required value"
 	// static credential is missing it's access_key_id
 	case accessKey == "" && secretKey != "":
 		badFields[fmt.Sprintf("secrets.%s", ConstAccessKeyId)] = "missing required value"
 	// dynamic credentials and credential rotation is not supported
 	case len(attrs.RoleArn) > 0 && !attrs.DisableCredentialRotation:
 		badFields[fmt.Sprintf("attributes.%s", ConstDisableCredentialRotation)] = "disable_credential_rotation attribute is required when providing a role_arn"
 	// add static credentials
 	case accessKey != "" && secretKey != "":
 		opts = append(opts,
 			awsutil.WithAccessKey(accessKey),
 			awsutil.WithSecretKey(secretKey),
 		)
 	// add dynamic credentials
 	case attrs.RoleArn != "":
 		opts = append(opts, awsutil.WithRoleArn(attrs.RoleArn))
 	}
 	if len(badFields) > 0 {
 		return nil, errors.InvalidArgumentError("Error in the secrets provided", badFields)
 	}
-	if attrs.Region != "" {
+	return awsutil.NewCredentialsConfig(
-		opts = append(opts, awsutil.WithRegion(attrs.Region))
+		awsutil.WithAccessKey(accessKey),
-	}
+		awsutil.WithSecretKey(secretKey),
-	if attrs.RoleExternalId != "" {
+		awsutil.WithRegion(region),
-		opts = append(opts, awsutil.WithRoleExternalId(attrs.RoleExternalId))
+	)
 	}
 	if attrs.RoleSessionName != "" {
 		opts = append(opts, awsutil.WithRoleSessionName(attrs.RoleSessionName))
 	}
 	if len(attrs.RoleTags) != 0 {
 		opts = append(opts, awsutil.WithRoleTags(attrs.RoleTags))
 	}
 	return awsutil.NewCredentialsConfig(opts...)
 }
 // GetCredentialAttributes parses values out of a protobuf struct input and returns a
@@ -143,26 +88,6 @@ func GetCredentialAttributes(in *structpb.Struct) (*CredentialAttributes, error)
 		badFields[fmt.Sprintf("attributes.%s", ConstDisableCredentialRotation)] = err.Error()
 	}
 	roleArn, err := values.GetStringValue(in, ConstRoleArn, false)
 	if err != nil {
 		badFields[fmt.Sprintf("attributes.%s", ConstRoleArn)] = err.Error()
 	}
 	roleExternalId, err := values.GetStringValue(in, ConstRoleExternalId, false)
 	if err != nil {
 		badFields[fmt.Sprintf("attributes.%s", ConstRoleExternalId)] = err.Error()
 	}
 	roleSessionName, err := values.GetStringValue(in, ConstRoleSessionName, false)
 	if err != nil {
 		badFields[fmt.Sprintf("attributes.%s", ConstRoleSessionName)] = err.Error()
 	}
 	roleTags, err := values.GetMapStringString(in, ConstRoleTags, false)
 	if err != nil {
 		badFields[fmt.Sprintf("attributes.%s", ConstRoleTags)] = err.Error()
 	}
 	if len(badFields) > 0 {
 		return nil, errors.InvalidArgumentError("Error in the attributes provided", badFields)
 	}
@@ -170,9 +95,5 @@ func GetCredentialAttributes(in *structpb.Struct) (*CredentialAttributes, error)
 	return &CredentialAttributes{
 		Region:                    region,
 		DisableCredentialRotation: disableCredentialRotation,
 		RoleArn:                   roleArn,
 		RoleExternalId:            roleExternalId,
 		RoleSessionName:           roleSessionName,
 		RoleTags:                  roleTags,
 	}, nil
 }
@@ -6,7 +6,7 @@ package credential
 import (
 	"testing"
-	"github.com/hashicorp/go-secure-stdlib/awsutil/v2"
+	"github.com/hashicorp/go-secure-stdlib/awsutil"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -61,28 +61,6 @@ func TestGetCredentialAttributes(t *testing.T) {
 				DisableCredentialRotation: true,
 			},
 		},
 		{
 			name: "with assume role",
 			in: map[string]any{
 				ConstRegion:          "us-west-2",
 				ConstRoleArn:         "arn:aws:iam::123456789012:role/S3Access",
 				ConstRoleExternalId:  "1234567890",
 				ConstRoleSessionName: "test-session",
 				ConstRoleTags: map[string]interface{}{
 					"foo": "bar",
 				},
 			},
 			expected: &CredentialAttributes{
 				Region:                    "us-west-2",
 				DisableCredentialRotation: false,
 				RoleArn:                   "arn:aws:iam::123456789012:role/S3Access",
 				RoleExternalId:            "1234567890",
 				RoleSessionName:           "test-session",
 				RoleTags: map[string]string{
 					"foo": "bar",
 				},
 			},
 		},
 	}
 	for _, tc := range cases {
@@ -111,155 +89,63 @@ func TestGetCredentialAttributes(t *testing.T) {
 func TestGetCredentialsConfig(t *testing.T) {
 	cases := []struct {
 		name                string
-		secrets             *structpb.Struct
+		in                  map[string]any
-		required            bool
+		region              string
 		attrs               *CredentialAttributes
 		expected            *awsutil.CredentialsConfig
 		expectedErrContains string
 	}{
 		{
-			name: "no credentials",
+			name:                "missing access_key_id",
-			attrs: &CredentialAttributes{
+			in:                  map[string]any{},
-				Region: "us-west-2",
+			region:              "us-west-2",
-			},
+			expectedErrContains: "missing required value \"access_key_id\"",
 			expected: &awsutil.CredentialsConfig{
 				Region: "us-west-2",
 			},
 		},
 		{
-			name: "with static credentials",
+			name: "missing secret_access_key",
-			secrets: &structpb.Struct{
+			in: map[string]any{
-				Fields: map[string]*structpb.Value{
+				ConstAccessKeyId: "foobar",
 					ConstAccessKeyId:     structpb.NewStringValue("AKIAfoobar"),
 					ConstSecretAccessKey: structpb.NewStringValue("bazqux"),
 				},
 			},
-			attrs: &CredentialAttributes{
+			region:              "us-west-2",
-				Region: "us-west-2",
+			expectedErrContains: "missing required value \"secret_access_key\"",
 			},
 			expected: &awsutil.CredentialsConfig{
 				AccessKey: "AKIAfoobar",
 				SecretKey: "bazqux",
 				Region:    "us-west-2",
 			},
 		},
 		{
 			name: "missing access key",
 			secrets: &structpb.Struct{
 				Fields: map[string]*structpb.Value{
 					ConstSecretAccessKey: structpb.NewStringValue("bazqux"),
 				},
 			},
 			attrs: &CredentialAttributes{
 				Region: "us-west-2",
 			},
 			required:            true,
 			expectedErrContains: "secrets.access_key_id: missing required value",
 		},
 		{
 			name: "missing secret key",
 			secrets: &structpb.Struct{
 				Fields: map[string]*structpb.Value{
 					ConstAccessKeyId: structpb.NewStringValue("AKIAfoobar"),
 				},
 			},
 			required: true,
 			attrs: &CredentialAttributes{
 				Region: "us-west-2",
 			},
 			expectedErrContains: "secrets.secret_access_key: missing required value",
 		},
 		{
 			name: "unknown fields",
-			secrets: &structpb.Struct{
+			in: map[string]any{
-				Fields: map[string]*structpb.Value{
+				ConstAccessKeyId:     "foobar",
-					ConstAccessKeyId:     structpb.NewStringValue("AKIAfoobar"),
+				ConstSecretAccessKey: "bazqux",
-					ConstSecretAccessKey: structpb.NewStringValue("bazqux"),
+				"foo":                true,
-					"foo":                structpb.NewBoolValue(true),
+				"bar":                true,
 					"bar":                structpb.NewBoolValue(true),
 				},
 			},
 			attrs: &CredentialAttributes{
 				Region: "us-west-2",
 			},
 			region:              "us-west-2",
 			expectedErrContains: "secrets.bar: unrecognized field, secrets.foo: unrecognized field",
 		},
 		{
 			name: "valid ignore creds_last_rotated_time",
-			secrets: &structpb.Struct{
+			in: map[string]any{
-				Fields: map[string]*structpb.Value{
+				ConstAccessKeyId:          "foobar",
-					ConstAccessKeyId:          structpb.NewStringValue("AKIAfoobar"),
+				ConstSecretAccessKey:      "bazqux",
-					ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
+				ConstCredsLastRotatedTime: "2006-01-02T15:04:05+07:00",
 					ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 				},
 			},
 			attrs: &CredentialAttributes{
 				Region: "us-west-2",
 			},
 			region: "us-west-2",
 			expected: &awsutil.CredentialsConfig{
-				AccessKey: "AKIAfoobar",
+				AccessKey: "foobar",
 				SecretKey: "bazqux",
 				Region:    "us-west-2",
 			},
 		},
 		{
-			name: "with assume role",
+			name: "good",
-			secrets: &structpb.Struct{
+			in: map[string]any{
-				Fields: map[string]*structpb.Value{},
+				ConstAccessKeyId:     "foobar",
-			},
+				ConstSecretAccessKey: "bazqux",
 			attrs: &CredentialAttributes{
 				Region:          "us-west-2",
 				RoleArn:         "arn:aws:iam::123456789012:role/S3Access",
 				RoleExternalId:  "1234567890",
 				RoleSessionName: "test-session",
 				RoleTags: map[string]string{
 					"foo": "bar",
 				},
 				DisableCredentialRotation: true,
 			},
 			region: "us-west-2",
 			expected: &awsutil.CredentialsConfig{
-				Region:          "us-west-2",
+				AccessKey: "foobar",
-				RoleARN:         "arn:aws:iam::123456789012:role/S3Access",
+				SecretKey: "bazqux",
-				RoleExternalId:  "1234567890",
+				Region:    "us-west-2",
 				RoleSessionName: "test-session",
 				RoleTags: map[string]string{
 					"foo": "bar",
 				},
 			},
 		},
 		{
 			name: "with static credential & assume role",
 			secrets: &structpb.Struct{
 				Fields: map[string]*structpb.Value{
 					ConstAccessKeyId:     structpb.NewStringValue("AKIAfoobar"),
 					ConstSecretAccessKey: structpb.NewStringValue("bazqux"),
 				},
 			},
 			attrs: &CredentialAttributes{
 				Region:          "us-west-2",
 				RoleArn:         "arn:aws:iam::123456789012:role/S3Access",
 				RoleExternalId:  "1234567890",
 				RoleSessionName: "test-session",
 				RoleTags: map[string]string{
 					"foo": "bar",
 				},
 			},
 			expectedErrContains: "attributes.role_arn: conflicts with access_key_id and secret_access_key values, secrets.access_key_id: conflicts with role_arn value, secrets.secret_access_key: conflicts with role_arn value",
 		},
 		{
 			name:    "with dynamic credentials and no disable credential rotation",
 			secrets: &structpb.Struct{Fields: map[string]*structpb.Value{}},
 			attrs: &CredentialAttributes{
 				Region:          "us-west-2",
 				RoleArn:         "arn:aws:iam::123456789012:role/S3Access",
 				RoleExternalId:  "1234567890",
 				RoleSessionName: "test-session",
 				RoleTags: map[string]string{
 					"foo": "bar",
 				},
 			},
 			expectedErrContains: "attributes.disable_credential_rotation: disable_credential_rotation attribute is required when providing a role_arn",
 		},
 	}
 	for _, tc := range cases {
@@ -267,7 +153,10 @@ func TestGetCredentialsConfig(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			require := require.New(t)
-			actual, err := GetCredentialsConfig(tc.secrets, tc.attrs, tc.required)
+			input, err := structpb.NewStruct(tc.in)
 			require.NoError(err)
 			actual, err := GetCredentialsConfig(input, tc.region)
 			if tc.expectedErrContains != "" {
 				require.Error(err)
 				require.Contains(err.Error(), tc.expectedErrContains)
@@ -279,10 +168,6 @@ func TestGetCredentialsConfig(t *testing.T) {
 			require.Equal(tc.expected.AccessKey, actual.AccessKey)
 			require.Equal(tc.expected.SecretKey, actual.SecretKey)
 			require.Equal(tc.expected.Region, actual.Region)
 			require.Equal(tc.expected.RoleARN, actual.RoleARN)
 			require.Equal(tc.expected.RoleExternalId, actual.RoleExternalId)
 			require.Equal(tc.expected.RoleSessionName, actual.RoleSessionName)
 			require.Equal(tc.expected.RoleTags, actual.RoleTags)
 		})
 	}
 }
@@ -18,16 +18,4 @@ const (
 	// ConstCredsLastRotatedTime is the key for the last rotated time in the aws credentials.
 	ConstCredsLastRotatedTime = "creds_last_rotated_time"
 	// ConstRoleArn is the key for assuming a IAM role.
 	ConstRoleArn = "role_arn"
 	// ConstRoleExternalId is the key for the external id used for assuming a IAM role.
 	ConstRoleExternalId = "role_external_id"
 	// ConstRoleSessionName is the key for the session name used for assuming a IAM role.
 	ConstRoleSessionName = "role_session_name"
 	// ConstRoleTags is the key for the tags used for assuming a IAM role.
 	ConstRoleTags = "role_tags"
 )
@@ -4,41 +4,18 @@
 package credential
 import (
 	"context"
 	"errors"
 	"fmt"
 	"strings"
 	"time"
-	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
-	iamTypes "github.com/aws/aws-sdk-go-v2/service/iam/types"
+	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/hashicorp/boundary-plugin-aws/internal/values"
-	"github.com/hashicorp/go-secure-stdlib/awsutil/v2"
+	"github.com/hashicorp/go-secure-stdlib/awsutil"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 type CredentialType int
 const (
 	// StaticAWS denotes an Access Key Id that begins with "AKIA". These are
 	// long-term access keys, provided by AWS, for an IAM user or an AWS account
 	// root user.
 	// https://docs.aws.amazon.com/IAM/latest/UserGuide/security-creds.html#sec-access-keys-and-secret-access-keys
 	StaticAWS CredentialType = iota
 	// DynamicAWS denotes the presence of a RoleARN, or an Access Key Id that
 	// begins with "ASIA". The latter are temporary credentials access keys that
 	// are created using AWS STS operations.
 	DynamicAWS
 	// StaticOther denotes the presence of an Access Key Id that does not follow
 	// the AKIA/ASIA convention outlined by AWS.
 	StaticOther
 	// Unknown is a catch-all for everything else.
 	Unknown
 )
 // rotationWaitTimeout controls the time we wait for credential rotation to
 // succeed. This is important to ensure that rotated credentials can be used
 // right away.
@@ -48,13 +25,19 @@ type AwsCredentialPersistedStateOption func(s *AwsCredentialPersistedState) erro
 // AwsCredentialPersistedState is the persisted state for the AWS credential.
 type AwsCredentialPersistedState struct {
-	// CredentialsConfig is the credential configuration for the AWS credential.
+	// AccessKeyId is the access key id for the AWS credential.
-	CredentialsConfig *awsutil.CredentialsConfig
+	AccessKeyId string
 	// SecretAccessKey is the secret access key for the AWS credential.
 	SecretAccessKey string
 	// CredsLastRotatedTime is the last rotation of aws secrets for the AWS credential.
 	CredsLastRotatedTime time.Time
 	// testOpts are options that should be used for testing only
 	testOpts []awsutil.Option
 	// Region is not a part of persisted state but if set is passed to clients
 	// created with this state
 	region string
 }
 // WithStateTestOpts enables unit testing different edge cases
@@ -67,19 +50,31 @@ func WithStateTestOpts(opts []awsutil.Option) AwsCredentialPersistedStateOption
 	}
 }
-// WithCredentialsConfig sets the value for CredentialsConfig in the credential persisted state.
+// WithAccessKeyId sets the value for AccesskeyId in the storage persisted state.
-func WithCredentialsConfig(x *awsutil.CredentialsConfig) AwsCredentialPersistedStateOption {
+func WithAccessKeyId(x string) AwsCredentialPersistedStateOption {
 	return func(s *AwsCredentialPersistedState) error {
-		if s.CredentialsConfig != nil {
+		if s.AccessKeyId != "" {
-			return errors.New("credentials config already set")
+			return errors.New("access key id already set")
 		}
-		s.CredentialsConfig = x
+		s.AccessKeyId = x
 		return nil
 	}
 }
-// WithCredsLastRotatedTime sets the value for CredsLastRotatedTime in the credential persisted state.
+// WithSecretAccessKey sets the value for SecretAccessKey in the storage persisted state.
 func WithSecretAccessKey(x string) AwsCredentialPersistedStateOption {
 	return func(s *AwsCredentialPersistedState) error {
 		if s.SecretAccessKey != "" {
 			return errors.New("secret access key already set")
 		}
 		s.SecretAccessKey = x
 		return nil
 	}
 }
 // WithCredsLastRotatedTime sets the value for CredsLastRotatedTime in the storage persisted state.
 func WithCredsLastRotatedTime(t time.Time) AwsCredentialPersistedStateOption {
 	return func(s *AwsCredentialPersistedState) error {
 		if !s.CredsLastRotatedTime.IsZero() {
@@ -91,6 +86,18 @@ func WithCredsLastRotatedTime(t time.Time) AwsCredentialPersistedStateOption {
 	}
 }
 // WithRegion sets the value for region in the storage persisted state.
 func WithRegion(with string) AwsCredentialPersistedStateOption {
 	return func(s *AwsCredentialPersistedState) error {
 		if s.region != "" {
 			return errors.New("region already set")
 		}
 		s.region = with
 		return nil
 	}
 }
 // NewAwsCredentialPersistedState returns a AwsCredentialPersistedState.
 // Supported options include: WithAccessKeyId, WithSecretAccessKey
 // WithCredsLastRotatedTime, & WithRegion.
@@ -101,19 +108,27 @@ func NewAwsCredentialPersistedState(opts ...AwsCredentialPersistedStateOption) (
 			return nil, err
 		}
 	}
 	return s, nil
 }
-// ValidateCreds takes the credentials configuration from the persisted state
+// ValidateCreds takes the access key and secret key from the persisted state
 // and runs sts.GetCallerIdentity for the current credentials, which is done
 // to check that the credentials are valid.
-func (s *AwsCredentialPersistedState) ValidateCreds(ctx context.Context) error {
+func (s *AwsCredentialPersistedState) ValidateCreds() error {
-	if s.CredentialsConfig == nil {
+	c, err := awsutil.NewCredentialsConfig(append([]awsutil.Option{
-		return errors.New("missing credentials config")
+		awsutil.WithAccessKey(s.AccessKeyId),
 		awsutil.WithSecretKey(s.SecretAccessKey),
 		awsutil.WithRegion(s.region),
 	}, s.testOpts...)...)
 	if err != nil {
 		return fmt.Errorf("error loading credentials: %w", err)
 	}
-	if _, err := s.CredentialsConfig.GetCallerIdentity(ctx, s.testOpts...); err != nil {
+
 	if _, err := c.GetCallerIdentity(s.testOpts...); err != nil {
 		return fmt.Errorf("error validating credentials: %w", err)
 	}
 	return nil
 }
@@ -122,44 +137,57 @@ func (s *AwsCredentialPersistedState) ValidateCreds(ctx context.Context) error {
 // written into the credentials config and the persisted state. On any error, the old credentials are not overwritten.
 // This ensures that any generated new secret key never leaves this function in case of an error, even though it will
 // still result in an extraneous access key existing.
-func (s *AwsCredentialPersistedState) RotateCreds(ctx context.Context) error {
+func (s *AwsCredentialPersistedState) RotateCreds() error {
-	if s.CredentialsConfig == nil {
+	c, err := awsutil.NewCredentialsConfig(append([]awsutil.Option{
-		return errors.New("missing credentials config")
+		awsutil.WithAccessKey(s.AccessKeyId),
 		awsutil.WithSecretKey(s.SecretAccessKey),
 		awsutil.WithRegion(s.region),
 	}, s.testOpts...)...)
 	if err != nil {
 		return fmt.Errorf("error loading credentials: %w", err)
 	}
-	if GetCredentialType(s.CredentialsConfig) != StaticAWS {
+
-		return errors.New("invalid credential type")
+	if err := c.RotateKeys(append([]awsutil.Option{
 	}
 	if err := s.CredentialsConfig.RotateKeys(ctx, append([]awsutil.Option{
 		awsutil.WithValidityCheckTimeout(rotationWaitTimeout),
 	}, s.testOpts...)...); err != nil {
 		return fmt.Errorf("error rotating credentials: %w", err)
 	}
 	s.AccessKeyId = c.AccessKey
 	s.SecretAccessKey = c.SecretKey
 	s.CredsLastRotatedTime = time.Now()
 	return nil
 }
 // ReplaceCreds replaces the access key in the state with a new key.
 // If the existing key was rotated at any point in time, it is
 // deleted first, otherwise it's left alone.
-func (s *AwsCredentialPersistedState) ReplaceCreds(ctx context.Context, credentialsConfig *awsutil.CredentialsConfig) error {
+func (s *AwsCredentialPersistedState) ReplaceCreds(accessKeyId, secretAccessKey string) error {
-	if credentialsConfig == nil {
+	if accessKeyId == "" {
-		return errors.New("missing new credentials config")
+		return errors.New("access key id cannot be empty")
 	}
 	if s.CredentialsConfig == nil {
 		return errors.New("missing credentials config")
 	}
-	// Delete old/existing credentials. This action is only possible for static credential types.
+	if secretAccessKey == "" {
-	// This is done with the same credentials to ensure that it has the proper permissions to do it.
+		return errors.New("secret access key cannot be empty")
-	ct := GetCredentialType(s.CredentialsConfig)
+	}
-	if !s.CredsLastRotatedTime.IsZero() && ct == StaticAWS {
+
-		if err := s.DeleteCreds(ctx); err != nil {
+	if accessKeyId == s.AccessKeyId {
 		return errors.New("attempting to replace access key with the same one")
 	}
 	if !s.CredsLastRotatedTime.IsZero() {
 		// Delete old/existing credentials. This is done with the same
 		// credentials to ensure that it has the proper permissions to do
 		// it.
 		if err := s.DeleteCreds(); err != nil {
 			return err
 		}
 	}
 	// Set the new attributes and clear the rotated time.
-	s.CredentialsConfig = credentialsConfig
+	s.AccessKeyId = accessKeyId
 	s.SecretAccessKey = secretAccessKey
 	s.CredsLastRotatedTime = time.Time{}
 	return nil
 }
@@ -167,87 +195,86 @@ func (s *AwsCredentialPersistedState) ReplaceCreds(ctx context.Context, credenti
 // DeleteCreds deletes the credentials in the state. The access key
 // ID, secret access key, and rotation time fields are zeroed out in
 // the state just to ensure that they cannot be re-used after.
-func (s *AwsCredentialPersistedState) DeleteCreds(ctx context.Context) error {
+func (s *AwsCredentialPersistedState) DeleteCreds() error {
-	if s.CredentialsConfig == nil {
+	c, err := awsutil.NewCredentialsConfig(append([]awsutil.Option{
-		return errors.New("missing credentials config")
+		awsutil.WithAccessKey(s.AccessKeyId),
-	}
+		awsutil.WithSecretKey(s.SecretAccessKey),
-	if GetCredentialType(s.CredentialsConfig) != StaticAWS {
+		awsutil.WithRegion(s.region),
-		return errors.New("invalid credential type")
+	}, s.testOpts...)...)
 	if err != nil {
 		return fmt.Errorf("error loading credentials: %w", err)
 	}
-	if err := s.CredentialsConfig.DeleteAccessKey(ctx, s.CredentialsConfig.AccessKey, s.testOpts...); err != nil {
+	if err := c.DeleteAccessKey(s.AccessKeyId, s.testOpts...); err != nil {
 		// Determine if the deletion error was due to a missing
 		// resource. If it was, just pass it.
-		var awsErr *iamTypes.NoSuchEntityException
+		var awsErr awserr.Error
-		if errors.As(err, &awsErr) && awsErr.ErrorCode() == "NoSuchEntity" {
+		if errors.As(err, &awsErr) {
-			s.CredentialsConfig = nil
+			if awsErr.Code() == iam.ErrCodeNoSuchEntityException {
-			s.CredsLastRotatedTime = time.Time{}
+				s.AccessKeyId = ""
-			return nil
+				s.SecretAccessKey = ""
 				s.CredsLastRotatedTime = time.Time{}
 				return nil
 			}
 		}
 		// Otherwise treat it as an actual error.
 		return err
 	}
-	s.CredentialsConfig = nil
+	s.AccessKeyId = ""
 	s.SecretAccessKey = ""
 	s.CredsLastRotatedTime = time.Time{}
 	return nil
 }
-// GenerateCredentialChain returns a AWS configuration for the credentials in the state.
+// GetSession returns a configured AWS session for the credentials in
-func (s *AwsCredentialPersistedState) GenerateCredentialChain(ctx context.Context) (*aws.Config, error) {
+// the state.
-	return s.CredentialsConfig.GenerateCredentialChain(ctx, s.testOpts...)
+func (s *AwsCredentialPersistedState) GetSession() (*session.Session, error) {
 	c, err := awsutil.NewCredentialsConfig(append([]awsutil.Option{
 		awsutil.WithAccessKey(s.AccessKeyId),
 		awsutil.WithSecretKey(s.SecretAccessKey),
 		awsutil.WithRegion(s.region),
 	}, s.testOpts...)...)
 	if err != nil {
 		return nil, err
 	}
 	return c.GetSession()
 }
-// ToMap returns a map of the credentials stored in the persisted state.
+// ToMap returns a map of the credentials stored in the persisted state,
-// ToMap will return an empty map for temporary credentials. ToMap will
+// which includes the following keys: access_key_id, secret_access_key,
-// return a map for long-term credentials with following keys:
+// & creds_last_rotated_time
 // access_key_id, secret_access_key & creds_last_rotated_time
 func (s *AwsCredentialPersistedState) ToMap() map[string]any {
 	ct := GetCredentialType(s.CredentialsConfig)
 	// Dynamic AWS credentials are temporary credentials that expire within an hour.
 	// ToMap() returns an empty map here so that Boundary does not store temporary
 	// credentials into the database.
 	//
 	// Uknown credentials are not aws compatiable secrets that may have been provided
 	// for a non-aws s3 compatiable service. These credentials will not be returned
 	// because the plugin does not know how to manage non-aws credentials.
 	if ct == DynamicAWS || ct == Unknown {
 		return map[string]any{}
 	}
 	return map[string]any{
-		ConstAccessKeyId:          s.CredentialsConfig.AccessKey,
+		ConstAccessKeyId:          s.AccessKeyId,
-		ConstSecretAccessKey:      s.CredentialsConfig.SecretKey,
+		ConstSecretAccessKey:      s.SecretAccessKey,
 		ConstCredsLastRotatedTime: s.CredsLastRotatedTime.Format(time.RFC3339Nano),
 	}
 }
 // AwsCredentialPersistedStateFromProto parses values out of a protobuf struct input
 // and returns a AwsCredentialPersistedState used for configuring an AWS session.
-func AwsCredentialPersistedStateFromProto(secrets *structpb.Struct, attrs *CredentialAttributes, opts ...AwsCredentialPersistedStateOption) (*AwsCredentialPersistedState, error) {
+// An error is returned if any of the following fields are missing from the protobuf
-	// initialize secrets if it is nil
+// struct input or have invalid value types: access_key_id, secret_access_key, &
-	// secrets can be nil because static credentials are optional
+// creds_last_rotated_time.
-	if secrets == nil {
+func AwsCredentialPersistedStateFromProto(in *structpb.Struct, opts ...AwsCredentialPersistedStateOption) (*AwsCredentialPersistedState, error) {
-		secrets = &structpb.Struct{
+	if in == nil {
-			Fields: map[string]*structpb.Value{},
+		return nil, errors.New("missing persisted secrets")
 		}
 	}
-	if attrs == nil {
+	accessKeyId, err := values.GetStringValue(in, ConstAccessKeyId, true)
 		return nil, fmt.Errorf("missing credential attributes")
 	}
 	accessKeyId, err := values.GetStringValue(secrets, ConstAccessKeyId, false)
 	if err != nil {
 		return nil, fmt.Errorf("persisted state integrity error: %w", err)
 	}
-	secretAccessKey, err := values.GetStringValue(secrets, ConstSecretAccessKey, false)
+	secretAccessKey, err := values.GetStringValue(in, ConstSecretAccessKey, true)
 	if err != nil {
 		return nil, fmt.Errorf("persisted state integrity error: %w", err)
 	}
-	credsLastRotatedTime, err := values.GetTimeValue(secrets, ConstCredsLastRotatedTime)
+	credsLastRotatedTime, err := values.GetTimeValue(in, ConstCredsLastRotatedTime)
 	if err != nil {
 		return nil, fmt.Errorf("persisted state integrity error: %w", err)
 	}
@@ -257,54 +284,9 @@ func AwsCredentialPersistedStateFromProto(secrets *structpb.Struct, attrs *Crede
 		return nil, err
 	}
-	awsOpts := append([]awsutil.Option{}, s.testOpts...)
+	s.AccessKeyId = accessKeyId
-	if accessKeyId != "" && secretAccessKey != "" {
+	s.SecretAccessKey = secretAccessKey
 		awsOpts = append(awsOpts,
 			awsutil.WithAccessKey(accessKeyId),
 			awsutil.WithSecretKey(secretAccessKey),
 		)
 	}
 	if attrs.Region != "" {
 		awsOpts = append(awsOpts, awsutil.WithRegion(attrs.Region))
 	}
 	if attrs.RoleArn != "" {
 		awsOpts = append(awsOpts, awsutil.WithRoleArn(attrs.RoleArn))
 	}
 	if attrs.RoleExternalId != "" {
 		awsOpts = append(awsOpts, awsutil.WithRoleExternalId(attrs.RoleExternalId))
 	}
 	if attrs.RoleSessionName != "" {
 		awsOpts = append(awsOpts, awsutil.WithRoleSessionName(attrs.RoleSessionName))
 	}
 	if len(attrs.RoleTags) != 0 {
 		awsOpts = append(awsOpts, awsutil.WithRoleTags(attrs.RoleTags))
 	}
 	credentialsConfig, err := awsutil.NewCredentialsConfig(awsOpts...)
 	if err != nil {
 		return nil, err
 	}
 	s.CredentialsConfig = credentialsConfig
 	s.CredsLastRotatedTime = credsLastRotatedTime
 	return s, nil
 }
 // GetCredentialType returns the credential type based on the given
 // AccessKey/RoleARN. See CredentialType definition for more information.
 func GetCredentialType(cc *awsutil.CredentialsConfig) CredentialType {
 	if cc == nil {
 		return Unknown
 	}
 	if len(cc.RoleARN) > 0 || strings.HasPrefix(cc.AccessKey, "ASIA") {
 		return DynamicAWS
 	}
 	if strings.HasPrefix(cc.AccessKey, "AKIA") {
 		return StaticAWS
 	}
 	if len(cc.AccessKey) > 0 {
 		return StaticOther
 	}
 	return Unknown
 }
@@ -4,16 +4,15 @@
 package credential
 import (
 	"context"
 	"errors"
 	"fmt"
 	"testing"
 	"time"
-	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go-v2/service/iam"
+	"github.com/aws/aws-sdk-go/aws/awserr"
-	iamTypes "github.com/aws/aws-sdk-go-v2/service/iam/types"
+	"github.com/aws/aws-sdk-go/service/iam"
-	"github.com/hashicorp/go-secure-stdlib/awsutil/v2"
+	"github.com/hashicorp/go-secure-stdlib/awsutil"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/structpb"
 )
@@ -37,22 +36,21 @@ func TestNewAwsCredentialPersistedState(t *testing.T) {
 			expectedErr: testOptionErr,
 		},
 		{
-			name: "with credentials config",
+			name: "access key id",
 			opts: []AwsCredentialPersistedStateOption{
-				WithCredentialsConfig(
+				WithAccessKeyId("foobar"),
 					&awsutil.CredentialsConfig{
 						AccessKey: "foobar",
 						SecretKey: "bazqux",
 						Region:    "us-west-2",
 					},
 				),
 			},
 			expected: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				AccessKeyId: "foobar",
-					AccessKey: "foobar",
+			},
-					SecretKey: "bazqux",
+		},
-					Region:    "us-west-2",
+		{
-				},
+			name: "secret access key",
 			opts: []AwsCredentialPersistedStateOption{
 				WithSecretAccessKey("bazqux"),
 			},
 			expected: &AwsCredentialPersistedState{
 				SecretAccessKey: "bazqux",
 			},
 		},
 		{
@@ -65,12 +63,29 @@ func TestNewAwsCredentialPersistedState(t *testing.T) {
 			},
 		},
 		{
-			name: "double set credentials config",
+			name: "region key",
 			opts: []AwsCredentialPersistedStateOption{
-				WithCredentialsConfig(&awsutil.CredentialsConfig{}),
+				WithRegion("foobar"),
 				WithCredentialsConfig(&awsutil.CredentialsConfig{}),
 			},
-			expectedErr: "credentials config already set",
+			expected: &AwsCredentialPersistedState{
 				region: "foobar",
 			},
 		},
 		{
 			name: "double set access key id",
 			opts: []AwsCredentialPersistedStateOption{
 				WithAccessKeyId("foobar"),
 				WithAccessKeyId("onetwo"),
 			},
 			expectedErr: "access key id already set",
 		},
 		{
 			name: "double set secret access key",
 			opts: []AwsCredentialPersistedStateOption{
 				WithSecretAccessKey("bazqux"),
 				WithSecretAccessKey("threefour"),
 			},
 			expectedErr: "secret access key already set",
 		},
 		{
 			name: "double set rotation time",
@@ -80,6 +95,14 @@ func TestNewAwsCredentialPersistedState(t *testing.T) {
 			},
 			expectedErr: "last rotation time already set",
 		},
 		{
 			name: "double set region",
 			opts: []AwsCredentialPersistedStateOption{
 				WithRegion("foobar"),
 				WithRegion("barfoo"),
 			},
 			expectedErr: "region already set",
 		},
 	}
 	for _, tc := range cases {
@@ -93,13 +116,7 @@ func TestNewAwsCredentialPersistedState(t *testing.T) {
 			}
 			require.NoError(err)
-			require.Equal(tc.expected.CredsLastRotatedTime, actual.CredsLastRotatedTime)
+			require.Equal(tc.expected, actual)
 			if tc.expected.CredentialsConfig != nil {
 				require.NotNil(actual.CredentialsConfig)
 				require.Equal(tc.expected.CredentialsConfig.AccessKey, actual.CredentialsConfig.AccessKey)
 				require.Equal(tc.expected.CredentialsConfig.SecretKey, actual.CredentialsConfig.SecretKey)
 				require.Equal(tc.expected.CredentialsConfig.Region, actual.CredentialsConfig.Region)
 			}
 		})
 	}
 }
@@ -107,95 +124,43 @@ func TestNewAwsCredentialPersistedState(t *testing.T) {
 func TestAwsCredentialPersistedStateFromProto(t *testing.T) {
 	cases := []struct {
 		name        string
-		secrets     *structpb.Struct
+		in          map[string]any
 		attrs       *CredentialAttributes
 		opts        []AwsCredentialPersistedStateOption
 		expected    *AwsCredentialPersistedState
 		expectedErr string
 	}{
 		{
-			name:        "missing credential attributes",
+			name:        "no secrets",
-			expectedErr: "missing credential attributes",
+			in:          nil,
 			expectedErr: "missing persisted secrets",
 		},
 		{
-			name: "missing secrets",
+			name:        "missing access key ID",
-			attrs: &CredentialAttributes{
+			in:          map[string]any{},
-				Region: "us-west-2",
+			expectedErr: "persisted state integrity error: missing required value \"access_key_id\"",
 			},
 			expected: &AwsCredentialPersistedState{
 				CredentialsConfig: &awsutil.CredentialsConfig{
 					Region: "us-west-2",
 				},
 			},
 		},
 		{
-			name:    "missing long-term access key id",
+			name: "missing secret access key",
-			secrets: &structpb.Struct{},
+			in: map[string]any{
-			attrs: &CredentialAttributes{
+				ConstAccessKeyId: "foobar",
 				Region: "us-west-2",
 			},
 			expected: &AwsCredentialPersistedState{
 				CredentialsConfig: &awsutil.CredentialsConfig{
 					Region: "us-west-2",
 				},
 			},
 		},
 		{
 			name:    "missing long-term secret access key",
 			secrets: &structpb.Struct{},
 			attrs: &CredentialAttributes{
 				Region: "us-west-2",
 			},
 			expected: &AwsCredentialPersistedState{
 				CredentialsConfig: &awsutil.CredentialsConfig{
 					Region: "us-west-2",
 				},
 			},
 		},
 		{
 			name: "with long-term static credentials",
 			secrets: &structpb.Struct{
 				Fields: map[string]*structpb.Value{
 					ConstAccessKeyId:     structpb.NewStringValue("foobar"),
 					ConstSecretAccessKey: structpb.NewStringValue("bazqux"),
 				},
 			},
 			attrs: &CredentialAttributes{
 				Region: "us-west-2",
 			},
 			expected: &AwsCredentialPersistedState{
 				CredentialsConfig: &awsutil.CredentialsConfig{
 					Region:    "us-west-2",
 					AccessKey: "foobar",
 					SecretKey: "bazqux",
 				},
 			},
 			expectedErr: "persisted state integrity error: missing required value \"secret_access_key\"",
 		},
 		{
 			name: "bad last rotated time",
-			secrets: &structpb.Struct{
+			in: map[string]any{
-				Fields: map[string]*structpb.Value{
+				ConstAccessKeyId:          "foobar",
-					ConstAccessKeyId:          structpb.NewStringValue("foobar"),
+				ConstSecretAccessKey:      "bazqux",
-					ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
+				ConstCredsLastRotatedTime: "notatime",
 					ConstCredsLastRotatedTime: structpb.NewStringValue("notatime"),
 				},
 			},
 			attrs: &CredentialAttributes{
 				Region: "us-west-2",
 			},
 			expectedErr: "persisted state integrity error: could not parse time in value \"creds_last_rotated_time\": parsing time \"notatime\" as \"2006-01-02T15:04:05.999999999Z07:00\": cannot parse \"notatime\" as \"2006\"",
 		},
 		{
 			name: "option error",
-			secrets: &structpb.Struct{
+			in: map[string]any{
-				Fields: map[string]*structpb.Value{
+				ConstAccessKeyId:          "foobar",
-					ConstAccessKeyId:          structpb.NewStringValue("foobar"),
+				ConstSecretAccessKey:      "bazqux",
-					ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
+				ConstCredsLastRotatedTime: "2006-01-02T15:04:05+07:00",
 					ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 				},
 			},
 			attrs: &CredentialAttributes{
 				Region: "us-west-2",
 			},
 			opts: []AwsCredentialPersistedStateOption{
 				func(s *AwsCredentialPersistedState) error {
@@ -206,22 +171,14 @@ func TestAwsCredentialPersistedStateFromProto(t *testing.T) {
 		},
 		{
 			name: "good with non-zero timestamp",
-			secrets: &structpb.Struct{
+			in: map[string]any{
-				Fields: map[string]*structpb.Value{
+				ConstAccessKeyId:          "foobar",
-					ConstAccessKeyId:          structpb.NewStringValue("foobar"),
+				ConstSecretAccessKey:      "bazqux",
-					ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
+				ConstCredsLastRotatedTime: "2006-01-02T15:04:05+07:00",
 					ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 				},
 			},
 			attrs: &CredentialAttributes{
 				Region: "us-west-2",
 			},
 			expected: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				AccessKeyId:     "foobar",
-					AccessKey: "foobar",
+				SecretAccessKey: "bazqux",
 					SecretKey: "bazqux",
 					Region:    "us-west-2",
 				},
 				CredsLastRotatedTime: func() time.Time {
 					t, err := time.Parse(time.RFC3339, "2006-01-02T15:04:05+07:00")
 					if err != nil {
@@ -233,79 +190,33 @@ func TestAwsCredentialPersistedStateFromProto(t *testing.T) {
 		},
 		{
 			name: "good with zero timestamp",
-			secrets: &structpb.Struct{
+			in: map[string]any{
-				Fields: map[string]*structpb.Value{
+				ConstAccessKeyId:          "foobar",
-					ConstAccessKeyId:          structpb.NewStringValue("foobar"),
+				ConstSecretAccessKey:      "bazqux",
-					ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
+				ConstCredsLastRotatedTime: (time.Time{}).Format(time.RFC3339Nano),
 					ConstCredsLastRotatedTime: structpb.NewStringValue((time.Time{}).Format(time.RFC3339Nano)),
 				},
 			},
 			attrs: &CredentialAttributes{
 				Region: "us-west-2",
 			},
 			expected: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				AccessKeyId:          "foobar",
-					AccessKey: "foobar",
+				SecretAccessKey:      "bazqux",
 					SecretKey: "bazqux",
 					Region:    "us-west-2",
 				},
 				CredsLastRotatedTime: time.Time{},
 			},
 		},
 		{
-			name: "with assume role",
+			name: "good (ignoring non-test options)",
-			attrs: &CredentialAttributes{
+			in: map[string]any{
-				Region:          "us-west-2",
+				ConstAccessKeyId:          "foobar",
-				RoleArn:         "arn:aws:iam::123456789012:role/S3Access",
+				ConstSecretAccessKey:      "bazqux",
-				RoleExternalId:  "1234567890",
+				ConstCredsLastRotatedTime: (time.Time{}).Format(time.RFC3339Nano),
-				RoleSessionName: "test-session",
+			},
-				RoleTags: map[string]string{
+			opts: []AwsCredentialPersistedStateOption{
-					"foo": "bar",
+				WithAccessKeyId("ignored"),
-				},
+				WithRegion("us-west-2"),
 			},
 			expected: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				AccessKeyId:          "foobar",
-					Region:          "us-west-2",
+				SecretAccessKey:      "bazqux",
 					RoleARN:         "arn:aws:iam::123456789012:role/S3Access",
 					RoleExternalId:  "1234567890",
 					RoleSessionName: "test-session",
 					RoleTags: map[string]string{
 						"foo": "bar",
 					},
 				},
 			},
 		},
 		{
 			name: "with assume role & static credentials",
 			secrets: &structpb.Struct{
 				Fields: map[string]*structpb.Value{
 					ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 					ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 					ConstCredsLastRotatedTime: structpb.NewStringValue((time.Time{}).Format(time.RFC3339Nano)),
 				},
 			},
 			attrs: &CredentialAttributes{
 				Region:          "us-west-2",
 				RoleArn:         "arn:aws:iam::123456789012:role/S3Access",
 				RoleExternalId:  "1234567890",
 				RoleSessionName: "test-session",
 				RoleTags: map[string]string{
 					"foo": "bar",
 				},
 			},
 			expected: &AwsCredentialPersistedState{
 				CredentialsConfig: &awsutil.CredentialsConfig{
 					AccessKey:       "foobar",
 					SecretKey:       "bazqux",
 					Region:          "us-west-2",
 					RoleARN:         "arn:aws:iam::123456789012:role/S3Access",
 					RoleExternalId:  "1234567890",
 					RoleSessionName: "test-session",
 					RoleTags: map[string]string{
 						"foo": "bar",
 					},
 				},
 				CredsLastRotatedTime: time.Time{},
 				region:               "us-west-2",
 			},
 		},
 	}
@@ -315,67 +226,55 @@ func TestAwsCredentialPersistedStateFromProto(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			require := require.New(t)
-			actual, err := AwsCredentialPersistedStateFromProto(tc.secrets, tc.attrs, tc.opts...)
+			var (
 				input *structpb.Struct
 				err   error
 			)
 			if tc.in != nil {
 				input, err = structpb.NewStruct(tc.in)
 				require.NoError(err)
 			}
 			actual, err := AwsCredentialPersistedStateFromProto(input, tc.opts...)
 			if tc.expectedErr != "" {
 				require.EqualError(err, tc.expectedErr)
 				return
 			}
 			require.NoError(err)
-			require.NotNil(actual)
+			require.Equal(tc.expected.AccessKeyId, actual.AccessKeyId)
-			require.Equal(tc.expected.CredsLastRotatedTime, actual.CredsLastRotatedTime)
+			require.Equal(tc.expected.SecretAccessKey, actual.SecretAccessKey)
-			if tc.expected.CredentialsConfig != nil {
+			require.Equal(tc.expected.region, actual.region)
 				require.NotNil(actual.CredentialsConfig)
 				require.Equal(tc.expected.CredentialsConfig.AccessKey, actual.CredentialsConfig.AccessKey)
 				require.Equal(tc.expected.CredentialsConfig.SecretKey, actual.CredentialsConfig.SecretKey)
 				require.Equal(tc.expected.CredentialsConfig.Region, actual.CredentialsConfig.Region)
 				require.Equal(tc.expected.CredentialsConfig.RoleARN, actual.CredentialsConfig.RoleARN)
 				require.Equal(tc.expected.CredentialsConfig.RoleExternalId, actual.CredentialsConfig.RoleExternalId)
 				require.Equal(tc.expected.CredentialsConfig.RoleSessionName, actual.CredentialsConfig.RoleSessionName)
 				require.Equal(tc.expected.CredentialsConfig.RoleTags, actual.CredentialsConfig.RoleTags)
 			}
 		})
 	}
 }
-func TestAwsCatalogPersistedState_ValidateCreds(t *testing.T) {
+func TestAwsCatalogPersistedStateValidateCreds(t *testing.T) {
 	cases := []struct {
 		name        string
 		in          *AwsCredentialPersistedState
 		expectedErr string
 	}{
 		{
-			name:        "missing credentials config",
+			name: "could not load credentials",
-			in:          &AwsCredentialPersistedState{},
+			in: &AwsCredentialPersistedState{
-			expectedErr: "missing credentials config",
+				testOpts: []awsutil.Option{awsutil.MockOptionErr(errors.New(testOptionErr))},
 			},
 			expectedErr: fmt.Sprintf("error loading credentials: error reading options in NewCredentialsConfig: %s", testOptionErr),
 		},
 		{
 			name: "validation error",
 			in: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				testOpts: []awsutil.Option{awsutil.WithSTSAPIFunc(awsutil.NewMockSTS(awsutil.WithGetCallerIdentityError(errors.New(testGetCallerIdentityErr))))},
 					AccessKey: "foobar",
 					SecretKey: "bazqux",
 					Region:    "us-west-2",
 				},
 				testOpts: []awsutil.Option{
 					awsutil.WithSTSAPIFunc(
 						awsutil.NewMockSTS(
 							awsutil.WithGetCallerIdentityError(errors.New(testGetCallerIdentityErr)),
 						),
 					),
 				},
 			},
 			expectedErr: fmt.Sprintf("error validating credentials: %s", testGetCallerIdentityErr),
 		},
 		{
 			name: "good",
 			in: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				AccessKeyId:     "foobar",
-					AccessKey: "foobar",
+				SecretAccessKey: "bazqux",
-					SecretKey: "bazqux",
+				testOpts:        []awsutil.Option{awsutil.WithSTSAPIFunc(awsutil.NewMockSTS())},
 					Region:    "us-west-2",
 				},
 				testOpts: []awsutil.Option{awsutil.WithSTSAPIFunc(awsutil.NewMockSTS())},
 			},
 		},
 	}
@@ -384,7 +283,7 @@ func TestAwsCatalogPersistedState_ValidateCreds(t *testing.T) {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			require := require.New(t)
-			err := tc.in.ValidateCreds(context.Background())
+			err := tc.in.ValidateCreds()
 			if tc.expectedErr != "" {
 				require.EqualError(err, tc.expectedErr)
 				return
@@ -395,49 +294,27 @@ func TestAwsCatalogPersistedState_ValidateCreds(t *testing.T) {
 	}
 }
-func TestAwsCatalogPersistedState_RotateCreds(t *testing.T) {
+func TestAwsCatalogPersistedStateRotateCreds(t *testing.T) {
 	cases := []struct {
 		name                       string
 		in                         *AwsCredentialPersistedState
-		exepected                  *awsutil.CredentialsConfig
+		expectedAccessKeyId        string
 		expectedSecretAccessKey    string
 		expectedNonZeroRotatedTime bool
 		expectedErr                string
 	}{
 		{
-			name:        "missing credentials config",
+			name: "could not load credentials",
 			in:          &AwsCredentialPersistedState{},
 			expectedErr: "missing credentials config",
 		},
 		{
 			name: "cannot delete dynamic credential type",
 			in: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				testOpts: []awsutil.Option{awsutil.MockOptionErr(errors.New(testOptionErr))},
 					AccessKey: "ASIAfoobar",
 					SecretKey: "bazqux",
 				},
 				CredsLastRotatedTime: time.Now(),
 			},
-			expectedErr: "invalid credential type",
+			expectedErr: fmt.Sprintf("error loading credentials: error reading options in NewCredentialsConfig: %s", testOptionErr),
 		},
 		{
 			name: "cannot delete unknown credential type",
 			in: &AwsCredentialPersistedState{
 				CredentialsConfig: &awsutil.CredentialsConfig{
 					AccessKey: "DNEfoobar",
 					SecretKey: "bazqux",
 				},
 				CredsLastRotatedTime: time.Now(),
 			},
 			expectedErr: "invalid credential type",
 		},
 		{
 			name: "rotation error",
 			in: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				AccessKeyId:     "foobar",
-					AccessKey: "AKIAfoobar",
+				SecretAccessKey: "bazqux",
 					SecretKey: "bazqux",
 					Region:    "us-west-2",
 				},
 				testOpts: []awsutil.Option{
 					awsutil.WithIAMAPIFunc(
 						awsutil.NewMockIAM(
@@ -446,16 +323,13 @@ func TestAwsCatalogPersistedState_RotateCreds(t *testing.T) {
 					),
 				},
 			},
-			expectedErr: fmt.Sprintf("error rotating credentials: error calling CreateAccessKey: error calling iam.GetUser: %s", testGetUserErr),
+			expectedErr: fmt.Sprintf("error rotating credentials: error calling CreateAccessKey: error calling aws.GetUser: %s", testGetUserErr),
 		},
 		{
 			name: "good",
 			in: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				AccessKeyId:     "foobar",
-					AccessKey: "AKIAfoobar",
+				SecretAccessKey: "bazqux",
 					SecretKey: "bazqux",
 					Region:    "us-west-2",
 				},
 				testOpts: []awsutil.Option{
 					awsutil.WithSTSAPIFunc(
 						awsutil.NewMockSTS(),
@@ -464,7 +338,7 @@ func TestAwsCatalogPersistedState_RotateCreds(t *testing.T) {
 						awsutil.NewMockIAM(
 							awsutil.WithGetUserOutput(
 								&iam.GetUserOutput{
-									User: &iamTypes.User{
+									User: &iam.User{
 										Arn:      aws.String("arn:aws:iam::123456789012:user/JohnDoe"),
 										UserId:   aws.String("AIDAJQABLZS4A3QDU576Q"),
 										UserName: aws.String("JohnDoe"),
@@ -473,7 +347,7 @@ func TestAwsCatalogPersistedState_RotateCreds(t *testing.T) {
 							),
 							awsutil.WithCreateAccessKeyOutput(
 								&iam.CreateAccessKeyOutput{
-									AccessKey: &iamTypes.AccessKey{
+									AccessKey: &iam.AccessKey{
 										AccessKeyId:     aws.String("one"),
 										SecretAccessKey: aws.String("two"),
 										UserName:        aws.String("JohnDoe"),
@@ -484,11 +358,8 @@ func TestAwsCatalogPersistedState_RotateCreds(t *testing.T) {
 					),
 				},
 			},
-			exepected: &awsutil.CredentialsConfig{
+			expectedAccessKeyId:        "one",
-				AccessKey: "one",
+			expectedSecretAccessKey:    "two",
 				SecretKey: "two",
 				Region:    "us-west-2",
 			},
 			expectedNonZeroRotatedTime: true,
 		},
 	}
@@ -497,49 +368,59 @@ func TestAwsCatalogPersistedState_RotateCreds(t *testing.T) {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			require := require.New(t)
-			err := tc.in.RotateCreds(context.Background())
+			err := tc.in.RotateCreds()
 			if tc.expectedErr != "" {
 				require.EqualError(err, tc.expectedErr)
 				return
 			}
 			require.NoError(err)
-			require.Equal(tc.exepected.AccessKey, tc.in.CredentialsConfig.AccessKey)
+			require.Equal(tc.expectedAccessKeyId, tc.in.AccessKeyId)
-			require.Equal(tc.exepected.SecretKey, tc.in.CredentialsConfig.SecretKey)
+			require.Equal(tc.expectedSecretAccessKey, tc.in.SecretAccessKey)
 			require.Equal(tc.expectedNonZeroRotatedTime, !tc.in.CredsLastRotatedTime.IsZero())
 		})
 	}
 }
-func TestAwsCatalogPersistedState_ReplaceCreds(t *testing.T) {
+func TestAwsCatalogPersistedStateReplaceCreds(t *testing.T) {
 	// NOTE: Not safe to run this test in parallel
 	state := new(testMockIAMState)
 	cases := []struct {
-		name                 string
+		name                    string
-		in                   *AwsCredentialPersistedState
+		in                      *AwsCredentialPersistedState
-		credentialConfig     *awsutil.CredentialsConfig
+		accessKeyId             string
-		expected             *awsutil.CredentialsConfig
+		secretAccessKey         string
-		expectedDeleteCalled bool
+		expectedAccessKeyId     string
-		expectedErr          string
+		expectedSecretAccessKey string
 		expectedDeleteCalled    bool
 		expectedErr             string
 	}{
 		{
-			name:        "missing new credentials config",
+			name:        "missing access key id",
 			in:          &AwsCredentialPersistedState{},
-			expectedErr: "missing new credentials config",
+			expectedErr: "access key id cannot be empty",
 		},
 		{
-			name:             "missing credentials config",
+			name:        "missing access key id",
-			in:               &AwsCredentialPersistedState{},
+			in:          &AwsCredentialPersistedState{},
-			credentialConfig: &awsutil.CredentialsConfig{},
+			accessKeyId: "one",
-			expectedErr:      "missing credentials config",
+			expectedErr: "secret access key cannot be empty",
 		},
 		{
 			name: "identical access key id",
 			in: &AwsCredentialPersistedState{
 				AccessKeyId:     "foobar",
 				SecretAccessKey: "bazqux",
 			},
 			accessKeyId:     "foobar",
 			secretAccessKey: "bazqux",
 			expectedErr:     "attempting to replace access key with the same one",
 		},
 		{
 			name: "deletion error",
 			in: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				AccessKeyId:          "foobar",
-					AccessKey: "AKIAfoobar",
+				SecretAccessKey:      "bazqux",
 					SecretKey: "bazqux",
 				},
 				CredsLastRotatedTime: time.Now(),
 				testOpts: []awsutil.Option{
 					awsutil.WithIAMAPIFunc(
@@ -549,16 +430,15 @@ func TestAwsCatalogPersistedState_ReplaceCreds(t *testing.T) {
 					),
 				},
 			},
-			credentialConfig: &awsutil.CredentialsConfig{},
+			accessKeyId:     "one",
-			expectedErr:      fmt.Sprintf("error deleting old access key: %s", testDeleteAccessKeyErr),
+			secretAccessKey: "two",
 			expectedErr:     fmt.Sprintf("error deleting old access key: %s", testDeleteAccessKeyErr),
 		},
 		{
 			name: "good with delete of old rotated",
 			in: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				AccessKeyId:          "foobar",
-					AccessKey: "AKIAfoobar",
+				SecretAccessKey:      "bazqux",
 					SecretKey: "bazqux",
 				},
 				CredsLastRotatedTime: time.Now(),
 				testOpts: []awsutil.Option{
 					awsutil.WithIAMAPIFunc(
@@ -566,38 +446,28 @@ func TestAwsCatalogPersistedState_ReplaceCreds(t *testing.T) {
 					),
 				},
 			},
-			credentialConfig: &awsutil.CredentialsConfig{
+			accessKeyId:             "one",
-				AccessKey: "one",
+			secretAccessKey:         "two",
-				SecretKey: "two",
+			expectedAccessKeyId:     "one",
-			},
+			expectedSecretAccessKey: "two",
-			expected: &awsutil.CredentialsConfig{
+			expectedDeleteCalled:    true,
 				AccessKey: "one",
 				SecretKey: "two",
 			},
 			expectedDeleteCalled: true,
 		},
 		{
 			name: "good without delete of old rotated",
 			in: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				AccessKeyId:     "foobar",
-					AccessKey: "AKIAfoobar",
+				SecretAccessKey: "bazqux",
 					SecretKey: "bazqux",
 				},
 				testOpts: []awsutil.Option{
 					awsutil.WithIAMAPIFunc(
 						newTestMockIAM(state),
 					),
 				},
 			},
-			credentialConfig: &awsutil.CredentialsConfig{
+			accessKeyId:             "one",
-				AccessKey: "one",
+			secretAccessKey:         "two",
-				SecretKey: "two",
+			expectedAccessKeyId:     "one",
-			},
+			expectedSecretAccessKey: "two",
-			expected: &awsutil.CredentialsConfig{
+			expectedDeleteCalled:    false,
 				AccessKey: "one",
 				SecretKey: "two",
 			},
 			expectedDeleteCalled: false,
 		},
 	}
@@ -606,61 +476,39 @@ func TestAwsCatalogPersistedState_ReplaceCreds(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			require := require.New(t)
 			state.Reset()
-			err := tc.in.ReplaceCreds(context.Background(), tc.credentialConfig)
+			err := tc.in.ReplaceCreds(tc.accessKeyId, tc.secretAccessKey)
 			if tc.expectedErr != "" {
 				require.EqualError(err, tc.expectedErr)
 				return
 			}
 			require.NoError(err)
-			require.Equal(tc.expected.AccessKey, tc.in.CredentialsConfig.AccessKey)
+			require.Equal(tc.expectedAccessKeyId, tc.in.AccessKeyId)
-			require.Equal(tc.expected.SecretKey, tc.in.CredentialsConfig.SecretKey)
+			require.Equal(tc.expectedSecretAccessKey, tc.in.SecretAccessKey)
 			require.Zero(tc.in.CredsLastRotatedTime)
 			require.Equal(tc.expectedDeleteCalled, state.DeleteAccessKeyCalled)
 		})
 	}
 }
-func TestAwsCatalogPersistedState_DeleteCreds(t *testing.T) {
+func TestAwsCatalogPersistedStateDeleteCreds(t *testing.T) {
 	cases := []struct {
 		name        string
 		in          *AwsCredentialPersistedState
 		expectedErr string
 	}{
 		{
-			name:        "missing credentials config",
+			name: "could not load credentials",
 			in:          &AwsCredentialPersistedState{},
 			expectedErr: "missing credentials config",
 		},
 		{
 			name: "cannot delete dynamic credential type",
 			in: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				testOpts: []awsutil.Option{awsutil.MockOptionErr(errors.New(testOptionErr))},
 					AccessKey: "ASIAfoobar",
 					SecretKey: "bazqux",
 				},
 				CredsLastRotatedTime: time.Now(),
 			},
-			expectedErr: "invalid credential type",
+			expectedErr: fmt.Sprintf("error loading credentials: error reading options in NewCredentialsConfig: %s", testOptionErr),
 		},
 		{
 			name: "cannot delete unknown credential type",
 			in: &AwsCredentialPersistedState{
 				CredentialsConfig: &awsutil.CredentialsConfig{
 					AccessKey: "DNEfoobar",
 					SecretKey: "bazqux",
 				},
 				CredsLastRotatedTime: time.Now(),
 			},
 			expectedErr: "invalid credential type",
 		},
 		{
 			name: "deletion error",
 			in: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				AccessKeyId:     "foobar",
-					AccessKey: "AKIAfoobar",
+				SecretAccessKey: "bazqux",
 					SecretKey: "bazqux",
 				},
 				testOpts: []awsutil.Option{
 					awsutil.WithIAMAPIFunc(
 						awsutil.NewMockIAM(
@@ -674,15 +522,13 @@ func TestAwsCatalogPersistedState_DeleteCreds(t *testing.T) {
 		{
 			name: "deletion error, but OK because key was just gone",
 			in: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				AccessKeyId:     "foobar",
-					AccessKey: "AKIAfoobar",
+				SecretAccessKey: "bazqux",
 					SecretKey: "bazqux",
 				},
 				testOpts: []awsutil.Option{
 					awsutil.WithIAMAPIFunc(
 						awsutil.NewMockIAM(
 							awsutil.WithDeleteAccessKeyError(
-								&iamTypes.NoSuchEntityException{},
+								awserr.New(iam.ErrCodeNoSuchEntityException, "", nil),
 							),
 						),
 					),
@@ -692,10 +538,8 @@ func TestAwsCatalogPersistedState_DeleteCreds(t *testing.T) {
 		{
 			name: "good",
 			in: &AwsCredentialPersistedState{
-				CredentialsConfig: &awsutil.CredentialsConfig{
+				AccessKeyId:     "foobar",
-					AccessKey: "AKIAfoobar",
+				SecretAccessKey: "bazqux",
 					SecretKey: "bazqux",
 				},
 				testOpts: []awsutil.Option{
 					awsutil.WithIAMAPIFunc(
 						awsutil.NewMockIAM(),
@@ -709,135 +553,26 @@ func TestAwsCatalogPersistedState_DeleteCreds(t *testing.T) {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			require := require.New(t)
-			err := tc.in.DeleteCreds(context.Background())
+			err := tc.in.DeleteCreds()
 			if tc.expectedErr != "" {
 				require.EqualError(err, tc.expectedErr)
 				return
 			}
 			require.NoError(err)
-			require.Nil(tc.in.CredentialsConfig)
+			require.Empty(tc.in.AccessKeyId)
 			require.Empty(tc.in.SecretAccessKey)
 			require.Zero(tc.in.CredsLastRotatedTime)
 		})
 	}
 }
-func TestAwsCatalogPersistedState_GenerateCredentialChain(t *testing.T) {
+func TestAwsCatalogPersistedStateGetSessionErr(t *testing.T) {
 	require := require.New(t)
-	cases := []struct {
+	state := &AwsCredentialPersistedState{
-		name        string
+		testOpts: []awsutil.Option{awsutil.MockOptionErr(errors.New(testOptionErr))},
 		in          *AwsCredentialPersistedState
 		expectedErr string
 	}{
 		{
 			name: "error",
 			in: &AwsCredentialPersistedState{
 				CredentialsConfig: &awsutil.CredentialsConfig{
 					AccessKey: "foobar",
 					SecretKey: "bazqux",
 				},
 				testOpts: []awsutil.Option{awsutil.MockOptionErr(errors.New(testOptionErr))},
 			},
 			expectedErr: fmt.Sprintf("error reading options in GenerateCredentialChain: %s", testOptionErr),
 		},
 		{
 			name: "static credentials",
 			in: &AwsCredentialPersistedState{
 				CredentialsConfig: &awsutil.CredentialsConfig{
 					AccessKey: "AKIA_foobar",
 					SecretKey: "bazqux",
 				},
 				testOpts: []awsutil.Option{
 					awsutil.WithIAMAPIFunc(
 						awsutil.NewMockIAM(),
 					),
 				},
 			},
 		},
 		{
 			name: "assume role",
 			in: &AwsCredentialPersistedState{
 				CredentialsConfig: func() *awsutil.CredentialsConfig {
 					config, err := awsutil.NewCredentialsConfig(
 						awsutil.WithRegion("us-west-2"),
 						awsutil.WithRoleArn("arn:aws:iam::123456789012:role/S3Access"),
 						awsutil.WithRoleExternalId("1234567890"),
 						awsutil.WithRoleSessionName("assume-role"),
 						awsutil.WithRoleTags(map[string]string{
 							"foo": "bar",
 						}),
 					)
 					require.NoError(err)
 					return config
 				}(),
 				testOpts: []awsutil.Option{
 					awsutil.WithIAMAPIFunc(
 						awsutil.NewMockIAM(),
 					),
 				},
 			},
 		},
 	}
 	for _, tc := range cases {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			_, err := tc.in.GenerateCredentialChain(context.Background())
 			if tc.expectedErr != "" {
 				require.EqualError(err, tc.expectedErr)
 				return
 			}
 			require.NoError(err)
 		})
 	}
 }
 func TestGetCredentialType(t *testing.T) {
 	tests := []struct {
 		name             string
 		credConfig       *awsutil.CredentialsConfig
 		expectedCredType CredentialType
 	}{
 		{
 			name:             "nil credential config",
 			credConfig:       nil,
 			expectedCredType: Unknown,
 		},
 		{
 			name:             "empty credential config",
 			credConfig:       &awsutil.CredentialsConfig{},
 			expectedCredType: Unknown,
 		},
 		{
 			name:             "static aws",
 			credConfig:       &awsutil.CredentialsConfig{AccessKey: "AKIAfoobar"},
 			expectedCredType: StaticAWS,
 		},
 		{
 			name:             "static other",
 			credConfig:       &awsutil.CredentialsConfig{AccessKey: "cK3kNFa24foobar"},
 			expectedCredType: StaticOther,
 		},
 		{
 			name:             "dynamic aws - role arn",
 			credConfig:       &awsutil.CredentialsConfig{RoleARN: "arn:aws:iam::123456789012:role/S3Access"},
 			expectedCredType: DynamicAWS,
 		},
 		{
 			name:             "dynamic aws - access key",
 			credConfig:       &awsutil.CredentialsConfig{AccessKey: "ASIAfoobar"},
 			expectedCredType: DynamicAWS,
 		},
 		{
 			name:             "dynamic aws - role arn and access key",
 			credConfig:       &awsutil.CredentialsConfig{AccessKey: "ASIAfoobar", RoleARN: "arn:aws:iam::123456789012:role/S3Access"},
 			expectedCredType: DynamicAWS,
 		},
 	}
-	for _, tc := range tests {
+	_, err := state.GetSession()
-		t.Run(tc.name, func(t *testing.T) {
+	require.EqualError(err, fmt.Sprintf("error reading options in NewCredentialsConfig: %s", testOptionErr))
 			ct := GetCredentialType(tc.credConfig)
 			require.Equal(t, tc.expectedCredType, ct)
 		})
 	}
 }
@@ -4,12 +4,10 @@
 package credential
 import (
-	"context"
+	"github.com/aws/aws-sdk-go/aws/session"
-
+	"github.com/aws/aws-sdk-go/service/iam"
-	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go/service/iam/iamiface"
-	"github.com/aws/aws-sdk-go-v2/service/iam"
+	"github.com/hashicorp/go-secure-stdlib/awsutil"
 	"github.com/hashicorp/go-secure-stdlib/awsutil/v2"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 const (
@@ -28,61 +26,25 @@ func (s *testMockIAMState) Reset() {
 }
 type testMockIAM struct {
-	awsutil.IAMClient
+	iamiface.IAMAPI
 	State *testMockIAMState
 }
-func (m *testMockIAM) DeleteAccessKey(ctx context.Context, input *iam.DeleteAccessKeyInput, opts ...func(*iam.Options)) (*iam.DeleteAccessKeyOutput, error) {
+func (m *testMockIAM) DeleteAccessKey(input *iam.DeleteAccessKeyInput) (*iam.DeleteAccessKeyOutput, error) {
 	m.State.DeleteAccessKeyCalled = true
-	return m.IAMClient.DeleteAccessKey(ctx, input, opts...)
+	return m.IAMAPI.DeleteAccessKey(input)
 }
 func newTestMockIAM(state *testMockIAMState, opts ...awsutil.MockIAMOption) awsutil.IAMAPIFunc {
-	return func(awsConfig *aws.Config) (awsutil.IAMClient, error) {
+	return func(sess *session.Session) (iamiface.IAMAPI, error) {
 		m := &testMockIAM{
 			State: state,
 		}
 		f := awsutil.NewMockIAM(opts...)
 		var err error
-		m.IAMClient, err = f(awsConfig)
+		m.IAMAPI, err = f(sess)
 		return m, err
 	}
 }
 // MockStaticCredentialSecrets returns a *structpb.Struct that contains two
 // key pair values: (access_key_id, AKIA_foobar) & (secret_access_key, bazqux)
 func MockStaticCredentialSecrets() *structpb.Struct {
 	return &structpb.Struct{
 		Fields: map[string]*structpb.Value{
 			ConstAccessKeyId:     structpb.NewStringValue("AKIA_foobar"),
 			ConstSecretAccessKey: structpb.NewStringValue("bazqux"),
 		},
 	}
 }
 // MockAssumeRoleAttributes returns a *structpb.Struct that contains six key pair values:
 //
 //	(region, region)
 //	(disable_credential_rotation, disableRotate)
 //	(role_arn, arn:aws:iam::123456789012:role/S3Access)
 //	(role_external_id, 1234567890)
 //	(role_session_name, ec2-assume-role-provider)
 //	(role_tags, struct{foo:bar})
 func MockAssumeRoleAttributes(region string, disableRotate bool) *structpb.Struct {
 	return &structpb.Struct{
 		Fields: map[string]*structpb.Value{
 			ConstRegion:                    structpb.NewStringValue(region),
 			ConstDisableCredentialRotation: structpb.NewBoolValue(disableRotate),
 			ConstRoleArn:                   structpb.NewStringValue("arn:aws:iam::123456789012:role/S3Access"),
 			ConstRoleExternalId:            structpb.NewStringValue("1234567890"),
 			ConstRoleSessionName:           structpb.NewStringValue("ec2-assume-role-provider"),
 			ConstRoleTags: structpb.NewStructValue(&structpb.Struct{
 				Fields: map[string]*structpb.Value{
 					"foo": structpb.NewStringValue("bar"),
 				},
 			}),
 		},
 	}
 }
@@ -84,33 +84,6 @@ func GetTimeValue(in *structpb.Struct, k string) (time.Time, error) {
 	return t, nil
 }
 // GetMapStringString returns a map[string]string value and no error if the given key
 // is found in the provided proto struct input. An error is returned if the key
 // is not found or the value type is not map[string]string.
 func GetMapStringString(in *structpb.Struct, k string, required bool) (map[string]string, error) {
 	mv := in.GetFields()
 	v, ok := mv[k]
 	if !ok {
 		if required {
 			return nil, fmt.Errorf("missing required value %q", k)
 		}
 		return nil, nil
 	}
 	result := map[string]string{}
 	m, ok := v.AsInterface().(map[string]any)
 	if !ok {
 		return nil, fmt.Errorf("unexpected type for value %q: want map[string]string, got %T", k, v.AsInterface())
 	}
 	for mapKey, mapValue := range m {
 		e, ok := mapValue.(string)
 		if !ok {
 			return nil, fmt.Errorf("unexpected type for value in map[%q]: want string, got %T", mapKey, mapValue)
 		}
 		result[mapKey] = e
 	}
 	return result, nil
 }
 // StructFields returns a map[string]struct{} of the
 // proto struct input.
 func StructFields(s *structpb.Struct) map[string]struct{} {
@@ -208,95 +208,3 @@ func TestGetTimeValue(t *testing.T) {
 		})
 	}
 }
 func TestGetMapStringString(t *testing.T) {
 	cases := []struct {
 		name        string
 		in          *structpb.Struct
 		key         string
 		required    bool
 		expected    map[string]string
 		expectedErr string
 	}{
 		{
 			name:        "required missing",
 			in:          &structpb.Struct{},
 			key:         "foo",
 			required:    true,
 			expectedErr: "missing required value \"foo\"",
 		},
 		{
 			name: "optional missing",
 			in:   &structpb.Struct{},
 			key:  "foo",
 		},
 		{
 			name: "non-map[string]string value",
 			in: &structpb.Struct{
 				Fields: map[string]*structpb.Value{
 					"foo": structpb.NewBoolValue(true),
 				},
 			},
 			key:         "foo",
 			expectedErr: "unexpected type for value \"foo\": want map[string]string, got bool",
 		},
 		{
 			name: "empty map",
 			in: &structpb.Struct{
 				Fields: map[string]*structpb.Value{
 					"foo": structpb.NewStructValue(&structpb.Struct{
 						Fields: map[string]*structpb.Value{},
 					}),
 				},
 			},
 			key:      "foo",
 			expected: map[string]string{},
 		},
 		{
 			name: "non-string value in map",
 			in: &structpb.Struct{
 				Fields: map[string]*structpb.Value{
 					"foo": structpb.NewStructValue(&structpb.Struct{
 						Fields: map[string]*structpb.Value{
 							"bar": structpb.NewBoolValue(true),
 						},
 					}),
 				},
 			},
 			key:         "foo",
 			expectedErr: "unexpected type for value in map[\"bar\"]: want string, got bool",
 		},
 		{
 			name: "good",
 			in: &structpb.Struct{
 				Fields: map[string]*structpb.Value{
 					"foo": structpb.NewStructValue(&structpb.Struct{
 						Fields: map[string]*structpb.Value{
 							"bar": structpb.NewStringValue("zoo"),
 						},
 					}),
 				},
 			},
 			key: "foo",
 			expected: map[string]string{
 				"bar": "zoo",
 			},
 		},
 	}
 	for _, tc := range cases {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			require := require.New(t)
 			actual, err := GetMapStringString(tc.in, tc.key, tc.required)
 			if tc.expectedErr != "" {
 				require.EqualError(err, tc.expectedErr)
 				return
 			}
 			require.NoError(err)
 			require.Equal(tc.expected, actual)
 		})
 	}
 }
@@ -105,19 +105,18 @@ a configured IAM user for this provider:
 The following `attributes` are valid on an AWS host catalog resource:
 - `disable_credential_rotation` (bool): If `true`, credential rotation will not
-  be performed. See the [Credential Rotation](../../../README.md#credential-rotation) readme for more information.
+  be performed. See the [Credential Rotation](../../../README.md#credential-rotation) section
  above.
 - `region` (string): The region to configure the host catalog for. All host sets
  in this catalog will be configured for this region.
-The following `secrets` are required on an AWS host catalog resource:
+The following `secrets` are valid on an AWS host catalog resource:
 - `access_key_id` (string): The access key ID for the IAM user to use with this
  host catalog.
 - `secret_access_key` (string): The secret access key for the IAM user to use
  with this host catalog.
 See the [Credential Rotation](../../../README.md#credential-rotation) readme for more information.
 ### Host Set
 The following attributes are valid on an AWS host Set resource:
@@ -38,14 +38,6 @@ func getCatalogAttributes(in *structpb.Struct) (*CatalogAttributes, error) {
 			continue
 		case cred.ConstDisableCredentialRotation:
 			continue
 		case cred.ConstRoleArn:
 			continue
 		case cred.ConstRoleExternalId:
 			continue
 		case cred.ConstRoleSessionName:
 			continue
 		case cred.ConstRoleTags:
 			continue
 		default:
 			badFields[fmt.Sprintf("attributes.%s", s)] = "unrecognized field"
 		}
@@ -9,7 +9,6 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/boundary-plugin-aws/internal/credential"
 	cred "github.com/hashicorp/boundary-plugin-aws/internal/credential"
 	"github.com/hashicorp/boundary/sdk/pbs/plugin"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"
@@ -21,34 +20,36 @@ import (
 func TestGetCatalogAttributes(t *testing.T) {
 	cases := []struct {
 		name                string
-		in                  *structpb.Struct
+		in                  map[string]any
 		expected            *CatalogAttributes
 		expectedErrContains string
 	}{
 		{
-			name: "missing region",
+			name:                "missing region",
-			in: &structpb.Struct{
+			in:                  map[string]any{},
 				Fields: make(map[string]*structpb.Value),
 			},
 			expectedErrContains: "missing required value \"region\"",
 		},
 		{
 			name: "bad value for disable_credential_rotation",
 			in: map[string]any{
 				credential.ConstRegion:                    "us-west-2",
 				credential.ConstDisableCredentialRotation: "sure",
 			},
 			expectedErrContains: "unexpected type for value \"disable_credential_rotation\": want bool, got string",
 		},
 		{
 			name: "unknown fields",
-			in: &structpb.Struct{
+			in: map[string]any{
-				Fields: map[string]*structpb.Value{
+				credential.ConstRegion: "us-west-2",
-					"region": structpb.NewStringValue("us-west-2"),
+				"foo":                  true,
-					"foo":    structpb.NewBoolValue(true),
+				"bar":                  true,
 					"bar":    structpb.NewBoolValue(true),
 				},
 			},
 			expectedErrContains: "attributes.bar: unrecognized field, attributes.foo: unrecognized field",
 		},
 		{
 			name: "default",
-			in: &structpb.Struct{
+			in: map[string]any{
-				Fields: map[string]*structpb.Value{
+				credential.ConstRegion: "us-west-2",
 					"region": structpb.NewStringValue("us-west-2"),
 				},
 			},
 			expected: &CatalogAttributes{
 				CredentialAttributes: &credential.CredentialAttributes{
@@ -58,31 +59,15 @@ func TestGetCatalogAttributes(t *testing.T) {
 			},
 		},
 		{
-			name: "credential attributes",
+			name: "with disable_credential_rotation",
-			in: &structpb.Struct{
+			in: map[string]any{
-				Fields: map[string]*structpb.Value{
+				credential.ConstRegion:                    "us-west-2",
-					"region":                      structpb.NewStringValue("us-west-2"),
+				credential.ConstDisableCredentialRotation: true,
 					"disable_credential_rotation": structpb.NewBoolValue(true),
 					"role_arn":                    structpb.NewStringValue("arn:aws:iam::123456789012:role/S3Access"),
 					"role_external_id":            structpb.NewStringValue("1234567890"),
 					"role_session_name":           structpb.NewStringValue("test-session"),
 					"role_tags": structpb.NewStructValue(&structpb.Struct{
 						Fields: map[string]*structpb.Value{
 							"foo": structpb.NewStringValue("bar"),
 						},
 					}),
 				},
 			},
 			expected: &CatalogAttributes{
-				CredentialAttributes: &cred.CredentialAttributes{
+				CredentialAttributes: &credential.CredentialAttributes{
 					Region:                    "us-west-2",
 					DisableCredentialRotation: true,
 					RoleArn:                   "arn:aws:iam::123456789012:role/S3Access",
 					RoleExternalId:            "1234567890",
 					RoleSessionName:           "test-session",
 					RoleTags: map[string]string{
 						"foo": "bar",
 					},
 				},
 			},
 		},
@@ -93,7 +78,10 @@ func TestGetCatalogAttributes(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			require := require.New(t)
-			actual, err := getCatalogAttributes(tc.in)
+			input, err := structpb.NewStruct(tc.in)
 			require.NoError(err)
 			actual, err := getCatalogAttributes(input)
 			if tc.expectedErrContains != "" {
 				require.Error(err)
 				require.Contains(err.Error(), tc.expectedErrContains)
@@ -9,10 +9,9 @@ import (
 	"fmt"
 	"strings"
-	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go-v2/service/ec2"
+	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go-v2/service/ec2/types"
+	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/smithy-go"
 	pb "github.com/hashicorp/boundary/sdk/pbs/plugin"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -59,7 +58,7 @@ func (p *HostPlugin) OnCreateCatalog(ctx context.Context, req *pb.OnCreateCatalo
 	if err != nil {
 		return nil, err
 	}
-	credConfig, err := cred.GetCredentialsConfig(secrets, catalogAttributes.CredentialAttributes, true)
+	credConfig, err := cred.GetCredentialsConfig(secrets, catalogAttributes.Region)
 	if err != nil {
 		return nil, err
 	}
@@ -67,7 +66,9 @@ func (p *HostPlugin) OnCreateCatalog(ctx context.Context, req *pb.OnCreateCatalo
 	// Set up the creds in our persisted state.
 	credState, err := credential.NewAwsCredentialPersistedState(
 		append([]credential.AwsCredentialPersistedStateOption{
-			credential.WithCredentialsConfig(credConfig),
+			credential.WithAccessKeyId(credConfig.AccessKey),
 			credential.WithSecretAccessKey(credConfig.SecretKey),
 			credential.WithRegion(credConfig.Region),
 		}, p.testCredStateOpts...)...,
 	)
 	if err != nil {
@@ -83,16 +84,15 @@ func (p *HostPlugin) OnCreateCatalog(ctx context.Context, req *pb.OnCreateCatalo
 		return nil, status.Errorf(codes.InvalidArgument, "error setting up persisted state: %s", err)
 	}
-	if cred.GetCredentialType(credState.CredentialsConfig) == cred.StaticAWS {
+	// Try to rotate the credentials if we're not skipping them.
-		if !catalogAttributes.DisableCredentialRotation {
+	if !catalogAttributes.DisableCredentialRotation {
-			if err := credState.RotateCreds(ctx); err != nil {
+		if err := credState.RotateCreds(); err != nil {
-				return nil, status.Errorf(codes.InvalidArgument, "error during credential rotation: %s", err)
+			return nil, status.Errorf(codes.InvalidArgument, "error during credential rotation: %s", err)
-			}
+		}
-		} else {
+	} else {
-			// Simply validate if we aren't rotating.
+		// Simply validate if we aren't rotating.
-			if err := credState.ValidateCreds(ctx); err != nil {
+		if err := credState.ValidateCreds(); err != nil {
-				return nil, status.Errorf(codes.InvalidArgument, "error during credential validation: %s", err)
+			return nil, status.Errorf(codes.InvalidArgument, "error during credential validation: %s", err)
 			}
 		}
 	}
@@ -144,8 +144,7 @@ func (p *HostPlugin) OnUpdateCatalog(ctx context.Context, req *pb.OnUpdateCatalo
 	// is fine and important, but this may change in the future.
 	credState, err := credential.AwsCredentialPersistedStateFromProto(
 		req.GetPersisted().GetSecrets(),
-		catalogAttributes.CredentialAttributes,
+		append(p.testCredStateOpts, credential.WithRegion(catalogAttributes.Region))...)
 		p.testCredStateOpts...)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "error loading persisted state: %s", err)
 	}
@@ -159,39 +158,38 @@ func (p *HostPlugin) OnUpdateCatalog(ctx context.Context, req *pb.OnUpdateCatalo
 		return nil, status.Errorf(codes.InvalidArgument, "error loading persisted state: %s", err)
 	}
-	if cred.GetCredentialType(credState.CredentialsConfig) == cred.StaticAWS {
+	if catalogAttributes.DisableCredentialRotation && !updateSecrets {
-		if catalogAttributes.DisableCredentialRotation && !updateSecrets {
+		// This is a validate check to make sure that we aren't disabling
-			// This is a validate check to make sure that we aren't disabling
+		// rotation for credentials currently being managed by rotation.
-			// rotation for credentials currently being managed by rotation.
+		// This is not allowed.
-			// This is not allowed.
+		if !credState.CredsLastRotatedTime.IsZero() {
-			if !credState.CredsLastRotatedTime.IsZero() {
+			return nil, status.Error(codes.FailedPrecondition, "cannot disable rotation for already-rotated credentials")
 				return nil, status.Error(codes.FailedPrecondition, "cannot disable rotation for already-rotated credentials")
 			}
 		}
 		if updateSecrets {
 			catalogSecrets, err := credential.GetCredentialsConfig(secrets, catalogAttributes.CredentialAttributes, true)
 			if err != nil {
 				return nil, err
 			}
 			// Replace the credentials. This checks the timestamp on the last
 			// rotation time as well and deletes the credentials if we are
 			// managing them (ie: if we've rotated them before).
 			if err := credState.ReplaceCreds(ctx, catalogSecrets); err != nil {
 				return nil, status.Errorf(codes.InvalidArgument, "error attempting to replace credentials: %s", err)
 			}
 		}
 		if !catalogAttributes.DisableCredentialRotation && credState.CredsLastRotatedTime.IsZero() {
 			// If we're enabling rotation now but didn't before, or have
 			// freshly replaced credentials, we can rotate here.
 			if err := credState.RotateCreds(ctx); err != nil {
 				return nil, status.Errorf(codes.InvalidArgument, "error during credential rotation: %s", err)
 			}
 		}
 	}
 	if updateSecrets {
 		catalogSecrets, err := credential.GetCredentialsConfig(secrets, catalogAttributes.Region)
 		if err != nil {
 			return nil, err
 		}
 		// Replace the credentials. This checks the timestamp on the last
 		// rotation time as well and deletes the credentials if we are
 		// managing them (ie: if we've rotated them before).
 		if err := credState.ReplaceCreds(catalogSecrets.AccessKey, catalogSecrets.SecretKey); err != nil {
 			return nil, status.Errorf(codes.InvalidArgument, "error attempting to replace credentials: %s", err)
 		}
 	}
 	if !catalogAttributes.DisableCredentialRotation && credState.CredsLastRotatedTime.IsZero() {
 		// If we're enabling rotation now but didn't before, or have
 		// freshly replaced credentials, we can rotate here.
 		if err := credState.RotateCreds(); err != nil {
 			return nil, status.Errorf(codes.InvalidArgument, "error during credential rotation: %s", err)
 		}
 	}
 	// That's it!
 	persistedProto, err := catalogState.toProto()
 	if err != nil {
 		return nil, status.Error(codes.InvalidArgument, err.Error())
@@ -227,8 +225,7 @@ func (p *HostPlugin) OnDeleteCatalog(ctx context.Context, req *pb.OnDeleteCatalo
 	// may be corrupt/and or legitimately missing.
 	credState, err := credential.AwsCredentialPersistedStateFromProto(
 		req.GetPersisted().GetSecrets(),
-		catalogAttributes.CredentialAttributes,
+		append(p.testCredStateOpts, credential.WithRegion(catalogAttributes.Region))...)
 		p.testCredStateOpts...)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "error loading persisted state: %s", err)
 	}
@@ -242,15 +239,12 @@ func (p *HostPlugin) OnDeleteCatalog(ctx context.Context, req *pb.OnDeleteCatalo
 		return nil, status.Errorf(codes.InvalidArgument, "error loading persisted state: %s", err)
 	}
-	// try to delete static credentials
+	if !credState.CredsLastRotatedTime.IsZero() {
-	if cred.GetCredentialType(credState.CredentialsConfig) == cred.StaticAWS {
+		// Delete old/existing credentials. This is done with the same
-		if !credState.CredsLastRotatedTime.IsZero() {
+		// credentials to ensure that it has the proper permissions to do
-			// Delete old/existing credentials. This is done with the same
+		// it.
-			// credentials to ensure that it has the proper permissions to do
+		if err := credState.DeleteCreds(); err != nil {
-			// it.
+			return nil, status.Errorf(codes.Aborted, "error removing rotated credentials during catalog deletion: %s", err)
 			if err := credState.DeleteCreds(ctx); err != nil {
 				return nil, status.Errorf(codes.Aborted, "error removing rotated credentials during catalog deletion: %s", err)
 			}
 		}
 	}
@@ -303,8 +297,7 @@ func (p *HostPlugin) OnCreateSet(ctx context.Context, req *pb.OnCreateSetRequest
 	credState, err := credential.AwsCredentialPersistedStateFromProto(
 		req.GetPersisted().GetSecrets(),
-		catalogAttributes.CredentialAttributes,
+		append(p.testCredStateOpts, credential.WithRegion(catalogAttributes.Region))...)
 		p.testCredStateOpts...)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "error loading persisted state: %s", err)
 	}
@@ -331,7 +324,7 @@ func (p *HostPlugin) OnCreateSet(ctx context.Context, req *pb.OnCreateSetRequest
 		return nil, err
 	}
-	ec2Client, err := catalogState.EC2Client(ctx)
+	ec2Client, err := catalogState.EC2Client(catalogAttributes.Region)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "error getting EC2 client: %s", err)
 	}
@@ -341,13 +334,12 @@ func (p *HostPlugin) OnCreateSet(ctx context.Context, req *pb.OnCreateSetRequest
 		return nil, status.Errorf(codes.InvalidArgument, "error building DescribeInstances parameters: %s", err)
 	}
-	_, err = ec2Client.DescribeInstances(ctx, input)
+	_, err = ec2Client.DescribeInstances(input)
 	if err == nil {
 		return nil, status.Error(codes.FailedPrecondition, "query error: DescribeInstances DryRun should have returned error, but none was found")
 	}
-	var apiErr smithy.APIError
+	if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "DryRunOperation" {
 	if errors.As(err, &apiErr) && apiErr.ErrorCode() == "DryRunOperation" {
 		// Success
 		return &pb.OnCreateSetResponse{}, nil
 	}
@@ -374,8 +366,7 @@ func (p *HostPlugin) OnUpdateSet(ctx context.Context, req *pb.OnUpdateSetRequest
 	credState, err := credential.AwsCredentialPersistedStateFromProto(
 		req.GetPersisted().GetSecrets(),
-		catalogAttributes.CredentialAttributes,
+		append(p.testCredStateOpts, credential.WithRegion(catalogAttributes.Region))...)
 		p.testCredStateOpts...)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "error loading persisted state: %s", err)
 	}
@@ -404,7 +395,7 @@ func (p *HostPlugin) OnUpdateSet(ctx context.Context, req *pb.OnUpdateSetRequest
 		return nil, err
 	}
-	ec2Client, err := catalogState.EC2Client(ctx)
+	ec2Client, err := catalogState.EC2Client(catalogAttributes.Region)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "error getting EC2 client: %s", err)
 	}
@@ -414,13 +405,12 @@ func (p *HostPlugin) OnUpdateSet(ctx context.Context, req *pb.OnUpdateSetRequest
 		return nil, status.Errorf(codes.InvalidArgument, "error building DescribeInstances parameters: %s", err)
 	}
-	_, err = ec2Client.DescribeInstances(ctx, input)
+	_, err = ec2Client.DescribeInstances(input)
 	if err == nil {
 		return nil, status.Error(codes.FailedPrecondition, "query error: DescribeInstances DryRun should have returned error, but none was found")
 	}
-	var apiErr smithy.APIError
+	if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "DryRunOperation" {
 	if errors.As(err, &apiErr) && apiErr.ErrorCode() == "DryRunOperation" {
 		// Success
 		return &pb.OnUpdateSetResponse{}, nil
 	}
@@ -452,10 +442,7 @@ func (p *HostPlugin) ListHosts(ctx context.Context, req *pb.ListHostsRequest) (*
 		return nil, err
 	}
-	credState, err := credential.AwsCredentialPersistedStateFromProto(
+	credState, err := credential.AwsCredentialPersistedStateFromProto(req.GetPersisted().GetSecrets(), p.testCredStateOpts...)
 		req.GetPersisted().GetSecrets(),
 		catalogAttributes.CredentialAttributes,
 		p.testCredStateOpts...)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "error loading persisted state: %s", err)
 	}
@@ -507,7 +494,7 @@ func (p *HostPlugin) ListHosts(ctx context.Context, req *pb.ListHostsRequest) (*
 		}
 	}
-	ec2Client, err := catalogState.EC2Client(ctx)
+	ec2Client, err := catalogState.EC2Client(catalogAttributes.Region)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "error getting EC2 client: %s", err)
 	}
@@ -515,7 +502,7 @@ func (p *HostPlugin) ListHosts(ctx context.Context, req *pb.ListHostsRequest) (*
 	// Run all queries now and assemble output.
 	var maxLen int
 	for i, query := range queries {
-		output, err := ec2Client.DescribeInstances(ctx, query.Input)
+		output, err := ec2Client.DescribeInstances(query.Input)
 		if err != nil {
 			return nil, status.Errorf(codes.InvalidArgument, "error running DescribeInstances for host set id %q: %s", query.Id, err)
 		}
@@ -569,8 +556,8 @@ func (p *HostPlugin) ListHosts(ctx context.Context, req *pb.ListHostsRequest) (*
 	}, nil
 }
-func buildFilters(attrs *SetAttributes) ([]types.Filter, error) {
+func buildFilters(attrs *SetAttributes) ([]*ec2.Filter, error) {
-	var filters []types.Filter
+	var filters []*ec2.Filter
 	var foundStateFilter bool
 	for _, filterAttr := range attrs.Filters {
 		// Each filter arrives in "k=v1,v2" format. First, split on equal sign.
@@ -589,9 +576,14 @@ func buildFilters(attrs *SetAttributes) ([]types.Filter, error) {
 			foundStateFilter = true
 		}
-		filters = append(filters, types.Filter{
+		var filterValues []*string
 		for _, val := range strings.Split(filterValue, ",") {
 			filterValues = append(filterValues, aws.String(val))
 		}
 		filters = append(filters, &ec2.Filter{
 			Name:   aws.String(filterKey),
-			Values: strings.Split(filterValue, ","),
+			Values: filterValues,
 		})
 	}
@@ -600,9 +592,9 @@ func buildFilters(attrs *SetAttributes) ([]types.Filter, error) {
 		// instance-state-name = ["running"] to the filter set. This
 		// ensures that we filter on running instances only at the API
 		// side, saving time when processing results.
-		filters = append(filters, types.Filter{
+		filters = append(filters, &ec2.Filter{
 			Name:   aws.String("instance-state-name"),
-			Values: []string{string(types.InstanceStateNameRunning)},
+			Values: aws.StringSlice([]string{ec2.InstanceStateNameRunning}),
 		})
 	}
@@ -624,49 +616,97 @@ func buildDescribeInstancesInput(attrs *SetAttributes, dryRun bool) (*ec2.Descri
 // awsInstanceToHost processes data from an ec2.Instance and returns
 // a ListHostsResponseHost with the ID and network addresses
 // populated.
-func awsInstanceToHost(instance types.Instance) (*pb.ListHostsResponseHost, error) {
+func awsInstanceToHost(instance *ec2.Instance) (*pb.ListHostsResponseHost, error) {
-	if aws.ToString(instance.InstanceId) == "" {
+	// Integrity check: some fields should always be non-nil. Check
 	// those.
 	if instance == nil {
 		return nil, errors.New("response integrity error: missing instance entry")
 	}
 	if aws.StringValue(instance.InstanceId) == "" {
 		return nil, errors.New("response integrity error: missing instance id")
 	}
 	result := new(pb.ListHostsResponseHost)
 	// External ID is the instance ID.
-	result.ExternalId = aws.ToString(instance.InstanceId)
+	result.ExternalId = aws.StringValue(instance.InstanceId)
 	// External Name is the AWS "Name" tag, if it exists.
 	for _, t := range instance.Tags {
-		if aws.ToString(t.Key) == ConstInstanceNameTagKey {
+		if aws.StringValue(t.Key) == ConstInstanceNameTagKey {
-			result.ExternalName = aws.ToString(t.Value)
+			result.ExternalName = aws.StringValue(t.Value)
 			break
 		}
 	}
-	result.IpAddresses = appendDistinct(result.IpAddresses, instance.PrivateIpAddress, instance.PublicIpAddress)
+	// First IP address/dns name are always the private fields if they
-	result.DnsNames = appendDistinct(result.DnsNames, instance.PrivateDnsName, instance.PublicDnsName)
+	// are populated
 	if aws.StringValue(instance.PrivateIpAddress) != "" {
 		result.IpAddresses = append(result.IpAddresses, aws.StringValue(instance.PrivateIpAddress))
 	}
 	if aws.StringValue(instance.PrivateDnsName) != "" {
 		result.DnsNames = append(result.DnsNames, aws.StringValue(instance.PrivateDnsName))
 	}
 	// Public IP address/dns names are next
 	if aws.StringValue(instance.PublicIpAddress) != "" {
 		result.IpAddresses = append(result.IpAddresses, aws.StringValue(instance.PublicIpAddress))
 	}
 	if aws.StringValue(instance.PublicDnsName) != "" {
 		result.DnsNames = append(result.DnsNames, aws.StringValue(instance.PublicDnsName))
 	}
 	// Now go through all of the interfaces and log the IP address of
 	// every interface.
 	for _, iface := range instance.NetworkInterfaces {
 		if iface == nil {
 			// Probably will never happen, but just in case
 			return nil, errors.New("response integrity error: interface entry is nil")
 		}
 		// Populate default IP addresses/DNS name similar to how we do
 		// for the entire instance.
-		result.IpAddresses = appendDistinct(result.IpAddresses, iface.PrivateIpAddress)
+		if aws.StringValue(iface.PrivateIpAddress) != "" && !stringInSlice(result.IpAddresses, aws.StringValue(iface.PrivateIpAddress)) {
-		result.DnsNames = appendDistinct(result.DnsNames, iface.PrivateDnsName)
+			result.IpAddresses = append(result.IpAddresses, aws.StringValue(iface.PrivateIpAddress))
 		}
 		if aws.StringValue(iface.PrivateDnsName) != "" && !stringInSlice(result.DnsNames, aws.StringValue(iface.PrivateDnsName)) {
 			result.DnsNames = append(result.DnsNames, aws.StringValue(iface.PrivateDnsName))
 		}
 		// Iterate through the private IP addresses and log the
 		// information.
 		for _, addr := range iface.PrivateIpAddresses {
-			result.IpAddresses = appendDistinct(result.IpAddresses, addr.PrivateIpAddress)
+			if addr == nil {
-			result.DnsNames = appendDistinct(result.DnsNames, addr.PrivateDnsName)
+				return nil, errors.New("response integrity error: interface address entry is nil")
-			if addr.Association != nil {
+			}
-				result.IpAddresses = appendDistinct(result.IpAddresses, addr.Association.PublicIp)
+
-				result.DnsNames = appendDistinct(result.DnsNames, addr.Association.PublicDnsName)
+			// Add private address/dns name if they have not been added yet
 			if aws.StringValue(addr.PrivateIpAddress) != "" && !stringInSlice(result.IpAddresses, aws.StringValue(addr.PrivateIpAddress)) {
 				result.IpAddresses = append(result.IpAddresses, aws.StringValue(addr.PrivateIpAddress))
 			}
 			if aws.StringValue(addr.PrivateDnsName) != "" && !stringInSlice(result.DnsNames, aws.StringValue(addr.PrivateDnsName)) {
 				result.DnsNames = append(result.DnsNames, aws.StringValue(addr.PrivateDnsName))
 			}
 			// Add public address/dns name if they have not been added yet
 			if addr.Association != nil && aws.StringValue(addr.Association.PublicIp) != "" && !stringInSlice(result.IpAddresses, aws.StringValue(addr.Association.PublicIp)) {
 				result.IpAddresses = append(result.IpAddresses, aws.StringValue(addr.Association.PublicIp))
 			}
 			if addr.Association != nil && aws.StringValue(addr.Association.PublicDnsName) != "" && !stringInSlice(result.DnsNames, aws.StringValue(addr.Association.PublicDnsName)) {
 				result.DnsNames = append(result.DnsNames, aws.StringValue(addr.Association.PublicDnsName))
 			}
 		}
 		// Add the IPv6 addresses.
 		for _, addr := range iface.Ipv6Addresses {
-			result.IpAddresses = appendDistinct(result.IpAddresses, addr.Ipv6Address)
+			if addr == nil {
 				continue
 			}
 			if addr.Ipv6Address != nil && aws.StringValue(addr.Ipv6Address) != "" {
 				result.IpAddresses = append(result.IpAddresses, aws.StringValue(addr.Ipv6Address))
 			}
 		}
 	}
@@ -674,25 +714,12 @@ func awsInstanceToHost(instance types.Instance) (*pb.ListHostsResponseHost, erro
 	return result, nil
 }
 // appendDistinct will append the elements to the slice
 // if an element is not nil, empty, and does not exist in slice.
 func appendDistinct(slice []string, elems ...*string) []string {
 	for _, e := range elems {
 		value := aws.ToString(e)
 		if value == "" || stringInSlice(slice, value) {
 			continue
 		}
 		slice = append(slice, value)
 	}
 	return slice
 }
 // stringInSlice returns true if the slice contains the given element.
 func stringInSlice(s []string, x string) bool {
 	for _, y := range s {
 		if x == y {
 			return true
 		}
 	}
 	return false
 }
@@ -10,14 +10,13 @@ import (
 	"sort"
 	"testing"
-	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go-v2/service/ec2"
+	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	"github.com/hashicorp/boundary-plugin-aws/internal/credential"
 	"github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/hostcatalogs"
 	"github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/hostsets"
 	pb "github.com/hashicorp/boundary/sdk/pbs/plugin"
-	"github.com/hashicorp/go-secure-stdlib/awsutil/v2"
+	"github.com/hashicorp/go-secure-stdlib/awsutil"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -39,6 +38,14 @@ func TestPluginOnCreateCatalogErr(t *testing.T) {
 			expectedErrContains: "catalog is nil",
 			expectedErrCode:     codes.InvalidArgument,
 		},
 		{
 			name: "nil secrets",
 			req: &pb.OnCreateCatalogRequest{
 				Catalog: &hostcatalogs.HostCatalog{},
 			},
 			expectedErrContains: "secrets are required",
 			expectedErrCode:     codes.InvalidArgument,
 		},
 		{
 			name: "nil attributes",
 			req: &pb.OnCreateCatalogRequest{
@@ -85,7 +92,7 @@ func TestPluginOnCreateCatalogErr(t *testing.T) {
 				Catalog: &hostcatalogs.HostCatalog{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:     structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:     structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey: structpb.NewStringValue("bazqux"),
 						}},
 					Attrs: &hostcatalogs.HostCatalog_Attributes{
@@ -106,7 +113,7 @@ func TestPluginOnCreateCatalogErr(t *testing.T) {
 				Catalog: &hostcatalogs.HostCatalog{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:     structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:     structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey: structpb.NewStringValue("bazqux"),
 						}},
 					Attrs: &hostcatalogs.HostCatalog_Attributes{
@@ -132,7 +139,7 @@ func TestPluginOnCreateCatalogErr(t *testing.T) {
 				Catalog: &hostcatalogs.HostCatalog{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:     structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:     structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey: structpb.NewStringValue("bazqux"),
 						}},
 					Attrs: &hostcatalogs.HostCatalog_Attributes{
@@ -153,7 +160,7 @@ func TestPluginOnCreateCatalogErr(t *testing.T) {
 					),
 				}),
 			},
-			expectedErrContains: fmt.Sprintf("error during credential rotation: error rotating credentials: error calling CreateAccessKey: error calling iam.GetUser: %s", testGetUserErr),
+			expectedErrContains: fmt.Sprintf("error during credential rotation: error rotating credentials: error calling CreateAccessKey: error calling aws.GetUser: %s", testGetUserErr),
 			expectedErrCode:     codes.InvalidArgument,
 		},
 		{
@@ -162,7 +169,7 @@ func TestPluginOnCreateCatalogErr(t *testing.T) {
 				Catalog: &hostcatalogs.HostCatalog{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:     structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:     structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey: structpb.NewStringValue("bazqux"),
 						}},
 					Attrs: &hostcatalogs.HostCatalog_Attributes{
@@ -273,7 +280,7 @@ func TestPluginOnUpdateCatalogErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -304,7 +311,7 @@ func TestPluginOnUpdateCatalogErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -330,7 +337,7 @@ func TestPluginOnUpdateCatalogErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -346,7 +353,7 @@ func TestPluginOnUpdateCatalogErr(t *testing.T) {
 				NewCatalog: &hostcatalogs.HostCatalog{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:     structpb.NewStringValue("AKIA_onetwo"),
+							credential.ConstAccessKeyId:     structpb.NewStringValue("onetwo"),
 							credential.ConstSecretAccessKey: structpb.NewStringValue("threefour"),
 						},
 					},
@@ -362,7 +369,7 @@ func TestPluginOnUpdateCatalogErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -396,7 +403,7 @@ func TestPluginOnUpdateCatalogErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:     structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:     structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey: structpb.NewStringValue("bazqux"),
 						},
 					},
@@ -411,7 +418,7 @@ func TestPluginOnUpdateCatalogErr(t *testing.T) {
 					),
 				}),
 			},
-			expectedErrContains: fmt.Sprintf("error during credential rotation: error rotating credentials: error calling CreateAccessKey: error calling iam.GetUser: %s", testGetUserErr),
+			expectedErrContains: fmt.Sprintf("error during credential rotation: error rotating credentials: error calling CreateAccessKey: error calling aws.GetUser: %s", testGetUserErr),
 			expectedErrCode:     codes.InvalidArgument,
 		},
 	}
@@ -455,7 +462,7 @@ func TestPluginOnDeleteCatalogErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -485,7 +492,7 @@ func TestPluginOnDeleteCatalogErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -590,7 +597,7 @@ func TestPluginOnCreateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -620,7 +627,7 @@ func TestPluginOnCreateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -645,7 +652,7 @@ func TestPluginOnCreateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -671,7 +678,7 @@ func TestPluginOnCreateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -706,7 +713,7 @@ func TestPluginOnCreateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -733,7 +740,7 @@ func TestPluginOnCreateSetErr(t *testing.T) {
 					awsutil.MockOptionErr(errors.New(testOptionErr)),
 				}),
 			},
-			expectedErrContains: fmt.Sprintf("error loading persisted state: error reading options in NewCredentialsConfig: %s", testOptionErr),
+			expectedErrContains: fmt.Sprintf("error getting EC2 client: error getting AWS session when fetching EC2 client: error reading options in NewCredentialsConfig: %s", testOptionErr),
 			expectedErrCode:     codes.InvalidArgument,
 		},
 		{
@@ -751,7 +758,7 @@ func TestPluginOnCreateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -797,7 +804,7 @@ func TestPluginOnCreateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -842,7 +849,7 @@ func TestPluginOnCreateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -959,7 +966,7 @@ func TestPluginOnUpdateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -989,7 +996,7 @@ func TestPluginOnUpdateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -1014,7 +1021,7 @@ func TestPluginOnUpdateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -1040,7 +1047,7 @@ func TestPluginOnUpdateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -1075,7 +1082,7 @@ func TestPluginOnUpdateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -1102,7 +1109,7 @@ func TestPluginOnUpdateSetErr(t *testing.T) {
 					awsutil.MockOptionErr(errors.New(testOptionErr)),
 				}),
 			},
-			expectedErrContains: fmt.Sprintf("error loading persisted state: error reading options in NewCredentialsConfig: %s", testOptionErr),
+			expectedErrContains: fmt.Sprintf("error getting EC2 client: error getting AWS session when fetching EC2 client: error reading options in NewCredentialsConfig: %s", testOptionErr),
 			expectedErrCode:     codes.InvalidArgument,
 		},
 		{
@@ -1120,7 +1127,7 @@ func TestPluginOnUpdateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -1166,7 +1173,7 @@ func TestPluginOnUpdateSetErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -1283,7 +1290,7 @@ func TestPluginListHostsErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -1313,7 +1320,7 @@ func TestPluginListHostsErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -1338,7 +1345,7 @@ func TestPluginListHostsErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -1364,7 +1371,7 @@ func TestPluginListHostsErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -1394,7 +1401,7 @@ func TestPluginListHostsErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -1432,7 +1439,7 @@ func TestPluginListHostsErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -1462,7 +1469,7 @@ func TestPluginListHostsErr(t *testing.T) {
 					awsutil.MockOptionErr(errors.New(testOptionErr)),
 				}),
 			},
-			expectedErrContains: fmt.Sprintf("error loading persisted state: error reading options in NewCredentialsConfig: %s", testOptionErr),
+			expectedErrContains: fmt.Sprintf("error getting EC2 client: error getting AWS session when fetching EC2 client: error reading options in NewCredentialsConfig: %s", testOptionErr),
 			expectedErrCode:     codes.InvalidArgument,
 		},
 		{
@@ -1480,7 +1487,7 @@ func TestPluginListHostsErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -1529,7 +1536,7 @@ func TestPluginListHostsErr(t *testing.T) {
 				Persisted: &pb.HostCatalogPersisted{
 					Secrets: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							credential.ConstAccessKeyId:          structpb.NewStringValue("AKIA_foobar"),
+							credential.ConstAccessKeyId:          structpb.NewStringValue("foobar"),
 							credential.ConstSecretAccessKey:      structpb.NewStringValue("bazqux"),
 							credential.ConstCredsLastRotatedTime: structpb.NewStringValue("2006-01-02T15:04:05+07:00"),
 						},
@@ -1559,9 +1566,9 @@ func TestPluginListHostsErr(t *testing.T) {
 					nil,
 					testMockEC2WithDescribeInstancesOutput(
 						&ec2.DescribeInstancesOutput{
-							Reservations: []types.Reservation{
+							Reservations: []*ec2.Reservation{
 								{
-									Instances: []types.Instance{
+									Instances: []*ec2.Instance{
 										{
 											// Blank so we error out
 										},
@@ -1596,7 +1603,7 @@ func TestBuildFilters(t *testing.T) {
 	cases := []struct {
 		name                string
 		in                  map[string]any
-		expected            []types.Filter
+		expected            []*ec2.Filter
 		expectedErrContains string
 	}{
 		{
@@ -1604,14 +1611,14 @@ func TestBuildFilters(t *testing.T) {
 			in: map[string]any{
 				ConstDescribeInstancesFilters: []any{"foo=bar"},
 			},
-			expected: []types.Filter{
+			expected: []*ec2.Filter{
 				{
 					Name:   aws.String("foo"),
-					Values: []string{"bar"},
+					Values: aws.StringSlice([]string{"bar"}),
 				},
 				{
 					Name:   aws.String("instance-state-name"),
-					Values: []string{string(types.InstanceStateNameRunning)},
+					Values: aws.StringSlice([]string{ec2.InstanceStateNameRunning}),
 				},
 			},
 		},
@@ -1623,14 +1630,14 @@ func TestBuildFilters(t *testing.T) {
 					"instance-state-name=static",
 				},
 			},
-			expected: []types.Filter{
+			expected: []*ec2.Filter{
 				{
 					Name:   aws.String("foo"),
-					Values: []string{"bar"},
+					Values: aws.StringSlice([]string{"bar"}),
 				},
 				{
 					Name:   aws.String("instance-state-name"),
-					Values: []string{"static"},
+					Values: aws.StringSlice([]string{"static"}),
 				},
 			},
 		},
@@ -1641,14 +1648,14 @@ func TestBuildFilters(t *testing.T) {
 					"foo=bar,baz",
 				},
 			},
-			expected: []types.Filter{
+			expected: []*ec2.Filter{
 				{
 					Name:   aws.String("foo"),
-					Values: []string{"bar", "baz"},
+					Values: aws.StringSlice([]string{"bar", "baz"}),
 				},
 				{
 					Name:   aws.String("instance-state-name"),
-					Values: []string{string(types.InstanceStateNameRunning)},
+					Values: aws.StringSlice([]string{ec2.InstanceStateNameRunning}),
 				},
 			},
 		},
@@ -1657,10 +1664,10 @@ func TestBuildFilters(t *testing.T) {
 			in: map[string]any{
 				ConstDescribeInstancesFilters: []any{},
 			},
-			expected: []types.Filter{
+			expected: []*ec2.Filter{
 				{
 					Name:   aws.String("instance-state-name"),
-					Values: []string{string(types.InstanceStateNameRunning)},
+					Values: aws.StringSlice([]string{ec2.InstanceStateNameRunning}),
 				},
 			},
 		},
@@ -1707,14 +1714,14 @@ func TestBuildDescribeInstancesInput(t *testing.T) {
 			dryRun: true,
 			expected: &ec2.DescribeInstancesInput{
 				DryRun: aws.Bool(true),
-				Filters: []types.Filter{
+				Filters: []*ec2.Filter{
 					{
 						Name:   aws.String("foo"),
-						Values: []string{"bar"},
+						Values: aws.StringSlice([]string{"bar"}),
 					},
 					{
 						Name:   aws.String("instance-state-name"),
-						Values: []string{string(types.InstanceStateNameRunning)},
+						Values: aws.StringSlice([]string{ec2.InstanceStateNameRunning}),
 					},
 				},
 			},
@@ -1729,14 +1736,14 @@ func TestBuildDescribeInstancesInput(t *testing.T) {
 			dryRun: false,
 			expected: &ec2.DescribeInstancesInput{
 				DryRun: aws.Bool(false),
-				Filters: []types.Filter{
+				Filters: []*ec2.Filter{
 					{
 						Name:   aws.String("foo"),
-						Values: []string{"bar"},
+						Values: aws.StringSlice([]string{"bar"}),
 					},
 					{
 						Name:   aws.String("instance-state-name"),
-						Values: []string{string(types.InstanceStateNameRunning)},
+						Values: aws.StringSlice([]string{ec2.InstanceStateNameRunning}),
 					},
 				},
 			},
@@ -1768,30 +1775,55 @@ func TestBuildDescribeInstancesInput(t *testing.T) {
 func TestAwsInstanceToHost(t *testing.T) {
 	cases := []struct {
 		name        string
-		instance    types.Instance
+		instance    *ec2.Instance
 		expected    *pb.ListHostsResponseHost
 		expectedErr string
 	}{
 		{
 			name:        "nil instance",
 			instance:    nil,
 			expectedErr: "response integrity error: missing instance entry",
 		},
 		{
 			name:        "missing instance id",
-			instance:    types.Instance{},
+			instance:    &ec2.Instance{},
 			expectedErr: "response integrity error: missing instance id",
 		},
 		{
 			name: "nil interface entry",
 			instance: &ec2.Instance{
 				InstanceId:        aws.String("foobar"),
 				NetworkInterfaces: []*ec2.InstanceNetworkInterface{nil},
 			},
 			expectedErr: "response integrity error: interface entry is nil",
 		},
 		{
 			name: "nil interface address entry",
 			instance: &ec2.Instance{
 				InstanceId: aws.String("foobar"),
 				NetworkInterfaces: []*ec2.InstanceNetworkInterface{
 					{
 						PrivateIpAddresses: []*ec2.InstancePrivateIpAddress{nil},
 					},
 				},
 			},
 			expectedErr: "response integrity error: interface address entry is nil",
 		},
 		{
 			name: "good, single IP w/public addr",
-			instance: types.Instance{
+			instance: &ec2.Instance{
 				InstanceId:       aws.String("foobar"),
 				PrivateIpAddress: aws.String("10.0.0.1"),
 				PrivateDnsName:   aws.String("test.example.internal"),
 				PublicIpAddress:  aws.String("1.1.1.1"),
 				PublicDnsName:    aws.String("test.example.com"),
-				NetworkInterfaces: []types.InstanceNetworkInterface{
+				NetworkInterfaces: []*ec2.InstanceNetworkInterface{
 					{
 						PrivateIpAddress: aws.String("10.0.0.1"),
 						PrivateDnsName:   aws.String("test.example.internal"),
-						PrivateIpAddresses: []types.InstancePrivateIpAddress{
+						PrivateIpAddresses: []*ec2.InstancePrivateIpAddress{
 							{
-								Association: &types.InstanceNetworkInterfaceAssociation{
+								Association: &ec2.InstanceNetworkInterfaceAssociation{
 									PublicIp:      aws.String("1.1.1.1"),
 									PublicDnsName: aws.String("test.example.com"),
 								},
@@ -1810,15 +1842,15 @@ func TestAwsInstanceToHost(t *testing.T) {
 		},
 		{
 			name: "good, private",
-			instance: types.Instance{
+			instance: &ec2.Instance{
 				InstanceId:       aws.String("foobar"),
 				PrivateIpAddress: aws.String("10.0.0.1"),
 				PrivateDnsName:   aws.String("test.example.internal"),
-				NetworkInterfaces: []types.InstanceNetworkInterface{
+				NetworkInterfaces: []*ec2.InstanceNetworkInterface{
 					{
 						PrivateIpAddress: aws.String("10.0.0.1"),
 						PrivateDnsName:   aws.String("test.example.internal"),
-						PrivateIpAddresses: []types.InstancePrivateIpAddress{
+						PrivateIpAddresses: []*ec2.InstancePrivateIpAddress{
 							{
 								PrivateIpAddress: aws.String("10.0.0.1"),
 								PrivateDnsName:   aws.String("test.example.internal"),
@@ -1835,17 +1867,17 @@ func TestAwsInstanceToHost(t *testing.T) {
 		},
 		{
 			name: "good, multiple interfaces",
-			instance: types.Instance{
+			instance: &ec2.Instance{
 				InstanceId:       aws.String("foobar"),
 				PrivateIpAddress: aws.String("10.0.0.1"),
 				PrivateDnsName:   aws.String("test.example.internal"),
 				PublicIpAddress:  aws.String("1.1.1.1"),
 				PublicDnsName:    aws.String("test.example.com"),
-				NetworkInterfaces: []types.InstanceNetworkInterface{
+				NetworkInterfaces: []*ec2.InstanceNetworkInterface{
 					{
 						PrivateIpAddress: aws.String("10.0.0.2"),
 						PrivateDnsName:   aws.String("test2.example.internal"),
-						PrivateIpAddresses: []types.InstancePrivateIpAddress{
+						PrivateIpAddresses: []*ec2.InstancePrivateIpAddress{
 							{
 								PrivateIpAddress: aws.String("10.0.0.2"),
 								PrivateDnsName:   aws.String("test2.example.internal"),
@@ -1855,9 +1887,9 @@ func TestAwsInstanceToHost(t *testing.T) {
 					{
 						PrivateIpAddress: aws.String("10.0.0.1"),
 						PrivateDnsName:   aws.String("test.example.internal"),
-						PrivateIpAddresses: []types.InstancePrivateIpAddress{
+						PrivateIpAddresses: []*ec2.InstancePrivateIpAddress{
 							{
-								Association: &types.InstanceNetworkInterfaceAssociation{
+								Association: &ec2.InstanceNetworkInterfaceAssociation{
 									PublicIp:      aws.String("1.1.1.1"),
 									PublicDnsName: aws.String("test.example.com"),
 								},
@@ -1876,19 +1908,19 @@ func TestAwsInstanceToHost(t *testing.T) {
 		},
 		{
 			name: "good, multiple public interfaces",
-			instance: types.Instance{
+			instance: &ec2.Instance{
 				InstanceId:       aws.String("foobar"),
 				PrivateIpAddress: aws.String("10.0.0.1"),
 				PrivateDnsName:   aws.String("test.example.internal"),
 				PublicIpAddress:  aws.String("1.1.1.1"),
 				PublicDnsName:    aws.String("test.example.com"),
-				NetworkInterfaces: []types.InstanceNetworkInterface{
+				NetworkInterfaces: []*ec2.InstanceNetworkInterface{
 					{
 						PrivateIpAddress: aws.String("10.0.0.2"),
 						PrivateDnsName:   aws.String("test2.example.internal"),
-						PrivateIpAddresses: []types.InstancePrivateIpAddress{
+						PrivateIpAddresses: []*ec2.InstancePrivateIpAddress{
 							{
-								Association: &types.InstanceNetworkInterfaceAssociation{
+								Association: &ec2.InstanceNetworkInterfaceAssociation{
 									PublicIp:      aws.String("1.1.1.2"),
 									PublicDnsName: aws.String("test2.example.com"),
 								},
@@ -1900,9 +1932,9 @@ func TestAwsInstanceToHost(t *testing.T) {
 					{
 						PrivateIpAddress: aws.String("10.0.0.1"),
 						PrivateDnsName:   aws.String("test.example.internal"),
-						PrivateIpAddresses: []types.InstancePrivateIpAddress{
+						PrivateIpAddresses: []*ec2.InstancePrivateIpAddress{
 							{
-								Association: &types.InstanceNetworkInterfaceAssociation{
+								Association: &ec2.InstanceNetworkInterfaceAssociation{
 									PublicIp:      aws.String("1.1.1.1"),
 									PublicDnsName: aws.String("test.example.com"),
 								},
@@ -1921,19 +1953,19 @@ func TestAwsInstanceToHost(t *testing.T) {
 		},
 		{
 			name: "good, multiple addresses on single interface",
-			instance: types.Instance{
+			instance: &ec2.Instance{
 				InstanceId:       aws.String("foobar"),
 				PrivateIpAddress: aws.String("10.0.0.1"),
 				PrivateDnsName:   aws.String("test.example.internal"),
 				PublicIpAddress:  aws.String("1.1.1.1"),
 				PublicDnsName:    aws.String("test.example.com"),
-				NetworkInterfaces: []types.InstanceNetworkInterface{
+				NetworkInterfaces: []*ec2.InstanceNetworkInterface{
 					{
 						PrivateIpAddress: aws.String("10.0.0.1"),
 						PrivateDnsName:   aws.String("test.example.internal"),
-						PrivateIpAddresses: []types.InstancePrivateIpAddress{
+						PrivateIpAddresses: []*ec2.InstancePrivateIpAddress{
 							{
-								Association: &types.InstanceNetworkInterfaceAssociation{
+								Association: &ec2.InstanceNetworkInterfaceAssociation{
 									PublicIp:      aws.String("1.1.1.1"),
 									PublicDnsName: aws.String("test.example.com"),
 								},
@@ -1956,25 +1988,25 @@ func TestAwsInstanceToHost(t *testing.T) {
 		},
 		{
 			name: "good, single IP w/public addr and IPv6",
-			instance: types.Instance{
+			instance: &ec2.Instance{
 				InstanceId:       aws.String("foobar"),
 				PrivateIpAddress: aws.String("10.0.0.1"),
 				PrivateDnsName:   aws.String("test.example.internal"),
 				PublicIpAddress:  aws.String("1.1.1.1"),
 				PublicDnsName:    aws.String("test.example.com"),
-				NetworkInterfaces: []types.InstanceNetworkInterface{
+				NetworkInterfaces: []*ec2.InstanceNetworkInterface{
 					{
 						PrivateIpAddress: aws.String("10.0.0.1"),
-						PrivateIpAddresses: []types.InstancePrivateIpAddress{
+						PrivateIpAddresses: []*ec2.InstancePrivateIpAddress{
 							{
-								Association: &types.InstanceNetworkInterfaceAssociation{
+								Association: &ec2.InstanceNetworkInterfaceAssociation{
 									PublicIp: aws.String("1.1.1.1"),
 								},
 								PrivateIpAddress: aws.String("10.0.0.1"),
 							},
 						},
-						Ipv6Addresses: []types.InstanceIpv6Address{
+						Ipv6Addresses: []*ec2.InstanceIpv6Address{
-							{Ipv6Address: nil}, // Just coverage for nil assertion which is skipped
+							nil, // Just coverage for nil assertion which is skipped
 							{Ipv6Address: aws.String("some::fake::address")},
 						},
 					},
@@ -1988,24 +2020,24 @@ func TestAwsInstanceToHost(t *testing.T) {
 		},
 		{
 			name: "good, single IP w/public addr and external name",
-			instance: types.Instance{
+			instance: &ec2.Instance{
 				InstanceId:       aws.String("foobar"),
 				PrivateIpAddress: aws.String("10.0.0.1"),
 				PrivateDnsName:   aws.String("test.example.internal"),
 				PublicIpAddress:  aws.String("1.1.1.1"),
 				PublicDnsName:    aws.String("test.example.com"),
-				Tags: []types.Tag{
+				Tags: []*ec2.Tag{
 					{Key: aws.String("Name"), Value: aws.String("test-instance-actual-name")}, // The tag name is "Name", not "name".
 					{Key: aws.String("name"), Value: aws.String("test-instance-fake-name")},
 					{Key: aws.String("contains-Name"), Value: aws.String("test-instance-contains-name")},
 				},
-				NetworkInterfaces: []types.InstanceNetworkInterface{
+				NetworkInterfaces: []*ec2.InstanceNetworkInterface{
 					{
 						PrivateIpAddress: aws.String("10.0.0.1"),
 						PrivateDnsName:   aws.String("test.example.internal"),
-						PrivateIpAddresses: []types.InstancePrivateIpAddress{
+						PrivateIpAddresses: []*ec2.InstancePrivateIpAddress{
 							{
-								Association: &types.InstanceNetworkInterfaceAssociation{
+								Association: &ec2.InstanceNetworkInterfaceAssociation{
 									PublicIp:      aws.String("1.1.1.1"),
 									PublicDnsName: aws.String("test.example.com"),
 								},
@@ -2025,24 +2057,24 @@ func TestAwsInstanceToHost(t *testing.T) {
 		},
 		{
 			name: "good, single IP w/public addr and external name",
-			instance: types.Instance{
+			instance: &ec2.Instance{
 				InstanceId:       aws.String("foobar"),
 				PrivateIpAddress: aws.String("10.0.0.1"),
 				PrivateDnsName:   aws.String("test.example.internal"),
 				PublicIpAddress:  aws.String("1.1.1.1"),
 				PublicDnsName:    aws.String("test.example.com"),
-				Tags: []types.Tag{
+				Tags: []*ec2.Tag{
 					{Key: aws.String("Name"), Value: aws.String("test-instance-actual-name")}, // The tag name is "Name", not "name".
 					{Key: aws.String("name"), Value: aws.String("test-instance-fake-name")},
 					{Key: aws.String("contains-Name"), Value: aws.String("test-instance-contains-name")},
 				},
-				NetworkInterfaces: []types.InstanceNetworkInterface{
+				NetworkInterfaces: []*ec2.InstanceNetworkInterface{
 					{
 						PrivateIpAddress: aws.String("10.0.0.1"),
 						PrivateDnsName:   aws.String("test.example.internal"),
-						PrivateIpAddresses: []types.InstancePrivateIpAddress{
+						PrivateIpAddresses: []*ec2.InstancePrivateIpAddress{
 							{
-								Association: &types.InstanceNetworkInterfaceAssociation{
+								Association: &ec2.InstanceNetworkInterfaceAssociation{
 									PublicIp:      aws.String("1.1.1.1"),
 									PublicDnsName: aws.String("test.example.com"),
 								},
@@ -2077,55 +2109,3 @@ func TestAwsInstanceToHost(t *testing.T) {
 		})
 	}
 }
 func TestAppendDistinct(t *testing.T) {
 	cases := []struct {
 		name     string
 		slice    []string
 		elems    []*string
 		expected []string
 	}{
 		{
 			name:     "empty slice, empty elems",
 			slice:    []string{},
 			elems:    []*string{},
 			expected: []string{},
 		},
 		{
 			name:     "empty elems",
 			slice:    []string{"bar"},
 			elems:    []*string{},
 			expected: []string{"bar"},
 		},
 		{
 			name:     "skip nil elem",
 			slice:    []string{"bar"},
 			elems:    []*string{nil},
 			expected: []string{"bar"},
 		},
 		{
 			name:     "skip empty elem",
 			slice:    []string{"bar"},
 			elems:    []*string{aws.String("")},
 			expected: []string{"bar"},
 		},
 		{
 			name:  "skip duplicate elem",
 			slice: []string{"bar"},
 			elems: []*string{
 				aws.String("bar"),
 				aws.String("foo"),
 				aws.String("foo"),
 			},
 			expected: []string{"bar", "foo"},
 		},
 	}
 	for _, tc := range cases {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			require := require.New(t)
 			actual := appendDistinct(tc.slice, tc.elems...)
 			require.ElementsMatch(actual, tc.expected)
 		})
 	}
 }
@@ -4,24 +4,21 @@
 package host
 import (
 	"context"
 	"errors"
 	"fmt"
 	"net"
 	"net/http"
 	"time"
-	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go-v2/service/ec2"
+	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/hashicorp/boundary-plugin-aws/internal/credential"
 	pb "github.com/hashicorp/boundary/sdk/pbs/plugin"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 type EC2API interface {
 	DescribeInstances(context.Context, *ec2.DescribeInstancesInput, ...func(*ec2.Options)) (*ec2.DescribeInstancesOutput, error)
 }
 var customClient = &http.Client{
 	Transport: &http.Transport{
 		Proxy: http.ProxyFromEnvironment,
@@ -33,6 +30,10 @@ var customClient = &http.Client{
 	},
 }
 type ec2APIFunc func(*session.Session, ...*aws.Config) (ec2iface.EC2API, error)
 type awsCatalogPersistedStateOption func(s *awsCatalogPersistedState) error
 type awsCatalogPersistedState struct {
 	*credential.AwsCredentialPersistedState
@@ -40,10 +41,6 @@ type awsCatalogPersistedState struct {
 	testEC2APIFunc ec2APIFunc
 }
 type ec2APIFunc func(...aws.Config) (EC2API, error)
 type awsCatalogPersistedStateOption func(s *awsCatalogPersistedState) error
 func withTestEC2APIFunc(f ec2APIFunc) awsCatalogPersistedStateOption {
 	return func(s *awsCatalogPersistedState) error {
 		if s.testEC2APIFunc != nil {
@@ -86,16 +83,22 @@ func (s *awsCatalogPersistedState) toProto() (*pb.HostCatalogPersisted, error) {
 // EC2Client returns a configured EC2 client based on the session
 // information stored in the state.
-func (s *awsCatalogPersistedState) EC2Client(ctx context.Context) (EC2API, error) {
+func (s *awsCatalogPersistedState) EC2Client(region string) (ec2iface.EC2API, error) {
-	awsCfg, err := s.GenerateCredentialChain(ctx)
+	sess, err := s.GetSession()
 	if err != nil {
-		return nil, fmt.Errorf("error getting AWS configuration when fetching EC2 client: %w", err)
+		return nil, fmt.Errorf("error getting AWS session when fetching EC2 client: %w", err)
 	}
 	if awsCfg == nil {
 		return nil, fmt.Errorf("nil aws configuration")
 	}
 	if s.testEC2APIFunc != nil {
-		return s.testEC2APIFunc(*awsCfg)
+		return s.testEC2APIFunc(sess, aws.NewConfig().WithRegion(region))
 	}
-	return ec2.NewFromConfig(*awsCfg), nil
+
 	cfg := aws.NewConfig()
 	if region != "" {
 		cfg = cfg.WithRegion(region)
 	}
 	cfg.HTTPClient = customClient
 	return ec2.New(sess, cfg), nil
 }
@@ -4,22 +4,18 @@
 package host
 import (
 	"context"
 	"testing"
 	"github.com/hashicorp/boundary-plugin-aws/internal/credential"
 	"github.com/hashicorp/go-secure-stdlib/awsutil/v2"
 	"github.com/stretchr/testify/require"
 )
 func TestAwsCatalogPersistedStateEC2Client(t *testing.T) {
 	require := require.New(t)
 	cred, err := credential.NewAwsCredentialPersistedState(
-		credential.WithCredentialsConfig(&awsutil.CredentialsConfig{
+		credential.WithRegion("us-west-2"),
-			Region:    "us-west-2",
+		credential.WithAccessKeyId("foobar"),
-			AccessKey: "foobar",
+		credential.WithSecretAccessKey("barfoo"),
 			SecretKey: "barfoo",
 		}),
 	)
 	require.NoError(err)
@@ -29,7 +25,7 @@ func TestAwsCatalogPersistedStateEC2Client(t *testing.T) {
 	)
 	require.NoError(err)
-	clientRaw, err := state.EC2Client(context.Background())
+	clientRaw, err := state.EC2Client("us-west-2")
 	require.NoError(err)
 	require.NotNil(clientRaw)
 	client, ok := clientRaw.(*testMockEC2)
@@ -4,11 +4,10 @@
 package host
 import (
-	"context"
+	"github.com/aws/aws-sdk-go/aws"
-
+	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/aws/aws-sdk-go-v2/service/ec2"
+	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/aws/aws-sdk-go-v2/service/ec2/types"
 )
 const (
@@ -30,11 +29,10 @@ func (s *testMockEC2State) Reset() {
 }
 type testMockEC2 struct {
-	EC2API
+	ec2iface.EC2API
 	State  *testMockEC2State
 	Region string
 	State                   *testMockEC2State
 	Region                  string
 	DescribeInstancesOutput *ec2.DescribeInstancesOutput
 	DescribeInstancesError  error
 }
@@ -56,7 +54,7 @@ func testMockEC2WithDescribeInstancesError(e error) testMockEC2Option {
 }
 func newTestMockEC2(state *testMockEC2State, opts ...testMockEC2Option) ec2APIFunc {
-	return func(cfgs ...aws.Config) (EC2API, error) {
+	return func(sess *session.Session, cfgs ...*aws.Config) (ec2iface.EC2API, error) {
 		m := &testMockEC2{
 			State: state,
 		}
@@ -69,17 +67,14 @@ func newTestMockEC2(state *testMockEC2State, opts ...testMockEC2Option) ec2APIFu
 		for _, cfg := range cfgs {
 			// Last region takes precedence
-			if cfg.Region != "" {
+			m.Region = *cfg.Region
 				m.Region = cfg.Region
 			}
 		}
 		return m, nil
 	}
 }
-func (m *testMockEC2) DescribeInstances(ctx context.Context, input *ec2.DescribeInstancesInput, optFns ...func(*ec2.Options)) (*ec2.DescribeInstancesOutput, error) {
+func (m *testMockEC2) DescribeInstances(input *ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) {
 	if m.State != nil {
 		m.State.DescribeInstancesCalled = true
 		m.State.DescribeInstancesInputParams = input
@@ -92,7 +87,7 @@ func (m *testMockEC2) DescribeInstances(ctx context.Context, input *ec2.Describe
 	return m.DescribeInstancesOutput, nil
 }
-type ec2FilterSorter []types.Filter
+type ec2FilterSorter []*ec2.Filter
 func (s ec2FilterSorter) Len() int           { return len(s) }
 func (s ec2FilterSorter) Less(i, j int) bool { return *s[i].Name < *s[j].Name }
@@ -42,7 +42,7 @@ Example policy:
 ```
 * `iam:GetUser`, `iam:CreateAccessKey`, and `iam:DeleteAccessKey`, configured to
-  the IAM user to allow static credential rotation. Example policy:
+  the IAM user to allow credential rotation. Example policy:
 ```
 {
@@ -66,24 +66,18 @@ Example policy:
 The following `attributes` are valid on an AWS storage bucket resource:
 - `disable_credential_rotation` (bool): If `true`, credential rotation will not
-  be performed.
+  be performed. See the [Credential Rotation](../../../README.md#credential-rotation) section
  above.
 - `region` (string): The region to configure the storage bucket for.
 - `endpoint-url` (string): The endpoint to configure the storage.
 - `role_arn` (string): The role arn configured for the assume role provider.
 - `role_external_id` (string):  The external id configured for the assume role provider.
 - `role_session_name` (string): The session name configured for the assume role provider.
 - `role_tags` (object): The key-value pair tags configured for the assume role provider.
 An example of how to utilize the [endpoint attribute](https://docs.aws.amazon.com/vpc/latest/privatelink/vpc-endpoints-s3.html)
 See the [Credential Rotation](../../../README.md#credential-rotation) readme for more information.
 ### Secrets
-The following `secrets` are optional on an AWS storage bucket resource:
+The following `secrets` are valid on an AWS storage bucket resource:
 - `access_key_id` (string): The access key ID for the IAM user to use with this
  storage bucket.
 - `secret_access_key` (string): The secret access key for the IAM user to use
-  with this storage bucket.
+  with this storage bucket.
 See the [Credential Rotation](../../../README.md#credential-rotation) readme for more information.
@@ -44,14 +44,6 @@ func getStorageAttributes(in *structpb.Struct) (*StorageAttributes, error) {
 			continue
 		case cred.ConstDisableCredentialRotation:
 			continue
 		case cred.ConstRoleArn:
 			continue
 		case cred.ConstRoleExternalId:
 			continue
 		case cred.ConstRoleSessionName:
 			continue
 		case cred.ConstRoleTags:
 			continue
 		default:
 			badFields[fmt.Sprintf("attributes.%s", s)] = "unrecognized field"
 		}
@@ -16,35 +16,29 @@ import (
 func TestGetStorageAttributes(t *testing.T) {
 	cases := []struct {
 		name                string
-		in                  *structpb.Struct
+		in                  map[string]any
 		expected            *StorageAttributes
 		expectedErrContains string
 	}{
 		{
-			name: "missing region",
+			name:                "missing region",
-			in: &structpb.Struct{
+			in:                  map[string]any{},
 				Fields: make(map[string]*structpb.Value),
 			},
 			expectedErrContains: "missing required value \"region\"",
 		},
 		{
 			name: "unknown fields",
-			in: &structpb.Struct{
+			in: map[string]any{
-				Fields: map[string]*structpb.Value{
+				"region": "us-west-2",
-					"region": structpb.NewStringValue("us-west-2"),
+				"foo":    true,
-					"foo":    structpb.NewBoolValue(true),
+				"bar":    true,
 					"bar":    structpb.NewBoolValue(true),
 				},
 			},
 			expectedErrContains: "attributes.bar: unrecognized field, attributes.foo: unrecognized field",
 		},
 		{
 			name: "good w/ endpoint",
-			in: &structpb.Struct{
+			in: map[string]any{
-				Fields: map[string]*structpb.Value{
+				cred.ConstRegion:    "us-west-2",
-					"region":       structpb.NewStringValue("us-west-2"),
+				ConstAwsEndpointUrl: "0.0.0.0",
 					"endpoint_url": structpb.NewStringValue("0.0.0.0"),
 				},
 			},
 			expected: &StorageAttributes{
 				CredentialAttributes: &cred.CredentialAttributes{
@@ -55,10 +49,8 @@ func TestGetStorageAttributes(t *testing.T) {
 		},
 		{
 			name: "good w/o endpoint",
-			in: &structpb.Struct{
+			in: map[string]any{
-				Fields: map[string]*structpb.Value{
+				cred.ConstRegion: "us-west-2",
 					"region": structpb.NewStringValue("us-west-2"),
 				},
 			},
 			expected: &StorageAttributes{
 				CredentialAttributes: &cred.CredentialAttributes{
@@ -66,35 +58,6 @@ func TestGetStorageAttributes(t *testing.T) {
 				},
 			},
 		},
 		{
 			name: "credential attributes",
 			in: &structpb.Struct{
 				Fields: map[string]*structpb.Value{
 					"region":                      structpb.NewStringValue("us-west-2"),
 					"disable_credential_rotation": structpb.NewBoolValue(true),
 					"role_arn":                    structpb.NewStringValue("arn:aws:iam::123456789012:role/S3Access"),
 					"role_external_id":            structpb.NewStringValue("1234567890"),
 					"role_session_name":           structpb.NewStringValue("test-session"),
 					"role_tags": structpb.NewStructValue(&structpb.Struct{
 						Fields: map[string]*structpb.Value{
 							"foo": structpb.NewStringValue("bar"),
 						},
 					}),
 				},
 			},
 			expected: &StorageAttributes{
 				CredentialAttributes: &cred.CredentialAttributes{
 					Region:                    "us-west-2",
 					DisableCredentialRotation: true,
 					RoleArn:                   "arn:aws:iam::123456789012:role/S3Access",
 					RoleExternalId:            "1234567890",
 					RoleSessionName:           "test-session",
 					RoleTags: map[string]string{
 						"foo": "bar",
 					},
 				},
 			},
 		},
 	}
 	for _, tc := range cases {
@@ -102,7 +65,10 @@ func TestGetStorageAttributes(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			require := require.New(t)
-			actual, err := getStorageAttributes(tc.in)
+			input, err := structpb.NewStruct(tc.in)
 			require.NoError(err)
 			actual, err := getStorageAttributes(input)
 			if tc.expectedErrContains != "" {
 				require.Error(err)
 				require.Contains(err.Error(), tc.expectedErrContains)
@@ -9,6 +9,7 @@ import (
 	"context"
 	"crypto/sha256"
 	"encoding/base64"
 	"fmt"
 	"io"
 	"os"
 	"path"
@@ -17,6 +18,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws/retry"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/google/uuid"
 	cred "github.com/hashicorp/boundary-plugin-aws/internal/credential"
 	"github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/storagebuckets"
@@ -51,6 +53,11 @@ func (p *StoragePlugin) OnCreateStorageBucket(ctx context.Context, req *pb.OnCre
 		return nil, status.Error(codes.InvalidArgument, "bucketName is required")
 	}
 	secrets := bucket.GetSecrets()
 	if secrets == nil {
 		return nil, status.Error(codes.InvalidArgument, "secrets is required")
 	}
 	attrs := bucket.GetAttributes()
 	if attrs == nil {
 		return nil, status.Error(codes.InvalidArgument, "attributes is required")
@@ -61,7 +68,7 @@ func (p *StoragePlugin) OnCreateStorageBucket(ctx context.Context, req *pb.OnCre
 		return nil, err
 	}
-	credConfig, err := cred.GetCredentialsConfig(bucket.GetSecrets(), storageAttributes.CredentialAttributes, false)
+	credConfig, err := cred.GetCredentialsConfig(secrets, storageAttributes.Region)
 	if err != nil {
 		return nil, err
 	}
@@ -69,18 +76,25 @@ func (p *StoragePlugin) OnCreateStorageBucket(ctx context.Context, req *pb.OnCre
 	// Set up the creds in our persisted state.
 	credState, err := cred.NewAwsCredentialPersistedState(
 		append([]cred.AwsCredentialPersistedStateOption{
-			cred.WithCredentialsConfig(credConfig),
+			cred.WithAccessKeyId(credConfig.AccessKey),
 			cred.WithSecretAccessKey(credConfig.SecretKey),
 			cred.WithRegion(credConfig.Region),
 		}, p.testCredStateOpts...)...,
 	)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "error setting up persisted state: %s", err)
 	}
-	// Try to rotate AWS static credentials
+	// Try to rotate the credentials if we're not skipping them.
-	if cred.GetCredentialType(credConfig) == cred.StaticAWS && !storageAttributes.DisableCredentialRotation {
+	if !storageAttributes.DisableCredentialRotation {
-		if err := credState.RotateCreds(ctx); err != nil {
+		if err := credState.RotateCreds(); err != nil {
 			return nil, status.Errorf(codes.InvalidArgument, "error during credential rotation: %s", err)
 		}
 	} else {
 		// Simply validate if we aren't rotating.
 		if err := credState.ValidateCreds(); err != nil {
 			return nil, status.Errorf(codes.InvalidArgument, "error during credential validation: %s", err)
 		}
 	}
 	storageState, err := newAwsStoragePersistedState(
@@ -112,102 +126,75 @@ func (p *StoragePlugin) OnUpdateStorageBucket(ctx context.Context, req *pb.OnUpd
 	// For storage buckets we only need to really validate what is
 	// currently in the new copy of the storage bucket data, so skip
 	// fetching the new copy to keep things a little less messy.
-	newBucket := req.GetNewBucket()
+	bucket := req.GetNewBucket()
-	if newBucket == nil {
+	if bucket == nil {
 		return nil, status.Error(codes.InvalidArgument, "new bucket is required")
 	}
-	if newBucket.BucketName == "" {
+	if bucket.BucketName == "" {
 		return nil, status.Error(codes.InvalidArgument, "new bucketName is required")
 	}
-	currentBucket := req.GetCurrentBucket()
+
-	if currentBucket == nil {
+	var updateSecrets bool
-		return nil, status.Error(codes.InvalidArgument, "current bucket is required")
+	secrets := bucket.GetSecrets()
 	if secrets != nil {
 		// We will be updating secrets this run, but what exactly that
 		// means will be determined later.
 		updateSecrets = true
 	}
-	oldAttrs := currentBucket.GetAttributes()
+	attrs := bucket.GetAttributes()
-	if oldAttrs == nil {
+	if attrs == nil {
 		return nil, status.Error(codes.InvalidArgument, "current bucket attributes is required")
 	}
 	oldStorageAttributes, err := getStorageAttributes(oldAttrs)
 	if err != nil {
 		return nil, err
 	}
 	newAttrs := newBucket.GetAttributes()
 	if newAttrs == nil {
 		return nil, status.Error(codes.InvalidArgument, "new bucket attributes is required")
 	}
-	newStorageAttributes, err := getStorageAttributes(newAttrs)
+
 	storageAttributes, err := getStorageAttributes(attrs)
 	if err != nil {
 		return nil, err
 	}
 	// Get the persisted data.
 	// NOTE: We might need to change this at a later time. I'm not too
 	// sure *exactly* what scenarios we might encounter that would
 	// ultimately mean that we would have to handle an empty or missing
 	// state in update, but what we are ultimately assuming here
 	// (implicitly through awsStoragePersistedStateFromProto) is that
 	// the state will exist and be populated. Personally I think this
 	// is fine and important, but this may change in the future.
 	credState, err := cred.AwsCredentialPersistedStateFromProto(
 		req.GetPersisted().GetData(),
-		oldStorageAttributes.CredentialAttributes,
+		append(p.testCredStateOpts, cred.WithRegion(storageAttributes.Region))...)
 		p.testCredStateOpts...)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "error loading persisted state: %s", err)
 	}
-	// Verify the incoming credentials are valid and return any errors to the
+	if storageAttributes.DisableCredentialRotation && !updateSecrets {
-	// user if they're not. Note this doesn't validate the credentials against
+		// This is a validate check to make sure that we aren't disabling
-	// AWS - it only does logical validation on the fields.
+		// rotation for credentials currently being managed by rotation.
-	updatedCredentials, err := cred.GetCredentialsConfig(newBucket.GetSecrets(), newStorageAttributes.CredentialAttributes, false)
+		// This is not allowed.
-	if err != nil {
+		if !credState.CredsLastRotatedTime.IsZero() {
-		return nil, err
+			return nil, status.Error(codes.FailedPrecondition, "cannot disable rotation for already-rotated credentials")
 		}
 	}
-	// We will be updating credentials when one of two changes occur:
+	if updateSecrets {
-	// 1. the new bucket has secrets for static credentials, in which case we need to delete the old static credentials
+		storageSecrets, err := cred.GetCredentialsConfig(secrets, storageAttributes.Region)
 	// 2. the new bucket has a different roleARN value for dynamic credentials
 	if newBucket.GetSecrets() != nil || newStorageAttributes.RoleArn != oldStorageAttributes.RoleArn {
 		// Ensure the incoming credentials are valid for interaction with the S3
 		// Bucket before replacing them.
 		newCredState, err := cred.NewAwsCredentialPersistedState(
 			append([]cred.AwsCredentialPersistedStateOption{
 				cred.WithCredentialsConfig(updatedCredentials),
 			}, p.testCredStateOpts...)...,
 		)
 		if err != nil {
-			return nil, status.Errorf(codes.InvalidArgument, "error setting up new credential persisted state: %s", err)
+			return nil, err
 		}
 		newStorageState, err := newAwsStoragePersistedState(
 			append([]awsStoragePersistedStateOption{
 				withCredentials(newCredState),
 			}, p.testStorageStateOpts...)...,
 		)
 		if err != nil {
 			return nil, status.Errorf(codes.InvalidArgument, "error loading persisted state: %s", err)
 		}
 		if err := dryRunValidation(ctx, newStorageState, newStorageAttributes, newBucket); err != nil {
 			return nil, status.Errorf(codes.InvalidArgument, "failed to validate incoming credentials: %s", err)
 		}
-		// Replace the existing credential state.
+		// Replace the credentials. This checks the timestamp on the last
-		// This checks the timestamp on the last rotation time as well
+		// rotation time as well and deletes the credentials if we are
-		// and deletes the credentials if we are managing them
+		// managing them (ie: if we've rotated them before).
-		// (ie: if we've rotated them before).
+		if err := credState.ReplaceCreds(storageSecrets.AccessKey, storageSecrets.SecretKey); err != nil {
 		if err := credState.ReplaceCreds(ctx, updatedCredentials); err != nil {
 			return nil, status.Errorf(codes.InvalidArgument, "error attempting to replace credentials: %s", err)
 		}
 	}
-	if cred.GetCredentialType(credState.CredentialsConfig) == cred.StaticAWS {
+	if !storageAttributes.DisableCredentialRotation && credState.CredsLastRotatedTime.IsZero() {
 		// This is a validate check to make sure that we aren't disabling
 		// rotation for credentials currently being managed by rotation.
 		// This is not allowed.
 		if newStorageAttributes.DisableCredentialRotation && newBucket.GetSecrets() == nil {
 			if !credState.CredsLastRotatedTime.IsZero() {
 				return nil, status.Error(codes.FailedPrecondition, "cannot disable rotation for already-rotated credentials")
 			}
 		}
 		// If we're enabling rotation now but didn't before, or have
 		// freshly replaced credentials, we can rotate here.
-		if !newStorageAttributes.DisableCredentialRotation && credState.CredsLastRotatedTime.IsZero() {
+		if err := credState.RotateCreds(); err != nil {
-			if err := credState.RotateCreds(ctx); err != nil {
+			return nil, status.Errorf(codes.InvalidArgument, "error during credential rotation: %s", err)
 				return nil, status.Errorf(codes.InvalidArgument, "error during credential rotation: %s", err)
 			}
 		}
 	}
@@ -221,7 +208,7 @@ func (p *StoragePlugin) OnUpdateStorageBucket(ctx context.Context, req *pb.OnUpd
 	}
 	// perform dry run to ensure we can interact with the bucket as expected.
-	if err := dryRunValidation(ctx, storageState, newStorageAttributes, newBucket); err != nil {
+	if err := dryRunValidation(ctx, storageState, storageAttributes, bucket); err != nil {
 		return nil, err
 	}
@@ -260,8 +247,7 @@ func (p *StoragePlugin) OnDeleteStorageBucket(ctx context.Context, req *pb.OnDel
 	// may be corrupt/and or legitimately missing.
 	credState, err := cred.AwsCredentialPersistedStateFromProto(
 		req.GetPersisted().GetData(),
-		storageAttributes.CredentialAttributes,
+		append(p.testCredStateOpts, cred.WithRegion(storageAttributes.Region))...)
 		p.testCredStateOpts...)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "error loading persisted state: %s", err)
 	}
@@ -275,15 +261,12 @@ func (p *StoragePlugin) OnDeleteStorageBucket(ctx context.Context, req *pb.OnDel
 		return nil, status.Errorf(codes.InvalidArgument, "error loading persisted state: %s", err)
 	}
-	// try to delete static credentials
+	if !credState.CredsLastRotatedTime.IsZero() {
-	if cred.GetCredentialType(credState.CredentialsConfig) == cred.StaticAWS {
+		// Delete old/existing credentials. This is done with the same
-		if !credState.CredsLastRotatedTime.IsZero() {
+		// credentials to ensure that it has the proper permissions to do
-			// Delete old/existing credentials. This is done with the same
+		// it.
-			// credentials to ensure that it has the proper permissions to do
+		if err := credState.DeleteCreds(); err != nil {
-			// it.
+			return nil, status.Errorf(codes.Aborted, "error removing rotated credentials during storage bucket deletion: %s", err)
 			if err := credState.DeleteCreds(ctx); err != nil {
 				return nil, status.Errorf(codes.Aborted, "error removing rotated credentials during storage bucket deletion: %s", err)
 			}
 		}
 	}
@@ -305,6 +288,11 @@ func (p *StoragePlugin) HeadObject(ctx context.Context, req *pb.HeadObjectReques
 		return nil, status.Error(codes.InvalidArgument, "bucketName is required")
 	}
 	secrets := bucket.GetSecrets()
 	if secrets == nil {
 		return nil, status.Error(codes.InvalidArgument, "secrets is required")
 	}
 	attrs := bucket.GetAttributes()
 	if attrs == nil {
 		return nil, status.Error(codes.InvalidArgument, "attributes is required")
@@ -315,7 +303,7 @@ func (p *StoragePlugin) HeadObject(ctx context.Context, req *pb.HeadObjectReques
 		return nil, err
 	}
-	credConfig, err := cred.GetCredentialsConfig(bucket.GetSecrets(), storageAttributes.CredentialAttributes, false)
+	credConfig, err := cred.GetCredentialsConfig(secrets, storageAttributes.Region)
 	if err != nil {
 		return nil, err
 	}
@@ -323,7 +311,9 @@ func (p *StoragePlugin) HeadObject(ctx context.Context, req *pb.HeadObjectReques
 	// Set up the creds in our persisted state.
 	credState, err := cred.NewAwsCredentialPersistedState(
 		append([]cred.AwsCredentialPersistedStateOption{
-			cred.WithCredentialsConfig(credConfig),
+			cred.WithAccessKeyId(credConfig.AccessKey),
 			cred.WithSecretAccessKey(credConfig.SecretKey),
 			cred.WithRegion(credConfig.Region),
 		}, p.testCredStateOpts...)...,
 	)
 	if err != nil {
@@ -340,6 +330,9 @@ func (p *StoragePlugin) HeadObject(ctx context.Context, req *pb.HeadObjectReques
 	}
 	opts := []s3Option{}
 	if storageAttributes.Region != "" {
 		opts = append(opts, WithRegion(storageAttributes.Region))
 	}
 	if storageAttributes.EndpointUrl != "" {
 		opts = append(opts, WithEndpoint(storageAttributes.EndpointUrl))
 	}
@@ -373,6 +366,11 @@ func (p *StoragePlugin) ValidatePermissions(ctx context.Context, req *pb.Validat
 		return nil, status.Error(codes.InvalidArgument, "bucketName is required")
 	}
 	secrets := bucket.GetSecrets()
 	if secrets == nil {
 		return nil, status.Error(codes.InvalidArgument, "secrets is required")
 	}
 	attrs := bucket.GetAttributes()
 	if attrs == nil {
 		return nil, status.Error(codes.InvalidArgument, "attributes is required")
@@ -383,7 +381,7 @@ func (p *StoragePlugin) ValidatePermissions(ctx context.Context, req *pb.Validat
 		return nil, err
 	}
-	credConfig, err := cred.GetCredentialsConfig(bucket.GetSecrets(), storageAttributes.CredentialAttributes, false)
+	credConfig, err := cred.GetCredentialsConfig(secrets, storageAttributes.Region)
 	if err != nil {
 		return nil, err
 	}
@@ -391,7 +389,9 @@ func (p *StoragePlugin) ValidatePermissions(ctx context.Context, req *pb.Validat
 	// Set up the creds in our persisted state.
 	credState, err := cred.NewAwsCredentialPersistedState(
 		append([]cred.AwsCredentialPersistedStateOption{
-			cred.WithCredentialsConfig(credConfig),
+			cred.WithAccessKeyId(credConfig.AccessKey),
 			cred.WithSecretAccessKey(credConfig.SecretKey),
 			cred.WithRegion(credConfig.Region),
 		}, p.testCredStateOpts...)...,
 	)
 	if err != nil {
@@ -431,6 +431,11 @@ func (p *StoragePlugin) GetObject(req *pb.GetObjectRequest, stream pb.StoragePlu
 		return status.Error(codes.InvalidArgument, "bucketName is required")
 	}
 	secrets := bucket.GetSecrets()
 	if secrets == nil {
 		return status.Error(codes.InvalidArgument, "secrets is required")
 	}
 	attrs := bucket.GetAttributes()
 	if attrs == nil {
 		return status.Error(codes.InvalidArgument, "attributes is required")
@@ -441,7 +446,7 @@ func (p *StoragePlugin) GetObject(req *pb.GetObjectRequest, stream pb.StoragePlu
 		return err
 	}
-	credConfig, err := cred.GetCredentialsConfig(bucket.GetSecrets(), storageAttributes.CredentialAttributes, false)
+	credConfig, err := cred.GetCredentialsConfig(secrets, storageAttributes.Region)
 	if err != nil {
 		return err
 	}
@@ -449,7 +454,9 @@ func (p *StoragePlugin) GetObject(req *pb.GetObjectRequest, stream pb.StoragePlu
 	// Set up the creds in our persisted state.
 	credState, err := cred.NewAwsCredentialPersistedState(
 		append([]cred.AwsCredentialPersistedStateOption{
-			cred.WithCredentialsConfig(credConfig),
+			cred.WithAccessKeyId(credConfig.AccessKey),
 			cred.WithSecretAccessKey(credConfig.SecretKey),
 			cred.WithRegion(credConfig.Region),
 		}, p.testCredStateOpts...)...,
 	)
 	if err != nil {
@@ -466,6 +473,9 @@ func (p *StoragePlugin) GetObject(req *pb.GetObjectRequest, stream pb.StoragePlu
 	}
 	opts := []s3Option{}
 	if storageAttributes.Region != "" {
 		opts = append(opts, WithRegion(storageAttributes.Region))
 	}
 	if storageAttributes.EndpointUrl != "" {
 		opts = append(opts, WithEndpoint(storageAttributes.EndpointUrl))
 	}
@@ -525,6 +535,10 @@ func (p *StoragePlugin) PutObject(ctx context.Context, req *pb.PutObjectRequest)
 	if bucket.GetBucketName() == "" {
 		return nil, status.Error(codes.InvalidArgument, "bucketName is required")
 	}
 	secrets := bucket.GetSecrets()
 	if secrets == nil {
 		return nil, status.Error(codes.InvalidArgument, "secrets is required")
 	}
 	attrs := bucket.GetAttributes()
 	if attrs == nil {
 		return nil, status.Error(codes.InvalidArgument, "attributes is required")
@@ -552,7 +566,7 @@ func (p *StoragePlugin) PutObject(ctx context.Context, req *pb.PutObjectRequest)
 		return nil, err
 	}
-	credConfig, err := cred.GetCredentialsConfig(bucket.GetSecrets(), storageAttributes.CredentialAttributes, false)
+	credConfig, err := cred.GetCredentialsConfig(secrets, storageAttributes.Region)
 	if err != nil {
 		return nil, err
 	}
@@ -560,7 +574,9 @@ func (p *StoragePlugin) PutObject(ctx context.Context, req *pb.PutObjectRequest)
 	// Set up the creds in our persisted state.
 	credState, err := cred.NewAwsCredentialPersistedState(
 		append([]cred.AwsCredentialPersistedStateOption{
-			cred.WithCredentialsConfig(credConfig),
+			cred.WithAccessKeyId(credConfig.AccessKey),
 			cred.WithSecretAccessKey(credConfig.SecretKey),
 			cred.WithRegion(credConfig.Region),
 		}, p.testCredStateOpts...)...,
 	)
 	if err != nil {
@@ -577,6 +593,9 @@ func (p *StoragePlugin) PutObject(ctx context.Context, req *pb.PutObjectRequest)
 	}
 	opts := []s3Option{}
 	if storageAttributes.Region != "" {
 		opts = append(opts, WithRegion(storageAttributes.Region))
 	}
 	if storageAttributes.EndpointUrl != "" {
 		opts = append(opts, WithEndpoint(storageAttributes.EndpointUrl))
 	}
@@ -640,6 +659,9 @@ func dryRunValidation(ctx context.Context, state *awsStoragePersistedState, attr
 	}
 	opts := []s3Option{}
 	if attrs.Region != "" {
 		opts = append(opts, WithRegion(attrs.Region))
 	}
 	if attrs.EndpointUrl != "" {
 		opts = append(opts, WithEndpoint(attrs.EndpointUrl))
 	}
@@ -694,5 +716,41 @@ func parseAWSErrCode(msg string, err error) error {
 	if retryErr.IsErrorThrottle(err).Bool() {
 		errCode = codes.Unavailable
 	}
-	return status.Errorf(errCode, "%s: %s", msg, err)
+	st := status.New(errCode, fmt.Sprintf("%s: %s", msg, err))
 	if aerr, ok := err.(awserr.Error); ok {
 		detail := &pb.ErrorDetail{
 			Status:  500,
 			Code:    aerr.Code(),
 			Message: aerr.Message(),
 		}
 		// aws error codes are strings that are more granular than status codes
 		// https://docs.aws.amazon.com/AmazonS3/latest/API/ErrorResponses.html
 		switch aerr.Code() {
 		case "AccessDenied":
 			// generic 403 response, who knows, credentials were invalidated, etc
 			detail.Status = 403
 			errCode = codes.Unauthenticated
 		case "InvalidSecurity":
 			// these specific credentials aren't valid
 			fallthrough
 		case "InvalidAccessKeyId":
 			// a specific case for an access key being revoked. this is probably
 			// the one we want to watch out for
 			fallthrough
 		case "UnauthorizedAccess":
 			// standard 401 response, client is no longer authorized and may
 			// need new credentials
 			detail.Status = 401
 			errCode = codes.Unauthenticated
 		default:
 			// we didn't get a code we were expecting, just fallback to previous
 			// logic. if we need to parse more codes in the future, we can.
 		}
 		var sterr error
 		if st, sterr = st.WithDetails(detail); sterr != nil {
 			panic(fmt.Sprintf("Unexpected error while attaching AWS error metadata: %v", sterr))
 		}
 	}
 	return st.Err()
 }
@@ -9,12 +9,12 @@ import (
 	"fmt"
 	"net"
 	"net/http"
 	"net/url"
 	"time"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/credentials"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	smithyEndpoints "github.com/aws/smithy-go/endpoints"
 	"github.com/hashicorp/boundary-plugin-aws/internal/credential"
 	"github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/storagebuckets"
 	"google.golang.org/protobuf/types/known/structpb"
@@ -97,23 +97,55 @@ func (s *awsStoragePersistedState) S3Client(ctx context.Context, opt ...s3Option
 	if err != nil {
 		return nil, fmt.Errorf("error parsing options when fetching S3 client: %w", err)
 	}
-	awsCfg, err := s.GenerateCredentialChain(ctx)
+
 	awsConfigOpts := []func(*config.LoadOptions) error{}
 	sess, err := s.GetSession()
 	if err != nil {
-		return nil, fmt.Errorf("error getting AWS configuration when fetching S3 client: %w", err)
+		return nil, fmt.Errorf("error getting AWS session when fetching S3 client: %w", err)
 	}
-	if awsCfg == nil {
+	creds, err := sess.Config.Credentials.Get()
-		return nil, fmt.Errorf("nil aws configuration")
+	if err != nil {
 		return nil, fmt.Errorf("error getting AWS session when fetching S3 client: %w", err)
 	}
 	customCredentials := config.WithCredentialsProvider(
 		credentials.NewStaticCredentialsProvider(creds.AccessKeyID, creds.SecretAccessKey, creds.SessionToken),
 	)
 	awsConfigOpts = append(awsConfigOpts, customCredentials)
 	if sess.Config.Region != nil {
 		awsConfigOpts = append(awsConfigOpts, config.WithRegion(*sess.Config.Region))
 	}
 	if opts.withRegion != "" {
 		awsConfigOpts = append(awsConfigOpts, config.WithRegion(opts.withRegion))
 	}
 	var s3Opts []func(*s3.Options)
 	if opts.withEndpoint != "" {
-		s3Opts = append(s3Opts, s3.WithEndpointResolverV2(&endpointResolver{
+		customResolver := aws.EndpointResolverWithOptionsFunc(func(service, region string, options ...interface{}) (aws.Endpoint, error) {
-			endpoint: opts.withEndpoint,
+			if service == s3.ServiceID {
-		}))
+				if opts.withRegion != "" {
 					region = opts.withRegion
 				}
 				return aws.Endpoint{
 					PartitionID:   "aws",
 					URL:           opts.withEndpoint,
 					SigningRegion: region,
 				}, nil
 			}
 			// returning EndpointNotFoundError will allow the service to fallback to it's default resolution
 			return aws.Endpoint{}, &aws.EndpointNotFoundError{}
 		})
 		awsConfigOpts = append(awsConfigOpts, config.WithEndpointResolverWithOptions(customResolver))
 	}
 	cfg, err := config.LoadDefaultConfig(ctx, awsConfigOpts...)
 	if err != nil {
 		return nil, fmt.Errorf("error loading aws configuration when fetching S3 client: %w", err)
 	}
 	if s.testS3APIFunc != nil {
-		return s.testS3APIFunc(*awsCfg)
+		return s.testS3APIFunc(cfg)
 	}
-	return s3.NewFromConfig(*awsCfg, s3Opts...), nil
+
 	cfg.HTTPClient = customClient
 	return s3.NewFromConfig(cfg), nil
 }
 // getOpts iterates the inbound s3Options and returns a struct
@@ -135,6 +167,7 @@ type s3Option func(*s3Options) error
 // options = how options are represented
 type s3Options struct {
 	withRegion   string
 	withEndpoint string
 }
@@ -142,6 +175,14 @@ func getDefaultS3Options() s3Options {
 	return s3Options{}
 }
 // WithRegion contains the region to use
 func WithRegion(with string) s3Option {
 	return func(o *s3Options) error {
 		o.withRegion = with
 		return nil
 	}
 }
 // WithEndpoint contains the endpoint to use
 func WithEndpoint(with string) s3Option {
 	return func(o *s3Options) error {
@@ -149,31 +190,3 @@ func WithEndpoint(with string) s3Option {
 		return nil
 	}
 }
 type endpointResolver struct {
 	endpoint string
 }
 func (e *endpointResolver) ResolveEndpoint(ctx context.Context, params s3.EndpointParameters) (resolver smithyEndpoints.Endpoint, err error) {
 	var uri *url.URL
 	resolver, err = s3.NewDefaultEndpointResolverV2().ResolveEndpoint(ctx, params)
 	if err != nil {
 		return
 	}
 	if e.endpoint == "" {
 		// TODO: not sure if we should set an error or ignore the missing endpoint value and continue with the default resolver
 		return
 	}
 	uri, err = url.Parse(e.endpoint)
 	if err != nil {
 		return
 	}
 	if uri == nil {
 		// TODO: not sure if we should set an error or ignore the missing uri value and continue with the default resolver
 		return
 	}
 	resolver = smithyEndpoints.Endpoint{
 		URI: *uri,
 	}
 	return
 }
@@ -7,70 +7,37 @@ import (
 	"context"
 	"testing"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/hashicorp/boundary-plugin-aws/internal/credential"
 	"github.com/hashicorp/go-secure-stdlib/awsutil/v2"
 	"github.com/stretchr/testify/require"
 )
 func TestAwsStoragePersistedStateS3Client(t *testing.T) {
-	cases := []struct {
+	require := require.New(t)
-		name             string
+	cred, err := credential.NewAwsCredentialPersistedState(
-		creds            *awsutil.CredentialsConfig
+		credential.WithRegion("us-west-2"),
-		opts             []awsStoragePersistedStateOption
+		credential.WithAccessKeyId("foobar"),
-		awsOpts          []awsutil.Option
+		credential.WithSecretAccessKey("barfoo"),
-		s3Opts           []s3Option
+	)
-		expectedRegion   string
+	require.NoError(err)
 		expectedEndpoint string
 	}{
 		{
 			name: "static credentials",
 			creds: func() *awsutil.CredentialsConfig {
 				creds, err := awsutil.NewCredentialsConfig(
 					awsutil.WithRegion("us-west-2"),
 					awsutil.WithAccessKey("foobar"),
 					awsutil.WithSecretKey("barfoo"),
 				)
 				require.NoError(t, err)
 				return creds
 			}(),
 			awsOpts: []awsutil.Option{
 				awsutil.WithIAMAPIFunc(
 					awsutil.NewMockIAM(),
 				),
 			},
 			opts: []awsStoragePersistedStateOption{
 				withTestS3APIFunc(newTestMockS3(nil)),
 			},
 			s3Opts: []s3Option{
 				WithEndpoint("0.0.0.0"),
 			},
 			expectedRegion:   "us-west-2",
 			expectedEndpoint: "0.0.0.0",
 		},
 	}
 	for _, tc := range cases {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			require := require.New(t)
-			cred, err := credential.NewAwsCredentialPersistedState(
+	state, err := newAwsStoragePersistedState(
-				credential.WithCredentialsConfig(tc.creds),
+		withCredentials(cred),
-				credential.WithStateTestOpts(tc.awsOpts),
+		withTestS3APIFunc(newTestMockS3(nil)),
-			)
+	)
-			require.NoError(err)
+	require.NoError(err)
-			state, err := newAwsStoragePersistedState(
+	clientRaw, err := state.S3Client(context.Background(), WithRegion("us-west-2"), WithEndpoint("0.0.0.0"))
-				append(tc.opts, withCredentials(cred))...,
+	require.NoError(err)
-			)
+	require.NotNil(clientRaw)
-			require.NoError(err)
+	client, ok := clientRaw.(*testMockS3)
 	require.True(ok)
 	require.NotNil(client)
 	require.Equal("us-west-2", client.Region)
-			clientRaw, err := state.S3Client(context.Background(), tc.s3Opts...)
+	endpoint, err := client.Endpoint.ResolveEndpoint(s3.ServiceID, client.Region)
-			require.NoError(err)
+	require.NoError(err)
-			require.NotNil(clientRaw)
+	require.Equal("0.0.0.0", endpoint.URL)
-			client, ok := clientRaw.(*testMockS3)
+	require.Equal("us-west-2", endpoint.SigningRegion)
-			require.True(ok)
+	require.Equal("aws", endpoint.PartitionID)
 			require.NotNil(client)
 			require.Equal(tc.expectedRegion, client.Region)
 		})
 	}
 }
@@ -13,11 +13,11 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/aws/aws-sdk-go-v2/service/sts"
+	"github.com/aws/aws-sdk-go/service/sts"
 	"github.com/hashicorp/boundary-plugin-aws/internal/credential"
 	"github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/storagebuckets"
 	pb "github.com/hashicorp/boundary/sdk/pbs/plugin"
-	"github.com/hashicorp/go-secure-stdlib/awsutil/v2"
+	"github.com/hashicorp/go-secure-stdlib/awsutil"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/types/known/structpb"
@@ -69,8 +69,9 @@ func (s *testMockS3State) Reset() {
 type testMockS3 struct {
 	S3API
-	State  *testMockS3State
+	State    *testMockS3State
-	Region string
+	Region   string
 	Endpoint aws.EndpointResolverWithOptions
 	// mocked responses for getObject
 	GetObjectOutput *s3.GetObjectOutput
@@ -146,6 +147,9 @@ func newTestMockS3(state *testMockS3State, opts ...testMockS3Option) s3APIFunc {
 			if cfg.Region != "" {
 				m.Region = cfg.Region
 			}
 			if cfg.EndpointResolverWithOptions != nil {
 				m.Endpoint = cfg.EndpointResolverWithOptions
 			}
 		}
 		return m, nil
@@ -11,20 +11,26 @@ import (
 	"testing"
 	"time"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/hashicorp/boundary-plugin-aws/internal/credential"
 	"github.com/hashicorp/boundary-plugin-aws/internal/values"
 	"github.com/hashicorp/boundary-plugin-aws/plugin/service/host"
 	"github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/hostcatalogs"
 	"github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/hostsets"
 	pb "github.com/hashicorp/boundary/sdk/pbs/plugin"
 	"github.com/hashicorp/go-secure-stdlib/awsutil"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/structpb"
 )
-const expectedEc2InstanceCount = 5
+const (
 	expectedIamUserCount     = 6
 	expectedEc2InstanceCount = 5
 )
 var expectedTags = []string{"foo", "bar", "baz"}
-func TestHostPlugin(t *testing.T) {
+func TestPlugin(t *testing.T) {
 	region := os.Getenv("AWS_REGION")
 	if region == "" {
 		t.Skip("set AWS_REGION to use this test")
@@ -189,7 +195,36 @@ func testPluginOnCreateCatalog(ctx context.Context, t *testing.T, p *host.HostPl
 	require.NotNil(response)
 	persisted := response.GetPersisted()
 	require.NotNil(persisted)
-	return validatePersistedSecrets(t, persisted.GetSecrets(), accessKeyId, secretAccessKey, rotate)
+	persistedSecrets := persisted.GetSecrets()
 	require.NotNil(persistedSecrets)
 	persistedAccessKeyId, err := values.GetStringValue(persistedSecrets, credential.ConstAccessKeyId, true)
 	require.NoError(err)
 	require.NotZero(persistedAccessKeyId)
 	if rotate {
 		require.NotEqual(accessKeyId, persistedAccessKeyId)
 	} else {
 		require.Equal(accessKeyId, persistedAccessKeyId)
 	}
 	persistedSecretAccessKey, err := values.GetStringValue(persistedSecrets, credential.ConstSecretAccessKey, true)
 	require.NoError(err)
 	require.NotZero(persistedSecretAccessKey)
 	if rotate {
 		require.NotEqual(secretAccessKey, persistedSecretAccessKey)
 	} else {
 		require.Equal(secretAccessKey, persistedSecretAccessKey)
 	}
 	persistedCredsLastRotatedTime, err := values.GetTimeValue(persistedSecrets, credential.ConstCredsLastRotatedTime)
 	require.NoError(err)
 	if rotate {
 		require.NotZero(persistedCredsLastRotatedTime)
 		requireCredentialsInvalid(t, accessKeyId, secretAccessKey)
 	} else {
 		require.Zero(persistedCredsLastRotatedTime)
 	}
 	return persistedAccessKeyId, persistedSecretAccessKey
 }
 func testPluginOnUpdateCatalog(
@@ -258,7 +293,116 @@ func testPluginOnUpdateCatalog(
 	require.NotNil(response)
 	persisted := response.GetPersisted()
 	require.NotNil(persisted)
-	return validateUpdateSecrets(t, persisted.GetSecrets(), currentCredsLastRotatedTime, currentAccessKeyId, currentSecretAccessKey, newAccessKeyId, newSecretAccessKey, rotated, rotate)
+	persistedSecrets := persisted.GetSecrets()
 	require.NotNil(persistedSecrets)
 	// Complex checks based on the scenarios.
 	persistedAccessKeyId, err := values.GetStringValue(persistedSecrets, credential.ConstAccessKeyId, true)
 	require.NoError(err)
 	require.NotZero(persistedAccessKeyId)
 	persistedSecretAccessKey, err := values.GetStringValue(persistedSecrets, credential.ConstSecretAccessKey, true)
 	require.NoError(err)
 	require.NotZero(persistedSecretAccessKey)
 	persistedCredsLastRotatedTime, err := values.GetTimeValue(persistedSecrets, credential.ConstCredsLastRotatedTime)
 	require.NoError(err)
 	// Our test scenarios are complex due the multi-dimensional nature
 	// of criteria, so we lay them out in a switch below.
 	switch {
 	case newAccessKeyId != "" && rotated && rotate:
 		// The new access key ID was provided, we had previously rotated
 		// the credentials before, and the new credential set is to be
 		// rotated as well. In this case, the old credentials should have
 		// been deleted, and the new credentials should have been rotated,
 		// hence, should not match the new credentials initially
 		// provided. Rotation time should be non-zero and updated.
 		requireCredentialsInvalid(t, currentAccessKeyId, currentSecretAccessKey)
 		require.NotEqual(persistedAccessKeyId, newAccessKeyId)
 		require.NotEqual(persistedSecretAccessKey, newSecretAccessKey)
 		require.NotZero(persistedCredsLastRotatedTime)
 		require.True(persistedCredsLastRotatedTime.After(currentCredsLastRotatedTime))
 	case newAccessKeyId != "" && rotated && !rotate:
 		// The new access key ID was provided, we had previously rotated
 		// the credentials before, and the new credential is *not*
 		// rotated. In this case, the old credentials should have
 		// been deleted, But the new credentials should have not been
 		// rotated, and hence should be the same. Rotation time should be
 		// zero.
 		requireCredentialsInvalid(t, currentAccessKeyId, currentSecretAccessKey)
 		require.Equal(persistedAccessKeyId, newAccessKeyId)
 		require.Equal(persistedSecretAccessKey, newSecretAccessKey)
 		require.Zero(persistedCredsLastRotatedTime)
 	case newAccessKeyId != "" && !rotated && rotate:
 		// The new access key ID was provided, we *have not* previously
 		// rotated the credentials, and the new credential set is to be
 		// rotated. In this case, the old credentials should have been
 		// left alone, and the new credentials should have been rotated,
 		// hence, should not match the new credentials initially
 		// provided. Rotation time should be non-zero, but updated.
 		requireCredentialsValid(t, currentAccessKeyId, currentSecretAccessKey)
 		require.NotEqual(persistedAccessKeyId, newAccessKeyId)
 		require.NotEqual(persistedSecretAccessKey, newSecretAccessKey)
 		require.NotZero(persistedCredsLastRotatedTime)
 		require.True(persistedCredsLastRotatedTime.After(currentCredsLastRotatedTime))
 	case newAccessKeyId != "" && !rotated && !rotate:
 		// The new access key ID was provided, but we have not rotated
 		// the credentials previously and we still don't plan on rotating
 		// them. In this case, the old credentials should still be valid,
 		// and the persisted ones should match the new ones provided.
 		// Rotation time should be zero.
 		requireCredentialsValid(t, currentAccessKeyId, currentSecretAccessKey)
 		require.Equal(persistedAccessKeyId, newAccessKeyId)
 		require.Equal(persistedSecretAccessKey, newSecretAccessKey)
 		require.Zero(persistedCredsLastRotatedTime)
 	case newAccessKeyId == "" && rotated && rotate:
 		// No new credentials have been provided, but we have previously
 		// rotated and are still rotating credentials. This is a no-op.
 		// Existing credentials should still be valid and match the ones
 		// persisted to state. Rotation time should be identical since
 		// no new rotation occurred.
 		requireCredentialsValid(t, currentAccessKeyId, currentSecretAccessKey)
 		require.Equal(persistedAccessKeyId, currentAccessKeyId)
 		require.Equal(persistedSecretAccessKey, currentSecretAccessKey)
 		require.NotZero(persistedCredsLastRotatedTime)
 		require.True(currentCredsLastRotatedTime.Equal(persistedCredsLastRotatedTime))
 	case newAccessKeyId == "" && rotated && !rotate:
 		// No new credentials have been provided, and we have previously
 		// rotated the credentials. This is actually an error, but we
 		// don't test it here; it's covered in unit testing (see
 		// plugin_test.go).
 		require.FailNow("testing rotated-to-not-rotated scenario not implemented by this helper")
 	case newAccessKeyId == "" && !rotated && rotate:
 		// No new credentials have been provided, and while we did not
 		// rotate before, we want to switch to rotation. In this case,
 		// the existing persisted credentials should have been rotated,
 		// with a new non-zero timestamp.
 		requireCredentialsInvalid(t, currentAccessKeyId, currentSecretAccessKey)
 		require.NotEqual(persistedAccessKeyId, currentAccessKeyId)
 		require.NotEqual(persistedSecretAccessKey, currentSecretAccessKey)
 		require.NotZero(persistedCredsLastRotatedTime)
 	case newAccessKeyId == "" && !rotated && !rotate:
 		// No new credentials have been provided and we have not, nor do
 		// not, plan on rotating the credentials. This is a no-op.
 		// Existing credentials should still be valid and match the ones
 		// persisted to state. Rotation time should remain at zero.
 		requireCredentialsValid(t, currentAccessKeyId, currentSecretAccessKey)
 		require.Equal(persistedAccessKeyId, currentAccessKeyId)
 		require.Equal(persistedSecretAccessKey, currentSecretAccessKey)
 		require.Zero(persistedCredsLastRotatedTime)
 	default:
 		// Scenario was reached that was not covered by this function.
 		require.FailNow("unknown test scenario")
 	}
 	return persistedAccessKeyId, persistedSecretAccessKey
 }
 func testPluginOnDeleteCatalog(ctx context.Context, t *testing.T, p *host.HostPlugin, region, accessKeyId, secretAccessKey string, rotated bool) {
@@ -444,3 +588,53 @@ func testPluginListHosts(ctx context.Context, t *testing.T, p *host.HostPlugin,
 	// Success
 	t.Logf("testing ListHosts: success (region=%s, tags=%v, expected/actual=(len=%d, ids=%s))", region, tags, len(actualInstances), actualInstances)
 }
 func requireCredentialsInvalid(t *testing.T, accessKeyId, secretAccessKey string) {
 	t.Helper()
 	require := require.New(t)
 	c, err := awsutil.NewCredentialsConfig(
 		awsutil.WithAccessKey(accessKeyId),
 		awsutil.WithSecretKey(secretAccessKey),
 	)
 	require.NoError(err)
 	// We need to wait for invalidation as while awsutil waits for
 	// credential creation, deletion of the old credentials returns
 	// immediately.
 	timeoutCtx, cancel := context.WithTimeout(context.Background(), time.Second*30)
 	defer cancel()
 waitErr:
 	for {
 		_, err = c.GetCallerIdentity()
 		if err != nil {
 			break
 		}
 		select {
 		case <-time.After(time.Second):
 			// pass
 		case <-timeoutCtx.Done():
 			break waitErr
 		}
 	}
 	require.NotNil(err)
 	awsErr, ok := err.(awserr.Error)
 	require.True(ok)
 	require.Equal("InvalidClientTokenId", awsErr.Code())
 }
 func requireCredentialsValid(t *testing.T, accessKeyId, secretAccessKey string) {
 	t.Helper()
 	require := require.New(t)
 	c, err := awsutil.NewCredentialsConfig(
 		awsutil.WithAccessKey(accessKeyId),
 		awsutil.WithSecretKey(secretAccessKey),
 	)
 	require.NoError(err)
 	_, err = c.GetCallerIdentity()
 	require.NoError(err)
 }
@@ -1,411 +0,0 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 package testing
 import (
 	"context"
 	"io"
 	"net"
 	"os"
 	"path/filepath"
 	"testing"
 	"time"
 	"github.com/google/uuid"
 	"github.com/hashicorp/boundary-plugin-aws/internal/credential"
 	"github.com/hashicorp/boundary-plugin-aws/plugin/service/storage"
 	"github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/storagebuckets"
 	pb "github.com/hashicorp/boundary/sdk/pbs/plugin"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 func TestStoragePlugin(t *testing.T) {
 	region := os.Getenv("AWS_REGION")
 	if region == "" {
 		t.Skip("set AWS_REGION to use this test")
 	}
 	if envAccessKeyId := os.Getenv("AWS_ACCESS_KEY_ID"); envAccessKeyId == "" {
 		t.Skip("set AWS_ACCESS_KEY_ID to use this test")
 	}
 	if envSecretAccessKey := os.Getenv("AWS_SECRET_ACCESS_KEY"); envSecretAccessKey == "" {
 		t.Skip("set AWS_SECRET_ACCESS_KEY to use this test")
 	}
 	require := require.New(t)
 	tf, err := NewTestTerraformer("testdata/storage")
 	require.NoError(err)
 	require.NotNil(tf)
 	t.Log("===== deploying test Terraform workspace =====")
 	err = tf.Deploy()
 	require.NoError(err)
 	t.Cleanup(func() {
 		t.Log("===== destroying test Terraform workspace =====")
 		if err := tf.Destroy(); err != nil {
 			t.Logf("WARNING: could not run Terraform destroy: %s", err)
 		}
 	})
 	bucketName, err := tf.GetOutputString("bucket_name")
 	require.NoError(err)
 	require.NotEmpty(bucketName)
 	iamAccessKeyIds, err := tf.GetOutputSlice("iam_access_key_ids")
 	require.NoError(err)
 	require.Len(iamAccessKeyIds, expectedIamUserCount)
 	iamSecretAccessKeys, err := tf.GetOutputSlice("iam_secret_access_keys")
 	require.NoError(err)
 	require.Len(iamSecretAccessKeys, expectedIamUserCount)
 	iamAccessKeyMissingGetObject, err := tf.GetOutputString("iam_access_key_missing_get_obj")
 	require.NoError(err)
 	iamSecretAccessKeyMissingGetObject, err := tf.GetOutputString("iam_secret_access_key_missing_get_obj")
 	require.NoError(err)
 	iamAccessKeyMissingPutObject, err := tf.GetOutputString("iam_access_key_missing_put_obj")
 	require.NoError(err)
 	iamSecretAccessKeyMissingPutObject, err := tf.GetOutputString("iam_secret_access_key_missing_put_obj")
 	require.NoError(err)
 	// Start the workflow now. Set up the storage bucket. Note that this
 	// will cause the state to go out of drift above in the sense that
 	// the access key ID/secret access key will no longer be valid. We
 	// will assert this through the returned state.
 	p := new(storage.StoragePlugin)
 	ctx := context.Background()
 	// ********************
 	// * OnCreateStorageBucket
 	// ********************
 	//
 	// Test non-rotation (using primary user).
 	keyid, secret := testPluginOnCreateStorageBucket(ctx, t, p, bucketName, region, iamAccessKeyIds[0].(string), iamSecretAccessKeys[0].(string), false)
 	// Test rotation next.
 	keyid, secret = testPluginOnCreateStorageBucket(ctx, t, p, bucketName, region, keyid, secret, true)
 	// ********************
 	// * OnUpdateStorageBucket
 	// ********************
 	//
 	// Test no-op non-rotation.
 	keyid, secret = testPluginOnUpdateStorageBucket(ctx, t, p, bucketName, region, keyid, secret, "", "", false, false)
 	// Switch to rotation.
 	keyid, secret = testPluginOnUpdateStorageBucket(ctx, t, p, bucketName, region, keyid, secret, "", "", false, true)
 	// Test no-op with rotation.
 	keyid, secret = testPluginOnUpdateStorageBucket(ctx, t, p, bucketName, region, keyid, secret, "", "", true, true)
 	// Switch credentials to next user. Don't rotate.
 	keyid, secret = testPluginOnUpdateStorageBucket(ctx, t, p, bucketName, region, keyid, secret, iamAccessKeyIds[1].(string), iamSecretAccessKeys[1].(string), true, false)
 	// Switch credentials to next user. Add rotation.
 	keyid, secret = testPluginOnUpdateStorageBucket(ctx, t, p, bucketName, region, keyid, secret, iamAccessKeyIds[2].(string), iamSecretAccessKeys[2].(string), false, true)
 	// Switch to next user, with rotation disabled.
 	keyid, secret = testPluginOnUpdateStorageBucket(ctx, t, p, bucketName, region, keyid, secret, iamAccessKeyIds[3].(string), iamSecretAccessKeys[3].(string), true, false)
 	// Last case - switch to another user and keep rotation off.
 	keyid, secret = testPluginOnUpdateStorageBucket(ctx, t, p, bucketName, region, keyid, secret, iamAccessKeyIds[4].(string), iamSecretAccessKeys[4].(string), false, false)
 	// ********************
 	// * OnDeleteStorageBucket
 	// ********************
 	//
 	// Test non-rotated.
 	testPluginOnDeleteStorageBucket(ctx, t, p, bucketName, region, keyid, secret, false)
 	// Test as if we had rotated these credentials (note that this
 	// makes this test set unusable).
 	testPluginOnDeleteStorageBucket(ctx, t, p, bucketName, region, keyid, secret, true)
 	// ********************
 	// * Object Methods: PutObject, GetObject, HeadObject
 	// ********************
 	//
 	// Reassign the keyid and secret first.
 	keyid, secret = iamAccessKeyIds[5].(string), iamSecretAccessKeys[5].(string)
 	testPluginObjectMethods(ctx, t, p, bucketName, region, keyid, secret)
 	// ********************
 	// * Validate Permissions
 	// ********************
 	//
 	// Validate error is returned for missing get object permission
 	testPluginValidatePermissions(ctx, t, p, bucketName, region, iamAccessKeyMissingGetObject, iamSecretAccessKeyMissingGetObject)
 	// Validate error is returned for missing put object permission
 	testPluginValidatePermissions(ctx, t, p, bucketName, region, iamAccessKeyMissingPutObject, iamSecretAccessKeyMissingPutObject)
 }
 func testPluginOnCreateStorageBucket(ctx context.Context, t *testing.T, p *storage.StoragePlugin, bucketName, region, accessKeyId, secretAccessKey string, rotate bool) (string, string) {
 	t.Helper()
 	t.Logf("testing OnCreateStorageBucket (region=%s, rotate=%t)", region, rotate)
 	require := require.New(t)
 	reqAttrs, err := structpb.NewStruct(map[string]any{
 		credential.ConstRegion:                    region,
 		credential.ConstDisableCredentialRotation: !rotate,
 	})
 	require.NoError(err)
 	reqSecrets, err := structpb.NewStruct(map[string]any{
 		credential.ConstAccessKeyId:     accessKeyId,
 		credential.ConstSecretAccessKey: secretAccessKey,
 	})
 	require.NoError(err)
 	request := &pb.OnCreateStorageBucketRequest{
 		Bucket: &storagebuckets.StorageBucket{
 			BucketName: bucketName,
 			Secrets:    reqSecrets,
 			Attributes: reqAttrs,
 		},
 	}
 	response, err := p.OnCreateStorageBucket(ctx, request)
 	require.NoError(err)
 	require.NotNil(response)
 	persisted := response.GetPersisted()
 	require.NotNil(persisted)
 	return validatePersistedSecrets(t, persisted.GetData(), accessKeyId, secretAccessKey, rotate)
 }
 func testPluginOnUpdateStorageBucket(
 	ctx context.Context, t *testing.T, p *storage.StoragePlugin, bucketName,
 	region, currentAccessKeyId, currentSecretAccessKey, newAccessKeyId, newSecretAccessKey string,
 	rotated, rotate bool,
 ) (string, string) {
 	t.Helper()
 	t.Logf("testing OnUpdateStorageBucket (region=%s, newcreds=%t, rotated=%t, rotate=%t)", region, newAccessKeyId != "" && newSecretAccessKey != "", rotated, rotate)
 	require := require.New(t)
 	// Take a timestamp of the current time to get a point in time to
 	// reference, ensuring that we are updating credential rotation
 	// timestamps.
 	currentCredsLastRotatedTime := time.Now()
 	reqCurrentAttrs, err := structpb.NewStruct(map[string]any{
 		credential.ConstRegion:                    region,
 		credential.ConstDisableCredentialRotation: !rotated,
 	})
 	require.NoError(err)
 	reqNewAttrs, err := structpb.NewStruct(map[string]any{
 		credential.ConstRegion:                    region,
 		credential.ConstDisableCredentialRotation: !rotate,
 	})
 	require.NoError(err)
 	var reqSecrets *structpb.Struct
 	if newAccessKeyId != "" && newSecretAccessKey != "" {
 		reqSecrets, err = structpb.NewStruct(map[string]any{
 			credential.ConstAccessKeyId:     newAccessKeyId,
 			credential.ConstSecretAccessKey: newSecretAccessKey,
 		})
 		require.NoError(err)
 	}
 	reqPersistedSecrets, err := structpb.NewStruct(map[string]any{
 		credential.ConstAccessKeyId:     currentAccessKeyId,
 		credential.ConstSecretAccessKey: currentSecretAccessKey,
 		credential.ConstCredsLastRotatedTime: func() string {
 			if rotated {
 				return currentCredsLastRotatedTime.Format(time.RFC3339Nano)
 			}
 			return (time.Time{}).Format(time.RFC3339Nano)
 		}(),
 	})
 	require.NoError(err)
 	require.NotNil(reqPersistedSecrets)
 	request := &pb.OnUpdateStorageBucketRequest{
 		CurrentBucket: &storagebuckets.StorageBucket{
 			BucketName: bucketName,
 			Attributes: reqCurrentAttrs,
 		},
 		NewBucket: &storagebuckets.StorageBucket{
 			BucketName: bucketName,
 			Attributes: reqNewAttrs,
 			Secrets:    reqSecrets,
 		},
 		Persisted: &storagebuckets.StorageBucketPersisted{
 			Data: reqPersistedSecrets,
 		},
 	}
 	response, err := p.OnUpdateStorageBucket(ctx, request)
 	require.NoError(err)
 	require.NotNil(response)
 	persisted := response.GetPersisted()
 	require.NotNil(persisted)
 	return validateUpdateSecrets(t, persisted.GetData(), currentCredsLastRotatedTime, currentAccessKeyId, currentSecretAccessKey, newAccessKeyId, newSecretAccessKey, rotated, rotate)
 }
 func testPluginOnDeleteStorageBucket(ctx context.Context, t *testing.T, p *storage.StoragePlugin, bucketName, region, accessKeyId, secretAccessKey string, rotated bool) {
 	t.Helper()
 	t.Logf("testing OnDeleteStorageBucket (region=%s, rotated=%t)", region, rotated)
 	require := require.New(t)
 	reqAttrs, err := structpb.NewStruct(map[string]any{
 		credential.ConstRegion:                    region,
 		credential.ConstDisableCredentialRotation: !rotated,
 	})
 	require.NoError(err)
 	reqSecrets, err := structpb.NewStruct(map[string]any{
 		credential.ConstAccessKeyId:     accessKeyId,
 		credential.ConstSecretAccessKey: secretAccessKey,
 	})
 	require.NoError(err)
 	reqPersistedSecrets, err := structpb.NewStruct(map[string]any{
 		credential.ConstAccessKeyId:     accessKeyId,
 		credential.ConstSecretAccessKey: secretAccessKey,
 		credential.ConstCredsLastRotatedTime: func() string {
 			if rotated {
 				return time.Now().Format(time.RFC3339Nano)
 			}
 			return (time.Time{}).Format(time.RFC3339Nano)
 		}(),
 	})
 	require.NoError(err)
 	request := &pb.OnDeleteStorageBucketRequest{
 		Bucket: &storagebuckets.StorageBucket{
 			BucketName: bucketName,
 			Attributes: reqAttrs,
 			Secrets:    reqSecrets,
 		},
 		Persisted: &storagebuckets.StorageBucketPersisted{
 			Data: reqPersistedSecrets,
 		},
 	}
 	response, err := p.OnDeleteStorageBucket(ctx, request)
 	require.NoError(err)
 	require.NotNil(response)
 	// We want to test the validity of the credentials post-deletion.
 	if rotated {
 		// The credentials should no longer be valid.
 		requireCredentialsInvalid(t, accessKeyId, secretAccessKey)
 	} else {
 		// The credentials should still be valid. Sleep 10s first just to
 		// be sure, since we're not rotating.
 		time.Sleep(time.Second * 10)
 		requireCredentialsValid(t, accessKeyId, secretAccessKey)
 	}
 }
 func testPluginValidatePermissions(ctx context.Context, t *testing.T, p *storage.StoragePlugin, bucketName, region, accessKeyId, secretAccessKey string) {
 	t.Helper()
 	t.Logf("testing ValidatePermissions")
 	require := require.New(t)
 	reqAttrs, err := structpb.NewStruct(map[string]any{
 		credential.ConstRegion:                    region,
 		credential.ConstDisableCredentialRotation: true,
 	})
 	require.NoError(err)
 	reqSecrets, err := structpb.NewStruct(map[string]any{
 		credential.ConstAccessKeyId:     accessKeyId,
 		credential.ConstSecretAccessKey: secretAccessKey,
 	})
 	require.NoError(err)
 	req := &pb.ValidatePermissionsRequest{
 		Bucket: &storagebuckets.StorageBucket{
 			BucketName: bucketName,
 			Attributes: reqAttrs,
 			Secrets:    reqSecrets,
 		},
 	}
 	_, err = p.ValidatePermissions(ctx, req)
 	require.Error(err)
 }
 func testPluginObjectMethods(ctx context.Context, t *testing.T, p *storage.StoragePlugin, bucketName, region, accessKeyId, secretAccessKey string) {
 	t.Helper()
 	t.Logf("testing PutObject")
 	require := require.New(t)
 	testDataPath, err := filepath.Abs("./testdata/storage/test_object_data")
 	require.NoError(err)
 	require.FileExists(testDataPath)
 	reqAttrs, err := structpb.NewStruct(map[string]any{
 		credential.ConstRegion:                    region,
 		credential.ConstDisableCredentialRotation: true,
 	})
 	require.NoError(err)
 	reqSecrets, err := structpb.NewStruct(map[string]any{
 		credential.ConstAccessKeyId:     accessKeyId,
 		credential.ConstSecretAccessKey: secretAccessKey,
 	})
 	require.NoError(err)
 	objectKey := uuid.New().String()
 	putObjReq := &pb.PutObjectRequest{
 		Bucket: &storagebuckets.StorageBucket{
 			BucketName: bucketName,
 			Attributes: reqAttrs,
 			Secrets:    reqSecrets,
 		},
 		Key:  objectKey,
 		Path: testDataPath,
 	}
 	putObjResp, err := p.PutObject(ctx, putObjReq)
 	require.NoError(err)
 	require.NotNil(putObjResp)
 	require.NotEmpty(putObjResp.GetChecksumSha_256())
 	t.Logf("testing HeadObject")
 	headObjReq := &pb.HeadObjectRequest{
 		Bucket: &storagebuckets.StorageBucket{
 			BucketName: bucketName,
 			Attributes: reqAttrs,
 			Secrets:    reqSecrets,
 		},
 		Key: objectKey,
 	}
 	headObjResp, err := p.HeadObject(ctx, headObjReq)
 	require.NoError(err)
 	require.NotNil(headObjResp)
 	require.NotEmpty(headObjResp.GetContentLength())
 	require.NotEmpty(headObjResp.GetLastModified())
 	// Need to create a GRPC server to test GetObject
 	t.Logf("testing GetObject")
 	lis, err := net.Listen("tcp", "localhost:2030")
 	require.NoError(err)
 	grpcServer := grpc.NewServer()
 	pb.RegisterStoragePluginServiceServer(grpcServer, &storage.StoragePlugin{})
 	go func() {
 		grpcServer.Serve(lis)
 	}()
 	conn, err := grpc.Dial("localhost:2030", grpc.WithTransportCredentials(insecure.NewCredentials()))
 	require.NoError(err)
 	defer conn.Close()
 	client := pb.NewStoragePluginServiceClient(conn)
 	stream, err := client.GetObject(ctx, &pb.GetObjectRequest{
 		Bucket: &storagebuckets.StorageBucket{
 			BucketName: bucketName,
 			Attributes: reqAttrs,
 			Secrets:    reqSecrets,
 		},
 		Key: objectKey,
 	})
 	require.NoError(err)
 	var actualData []byte
 	expectedData, err := os.ReadFile(testDataPath)
 	require.NoError(err)
 	for {
 		resp, err := stream.Recv()
 		if err == io.EOF {
 			require.NoError(stream.CloseSend())
 			break
 		} else if err != nil {
 			require.NoError(err)
 		}
 		actualData = append(actualData, resp.GetFileChunk()...)
 	}
 	require.Equal(expectedData, actualData)
 	require.NoError(conn.Close())
 	grpcServer.Stop()
 }
@@ -1,240 +0,0 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 resource "aws_iam_role" "valid" {
  name = "${random_id.prefix.dec}-valid"
  tags = local.tags
  assume_role_policy = jsonencode({
    Version = "2012-10-17"
    Statement = [
      {
        Action = "sts:AssumeRole"
        Effect = "Allow"
        Sid    = ""
        Principal = {
          AWS: data.aws_caller_identity.current.user_id
        }
      },
    ]
  })
 }
 resource "aws_iam_policy" "valid" {
  name = "${random_id.prefix.dec}-valid"
  tags = local.tags
  policy = <<EOT
 {
  "Version": "2012-10-17",
  "Statement": [
    {
      "Action": [
        "s3:PutObject",
        "s3:GetObject",
        "s3:GetObjectAttributes"
      ],
      "Effect": "Allow",
      "Resource": "${aws_s3_bucket.test.arn}*"
    }
  ]
 }
 EOT
 }
 resource "aws_iam_role_policy_attachment" "valid" {
  role       = aws_iam_role.valid.name
  policy_arn = aws_iam_policy.valid.arn
 }
 resource "aws_iam_role" "missing_put_obj" {
  name = "${random_id.prefix.dec}-missing-put-obj"
  tags = local.tags
  assume_role_policy = jsonencode({
    Version = "2012-10-17"
    Statement = [
      {
        Action = "sts:AssumeRole"
        Effect = "Allow"
        Sid    = ""
        Principal = {
          AWS: data.aws_caller_identity.current.user_id
        }
      },
    ]
  })
 }
 resource "aws_iam_policy" "missing_put_obj" {
  name = "${random_id.prefix.dec}-missing-put-obj"
  tags = local.tags
  policy = <<EOT
 {
  "Version": "2012-10-17",
  "Statement": [
    {
      "Action": [
        "s3:GetObject",
        "s3:GetObjectAttributes"
      ],
      "Effect": "Allow",
      "Resource": "${aws_s3_bucket.test.arn}*"
    }
  ]
 }
 EOT
 }
 resource "aws_iam_role_policy_attachment" "missing_put_obj" {
  role       = aws_iam_role.missing_put_obj.name
  policy_arn = aws_iam_policy.missing_put_obj.arn
 }
 resource "aws_iam_role" "missing_get_obj" {
  name = "${random_id.prefix.dec}-missing-get-obj"
  tags = local.tags
  assume_role_policy = jsonencode({
    Version = "2012-10-17"
    Statement = [
      {
        Action = "sts:AssumeRole"
        Effect = "Allow"
        Sid    = ""
        Principal = {
          AWS: data.aws_caller_identity.current.user_id
        }
      },
    ]
  })
 }
 resource "aws_iam_policy" "missing_get_obj" {
  name = "${random_id.prefix.dec}-missing-get-obj"
  tags = local.tags
  policy = <<EOT
 {
  "Version": "2012-10-17",
  "Statement": [
    {
      "Action": [
        "s3:PutObject",
        "s3:GetObjectAttributes"
      ],
      "Effect": "Allow",
      "Resource": "${aws_s3_bucket.test.arn}*"
    }
  ]
 }
 EOT
 }
 resource "aws_iam_role_policy_attachment" "missing_get_obj" {
  role       = aws_iam_role.missing_get_obj.name
  policy_arn = aws_iam_policy.missing_get_obj.arn
 }
 # Static Credential Testing
 resource "random_id" "user_name" {
  count       = var.iam_user_count
  prefix      = random_id.prefix.dec
  byte_length = 4
 }
 resource "aws_iam_user" "test" {
  count         = var.iam_user_count
  name          = random_id.user_name[count.index].dec
  force_destroy = true
  tags          = local.tags
 }
 resource "aws_iam_access_key" "test" {
  count = var.iam_user_count
  user  = aws_iam_user.test[count.index].name
 }
 resource "aws_iam_user_policy_attachment" "test_s3" {
  count      = var.iam_user_count
  user       = aws_iam_user.test[count.index].name
  policy_arn = aws_iam_policy.valid.arn
 }
 resource "aws_iam_policy" "credentials" {
  count = var.iam_user_count
  name  = aws_iam_user.test[count.index].name
  tags  = local.tags
  policy = <<EOF
 {
  "Version": "2012-10-17",
  "Statement": [
    {
      "Action": [
        "iam:DeleteAccessKey",
        "iam:GetUser",
        "iam:CreateAccessKey"
      ],
      "Effect": "Allow",
      "Resource": "${aws_iam_user.test[count.index].arn}"
    }
  ]
 }
 EOF
 }
 resource "aws_iam_user_policy_attachment" "test_credentials" {
  count      = var.iam_user_count
  user       = aws_iam_user.test[count.index].name
  policy_arn = aws_iam_policy.credentials[count.index].arn
 }
 # Edge case for missing GetObject permission
 resource "random_id" "missing_get_obj" {
  prefix      = random_id.prefix.dec
  byte_length = 4
 }
 resource "aws_iam_user" "missing_get_obj" {
  name          = random_id.missing_get_obj.dec
  force_destroy = true
  tags          = local.tags
 }
 resource "aws_iam_access_key" "missing_get_obj" {
  user  = aws_iam_user.missing_get_obj.name
 }
 resource "aws_iam_user_policy_attachment" "missing_get_obj" {
  user       = aws_iam_user.missing_get_obj.name
  policy_arn = aws_iam_policy.missing_get_obj.arn
 }
 # Edge case for missing PutObject permission
 resource "random_id" "missing_put_obj" {
  prefix      = random_id.prefix.dec
  byte_length = 4
 }
 resource "aws_iam_user" "missing_put_obj" {
  name          = random_id.missing_put_obj.dec
  force_destroy = true
  tags          = local.tags
 }
 resource "aws_iam_access_key" "missing_put_obj" {
  user  = aws_iam_user.missing_put_obj.name
 }
 resource "aws_iam_user_policy_attachment" "missing_put_obj" {
  user       = aws_iam_user.missing_put_obj.name
  policy_arn = aws_iam_policy.missing_put_obj.arn
 }
@@ -1,11 +0,0 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 terraform {
  required_providers {
    aws = {
      source  = "hashicorp/aws"
      version = "~> 3.0"
    }
  }
 }
@@ -1,56 +0,0 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 output "bucket_name" {
  value = aws_s3_bucket.test.id
 }
 output "valid_policy_arn" {
    value = aws_iam_role.valid.arn
 }
 output "missing_put_obj_policy_arn" {
    value = aws_iam_role.missing_put_obj.arn
 }
 output "missing_put_get_policy_arn" {
    value = aws_iam_role.missing_get_obj.arn
 }
 output "iam_user_names" {
  value = aws_iam_user.test.*.name
 }
 output "iam_user_arns" {
  value = aws_iam_user.test.*.arn
 }
 output "iam_access_key_ids" {
  value     = aws_iam_access_key.test.*.id
  sensitive = true
 }
 output "iam_secret_access_keys" {
  value     = aws_iam_access_key.test.*.secret
  sensitive = true
 }
 output "iam_access_key_missing_put_obj" {
  value     = aws_iam_access_key.missing_put_obj.id
  sensitive = true
 }
 output "iam_secret_access_key_missing_put_obj" {
  value     = aws_iam_access_key.missing_put_obj.secret
  sensitive = true
 }
 output "iam_access_key_missing_get_obj" {
  value     = aws_iam_access_key.missing_get_obj.id
  sensitive = true
 }
 output "iam_secret_access_key_missing_get_obj" {
  value     = aws_iam_access_key.missing_get_obj.secret
  sensitive = true
 }
@@ -1,9 +0,0 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 resource "aws_s3_bucket" "test" {
  bucket        = random_id.prefix.dec
  force_destroy = true
  acl           = "private"
  tags          = local.tags
 }
@@ -1 +0,0 @@
 HELLO_WORLD!
@@ -1,20 +0,0 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 data "aws_caller_identity" "current" {}
 resource "random_id" "prefix" {
  prefix      = "storage-e2e-test"
  byte_length = 4
 }
 variable "iam_user_count" {
  default = 6
 }
 locals {
  tags = {
    user_id = split(":", data.aws_caller_identity.current.user_id)[1]
    repo    = "boundary-plugin-aws" 
  }
 }
@@ -4,26 +4,15 @@
 package testing
 import (
 	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"os/exec"
 	"sync"
 	"testing"
 	"time"
 	"github.com/aws/smithy-go"
 	"github.com/hashicorp/boundary-plugin-aws/internal/credential"
 	"github.com/hashicorp/boundary-plugin-aws/internal/values"
 	"github.com/hashicorp/go-secure-stdlib/awsutil/v2"
 	tfjson "github.com/hashicorp/terraform-json"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 const expectedIamUserCount = 6
 // TestTerraformer is an object representing the lifecycle of a
 // particular Terraform project.
 //
@@ -275,204 +264,3 @@ func (t *TestTerraformer) showJson() ([]byte, error) {
 	return output, nil
 }
 func requireCredentialsInvalid(t *testing.T, accessKeyId, secretAccessKey string) {
 	t.Helper()
 	require := require.New(t)
 	c, err := awsutil.NewCredentialsConfig(
 		awsutil.WithAccessKey(accessKeyId),
 		awsutil.WithSecretKey(secretAccessKey),
 	)
 	require.NoError(err)
 	// We need to wait for invalidation as while awsutil waits for
 	// credential creation, deletion of the old credentials returns
 	// immediately.
 	timeoutCtx, cancel := context.WithTimeout(context.Background(), time.Second*30)
 	defer cancel()
 waitErr:
 	for {
 		_, err = c.GetCallerIdentity(context.Background())
 		if err != nil {
 			break
 		}
 		select {
 		case <-time.After(time.Second):
 			// pass
 		case <-timeoutCtx.Done():
 			break waitErr
 		}
 	}
 	require.NotNil(err)
 	var ae smithy.APIError
 	require.True(errors.As(err, &ae))
 	require.Equal("InvalidClientTokenId", ae.ErrorCode())
 }
 func requireCredentialsValid(t *testing.T, accessKeyId, secretAccessKey string) {
 	t.Helper()
 	require := require.New(t)
 	c, err := awsutil.NewCredentialsConfig(
 		awsutil.WithAccessKey(accessKeyId),
 		awsutil.WithSecretKey(secretAccessKey),
 	)
 	require.NoError(err)
 	_, err = c.GetCallerIdentity(context.Background())
 	require.NoError(err)
 }
 func validatePersistedSecrets(t *testing.T, persistedSecrets *structpb.Struct, accessKeyId, secretAccessKey string, rotate bool) (string, string) {
 	t.Helper()
 	require := require.New(t)
 	require.NotNil(persistedSecrets)
 	persistedAccessKeyId, err := values.GetStringValue(persistedSecrets, credential.ConstAccessKeyId, true)
 	require.NoError(err)
 	require.NotZero(persistedAccessKeyId)
 	if rotate {
 		require.NotEqual(accessKeyId, persistedAccessKeyId)
 	} else {
 		require.Equal(accessKeyId, persistedAccessKeyId)
 	}
 	persistedSecretAccessKey, err := values.GetStringValue(persistedSecrets, credential.ConstSecretAccessKey, true)
 	require.NoError(err)
 	require.NotZero(persistedSecretAccessKey)
 	if rotate {
 		require.NotEqual(secretAccessKey, persistedSecretAccessKey)
 	} else {
 		require.Equal(secretAccessKey, persistedSecretAccessKey)
 	}
 	persistedCredsLastRotatedTime, err := values.GetTimeValue(persistedSecrets, credential.ConstCredsLastRotatedTime)
 	require.NoError(err)
 	if rotate {
 		require.NotZero(persistedCredsLastRotatedTime)
 		requireCredentialsInvalid(t, accessKeyId, secretAccessKey)
 	} else {
 		require.Zero(persistedCredsLastRotatedTime)
 	}
 	return persistedAccessKeyId, persistedSecretAccessKey
 }
 func validateUpdateSecrets(
 	t *testing.T, persistedSecrets *structpb.Struct, currentCredsLastRotatedTime time.Time,
 	currentAccessKeyId, currentSecretAccessKey, newAccessKeyId, newSecretAccessKey string,
 	rotated, rotate bool) (string, string) {
 	t.Helper()
 	require := require.New(t)
 	// Complex checks based on the scenarios.
 	persistedAccessKeyId, err := values.GetStringValue(persistedSecrets, credential.ConstAccessKeyId, true)
 	require.NoError(err)
 	require.NotZero(persistedAccessKeyId)
 	persistedSecretAccessKey, err := values.GetStringValue(persistedSecrets, credential.ConstSecretAccessKey, true)
 	require.NoError(err)
 	require.NotZero(persistedSecretAccessKey)
 	persistedCredsLastRotatedTime, err := values.GetTimeValue(persistedSecrets, credential.ConstCredsLastRotatedTime)
 	require.NoError(err)
 	// Our test scenarios are complex due the multi-dimensional nature
 	// of criteria, so we lay them out in a switch below.
 	switch {
 	case newAccessKeyId != "" && rotated && rotate:
 		// The new access key ID was provided, we had previously rotated
 		// the credentials before, and the new credential set is to be
 		// rotated as well. In this case, the old credentials should have
 		// been deleted, and the new credentials should have been rotated,
 		// hence, should not match the new credentials initially
 		// provided. Rotation time should be non-zero and updated.
 		requireCredentialsInvalid(t, currentAccessKeyId, currentSecretAccessKey)
 		require.NotEqual(persistedAccessKeyId, newAccessKeyId)
 		require.NotEqual(persistedSecretAccessKey, newSecretAccessKey)
 		require.NotZero(persistedCredsLastRotatedTime)
 		require.True(persistedCredsLastRotatedTime.After(currentCredsLastRotatedTime))
 	case newAccessKeyId != "" && rotated && !rotate:
 		// The new access key ID was provided, we had previously rotated
 		// the credentials before, and the new credential is *not*
 		// rotated. In this case, the old credentials should have
 		// been deleted, But the new credentials should have not been
 		// rotated, and hence should be the same. Rotation time should be
 		// zero.
 		requireCredentialsInvalid(t, currentAccessKeyId, currentSecretAccessKey)
 		require.Equal(persistedAccessKeyId, newAccessKeyId)
 		require.Equal(persistedSecretAccessKey, newSecretAccessKey)
 		require.Zero(persistedCredsLastRotatedTime)
 	case newAccessKeyId != "" && !rotated && rotate:
 		// The new access key ID was provided, we *have not* previously
 		// rotated the credentials, and the new credential set is to be
 		// rotated. In this case, the old credentials should have been
 		// left alone, and the new credentials should have been rotated,
 		// hence, should not match the new credentials initially
 		// provided. Rotation time should be non-zero, but updated.
 		requireCredentialsValid(t, currentAccessKeyId, currentSecretAccessKey)
 		require.NotEqual(persistedAccessKeyId, newAccessKeyId)
 		require.NotEqual(persistedSecretAccessKey, newSecretAccessKey)
 		require.NotZero(persistedCredsLastRotatedTime)
 		require.True(persistedCredsLastRotatedTime.After(currentCredsLastRotatedTime))
 	case newAccessKeyId != "" && !rotated && !rotate:
 		// The new access key ID was provided, but we have not rotated
 		// the credentials previously and we still don't plan on rotating
 		// them. In this case, the old credentials should still be valid,
 		// and the persisted ones should match the new ones provided.
 		// Rotation time should be zero.
 		requireCredentialsValid(t, currentAccessKeyId, currentSecretAccessKey)
 		require.Equal(persistedAccessKeyId, newAccessKeyId)
 		require.Equal(persistedSecretAccessKey, newSecretAccessKey)
 		require.Zero(persistedCredsLastRotatedTime)
 	case newAccessKeyId == "" && rotated && rotate:
 		// No new credentials have been provided, but we have previously
 		// rotated and are still rotating credentials. This is a no-op.
 		// Existing credentials should still be valid and match the ones
 		// persisted to state. Rotation time should be identical since
 		// no new rotation occurred.
 		requireCredentialsValid(t, currentAccessKeyId, currentSecretAccessKey)
 		require.Equal(persistedAccessKeyId, currentAccessKeyId)
 		require.Equal(persistedSecretAccessKey, currentSecretAccessKey)
 		require.NotZero(persistedCredsLastRotatedTime)
 		require.True(currentCredsLastRotatedTime.Equal(persistedCredsLastRotatedTime))
 	case newAccessKeyId == "" && rotated && !rotate:
 		// No new credentials have been provided, and we have previously
 		// rotated the credentials. This is actually an error, but we
 		// don't test it here; it's covered in unit testing (see
 		// plugin_test.go).
 		require.FailNow("testing rotated-to-not-rotated scenario not implemented by this helper")
 	case newAccessKeyId == "" && !rotated && rotate:
 		// No new credentials have been provided, and while we did not
 		// rotate before, we want to switch to rotation. In this case,
 		// the existing persisted credentials should have been rotated,
 		// with a new non-zero timestamp.
 		requireCredentialsInvalid(t, currentAccessKeyId, currentSecretAccessKey)
 		require.NotEqual(persistedAccessKeyId, currentAccessKeyId)
 		require.NotEqual(persistedSecretAccessKey, currentSecretAccessKey)
 		require.NotZero(persistedCredsLastRotatedTime)
 	case newAccessKeyId == "" && !rotated && !rotate:
 		// No new credentials have been provided and we have not, nor do
 		// not, plan on rotating the credentials. This is a no-op.
 		// Existing credentials should still be valid and match the ones
 		// persisted to state. Rotation time should remain at zero.
 		requireCredentialsValid(t, currentAccessKeyId, currentSecretAccessKey)
 		require.Equal(persistedAccessKeyId, currentAccessKeyId)
 		require.Equal(persistedSecretAccessKey, currentSecretAccessKey)
 		require.Zero(persistedCredsLastRotatedTime)
 	default:
 		// Scenario was reached that was not covered by this function.
 		require.FailNow("unknown test scenario")
 	}
 	return persistedAccessKeyId, persistedSecretAccessKey
 }
Author	SHA1	Message	Date
Danielle Miu	b22c64aa64	update sdk version, update replaced version	2023-07-05 15:46:26 -04:00
Danielle Miu	009d2cd570	pull and use new ErrorDetail protodef	2023-07-05 13:09:47 -04:00