Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Resource: aws_cloudfront_key_value_store #35663

Merged
merged 17 commits into from
Feb 13, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions internal/service/cloudfront/key_value_store.go
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ func (r *keyValueStoreResource) Create(ctx context.Context, request resource.Cre
}

name := aws.ToString(input.Name)
outputCKVS, err := conn.CreateKeyValueStore(ctx, input)
_, err := conn.CreateKeyValueStore(ctx, input)

if err != nil {
response.Diagnostics.AddError(fmt.Sprintf("creating CloudFront Key Value Store (%s)", name), err.Error())
@@ -128,10 +128,10 @@ func (r *keyValueStoreResource) Create(ctx context.Context, request resource.Cre
return
}

data.ETag = fwflex.StringToFramework(ctx, outputCKVS.ETag)
data.ETag = fwflex.StringToFramework(ctx, outputDKVS.ETag)
data.setID() // API response has a field named 'Id' which isn't the resource's ID.

response.Diagnostics.Append(response.State.Set(ctx, data)...)
response.Diagnostics.Append(response.State.Set(ctx, &data)...)
}

func (r *keyValueStoreResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) {
@@ -176,7 +176,11 @@ func (r *keyValueStoreResource) Read(ctx context.Context, request resource.ReadR
}

func (r *keyValueStoreResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) {
var new keyValueStoreResourceModel
var old, new keyValueStoreResourceModel
response.Diagnostics.Append(request.State.Get(ctx, &old)...)
if response.Diagnostics.HasError() {
return
}
response.Diagnostics.Append(request.Plan.Get(ctx, &new)...)
if response.Diagnostics.HasError() {
return
@@ -190,7 +194,7 @@ func (r *keyValueStoreResource) Update(ctx context.Context, request resource.Upd
return
}

input.IfMatch = fwflex.StringFromFramework(ctx, new.ETag)
input.IfMatch = fwflex.StringFromFramework(ctx, old.ETag)

output, err := conn.UpdateKeyValueStore(ctx, input)

16 changes: 7 additions & 9 deletions internal/service/cloudfront/key_value_store_test.go
Original file line number Diff line number Diff line change
@@ -39,17 +39,16 @@ func TestAccCloudFrontKeyValueStore_basic(t *testing.T) {
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckKeyValueStoreExists(ctx, resourceName, &keyvaluestore),
resource.TestCheckResourceAttrSet(resourceName, "arn"),
resource.TestCheckResourceAttr(resourceName, "comment", ""),
resource.TestCheckNoResourceAttr(resourceName, "comment"),
resource.TestCheckResourceAttrSet(resourceName, "etag"),
resource.TestCheckResourceAttrSet(resourceName, "last_modified_time"),
resource.TestCheckResourceAttr(resourceName, "name", rName),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"last_modified_time"},
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
@@ -104,10 +103,9 @@ func TestAccCloudFrontKeyValueStore_comment(t *testing.T) {
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"last_modified_time"},
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccKeyValueStoreConfig_comment(rName, comment2),