Skip to content

Commit 7dba0c6

Browse files
committed
Revert "b-aws_kinesisanalyticsv2_application-43003 :: Core snapshot restore state fix"
This reverts commit e0582c0.
1 parent 1c3432f commit 7dba0c6

File tree

1 file changed

+5
-17
lines changed

1 file changed

+5
-17
lines changed

internal/service/kinesisanalyticsv2/application.go

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,9 @@ func resourceApplication() *schema.Resource {
284284
Elem: &schema.Resource{
285285
Schema: map[string]*schema.Schema{
286286
"application_restore_type": {
287-
// NOTE: Set as required in Cloudformation: https://docs.aws.amazon.com/AWSCloudFormation/latest/TemplateReference/aws-properties-kinesisanalyticsv2-application-applicationrestoreconfiguration.html
288287
Type: schema.TypeString,
289-
Required: true,
288+
Optional: true,
289+
Computed: true,
290290
ValidateDiagFunc: enum.Validate[awstypes.ApplicationRestoreType](),
291291
},
292292
"snapshot_name": {
@@ -1283,29 +1283,17 @@ func resourceApplicationUpdate(ctx context.Context, d *schema.ResourceData, meta
12831283
}
12841284
}
12851285

1286-
if runConfig := d.Get("application_configuration.0.run_configuration").([]any); len(runConfig) > 0 {
1286+
if d.HasChange("application_configuration.0.run_configuration") {
12871287
application, err := findApplicationDetailByName(ctx, conn, applicationName)
12881288

12891289
if err != nil {
12901290
return sdkdiag.AppendErrorf(diags, "reading Kinesis Analytics v2 Application (%s): %s", applicationName, err)
12911291
}
12921292

12931293
if actual, expected := application.ApplicationStatus, awstypes.ApplicationStatusRunning; actual == expected {
1294-
var needsRunConfigUpdate bool
1295-
// NOTE: Always apply application_restore_configuration if set (prevents dangerous defaults)
1296-
if restoreConfig := d.Get("application_configuration.0.run_configuration.0.application_restore_configuration").([]any); len(restoreConfig) > 0 && restoreConfig[0] != nil {
1297-
needsRunConfigUpdate = true
1298-
}
1294+
input.RunConfigurationUpdate = expandRunConfigurationUpdate(d.Get("application_configuration.0.run_configuration").([]any))
12991295

1300-
// Catch any other run config changes
1301-
if d.HasChange("application_configuration.0.run_configuration") {
1302-
needsRunConfigUpdate = true
1303-
}
1304-
1305-
if needsRunConfigUpdate {
1306-
input.RunConfigurationUpdate = expandRunConfigurationUpdate(d.Get("application_configuration.0.run_configuration").([]any))
1307-
updateApplication = true
1308-
}
1296+
updateApplication = true
13091297
}
13101298
}
13111299

0 commit comments

Comments
 (0)