From 9dbb5fcb9caa5f5659b4f4bfa3ac78362788b25e Mon Sep 17 00:00:00 2001 From: Denis O Date: Tue, 20 Jan 2026 11:27:14 +0200 Subject: [PATCH] Error checking simplifications (#3694) Signed-off-by: Denis O --- internal/command/e2etest/provider_oci_mirrors_test.go | 3 --- internal/plans/planfile/tfplan_test.go | 4 ---- internal/states/statefile/version3_upgrade.go | 6 +++--- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/internal/command/e2etest/provider_oci_mirrors_test.go b/internal/command/e2etest/provider_oci_mirrors_test.go index 5fceee065b..ec08fb74f1 100644 --- a/internal/command/e2etest/provider_oci_mirrors_test.go +++ b/internal/command/e2etest/provider_oci_mirrors_test.go @@ -91,9 +91,6 @@ func TestProviderOCIMirrors(t *testing.T) { } `, registryAddr) t.Logf("cli config:\n%s", cliConfigSrc) - if err != nil { - t.Fatalf("failed to marshal temporary CLI configuration: %s", err) - } err = os.WriteFile(cliConfigFile, []byte(cliConfigSrc), os.ModePerm) if err != nil { t.Fatalf("failed to create temporary CLI configuration file: %s", err) diff --git a/internal/plans/planfile/tfplan_test.go b/internal/plans/planfile/tfplan_test.go index 987780723d..9ae7ce0eef 100644 --- a/internal/plans/planfile/tfplan_test.go +++ b/internal/plans/planfile/tfplan_test.go @@ -585,9 +585,5 @@ func TestTFPlanChangeReasonsEncoding(t *testing.T) { if err != nil { t.Fatal(err) } - - if err != nil { - t.Fatal("should've succeeded, got error: ", err) - } } } diff --git a/internal/states/statefile/version3_upgrade.go b/internal/states/statefile/version3_upgrade.go index 8757a74460..6ebd99c85e 100644 --- a/internal/states/statefile/version3_upgrade.go +++ b/internal/states/statefile/version3_upgrade.go @@ -329,10 +329,10 @@ func upgradeInstanceObjectV3ToV4(_ *resourceStateV2, isOld *instanceStateV2, ins instKeyRaw = int(tk) case addrs.StringKey: instKeyRaw = string(tk) + case nil: + // NoKey, so instKeyRaw remains nil default: - if instKeyRaw != nil { - return nil, fmt.Errorf("unsupported instance key: %#v", instKey) - } + return nil, fmt.Errorf("unsupported instance key: %#v", instKey) } var attributes map[string]string