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

fix: user error handling #2486

Merged
merged 5 commits into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
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
5 changes: 2 additions & 3 deletions pkg/resources/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,8 @@ func ReadUser(d *schema.ResourceData, meta interface{}) error {
ctx := context.Background()
user, err := client.Users.Describe(ctx, objectIdentifier)
if err != nil {
if errors.Is(err, sql.ErrNoRows) {
// If not found, mark resource to be removed from state file during apply or refresh
log.Printf("[DEBUG] user (%s) not found or we are not authorized.Err:\n%s", d.Id(), err.Error())
if errors.Is(err, sdk.ErrObjectNotExistOrAuthorized) {
log.Printf("[DEBUG] user (%s) not found or we are not authorized. Err: %s", d.Id(), err)
d.SetId("")
return nil
}
Expand Down
68 changes: 68 additions & 0 deletions pkg/resources/user_acceptance_test.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
package resources_test

import (
"context"
"errors"
"fmt"
"github.com/hashicorp/terraform-plugin-testing/plancheck"
sfc-gh-asawicki marked this conversation as resolved.
Show resolved Hide resolved
"log"
"strconv"
"strings"
"testing"

"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
"github.com/hashicorp/terraform-plugin-testing/tfversion"

acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/testhelpers"
"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
Expand Down Expand Up @@ -112,6 +118,68 @@ func TestAcc_User(t *testing.T) {
})
}

// proves https://github.com/Snowflake-Labs/terraform-provider-snowflake/issues/2481 has been fixed
func TestAcc_User_RemovedOutsideOfTerraform(t *testing.T) {
userName := sdk.NewAccountObjectIdentifier(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
config := fmt.Sprintf(`
resource "snowflake_user" "test" {
name = "%s"
}
`, userName.Name())

resource.Test(t, resource.TestCase{
ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
PreCheck: func() { acc.TestAccPreCheck(t) },
TerraformVersionChecks: []tfversion.TerraformVersionCheck{
tfversion.RequireAbove(tfversion.Version1_5_0),
},
Steps: []resource.TestStep{
{
Config: config,
ConfigPlanChecks: resource.ConfigPlanChecks{
PostApplyPostRefresh: []plancheck.PlanCheck{
plancheck.ExpectEmptyPlan(),
},
},
},
{
PreConfig: removeUserOutsideOfTerraform(t, userName),
Config: config,
sfc-gh-asawicki marked this conversation as resolved.
Show resolved Hide resolved
ConfigPlanChecks: resource.ConfigPlanChecks{
PreApply: []plancheck.PlanCheck{
plancheck.ExpectNonEmptyPlan(),
},
PostApplyPostRefresh: []plancheck.PlanCheck{
plancheck.ExpectEmptyPlan(),
},
},
Check: resource.ComposeTestCheckFunc(
func(state *terraform.State) error {
if len(state.RootModule().Resources) != 1 {
return errors.New("user should be created again and present in the state")
}
return nil
},
),
},
},
})
}

func removeUserOutsideOfTerraform(t *testing.T, name sdk.AccountObjectIdentifier) func() {
t.Helper()
return func() {
client, err := sdk.NewDefaultClient()
if err != nil {
t.Fatal(err)
}
ctx := context.Background()
if err := client.Users.Drop(ctx, name); err != nil {
t.Fatalf("failed to drop user: %s", name.FullyQualifiedName())
}
}
}

func uConfig(prefix, key1, key2 string) string {
s := `
resource "snowflake_user" "w" {
Expand Down
Loading