From a4e91213830c5bc4cce69b88af60e32406c05289 Mon Sep 17 00:00:00 2001 From: adiyaar24 Date: Thu, 4 May 2023 11:57:58 +0530 Subject: [PATCH] Updation of Vault Test --- .../service/platform/connector/vault_test.go | 117 +++--------------- 1 file changed, 18 insertions(+), 99 deletions(-) diff --git a/internal/service/platform/connector/vault_test.go b/internal/service/platform/connector/vault_test.go index e807b067a..0c4e00061 100644 --- a/internal/service/platform/connector/vault_test.go +++ b/internal/service/platform/connector/vault_test.go @@ -3,7 +3,6 @@ package connector_test import ( "fmt" "os" - "runtime" "testing" "github.com/harness/harness-go-sdk/harness/utils" @@ -522,33 +521,13 @@ func TestOrgResourceConnectorVault_K8sAuth(t *testing.T) { }) } -func TestAccResourceConnectorVault_AppRolee(t *testing.T) { - maxAttempts := 3 - attempts := 0 - var err error - var memBefore, memAfter runtime.MemStats - - for attempts < maxAttempts { - attempts++ - - // Defer statement to recover from panics - defer func() { - if r := recover(); r != nil { - runtime.GC() - runtime.ReadMemStats(&memBefore) - t.Logf("Recovered from panic: %v", r) - err = fmt.Errorf("panic occurred: %v", r) - t.Logf("ERROR: %v", err) - } - }() - - runtime.GC() - runtime.ReadMemStats(&memAfter) - id := fmt.Sprintf("%s_%s", t.Name(), utils.RandStringBytes(5)) - name := id - updatedName := fmt.Sprintf("%s_updated", name) - resourceName := "harness_platform_connector_vault.test" - vault_sercet := os.Getenv("HARNESS_TEST_VAULT_SECRET") +func TestAccResourceConnectorVault_AppRole(t *testing.T) { + + id := fmt.Sprintf("%s_%s", t.Name(), utils.RandStringBytes(5)) + name := id + updatedName := fmt.Sprintf("%s_updated", name) + resourceName := "harness_platform_connector_vault.test" + vault_sercet := os.Getenv("HARNESS_TEST_VAULT_SECRET") resource.UnitTest(t, resource.TestCase{ PreCheck: func() { acctest.TestAccPreCheck(t) }, @@ -597,68 +576,8 @@ func TestAccResourceConnectorVault_AppRolee(t *testing.T) { ImportStateIdFunc: acctest.AccountLevelResourceImportStateIdFunc(resourceName), }, }, - }, - ) + }) } -} - -// func TestAccResourceConnectorVault_AppRole(t *testing.T) { - -// id := fmt.Sprintf("%s_%s", t.Name(), utils.RandStringBytes(5)) -// name := id -// updatedName := fmt.Sprintf("%s_updated", name) -// resourceName := "harness_platform_connector_vault.test" -// vault_sercet := os.Getenv("HARNESS_TEST_VAULT_SECRET") - -// resource.UnitTest(t, resource.TestCase{ -// PreCheck: func() { acctest.TestAccPreCheck(t) }, -// ProviderFactories: acctest.ProviderFactories, -// ExternalProviders: map[string]resource.ExternalProvider{ -// "time": {}, -// }, -// CheckDestroy: testAccConnectorDestroy(resourceName), -// Steps: []resource.TestStep{ -// { -// Config: testAccResourceConnectorVault_app_role(id, name, vault_sercet), -// Check: resource.ComposeTestCheckFunc( -// resource.TestCheckResourceAttr(resourceName, "id", id), -// resource.TestCheckResourceAttr(resourceName, "identifier", id), -// resource.TestCheckResourceAttr(resourceName, "name", name), -// resource.TestCheckResourceAttr(resourceName, "description", "test"), -// resource.TestCheckResourceAttr(resourceName, "tags.#", "1"), -// resource.TestCheckResourceAttr(resourceName, "base_path", "vikas-test/"), -// resource.TestCheckResourceAttr(resourceName, "is_read_only", "false"), -// resource.TestCheckResourceAttr(resourceName, "renewal_interval_minutes", "60"), -// resource.TestCheckResourceAttr(resourceName, "secret_engine_manually_configured", "true"), -// resource.TestCheckResourceAttr(resourceName, "use_vault_agent", "false"), -// resource.TestCheckResourceAttr(resourceName, "access_type", "APP_ROLE"), -// ), -// }, -// { -// Config: testAccResourceConnectorVault_app_role(id, updatedName, vault_sercet), -// Check: resource.ComposeTestCheckFunc( -// resource.TestCheckResourceAttr(resourceName, "id", id), -// resource.TestCheckResourceAttr(resourceName, "identifier", id), -// resource.TestCheckResourceAttr(resourceName, "name", updatedName), -// resource.TestCheckResourceAttr(resourceName, "description", "test"), -// resource.TestCheckResourceAttr(resourceName, "tags.#", "1"), -// resource.TestCheckResourceAttr(resourceName, "base_path", "vikas-test/"), -// resource.TestCheckResourceAttr(resourceName, "is_read_only", "false"), -// resource.TestCheckResourceAttr(resourceName, "renewal_interval_minutes", "60"), -// resource.TestCheckResourceAttr(resourceName, "secret_engine_manually_configured", "true"), -// resource.TestCheckResourceAttr(resourceName, "use_vault_agent", "false"), -// resource.TestCheckResourceAttr(resourceName, "access_type", "APP_ROLE"), -// ), -// }, -// { -// ResourceName: resourceName, -// ImportState: true, -// ImportStateVerify: true, -// ImportStateIdFunc: acctest.AccountLevelResourceImportStateIdFunc(resourceName), -// }, -// }, -// }) -// } func TestProjectResourceConnectorVault_AppRole(t *testing.T) { id := fmt.Sprintf("%s_%s", t.Name(), utils.RandStringBytes(5)) @@ -1169,7 +1088,7 @@ func testAccResourceConnectorVault_app_role(id string, name string, vault_secret resource "time_sleep" "wait_4_seconds" { depends_on = [harness_platform_secret_text.test] - create_duration = "10s" + create_duration = "15s" } `, id, name, vault_secret) } @@ -1237,7 +1156,7 @@ func testProjectResourceConnectorVault_app_role(id string, name string, vault_se resource "time_sleep" "wait_3_seconds" { depends_on = [harness_platform_secret_text.test] - create_duration = "3s" + create_duration = "15s" } `, id, name, vault_secret) } @@ -1298,7 +1217,7 @@ func testOrgResourceConnectorVault_app_role(id string, name string, vault_secret resource "time_sleep" "wait_3_seconds" { depends_on = [harness_platform_secret_text.test] - create_duration = "3s" + create_duration = "15s" } `, id, name, vault_secret) } @@ -1347,7 +1266,7 @@ func testAccResourceConnectorVault_k8s_auth(id string, name string) string { resource "time_sleep" "wait_4_seconds" { depends_on = [harness_platform_secret_text.test] - create_duration = "4s" + create_duration = "10s" } `, id, name) } @@ -1403,7 +1322,7 @@ func testProjectResourceConnectorVault_k8s_auth(id string, name string, connecto resource "time_sleep" "wait_5_seconds" { depends_on = [harness_platform_connector_azure_key_vault.test] - create_duration = "5s" + create_duration = "15s" } resource "harness_platform_connector_vault" "test" { @@ -1438,7 +1357,7 @@ func testProjectResourceConnectorVault_k8s_auth(id string, name string, connecto resource "time_sleep" "wait_4_seconds" { depends_on = [harness_platform_secret_text.test] - create_duration = "4s" + create_duration = "10s" } `, id, name, connectorName) } @@ -1517,7 +1436,7 @@ func testOrgResourceConnectorVault_k8s_auth(id string, name string, connectorNam resource "time_sleep" "wait_5_seconds" { depends_on = [harness_platform_secret_text.test] - create_duration = "5s" + create_duration = "10s" } `, id, name, connectorName) } @@ -1563,7 +1482,7 @@ func testAccResourceConnectorVault_vault_agent(id string, name string) string { resource "time_sleep" "wait_4_seconds" { depends_on = [harness_platform_secret_text.test] - create_duration = "4s" + create_duration = "10s" } `, id, name) } @@ -1620,7 +1539,7 @@ func testProjectResourceConnectorVault_vault_agent(id string, name string, conne resource "time_sleep" "wait_5_seconds" { depends_on = [harness_platform_connector_azure_key_vault.test] - create_duration = "5s" + create_duration = "10s" } resource "harness_platform_connector_vault" "test" { @@ -1652,7 +1571,7 @@ func testProjectResourceConnectorVault_vault_agent(id string, name string, conne resource "time_sleep" "wait_4_seconds" { depends_on = [harness_platform_secret_text.test] - create_duration = "4s" + create_duration = "10s" } `, id, name, connectorName) }