Skip to content

Commit

Permalink
chore: CS
Browse files Browse the repository at this point in the history
  • Loading branch information
Baachi committed Dec 11, 2023
1 parent eb82172 commit ca733e1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ func TestAccECRPullThroughCacheRuleDataSource_basic(t *testing.T) {

func TestAccECRPullThroughCacheRuleDataSource_credential(t *testing.T) {
ctx := acctest.Context(t)
upstreamRegistryUrl := "registry-1.docker.io"
dataSource := "data.aws_ecr_pull_through_cache_rule.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -43,7 +44,7 @@ func TestAccECRPullThroughCacheRuleDataSource_credential(t *testing.T) {
{
Config: testAccPullThroughCacheRuleDataSourceConfig_credentialArn(),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(dataSource, "upstream_registry_url", "registry-1.docker.io"),
resource.TestCheckResourceAttr(dataSource, "upstream_registry_url", upstreamRegistryUrl),
acctest.CheckResourceAttrAccountID(dataSource, "registry_id"),
resource.TestCheckResourceAttrSet(dataSource, "credential_arn"),
),
Expand All @@ -68,19 +69,19 @@ data "aws_ecr_pull_through_cache_rule" "test" {
func testAccPullThroughCacheRuleDataSourceConfig_credentialArn() string {
return `
resource "aws_secretsmanager_secret" "test" {
name = "ecr-pullthroughcache/docker-hub"
name = "ecr-pullthroughcache/docker-hub"
recovery_window_in_days = 0
}
resource "aws_secretsmanager_secret_version" "test" {
secret_id = aws_secretsmanager_secret.test.id
secret_id = aws_secretsmanager_secret.test.id
secret_string = "test"
}
resource "aws_ecr_pull_through_cache_rule" "test" {
ecr_repository_prefix = "ecr-public"
upstream_registry_url = "registry-1.docker.io"
credential_arn = aws_secretsmanager_secret.test.arn
credential_arn = aws_secretsmanager_secret.test.arn
}
data "aws_ecr_pull_through_cache_rule" "test" {
Expand Down
14 changes: 8 additions & 6 deletions internal/service/ecr/pull_through_cache_rule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
func TestAccECRPullThroughCacheRule_basic(t *testing.T) {
ctx := acctest.Context(t)
repositoryPrefix := "tf-test-" + sdkacctest.RandString(8)
upstreamRegistryUrl := "public.ecr.aws"
resourceName := "aws_ecr_pull_through_cache_rule.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -36,7 +37,7 @@ func TestAccECRPullThroughCacheRule_basic(t *testing.T) {
testAccCheckPullThroughCacheRuleExists(ctx, resourceName),
resource.TestCheckResourceAttr(resourceName, "ecr_repository_prefix", repositoryPrefix),
testAccCheckPullThroughCacheRuleRegistryID(resourceName),
resource.TestCheckResourceAttr(resourceName, "upstream_registry_url", "public.ecr.aws"),
resource.TestCheckResourceAttr(resourceName, "upstream_registry_url", upstreamRegistryUrl),
),
},
{
Expand All @@ -51,6 +52,7 @@ func TestAccECRPullThroughCacheRule_basic(t *testing.T) {
func TestAccECRPullThroughCacheRule_credentialArn(t *testing.T) {
ctx := acctest.Context(t)
repositoryPrefix := "tf-test-" + sdkacctest.RandString(8)
upstreamRegistryUrl := "registry-1.docker.io"
resourceName := "aws_ecr_pull_through_cache_rule.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -65,7 +67,7 @@ func TestAccECRPullThroughCacheRule_credentialArn(t *testing.T) {
testAccCheckPullThroughCacheRuleExists(ctx, resourceName),
resource.TestCheckResourceAttr(resourceName, "ecr_repository_prefix", repositoryPrefix),
testAccCheckPullThroughCacheRuleRegistryID(resourceName),
resource.TestCheckResourceAttr(resourceName, "upstream_registry_url", "registry-1.docker.io"),
resource.TestCheckResourceAttr(resourceName, "upstream_registry_url", upstreamRegistryUrl),
resource.TestCheckResourceAttrSet(resourceName, "credential_arn"),
),
},
Expand Down Expand Up @@ -190,20 +192,20 @@ resource "aws_ecr_pull_through_cache_rule" "test" {
func testAccPullThroughCacheRuleConfig_credentialArn(repositoryPrefix string, credentialArn string) string {
return fmt.Sprintf(`
resource "aws_secretsmanager_secret" "test" {
name = "ecr-pullthroughcache/%[2]s"
name = "ecr-pullthroughcache/%[2]s"
recovery_window_in_days = 0
}
resource "aws_secretsmanager_secret_version" "test" {
secret_id = aws_secretsmanager_secret.test.id
secret_id = aws_secretsmanager_secret.test.id
secret_string = "test"
}
resource "aws_ecr_pull_through_cache_rule" "test" {
ecr_repository_prefix = %[1]q
upstream_registry_url = "registry-1.docker.io"
depends_on = [aws_secretsmanager_secret.test]
credential_arn = aws_secretsmanager_secret.test.arn
depends_on = [aws_secretsmanager_secret.test]
credential_arn = aws_secretsmanager_secret.test.arn
}
`, repositoryPrefix, credentialArn)
}
Expand Down

0 comments on commit ca733e1

Please sign in to comment.