diff --git a/internal/provider/resource_account_ldap_test.go b/internal/provider/resource_account_ldap_test.go index bb6cd3f8..95a1f17f 100644 --- a/internal/provider/resource_account_ldap_test.go +++ b/internal/provider/resource_account_ldap_test.go @@ -67,7 +67,7 @@ func TestAccLdapAccount(t *testing.T) { resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckAccountResourceDestroy(t, provider), + CheckDestroy: testAccCheckAccountResourceDestroy(t, provider, baseAccountType), Steps: []resource.TestStep{ { // create diff --git a/internal/provider/resource_account_password_test.go b/internal/provider/resource_account_password_test.go index d1b64b4f..dd60263a 100644 --- a/internal/provider/resource_account_password_test.go +++ b/internal/provider/resource_account_password_test.go @@ -4,17 +4,12 @@ package provider import ( - "context" "fmt" - "net/http" "testing" - "github.com/hashicorp/boundary/api" - "github.com/hashicorp/boundary/api/accounts" "github.com/hashicorp/boundary/testing/controller" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) const ( @@ -69,7 +64,7 @@ func TestAccAccount(t *testing.T) { resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckAccountPasswordResourceDestroy(t, provider), + CheckDestroy: testAccCheckAccountResourceDestroy(t, provider, passwordAccountType), Steps: []resource.TestStep{ { // create @@ -80,7 +75,7 @@ func TestAccAccount(t *testing.T) { resource.TestCheckResourceAttr("boundary_account_password.foo", "type", "password"), resource.TestCheckResourceAttr("boundary_account_password.foo", "login_name", "foo"), resource.TestCheckResourceAttr("boundary_account_password.foo", "password", "foofoofoo"), - testAccCheckAccountPasswordResourceExists(provider, "boundary_account_password.foo"), + testAccCheckAccountResourceExists(provider, "boundary_account_password.foo"), ), }, importStep("boundary_account_password.foo", "password"), @@ -93,61 +88,10 @@ func TestAccAccount(t *testing.T) { resource.TestCheckResourceAttr("boundary_account_password.foo", "type", "password"), resource.TestCheckResourceAttr("boundary_account_password.foo", "login_name", "foo"), resource.TestCheckResourceAttr("boundary_account_password.foo", "password", "foofoofoo"), - testAccCheckAccountPasswordResourceExists(provider, "boundary_account_password.foo"), + testAccCheckAccountResourceExists(provider, "boundary_account_password.foo"), ), }, importStep("boundary_account_password.foo", "password"), }, }) } - -func testAccCheckAccountPasswordResourceExists(testProvider *schema.Provider, name string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] - if !ok { - return fmt.Errorf("Not found: %s", name) - } - - id := rs.Primary.ID - if id == "" { - return fmt.Errorf("No ID is set") - } - - md := testProvider.Meta().(*metaData) - - amClient := accounts.NewClient(md.client) - - if _, err := amClient.Read(context.Background(), id); err != nil { - return fmt.Errorf("Got an error when reading account %q: %v", id, err) - } - - return nil - } -} - -func testAccCheckAccountPasswordResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { - return func(s *terraform.State) error { - if testProvider.Meta() == nil { - t.Fatal("got nil provider metadata") - } - md := testProvider.Meta().(*metaData) - - for _, rs := range s.RootModule().Resources { - switch rs.Type { - case "boundary_account_password": - id := rs.Primary.ID - - amClient := accounts.NewClient(md.client) - - _, err := amClient.Read(context.Background(), id) - if apiErr := api.AsServerError(err); apiErr == nil || apiErr.Response().StatusCode() != http.StatusNotFound { - return fmt.Errorf("didn't get a 404 when reading destroyed account %q: %v", id, err) - } - - default: - continue - } - } - return nil - } -} diff --git a/internal/provider/resource_account_test.go b/internal/provider/resource_account_test.go index aa4a495a..48e2a09b 100644 --- a/internal/provider/resource_account_test.go +++ b/internal/provider/resource_account_test.go @@ -69,7 +69,7 @@ func TestAccAccountBase(t *testing.T) { resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckAccountResourceDestroy(t, provider), + CheckDestroy: testAccCheckAccountResourceDestroy(t, provider, baseAccountType), Steps: []resource.TestStep{ { // create @@ -125,7 +125,14 @@ func testAccCheckAccountResourceExists(testProvider *schema.Provider, name strin } } -func testAccCheckAccountResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { +type accountType string + +const ( + baseAccountType accountType = "boundary_account" + passwordAccountType accountType = "boundary_account_password" +) + +func testAccCheckAccountResourceDestroy(t *testing.T, testProvider *schema.Provider, typ accountType) resource.TestCheckFunc { return func(s *terraform.State) error { if testProvider.Meta() == nil { t.Fatal("got nil provider metadata") @@ -134,7 +141,7 @@ func testAccCheckAccountResourceDestroy(t *testing.T, testProvider *schema.Provi for _, rs := range s.RootModule().Resources { switch rs.Type { - case "boundary_account": + case string(typ): id := rs.Primary.ID amClient := accounts.NewClient(md.client) diff --git a/internal/provider/resource_auth_method_password_test.go b/internal/provider/resource_auth_method_password_test.go index a02b2082..592568de 100644 --- a/internal/provider/resource_auth_method_password_test.go +++ b/internal/provider/resource_auth_method_password_test.go @@ -4,17 +4,12 @@ package provider import ( - "context" "fmt" - "net/http" "testing" - "github.com/hashicorp/boundary/api" - "github.com/hashicorp/boundary/api/authmethods" "github.com/hashicorp/boundary/testing/controller" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) const ( @@ -50,7 +45,7 @@ func TestAccAuthMethodPassword(t *testing.T) { var provider *schema.Provider resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckAuthMethodResourceDestroy(t, provider, ldapAuthMethodType), + CheckDestroy: testAccCheckAuthMethodResourceDestroy(t, provider, passwordAuthMethodType), Steps: []resource.TestStep{ { // create @@ -77,62 +72,3 @@ func TestAccAuthMethodPassword(t *testing.T) { }, }) } - -func testAccCheckAuthMethodResourceExists(testProvider *schema.Provider, name string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] - if !ok { - return fmt.Errorf("Not found: %s", name) - } - - id := rs.Primary.ID - if id == "" { - return fmt.Errorf("No ID is set") - } - - md := testProvider.Meta().(*metaData) - - amClient := authmethods.NewClient(md.client) - - if _, err := amClient.Read(context.Background(), id); err != nil { - return fmt.Errorf("Got an error when reading auth method %q: %w", id, err) - } - - return nil - } -} - -type authMethodType string - -const ( - passwordAuthMethodType authMethodType = "boundary_auth_method_password" - ldapAuthMethodType authMethodType = "boundary_auth_method_ldap" - oidcAuthMethodType authMethodType = "boundary_auth_method_oidc" -) - -func testAccCheckAuthMethodResourceDestroy(t *testing.T, testProvider *schema.Provider, typ authMethodType) resource.TestCheckFunc { - return func(s *terraform.State) error { - if testProvider.Meta() == nil { - t.Fatal("got nil provider metadata") - } - md := testProvider.Meta().(*metaData) - - for _, rs := range s.RootModule().Resources { - switch rs.Type { - case string(typ): - id := rs.Primary.ID - - amClient := authmethods.NewClient(md.client) - - _, err := amClient.Read(context.Background(), id) - if apiErr := api.AsServerError(err); apiErr == nil || apiErr.Response().StatusCode() != http.StatusNotFound { - return fmt.Errorf("didn't get a 404 when reading destroyed auth method %q: %v", id, err) - } - - default: - continue - } - } - return nil - } -} diff --git a/internal/provider/resource_auth_method_test.go b/internal/provider/resource_auth_method_test.go index 8fe40feb..fb48bcfe 100644 --- a/internal/provider/resource_auth_method_test.go +++ b/internal/provider/resource_auth_method_test.go @@ -52,7 +52,7 @@ func TestAccBaseAuthMethodPassword(t *testing.T) { var provider *schema.Provider resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckAuthMethodResourceDestroy(t, provider, passwordAuthMethodType), + CheckDestroy: testAccCheckAuthMethodResourceDestroy(t, provider, baseAuthMethodType), Steps: []resource.TestStep{ { // create @@ -61,7 +61,7 @@ func TestAccBaseAuthMethodPassword(t *testing.T) { resource.TestCheckResourceAttr("boundary_auth_method.foo", "description", fooBaseAuthMethodDesc), resource.TestCheckResourceAttr("boundary_auth_method.foo", "name", "test"), resource.TestCheckResourceAttr("boundary_auth_method.foo", "type", "password"), - testAccCheckBaseAuthMethodResourceExists(provider, "boundary_auth_method.foo"), + testAccCheckAuthMethodResourceExists(provider, "boundary_auth_method.foo"), ), }, importStep("boundary_auth_method.foo"), @@ -73,7 +73,7 @@ func TestAccBaseAuthMethodPassword(t *testing.T) { resource.TestCheckResourceAttr("boundary_auth_method.foo", "description", fooBaseAuthMethodDescUpdate), resource.TestCheckResourceAttr("boundary_auth_method.foo", "name", "test"), resource.TestCheckResourceAttr("boundary_auth_method.foo", "type", "password"), - testAccCheckBaseAuthMethodResourceExists(provider, "boundary_auth_method.foo"), + testAccCheckAuthMethodResourceExists(provider, "boundary_auth_method.foo"), ), }, importStep("boundary_auth_method.foo"), @@ -81,7 +81,7 @@ func TestAccBaseAuthMethodPassword(t *testing.T) { }) } -func testAccCheckBaseAuthMethodResourceExists(testProvider *schema.Provider, name string) resource.TestCheckFunc { +func testAccCheckAuthMethodResourceExists(testProvider *schema.Provider, name string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] if !ok { @@ -105,7 +105,16 @@ func testAccCheckBaseAuthMethodResourceExists(testProvider *schema.Provider, nam } } -func testAccCheckBaseAuthMethodResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { +type authMethodType string + +const ( + baseAuthMethodType authMethodType = "boundary_auth_method" + passwordAuthMethodType authMethodType = "boundary_auth_method_password" + ldapAuthMethodType authMethodType = "boundary_auth_method_ldap" + oidcAuthMethodType authMethodType = "boundary_auth_method_oidc" +) + +func testAccCheckAuthMethodResourceDestroy(t *testing.T, testProvider *schema.Provider, typ authMethodType) resource.TestCheckFunc { return func(s *terraform.State) error { if testProvider.Meta() == nil { t.Fatal("got nil provider metadata") @@ -114,7 +123,7 @@ func testAccCheckBaseAuthMethodResourceDestroy(t *testing.T, testProvider *schem for _, rs := range s.RootModule().Resources { switch rs.Type { - case "boundary_auth_method": + case string(typ): id := rs.Primary.ID amClient := authmethods.NewClient(md.client) diff --git a/internal/provider/resource_credential_json_test.go b/internal/provider/resource_credential_json_test.go index ed5b3a6c..5f243095 100644 --- a/internal/provider/resource_credential_json_test.go +++ b/internal/provider/resource_credential_json_test.go @@ -70,7 +70,7 @@ func TestAccCredentialJson(t *testing.T) { var provider *schema.Provider resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckCredentialJsonResourceDestroy(t, provider), + CheckDestroy: testAccCheckCredentialResourceDestroy(t, provider, jsonCredentialType), Steps: []resource.TestStep{ { // create @@ -80,8 +80,8 @@ func TestAccCredentialJson(t *testing.T) { resource.TestCheckResourceAttr(jsonCredResc, DescriptionKey, jsonCredDesc), resource.TestCheckResourceAttr(jsonCredResc, credentialJsonObjectKey, `{"password":"password","username":"admin"}`), - testAccCheckCredentialJsonObjectHmac(provider), - testAccCheckCredentialJsonResourceExists(provider, jsonCredResc), + testAccCheckCredentialJsonObjectHmac(), + testAccCheckCredentialResourceExists(provider, jsonCredResc), ), }, importStep(jsonCredResc, credentialJsonObjectKey), @@ -93,8 +93,8 @@ func TestAccCredentialJson(t *testing.T) { resource.TestCheckResourceAttr(jsonCredResc, DescriptionKey, jsonCredDescUpdate), resource.TestCheckResourceAttr(jsonCredResc, credentialJsonObjectKey, `{"password":"password","username":"db-admin"}`), - testAccCheckCredentialJsonObjectHmac(provider), - testAccCheckCredentialJsonResourceExists(provider, jsonCredResc), + testAccCheckCredentialJsonObjectHmac(), + testAccCheckCredentialResourceExists(provider, jsonCredResc), ), }, importStep(jsonCredResc, credentialJsonObjectKey), @@ -114,32 +114,7 @@ func TestAccCredentialJson(t *testing.T) { }) } -func testAccCheckCredentialJsonResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { - return func(s *terraform.State) error { - if testProvider.Meta() == nil { - t.Fatal("got nil provider metadata") - } - md := testProvider.Meta().(*metaData) - - for _, rs := range s.RootModule().Resources { - switch rs.Type { - case "boundary_credential_json": - id := rs.Primary.ID - - c := credentials.NewClient(md.client) - _, err := c.Read(context.Background(), id) - if apiErr := api.AsServerError(err); apiErr == nil || apiErr.Response().StatusCode() != http.StatusNotFound { - return fmt.Errorf("didn't get a 404 when reading destroyed json credential %q: %v", id, err) - } - default: - continue - } - } - return nil - } -} - -func testAccCheckCredentialJsonResourceExists(testProvider *schema.Provider, name string) resource.TestCheckFunc { +func testAccCheckCredentialResourceExists(testProvider *schema.Provider, name string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] if !ok { @@ -162,7 +137,40 @@ func testAccCheckCredentialJsonResourceExists(testProvider *schema.Provider, nam } } -func testAccCheckCredentialJsonObjectHmac(testProvider *schema.Provider) resource.TestCheckFunc { +type credentialType string + +const ( + jsonCredentialType credentialType = "boundary_credential_json" + sshPrivateKeyCredentialType credentialType = "boundary_credential_ssh_private_key" + usernamePasswordCredentialType credentialType = "boundary_credential_username_password" +) + +func testAccCheckCredentialResourceDestroy(t *testing.T, testProvider *schema.Provider, typ credentialType) resource.TestCheckFunc { + return func(s *terraform.State) error { + if testProvider.Meta() == nil { + t.Fatal("got nil provider metadata") + } + md := testProvider.Meta().(*metaData) + + for _, rs := range s.RootModule().Resources { + switch rs.Type { + case string(typ): + id := rs.Primary.ID + + c := credentials.NewClient(md.client) + _, err := c.Read(context.Background(), id) + if apiErr := api.AsServerError(err); apiErr == nil || apiErr.Response().StatusCode() != http.StatusNotFound { + return fmt.Errorf("didn't get a 404 when reading destroyed credential %q: %v", id, err) + } + default: + continue + } + } + return nil + } +} + +func testAccCheckCredentialJsonObjectHmac() resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[jsonCredResc] if !ok { diff --git a/internal/provider/resource_credential_library_vault_ssh_certificate_test.go b/internal/provider/resource_credential_library_vault_ssh_certificate_test.go index 0882468e..c14db251 100644 --- a/internal/provider/resource_credential_library_vault_ssh_certificate_test.go +++ b/internal/provider/resource_credential_library_vault_ssh_certificate_test.go @@ -4,19 +4,14 @@ package provider import ( - "context" "fmt" - "net/http" "strconv" "testing" - "github.com/hashicorp/boundary/api" - "github.com/hashicorp/boundary/api/credentiallibraries" "github.com/hashicorp/boundary/testing/controller" "github.com/hashicorp/boundary/testing/vault" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) const ( @@ -39,7 +34,6 @@ resource "boundary_credential_library_vault_ssh_certificate" "example" { path = "%s" username = "%s" key_type = "ed25519" - }`, vaultSshCertCredLibName, vaultSshCertCredLibDesc, vaultSshCertCredLibPath, @@ -69,11 +63,9 @@ resource "boundary_credential_library_vault_ssh_certificate" "ext_co_example" { path = "%s" username = "%s" key_type = "ed25519" - extensions = { permit-pty = "" } - critical_options = { force-command = "/bin/foo" } @@ -90,7 +82,6 @@ resource "boundary_credential_library_vault_ssh_certificate" "ext_co_example" { path = "%s" username = "%s" key_type = "ed25519" - extensions = { permit-pty = "" permit-X11-forwarding = "" @@ -108,11 +99,9 @@ resource "boundary_credential_library_vault_ssh_certificate" "ext_co_example" { path = "%s" username = "%s" key_type = "ed25519" - extensions = { permit-pty = "" } - critical_options = { force-command = "/bin/foo" source-address = "10.10.0.0/16" @@ -141,7 +130,7 @@ func TestAccCredentialLibraryVaultSshCertificate(t *testing.T) { resource.Test(t, resource.TestCase{ IsUnitTest: true, ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckCredentialLibraryVaultSshCertificateResourceDestroy(t, provider), + CheckDestroy: testAccCheckCredentialLibraryVaultResourceDestroy(t, provider, sshCertVaultCredentialLibraryType), Steps: []resource.TestStep{ { // create @@ -152,7 +141,7 @@ func TestAccCredentialLibraryVaultSshCertificate(t *testing.T) { resource.TestCheckResourceAttr(vaultSshCertCredResc, credentialLibraryVaultPathKey, vaultSshCertCredLibPath), resource.TestCheckResourceAttr(vaultSshCertCredResc, credentialLibraryVaultSshCertificateUsernameKey, vaultSshCertCredUsername), - testAccCheckCredentialLibraryVaultSshCertificateResourceExists(provider, vaultSshCertCredResc), + testAccCheckCredentialLibraryResourceExists(provider, vaultSshCertCredResc), ), }, importStep(vaultSshCertCredResc), @@ -167,7 +156,7 @@ func TestAccCredentialLibraryVaultSshCertificate(t *testing.T) { resource.TestCheckResourceAttr(vaultSshCertCredResc, credentialLibraryVaultSshCertificateKeyTypeKey, vaultSshCertCredKeyType), resource.TestCheckResourceAttr(vaultSshCertCredResc, credentialLibraryVaultSshCertificateKeyBitsKey, strconv.Itoa(vaultSshCertCredKeyBits)), - testAccCheckCredentialLibraryVaultSshCertificateResourceExists(provider, vaultSshCertCredResc), + testAccCheckCredentialLibraryResourceExists(provider, vaultSshCertCredResc), ), }, importStep(vaultSshCertCredResc), @@ -180,7 +169,7 @@ func TestAccCredentialLibraryVaultSshCertificate(t *testing.T) { resource.TestCheckResourceAttr(vaultSshCertCredExtCOResc, credentialLibraryVaultPathKey, vaultSshCertCredLibPath), resource.TestCheckResourceAttr(vaultSshCertCredExtCOResc, credentialLibraryVaultSshCertificateUsernameKey, vaultSshCertCredUsername), - testAccCheckCredentialLibraryVaultSshCertificateResourceExists(provider, vaultSshCertCredExtCOResc), + testAccCheckCredentialLibraryResourceExists(provider, vaultSshCertCredExtCOResc), ), }, importStep(vaultSshCertCredExtCOResc), @@ -195,7 +184,7 @@ func TestAccCredentialLibraryVaultSshCertificate(t *testing.T) { resource.TestCheckResourceAttr(vaultSshCertCredExtCOResc, credentialLibraryVaultSshCertificateCriticalOptionsKey+".%", "0"), resource.TestCheckResourceAttr(vaultSshCertCredExtCOResc, credentialLibraryVaultSshCertificateExtensionsKey+".%", "2"), - testAccCheckCredentialLibraryVaultSshCertificateResourceExists(provider, vaultSshCertCredExtCOResc), + testAccCheckCredentialLibraryResourceExists(provider, vaultSshCertCredExtCOResc), ), }, importStep(vaultSshCertCredExtCOResc), @@ -210,58 +199,10 @@ func TestAccCredentialLibraryVaultSshCertificate(t *testing.T) { resource.TestCheckResourceAttr(vaultSshCertCredExtCOResc, credentialLibraryVaultSshCertificateCriticalOptionsKey+".%", "2"), resource.TestCheckResourceAttr(vaultSshCertCredExtCOResc, credentialLibraryVaultSshCertificateExtensionsKey+".%", "1"), - testAccCheckCredentialLibraryVaultSshCertificateResourceExists(provider, vaultSshCertCredExtCOResc), + testAccCheckCredentialLibraryResourceExists(provider, vaultSshCertCredExtCOResc), ), }, importStep(vaultSshCertCredExtCOResc), }, }) } - -func testAccCheckCredentialLibraryVaultSshCertificateResourceExists(testProvider *schema.Provider, name string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] - if !ok { - return fmt.Errorf("not found: %s", name) - } - - id := rs.Primary.ID - if id == "" { - return fmt.Errorf("no ID is set") - } - - md := testProvider.Meta().(*metaData) - c := credentiallibraries.NewClient(md.client) - if _, err := c.Read(context.Background(), id); err != nil { - return fmt.Errorf("got an error reading %q: %w", id, err) - } - - return nil - } -} - -func testAccCheckCredentialLibraryVaultSshCertificateResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { - return func(s *terraform.State) error { - if testProvider.Meta() == nil { - t.Fatal("got nil provider metadata") - } - md := testProvider.Meta().(*metaData) - - for _, rs := range s.RootModule().Resources { - switch rs.Type { - case "boundary_credential_library_vault": - id := rs.Primary.ID - - c := credentiallibraries.NewClient(md.client) - _, err := c.Read(context.Background(), id) - if apiErr := api.AsServerError(err); apiErr == nil || apiErr.Response().StatusCode() != http.StatusNotFound { - return fmt.Errorf("didn't get a 404 when reading destroyed vault credential library %q: %v", id, err) - } - - default: - continue - } - } - return nil - } -} diff --git a/internal/provider/resource_credential_library_vault_test.go b/internal/provider/resource_credential_library_vault_test.go index bb92db3f..8a133521 100644 --- a/internal/provider/resource_credential_library_vault_test.go +++ b/internal/provider/resource_credential_library_vault_test.go @@ -24,6 +24,7 @@ const ( vaultCredUsernamePasswordResc = "boundary_credential_library_vault.username_password_mapping_override" vaultCredSshPrivateKeyResc = "boundary_credential_library_vault.ssh_private_key_mapping_override" vaultCredLibName = "foo" + vaultCredLibNameOverride = "base foo" vaultCredLibDesc = "the foo" vaultCredLibPath = "/foo/bar" vaultCredLibMethodGet = "GET" @@ -83,7 +84,7 @@ resource "boundary_credential_library_vault" "username_password_mapping_override password_attribute = "alternative_password_label" username_attribute = "alternative_username_label" } -}`, vaultCredLibName, +}`, vaultCredLibNameOverride, vaultCredLibDesc, vaultCredLibPath, vaultCredLibMethodGet) @@ -100,7 +101,7 @@ var vaultUsernamePasswordMappingOverrideCredLibResourceUpdate = fmt.Sprintf(` password_attribute = "updated_password_label" username_attribute = "updated_username_label" } - }`, vaultCredLibName, + }`, vaultCredLibNameOverride, vaultCredLibDesc, vaultCredLibPath, vaultCredLibMethodGet) @@ -113,7 +114,7 @@ var vaultUsernamePasswordMappingOverrideCredLibResourceRemove = fmt.Sprintf(` path = "%s" http_method = "%s" credential_type = "username_password" - }`, vaultCredLibName, + }`, vaultCredLibNameOverride, vaultCredLibDesc, vaultCredLibPath, vaultCredLibMethodGet) @@ -155,7 +156,7 @@ func TestAccCredentialLibraryVault(t *testing.T) { resource.Test(t, resource.TestCase{ IsUnitTest: true, ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckCredentialLibraryVaultResourceDestroy(t, provider), + CheckDestroy: testAccCheckCredentialLibraryVaultResourceDestroy(t, provider, baseVaultCredentialLibraryType), Steps: []resource.TestStep{ { // create @@ -167,7 +168,7 @@ func TestAccCredentialLibraryVault(t *testing.T) { resource.TestCheckResourceAttr(vaultCredResc, credentialLibraryVaultHttpMethodKey, vaultCredLibMethodGet), resource.TestCheckResourceAttr(vaultCredResc, credentialLibraryVaultHttpRequestBodyKey, ""), - testAccCheckCredentialLibraryVaultResourceExists(provider, vaultCredResc), + testAccCheckCredentialLibraryResourceExists(provider, vaultCredResc), ), }, importStep(vaultCredResc), @@ -182,7 +183,7 @@ func TestAccCredentialLibraryVault(t *testing.T) { resource.TestCheckResourceAttr(vaultCredResc, credentialLibraryVaultHttpMethodKey, vaultCredLibMethodPost), resource.TestCheckResourceAttr(vaultCredResc, credentialLibraryVaultHttpRequestBodyKey, vaultCredLibRequestBody), - testAccCheckCredentialLibraryVaultResourceExists(provider, vaultCredResc), + testAccCheckCredentialLibraryResourceExists(provider, vaultCredResc), ), }, importStep(vaultCredResc), @@ -198,7 +199,7 @@ func TestAccCredentialLibraryVault(t *testing.T) { resource.TestCheckResourceAttr(vaultCredTypedResc, credentialLibraryVaultHttpRequestBodyKey, ""), resource.TestCheckResourceAttr(vaultCredTypedResc, credentialLibraryCredentialTypeKey, "ssh_private_key"), - testAccCheckCredentialLibraryVaultResourceExists(provider, vaultCredTypedResc), + testAccCheckCredentialLibraryResourceExists(provider, vaultCredTypedResc), ), }, importStep(vaultCredResc), @@ -206,7 +207,7 @@ func TestAccCredentialLibraryVault(t *testing.T) { { Config: testConfig(url, fooOrg, firstProjectFoo, credStoreRes, vaultCredLibResourceUpdate, vaultUsernamePasswordMappingOverrideCredLibResource), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, NameKey, vaultCredLibName), + resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, NameKey, vaultCredLibNameOverride), resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, DescriptionKey, vaultCredLibDesc), resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, credentialLibraryVaultPathKey, vaultCredLibPath), resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, credentialLibraryVaultHttpMethodKey, vaultCredLibMethodGet), @@ -215,7 +216,7 @@ func TestAccCredentialLibraryVault(t *testing.T) { resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, "credential_mapping_overrides.password_attribute", "alternative_password_label"), resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, "credential_mapping_overrides.username_attribute", "alternative_username_label"), - testAccCheckCredentialLibraryVaultResourceExists(provider, vaultCredUsernamePasswordResc), + testAccCheckCredentialLibraryResourceExists(provider, vaultCredUsernamePasswordResc), ), }, importStep(vaultCredResc), @@ -223,7 +224,7 @@ func TestAccCredentialLibraryVault(t *testing.T) { { Config: testConfig(url, fooOrg, firstProjectFoo, credStoreRes, vaultCredLibResourceUpdate, vaultUsernamePasswordMappingOverrideCredLibResourceUpdate), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, NameKey, vaultCredLibName), + resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, NameKey, vaultCredLibNameOverride), resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, DescriptionKey, vaultCredLibDesc), resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, credentialLibraryVaultPathKey, vaultCredLibPath), resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, credentialLibraryVaultHttpMethodKey, vaultCredLibMethodGet), @@ -232,7 +233,7 @@ func TestAccCredentialLibraryVault(t *testing.T) { resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, "credential_mapping_overrides.password_attribute", "updated_password_label"), resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, "credential_mapping_overrides.username_attribute", "updated_username_label"), - testAccCheckCredentialLibraryVaultResourceExists(provider, vaultCredUsernamePasswordResc), + testAccCheckCredentialLibraryResourceExists(provider, vaultCredUsernamePasswordResc), ), }, importStep(vaultCredResc), @@ -240,7 +241,7 @@ func TestAccCredentialLibraryVault(t *testing.T) { { Config: testConfig(url, fooOrg, firstProjectFoo, credStoreRes, vaultCredLibResourceUpdate, vaultUsernamePasswordMappingOverrideCredLibResourceRemove), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, NameKey, vaultCredLibName), + resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, NameKey, vaultCredLibNameOverride), resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, DescriptionKey, vaultCredLibDesc), resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, credentialLibraryVaultPathKey, vaultCredLibPath), resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, credentialLibraryVaultHttpMethodKey, vaultCredLibMethodGet), @@ -248,7 +249,7 @@ func TestAccCredentialLibraryVault(t *testing.T) { resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, credentialLibraryCredentialTypeKey, "username_password"), resource.TestCheckResourceAttr(vaultCredUsernamePasswordResc, credentialLibraryCredentialMappingOverridesKey+".%", "0"), - testAccCheckCredentialLibraryVaultResourceExists(provider, vaultCredUsernamePasswordResc), + testAccCheckCredentialLibraryResourceExists(provider, vaultCredUsernamePasswordResc), ), }, importStep(vaultCredResc), @@ -266,7 +267,7 @@ func TestAccCredentialLibraryVault(t *testing.T) { resource.TestCheckResourceAttr(vaultCredSshPrivateKeyResc, "credential_mapping_overrides.private_key_passphrase_attribute", "alternative_passphrase_label"), resource.TestCheckResourceAttr(vaultCredSshPrivateKeyResc, "credential_mapping_overrides.username_attribute", "alternative_username_label"), - testAccCheckCredentialLibraryVaultResourceExists(provider, vaultCredSshPrivateKeyResc), + testAccCheckCredentialLibraryResourceExists(provider, vaultCredSshPrivateKeyResc), ), }, importStep(vaultCredResc), @@ -274,7 +275,7 @@ func TestAccCredentialLibraryVault(t *testing.T) { }) } -func testAccCheckCredentialLibraryVaultResourceExists(testProvider *schema.Provider, name string) resource.TestCheckFunc { +func testAccCheckCredentialLibraryResourceExists(testProvider *schema.Provider, name string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] if !ok { @@ -296,7 +297,14 @@ func testAccCheckCredentialLibraryVaultResourceExists(testProvider *schema.Provi } } -func testAccCheckCredentialLibraryVaultResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { +type vaultCredentialLibraryType string + +const ( + baseVaultCredentialLibraryType vaultCredentialLibraryType = "boundary_credential_library_vault" + sshCertVaultCredentialLibraryType vaultCredentialLibraryType = "boundary_credential_library_vault_ssh_certificate" +) + +func testAccCheckCredentialLibraryVaultResourceDestroy(t *testing.T, testProvider *schema.Provider, typ vaultCredentialLibraryType) resource.TestCheckFunc { return func(s *terraform.State) error { if testProvider.Meta() == nil { t.Fatal("got nil provider metadata") @@ -305,7 +313,7 @@ func testAccCheckCredentialLibraryVaultResourceDestroy(t *testing.T, testProvide for _, rs := range s.RootModule().Resources { switch rs.Type { - case "boundary_credential_library_vault": + case string(typ): id := rs.Primary.ID c := credentiallibraries.NewClient(md.client) diff --git a/internal/provider/resource_credential_ssh_private_key_test.go b/internal/provider/resource_credential_ssh_private_key_test.go index 8927d20b..a04528f0 100644 --- a/internal/provider/resource_credential_ssh_private_key_test.go +++ b/internal/provider/resource_credential_ssh_private_key_test.go @@ -4,13 +4,9 @@ package provider import ( - "context" "fmt" - "net/http" "testing" - "github.com/hashicorp/boundary/api" - "github.com/hashicorp/boundary/api/credentials" "github.com/hashicorp/boundary/testing/controller" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -75,7 +71,7 @@ func TestAccCredentialSshPrivateKey(t *testing.T) { resource.Test(t, resource.TestCase{ IsUnitTest: true, ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckCredentialSshPrivateKeyResourceDestroy(t, provider), + CheckDestroy: testAccCheckCredentialResourceDestroy(t, provider, sshPrivateKeyCredentialType), Steps: []resource.TestStep{ { // create @@ -87,8 +83,8 @@ func TestAccCredentialSshPrivateKey(t *testing.T) { resource.TestCheckResourceAttr(sshPrivateKeyCredResc, credentialSshPrivateKeyPrivateKeyKey, privKey), resource.TestCheckResourceAttr(sshPrivateKeyCredResc, credentialSshPrivateKeyPassphraseKey, ""), - testAccCheckCredentialStoreSshPrivateKeyHmac(provider), - testAccCheckCredentialSshPrivateKeyResourceExists(provider, sshPrivateKeyCredResc), + testAccCheckCredentialStoreSshPrivateKeyHmac(), + testAccCheckCredentialResourceExists(provider, sshPrivateKeyCredResc), ), }, importStep(sshPrivateKeyCredResc, credentialSshPrivateKeyPrivateKeyKey, credentialSshPrivateKeyPassphraseKey), @@ -102,63 +98,15 @@ func TestAccCredentialSshPrivateKey(t *testing.T) { resource.TestCheckResourceAttr(sshPrivateKeyCredResc, credentialSshPrivateKeyPrivateKeyKey, privKeyUpdate), resource.TestCheckResourceAttr(sshPrivateKeyCredResc, credentialSshPrivateKeyPassphraseKey, privKeyUpdatePassphrase), - testAccCheckCredentialStoreSshPrivateKeyHmac(provider), - testAccCheckCredentialSshPrivateKeyResourceExists(provider, sshPrivateKeyCredResc), + testAccCheckCredentialStoreSshPrivateKeyHmac(), + testAccCheckCredentialResourceExists(provider, sshPrivateKeyCredResc), ), }, }, }) } -func testAccCheckCredentialSshPrivateKeyResourceExists(testProvider *schema.Provider, name string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] - if !ok { - return fmt.Errorf("not found: %s", name) - } - - id := rs.Primary.ID - if id == "" { - return fmt.Errorf("no ID is set") - } - storeId = id - - md := testProvider.Meta().(*metaData) - c := credentials.NewClient(md.client) - if _, err := c.Read(context.Background(), id); err != nil { - return fmt.Errorf("got an error reading %q: %w", id, err) - } - - return nil - } -} - -func testAccCheckCredentialSshPrivateKeyResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { - return func(s *terraform.State) error { - if testProvider.Meta() == nil { - t.Fatal("got nil provider metadata") - } - md := testProvider.Meta().(*metaData) - - for _, rs := range s.RootModule().Resources { - switch rs.Type { - case "boundary_credential_ssh_private_key": - id := rs.Primary.ID - - c := credentials.NewClient(md.client) - _, err := c.Read(context.Background(), id) - if apiErr := api.AsServerError(err); apiErr == nil || apiErr.Response().StatusCode() != http.StatusNotFound { - return fmt.Errorf("didn't get a 404 when reading destroyed credential %q: %v", id, err) - } - default: - continue - } - } - return nil - } -} - -func testAccCheckCredentialStoreSshPrivateKeyHmac(testProvider *schema.Provider) resource.TestCheckFunc { +func testAccCheckCredentialStoreSshPrivateKeyHmac() resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[sshPrivateKeyCredResc] if !ok { diff --git a/internal/provider/resource_credential_store_static_test.go b/internal/provider/resource_credential_store_static_test.go index c470d37b..daf27c7e 100644 --- a/internal/provider/resource_credential_store_static_test.go +++ b/internal/provider/resource_credential_store_static_test.go @@ -6,15 +6,12 @@ package provider import ( "context" "fmt" - "net/http" "testing" - "github.com/hashicorp/boundary/api" "github.com/hashicorp/boundary/api/credentialstores" "github.com/hashicorp/boundary/testing/controller" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) const ( @@ -50,7 +47,7 @@ func TestAccCredentialStoreStatic(t *testing.T) { var provider *schema.Provider resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckCredentialStoreStaticResourceDestroy(t, provider), + CheckDestroy: testAccCheckCredentialStoreResourceDestroy(t, provider, staticStoreCredentialStoreType), Steps: []resource.TestStep{ { // create @@ -59,7 +56,7 @@ func TestAccCredentialStoreStatic(t *testing.T) { resource.TestCheckResourceAttr(staticCredStoreResc, NameKey, staticCredStoreName), resource.TestCheckResourceAttr(staticCredStoreResc, DescriptionKey, staticCredStoreDesc), - testAccCheckCredentialStoreVaultResourceExists(provider, staticCredStoreResc), + testAccCheckCredentialStoreResourceExists(provider, staticCredStoreResc), ), }, importStep(staticCredStoreResc), @@ -70,7 +67,7 @@ func TestAccCredentialStoreStatic(t *testing.T) { resource.TestCheckResourceAttr(staticCredStoreResc, NameKey, staticCredStoreName+staticCredStoreUpdate), resource.TestCheckResourceAttr(staticCredStoreResc, DescriptionKey, staticCredStoreDesc+staticCredStoreUpdate), - testAccCheckCredentialStoreVaultResourceExists(provider, staticCredStoreResc), + testAccCheckCredentialStoreResourceExists(provider, staticCredStoreResc), ), }, importStep(staticCredStoreResc), @@ -115,28 +112,3 @@ func staticCredentialStoreExternalUpdate(t *testing.T, testProvider *schema.Prov t.Fatal(fmt.Errorf("got an error updating %q: %w", cr.Item.Id, err)) } } - -func testAccCheckCredentialStoreStaticResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { - return func(s *terraform.State) error { - if testProvider.Meta() == nil { - t.Fatal("got nil provider metadata") - } - md := testProvider.Meta().(*metaData) - - for _, rs := range s.RootModule().Resources { - switch rs.Type { - case "boundary_credential_store_static": - id := rs.Primary.ID - - c := credentialstores.NewClient(md.client) - _, err := c.Read(context.Background(), id) - if apiErr := api.AsServerError(err); apiErr == nil || apiErr.Response().StatusCode() != http.StatusNotFound { - return fmt.Errorf("didn't get a 404 when reading destroyed static credential store %q: %v", id, err) - } - default: - continue - } - } - return nil - } -} diff --git a/internal/provider/resource_credential_store_vault_test.go b/internal/provider/resource_credential_store_vault_test.go index 10472834..013c7d87 100644 --- a/internal/provider/resource_credential_store_vault_test.go +++ b/internal/provider/resource_credential_store_vault_test.go @@ -9,11 +9,11 @@ import ( "crypto/sha256" "encoding/base64" "fmt" + "github.com/hashicorp/boundary/api" "net/http" "strings" "testing" - "github.com/hashicorp/boundary/api" "github.com/hashicorp/boundary/api/credentialstores" "github.com/hashicorp/boundary/testing/controller" "github.com/hashicorp/boundary/testing/vault" @@ -100,7 +100,7 @@ func TestAccCredentialStoreVault(t *testing.T) { var provider *schema.Provider resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckCredentialStoreVaultResourceDestroy(t, provider), + CheckDestroy: testAccCheckCredentialStoreResourceDestroy(t, provider, vaultStoreCredentialStoreType), Steps: []resource.TestStep{ { // create @@ -118,7 +118,7 @@ func TestAccCredentialStoreVault(t *testing.T) { resource.TestCheckResourceAttr(vaultCredStoreResc, credentialStoreVaultClientCertificateKey, ""), resource.TestCheckResourceAttr(vaultCredStoreResc, credentialStoreVaultClientCertificateKeyKey, ""), - testAccCheckCredentialStoreVaultResourceExists(provider, vaultCredStoreResc), + testAccCheckCredentialStoreResourceExists(provider, vaultCredStoreResc), ), }, importStep(vaultCredStoreResc, credentialStoreVaultTokenKey, credentialStoreVaultClientCertificateKeyKey), @@ -138,7 +138,7 @@ func TestAccCredentialStoreVault(t *testing.T) { resource.TestCheckResourceAttr(vaultCredStoreResc, credentialStoreVaultClientCertificateKey, string(vcUpdate.ClientCert)), resource.TestCheckResourceAttr(vaultCredStoreResc, credentialStoreVaultClientCertificateKeyKey, string(vcUpdate.ClientKey)), - testAccCheckCredentialStoreVaultResourceExists(provider, vaultCredStoreResc), + testAccCheckCredentialStoreResourceExists(provider, vaultCredStoreResc), ), }, importStep(vaultCredStoreResc, credentialStoreVaultTokenKey, credentialStoreVaultClientCertificateKeyKey), @@ -194,7 +194,7 @@ func externalUpdate(t *testing.T, testProvider *schema.Provider) { } } -func testAccCheckCredentialStoreVaultResourceExists(testProvider *schema.Provider, name string) resource.TestCheckFunc { +func testAccCheckCredentialStoreResourceExists(testProvider *schema.Provider, name string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] if !ok { @@ -217,7 +217,14 @@ func testAccCheckCredentialStoreVaultResourceExists(testProvider *schema.Provide } } -func testAccCheckCredentialStoreVaultResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { +type credentialDestroyStoreType string + +const ( + staticStoreCredentialStoreType credentialDestroyStoreType = "boundary_credential_store_static" + vaultStoreCredentialStoreType credentialDestroyStoreType = "boundary_credential_store_vault" +) + +func testAccCheckCredentialStoreResourceDestroy(t *testing.T, testProvider *schema.Provider, typ credentialDestroyStoreType) resource.TestCheckFunc { return func(s *terraform.State) error { if testProvider.Meta() == nil { t.Fatal("got nil provider metadata") @@ -226,13 +233,13 @@ func testAccCheckCredentialStoreVaultResourceDestroy(t *testing.T, testProvider for _, rs := range s.RootModule().Resources { switch rs.Type { - case "boundary_credential_store_vault": + case string(typ): id := rs.Primary.ID c := credentialstores.NewClient(md.client) _, err := c.Read(context.Background(), id) if apiErr := api.AsServerError(err); apiErr == nil || apiErr.Response().StatusCode() != http.StatusNotFound { - return fmt.Errorf("didn't get a 404 when reading destroyed Vault credential store %q: %v", id, err) + return fmt.Errorf("didn't get a 404 when reading destroyed static credential store %q: %v", id, err) } default: continue diff --git a/internal/provider/resource_credential_username_password_test.go b/internal/provider/resource_credential_username_password_test.go index 59d625cb..95238d67 100644 --- a/internal/provider/resource_credential_username_password_test.go +++ b/internal/provider/resource_credential_username_password_test.go @@ -6,10 +6,8 @@ package provider import ( "context" "fmt" - "net/http" "testing" - "github.com/hashicorp/boundary/api" "github.com/hashicorp/boundary/api/credentials" "github.com/hashicorp/boundary/testing/controller" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" @@ -69,7 +67,7 @@ func TestAccCredentialUsernamePassword(t *testing.T) { var provider *schema.Provider resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckCredentialUsernamePasswordResourceDestroy(t, provider), + CheckDestroy: testAccCheckCredentialResourceDestroy(t, provider, usernamePasswordCredentialType), Steps: []resource.TestStep{ { // create @@ -80,8 +78,8 @@ func TestAccCredentialUsernamePassword(t *testing.T) { resource.TestCheckResourceAttr(usernamePasswordCredResc, credentialUsernamePasswordUsernameKey, usernamePasswordCredUsername), resource.TestCheckResourceAttr(usernamePasswordCredResc, credentialUsernamePasswordPasswordKey, usernamePasswordCredPassword), - testAccCheckCredentialStoreUsernamePasswordHmac(provider), - testAccCheckCredentialUsernamePasswordResourceExists(provider, usernamePasswordCredResc), + testAccCheckCredentialStoreUsernamePasswordHmac(), + testAccCheckCredentialResourceExists(provider, usernamePasswordCredResc), ), }, importStep(usernamePasswordCredResc, credentialUsernamePasswordPasswordKey), @@ -94,8 +92,8 @@ func TestAccCredentialUsernamePassword(t *testing.T) { resource.TestCheckResourceAttr(usernamePasswordCredResc, credentialUsernamePasswordUsernameKey, usernamePasswordCredUsername+usernamePasswordCredUpdate), resource.TestCheckResourceAttr(usernamePasswordCredResc, credentialUsernamePasswordPasswordKey, usernamePasswordCredPassword+usernamePasswordCredUpdate), - testAccCheckCredentialStoreUsernamePasswordHmac(provider), - testAccCheckCredentialUsernamePasswordResourceExists(provider, usernamePasswordCredResc), + testAccCheckCredentialStoreUsernamePasswordHmac(), + testAccCheckCredentialResourceExists(provider, usernamePasswordCredResc), ), }, importStep(usernamePasswordCredResc, credentialUsernamePasswordPasswordKey), @@ -137,55 +135,7 @@ func usernamePasswordCredExternalUpdate(t *testing.T, testProvider *schema.Provi } } -func testAccCheckCredentialUsernamePasswordResourceExists(testProvider *schema.Provider, name string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] - if !ok { - return fmt.Errorf("not found: %s", name) - } - - id := rs.Primary.ID - if id == "" { - return fmt.Errorf("no ID is set") - } - storeId = id - - md := testProvider.Meta().(*metaData) - c := credentials.NewClient(md.client) - if _, err := c.Read(context.Background(), id); err != nil { - return fmt.Errorf("got an error reading %q: %w", id, err) - } - - return nil - } -} - -func testAccCheckCredentialUsernamePasswordResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { - return func(s *terraform.State) error { - if testProvider.Meta() == nil { - t.Fatal("got nil provider metadata") - } - md := testProvider.Meta().(*metaData) - - for _, rs := range s.RootModule().Resources { - switch rs.Type { - case "boundary_credential_username_password": - id := rs.Primary.ID - - c := credentials.NewClient(md.client) - _, err := c.Read(context.Background(), id) - if apiErr := api.AsServerError(err); apiErr == nil || apiErr.Response().StatusCode() != http.StatusNotFound { - return fmt.Errorf("didn't get a 404 when reading destroyed username password credential %q: %v", id, err) - } - default: - continue - } - } - return nil - } -} - -func testAccCheckCredentialStoreUsernamePasswordHmac(testProvider *schema.Provider) resource.TestCheckFunc { +func testAccCheckCredentialStoreUsernamePasswordHmac() resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[usernamePasswordCredResc] if !ok { diff --git a/internal/provider/resource_host_catalog_plugin_test.go b/internal/provider/resource_host_catalog_plugin_test.go index b526563b..03729196 100644 --- a/internal/provider/resource_host_catalog_plugin_test.go +++ b/internal/provider/resource_host_catalog_plugin_test.go @@ -8,10 +8,8 @@ import ( "encoding/json" "errors" "fmt" - "net/http" "testing" - "github.com/hashicorp/boundary/api" "github.com/hashicorp/boundary/api/hostcatalogs" "github.com/hashicorp/boundary/testing/controller" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" @@ -156,7 +154,7 @@ func TestAccPluginHostCatalog(t *testing.T) { var provider *schema.Provider resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckPluginHostCatalogResourceDestroy(t, provider), + CheckDestroy: testAccCheckHostCatalogResourceDestroy(t, provider, baseHostCatalogType), Steps: []resource.TestStep{ { // test create @@ -368,27 +366,3 @@ func testAccCheckPluginHostCatalogResourceExists(testProvider *schema.Provider, return nil } } - -func testAccCheckPluginHostCatalogResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { - return func(s *terraform.State) error { - md := testProvider.Meta().(*metaData) - - for _, rs := range s.RootModule().Resources { - switch rs.Type { - case "boundary_host_catalog": - - id := rs.Primary.ID - hcClient := hostcatalogs.NewClient(md.client) - - _, err := hcClient.Read(context.Background(), id) - if apiErr := api.AsServerError(err); apiErr == nil || apiErr.Response().StatusCode() != http.StatusNotFound { - return fmt.Errorf("didn't get a 404 when reading destroyed host catalog %q: %v", id, err) - } - - default: - continue - } - } - return nil - } -} diff --git a/internal/provider/resource_host_catalog_static_test.go b/internal/provider/resource_host_catalog_static_test.go index f8650e25..73d5c399 100644 --- a/internal/provider/resource_host_catalog_static_test.go +++ b/internal/provider/resource_host_catalog_static_test.go @@ -70,7 +70,7 @@ func testAccHostCatalog(t *testing.T, static bool) { var provider *schema.Provider resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckHostCatalogResourceDestroy(t, provider), + CheckDestroy: testAccCheckHostCatalogResourceDestroy(t, provider, staticHostCatalogType), Steps: []resource.TestStep{ { // test create @@ -119,13 +119,23 @@ func testAccCheckHostCatalogResourceExists(testProvider *schema.Provider, name s } } -func testAccCheckHostCatalogResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { +type hostCatalogType string + +const ( + baseHostCatalogType hostCatalogType = "boundary_host_catalog" + staticHostCatalogType hostCatalogType = "boundary_host_catalog_static" +) + +func testAccCheckHostCatalogResourceDestroy(t *testing.T, testProvider *schema.Provider, typ hostCatalogType) resource.TestCheckFunc { return func(s *terraform.State) error { + if testProvider.Meta() == nil { + t.Fatal("got nil provider metadata") + } md := testProvider.Meta().(*metaData) for _, rs := range s.RootModule().Resources { switch rs.Type { - case "boundary_host_catalog", "boundary_host_catalog_static": + case string(typ): id := rs.Primary.ID hcClient := hostcatalogs.NewClient(md.client) diff --git a/internal/provider/resource_host_set_plugin_test.go b/internal/provider/resource_host_set_plugin_test.go index e86ea6f3..8332981b 100644 --- a/internal/provider/resource_host_set_plugin_test.go +++ b/internal/provider/resource_host_set_plugin_test.go @@ -8,10 +8,8 @@ import ( "encoding/json" "errors" "fmt" - "net/http" "testing" - "github.com/hashicorp/boundary/api" "github.com/hashicorp/boundary/api/hostsets" "github.com/hashicorp/boundary/testing/controller" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" @@ -89,7 +87,7 @@ func TestAccHostSetPlugin(t *testing.T) { var provider *schema.Provider resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckHostSetPluginResourceDestroy(t, provider), + CheckDestroy: testAccCheckHostSetResourceDestroy(t, provider, baseHostSetType), Steps: []resource.TestStep{ { // test project hostset create @@ -256,34 +254,6 @@ func testAccCheckHostSetPluginResourceExists(testProvider *schema.Provider, name } } -func testAccCheckHostSetPluginResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { - return func(s *terraform.State) error { - if testProvider.Meta() == nil { - t.Fatal("got nil provider metadata") - } - md := testProvider.Meta().(*metaData) - - for _, rs := range s.RootModule().Resources { - switch rs.Type { - case "boundary_host_set": - - id := rs.Primary.ID - - hostsetsClient := hostsets.NewClient(md.client) - - _, err := hostsetsClient.Read(context.Background(), id) - if apiErr := api.AsServerError(err); apiErr == nil || apiErr.Response().StatusCode() != http.StatusNotFound { - return fmt.Errorf("didn't get a 404 when reading destroyed host set %q: %v", id, apiErr) - } - - default: - continue - } - } - return nil - } -} - func testAccCheckHostSetPluginPreferredEndpoints(t *testing.T, testProvider *schema.Provider, name string, wantPreferredEndpoints []string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] diff --git a/internal/provider/resource_host_set_static_test.go b/internal/provider/resource_host_set_static_test.go index 583a7287..bbb4dbe5 100644 --- a/internal/provider/resource_host_set_static_test.go +++ b/internal/provider/resource_host_set_static_test.go @@ -86,7 +86,7 @@ func testAccHostSetStatic(t *testing.T, static bool) { var provider *schema.Provider resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckHostSetStaticResourceDestroy(t, provider), + CheckDestroy: testAccCheckHostSetResourceDestroy(t, provider, baseHostSetType), Steps: []resource.TestStep{ { // test project hostset create @@ -195,7 +195,11 @@ func testAccCheckHostSetStaticHostIDsSet(testProvider *schema.Provider, name str } } -func testAccCheckHostSetStaticResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { +type hostSetType string + +const baseHostSetType hostSetType = "boundary_host_set" + +func testAccCheckHostSetResourceDestroy(t *testing.T, testProvider *schema.Provider, typ hostSetType) resource.TestCheckFunc { return func(s *terraform.State) error { if testProvider.Meta() == nil { t.Fatal("got nil provider metadata") @@ -204,7 +208,7 @@ func testAccCheckHostSetStaticResourceDestroy(t *testing.T, testProvider *schema for _, rs := range s.RootModule().Resources { switch rs.Type { - case "boundary_host_set": + case string(typ): id := rs.Primary.ID diff --git a/internal/provider/resource_managed_group_ldap_test.go b/internal/provider/resource_managed_group_ldap_test.go index 3b3d7fe5..073638a8 100644 --- a/internal/provider/resource_managed_group_ldap_test.go +++ b/internal/provider/resource_managed_group_ldap_test.go @@ -46,7 +46,7 @@ func TestAccManagedGroupLdap(t *testing.T) { var provider *schema.Provider resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckManagedGroupResourceDestroy(t, provider), + CheckDestroy: testAccCheckManagedGroupResourceDestroy(t, provider, ldapManagedGroupType), Steps: []resource.TestStep{ { // test create diff --git a/internal/provider/resource_managed_group_test.go b/internal/provider/resource_managed_group_test.go index 16a4a4cf..6f745e94 100644 --- a/internal/provider/resource_managed_group_test.go +++ b/internal/provider/resource_managed_group_test.go @@ -57,7 +57,7 @@ func TestAccManagedGroup(t *testing.T) { var provider *schema.Provider resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories(&provider), - CheckDestroy: testAccCheckManagedGroupResourceDestroy(t, provider), + CheckDestroy: testAccCheckManagedGroupResourceDestroy(t, provider, baseManagedGroupType), Steps: []resource.TestStep{ { // test create @@ -108,7 +108,14 @@ func testAccCheckManagedGroupResourceExists(testProvider *schema.Provider, name } } -func testAccCheckManagedGroupResourceDestroy(t *testing.T, testProvider *schema.Provider) resource.TestCheckFunc { +type managedGroupType string + +const ( + baseManagedGroupType managedGroupType = "boundary_managed_group" + ldapManagedGroupType managedGroupType = "boundary_managed_group_ldap" +) + +func testAccCheckManagedGroupResourceDestroy(t *testing.T, testProvider *schema.Provider, typ managedGroupType) resource.TestCheckFunc { return func(s *terraform.State) error { if testProvider.Meta() == nil { t.Fatal("got nil provider metadata") @@ -118,7 +125,7 @@ func testAccCheckManagedGroupResourceDestroy(t *testing.T, testProvider *schema. for _, rs := range s.RootModule().Resources { switch rs.Type { - case "boundary_managed_group", "boundary_managed_group_ldap": + case string(typ): grpClient := managedgroups.NewClient(md.client) id := rs.Primary.ID