From c7f4d7968476c960f9c14dc1dcfb11b5bd4063df Mon Sep 17 00:00:00 2001
From: Nick Cabatoff <ncabatoff@hashicorp.com>
Date: Tue, 20 Sep 2022 08:23:51 -0400
Subject: [PATCH] We don't need to test LifetimeWatcher's behaviour with
 database leases specifically. (#17208)

---
 .../api/renewer_integration_test.go           | 83 -------------------
 1 file changed, 83 deletions(-)

diff --git a/vault/external_tests/api/renewer_integration_test.go b/vault/external_tests/api/renewer_integration_test.go
index c5ea4fae9..6413eb18e 100644
--- a/vault/external_tests/api/renewer_integration_test.go
+++ b/vault/external_tests/api/renewer_integration_test.go
@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/vault/api"
-	postgreshelper "github.com/hashicorp/vault/helper/testhelpers/postgresql"
 )
 
 func TestRenewer_Renew(t *testing.T) {
@@ -87,88 +86,6 @@ func TestRenewer_Renew(t *testing.T) {
 			}
 		})
 
-		t.Run("database", func(t *testing.T) {
-			t.Parallel()
-
-			cleanup, pgURL := postgreshelper.PrepareTestContainer(t, "")
-			defer cleanup()
-
-			if err := client.Sys().Mount("database", &api.MountInput{
-				Type: "database",
-			}); err != nil {
-				t.Fatal(err)
-			}
-			if _, err := client.Logical().Write("database/config/postgresql", map[string]interface{}{
-				"plugin_name":    "postgresql-database-plugin",
-				"connection_url": pgURL,
-				"allowed_roles":  "readonly",
-			}); err != nil {
-				t.Fatal(err)
-			}
-			if _, err := client.Logical().Write("database/roles/readonly", map[string]interface{}{
-				"db_name": "postgresql",
-				"creation_statements": `` +
-					`CREATE ROLE "{{name}}" WITH LOGIN PASSWORD '{{password}}' VALID UNTIL '{{expiration}}';` +
-					`GRANT SELECT ON ALL TABLES IN SCHEMA public TO "{{name}}";`,
-				"default_ttl": "5s",
-				"max_ttl":     "10s",
-			}); err != nil {
-				t.Fatal(err)
-			}
-
-			secret, err := client.Logical().Read("database/creds/readonly")
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			v, err := client.NewLifetimeWatcher(&api.RenewerInput{
-				Secret: secret,
-			})
-			if err != nil {
-				t.Fatal(err)
-			}
-			go v.Renew()
-			defer v.Stop()
-
-			done, renewed := false, false
-			timeout := time.After(5 * time.Second)
-			for {
-
-				if done {
-					break
-				}
-				select {
-				case err := <-v.DoneCh():
-					if renewed {
-						// If we renewed but there's an error, we fail
-						if err != nil {
-							t.Fatalf("renewal failed with an error: %v", err)
-						}
-						// We can break out early here
-						done = true
-					} else {
-						t.Errorf("should have renewed once before returning: %s", err)
-					}
-				case renew := <-v.RenewCh():
-					if renew == nil {
-						t.Fatal("renew is nil")
-					}
-					if !renew.Secret.Renewable {
-						t.Errorf("expected lease to be renewable: %#v", renew)
-					}
-					if renew.Secret.LeaseDuration > 5 {
-						t.Errorf("expected lease to <= 5s: %#v", renew)
-					}
-					renewed = true
-				case <-timeout:
-					if !renewed {
-						t.Errorf("no renewal")
-					}
-					done = true
-				}
-			}
-		})
-
 		t.Run("auth", func(t *testing.T) {
 			t.Parallel()