test(upgrade): add v20.11 upgrade tests in query package (#8954)

hypermodeinc · Aug 16, 2023 · 7793eb3 · 7793eb3
1 parent 8631dab
commit 7793eb3
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 17 deletions.
diff --git a/dgraphtest/cluster.go b/dgraphtest/cluster.go
@@ -134,6 +134,11 @@ func (hc *HTTPClient) LoginUsingToken(ns uint64) error {
 }
 
 func (hc *HTTPClient) LoginIntoNamespace(user, password string, ns uint64) error {
+	// This is useful for v20.11 which does not support multi-tenancy
+	if ns == 0 {
+		return hc.LoginIntoNamespaceV20(user, password)
+	}
+
 	q := `mutation login($userId: String, $password: String, $namespace: Int) {
 		login(userId: $userId, password: $password, namespace: $namespace) {
 			response {
@@ -158,6 +163,30 @@ func (hc *HTTPClient) LoginIntoNamespace(user, password string, ns uint64) error
 	return hc.doLogin(params, true)
 }
 
+func (hc *HTTPClient) LoginIntoNamespaceV20(user, password string) error {
+	q := `mutation login($userId: String, $password: String) {
+		login(userId: $userId, password: $password) {
+			response {
+				accessJWT
+				refreshJWT
+			}
+		}
+	}`
+	params := GraphQLParams{
+		Query: q,
+		Variables: map[string]interface{}{
+			"userId":   user,
+			"password": password,
+		},
+	}
+
+	hc.HttpToken = &HttpToken{
+		UserId:   user,
+		Password: password,
+	}
+	return hc.doLogin(params, true)
+}
+
 func (hc *HTTPClient) doLogin(params GraphQLParams, isAdmin bool) error {
 	resp, err := hc.RunGraphqlQuery(params, isAdmin)
 	if err != nil {

diff --git a/dgraphtest/config.go b/dgraphtest/config.go
@@ -29,7 +29,7 @@ type UpgradeCombo struct {
 	Strategy UpgradeStrategy
 }
 
-func AllUpgradeCombos() []UpgradeCombo {
+func AllUpgradeCombos(v20 bool) []UpgradeCombo {
 	fixedVersionCombos := []UpgradeCombo{
 		// OPEN SOURCE RELEASES
 		{"v21.03.0", "v23.0.1", BackupRestore},
@@ -66,6 +66,12 @@ func AllUpgradeCombos() []UpgradeCombo {
 		{"0c9f60156", "v23.0.1", InPlace}, // v21.03.0-92-g0c9f60156
 	}
 
+	if v20 {
+		fixedVersionCombos = append(fixedVersionCombos, []UpgradeCombo{
+			{"v20.11.3", localVersion, BackupRestore},
+		}...)
+	}
+
 	mainCombos := []UpgradeCombo{
 		{"v23.0.1", localVersion, BackupRestore},
 		{"v23.0.1", localVersion, InPlace},

diff --git a/dgraphtest/dgraph.go b/dgraphtest/dgraph.go
@@ -133,9 +133,14 @@ func (z *zero) bindings(offset int) nat.PortMap {
 
 func (z *zero) cmd(c *LocalCluster) []string {
 	zcmd := []string{"/gobin/dgraph", "zero", fmt.Sprintf("--my=%s:%v", z.aname(), zeroGrpcPort), "--bindall",
-		fmt.Sprintf(`--replicas=%v`, c.conf.replicas), fmt.Sprintf(`--raft=idx=%v`, z.id+1), "--logtostderr",
-		fmt.Sprintf("-v=%d", c.conf.verbosity),
-		fmt.Sprintf(`--limit=refill-interval=%v;uid-lease=%v`, c.conf.refillInterval, c.conf.uidLease)}
+		fmt.Sprintf(`--replicas=%v`, c.conf.replicas), "--logtostderr", fmt.Sprintf("-v=%d", c.conf.verbosity)}
+
+	if c.lowerThanV21 {
+		zcmd = append(zcmd, fmt.Sprintf(`--idx=%v`, z.id+1))
+	} else {
+		zcmd = append(zcmd, fmt.Sprintf(`--raft=idx=%v`, z.id+1),
+			fmt.Sprintf(`--limit=refill-interval=%v;uid-lease=%v`, c.conf.refillInterval, c.conf.uidLease))
+	}
 
 	if z.id > 0 {
 		zcmd = append(zcmd, "--peer="+c.zeros[0].aname()+":"+zeroGrpcPort)
@@ -227,14 +232,28 @@ func (a *alpha) bindings(offset int) nat.PortMap {
 
 func (a *alpha) cmd(c *LocalCluster) []string {
 	acmd := []string{"/gobin/dgraph", "alpha", fmt.Sprintf("--my=%s:%v", a.aname(), alphaInterPort),
-		"--bindall", "--logtostderr", fmt.Sprintf("-v=%d", c.conf.verbosity),
-		`--security=whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16`}
+		"--bindall", "--logtostderr", fmt.Sprintf("-v=%d", c.conf.verbosity)}
+
+	if c.lowerThanV21 {
+		acmd = append(acmd, `--whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16`)
+	} else {
+		acmd = append(acmd, `--security=whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16`)
+	}
 
 	if c.conf.acl {
-		acmd = append(acmd, fmt.Sprintf(`--acl=secret-file=%s;access-ttl=%s`, aclSecretMountPath, c.conf.aclTTL))
+		if c.lowerThanV21 {
+			acmd = append(acmd, fmt.Sprintf(`--acl_secret_file=%s`, aclSecretMountPath),
+				fmt.Sprintf(`--acl_access_ttl=%s`, c.conf.aclTTL))
+		} else {
+			acmd = append(acmd, fmt.Sprintf(`--acl=secret-file=%s;access-ttl=%s`, aclSecretMountPath, c.conf.aclTTL))
+		}
 	}
 	if c.conf.encryption {
-		acmd = append(acmd, fmt.Sprintf(`--encryption=key-file=%v`, encKeyMountPath))
+		if c.lowerThanV21 {
+			acmd = append(acmd, fmt.Sprintf(`--encryption_key_file=%v`, encKeyMountPath))
+		} else {
+			acmd = append(acmd, fmt.Sprintf(`--encryption=key-file=%v`, encKeyMountPath))
+		}
 	}
 
 	zeroAddrsArg, delimiter := "--zero=", ""

diff --git a/dgraphtest/local_cluster.go b/dgraphtest/local_cluster.go
@@ -49,8 +49,9 @@ type cnet struct {
 
 // LocalCluster is a local dgraph cluster
 type LocalCluster struct {
-	conf       ClusterConfig
-	tempBinDir string
+	conf         ClusterConfig
+	tempBinDir   string
+	lowerThanV21 bool
 
 	// resources
 	dcli   *docker.Client
@@ -115,6 +116,12 @@ func (c *LocalCluster) init() error {
 		return errors.Wrap(err, "error while making binDir")
 	}
 
+	higher, err := IsHigherVersion(c.GetVersion(), "v21.03.0")
+	if err != nil {
+		return errors.Wrapf(err, "error checking if version %s is older than v21.03.0", c.GetVersion())
+	}
+	c.lowerThanV21 = !higher
+
 	for _, vol := range c.conf.volumes {
 		if err := c.createVolume(vol); err != nil {
 			return err
@@ -492,6 +499,18 @@ func (c *LocalCluster) recreateContainers() error {
 	return nil
 }
 
+func (c *LocalCluster) changeVersion(version string) error {
+	c.conf.version = version
+
+	higher, err := IsHigherVersion(c.GetVersion(), "v21.03.0")
+	if err != nil {
+		return errors.Wrapf(err, "error checking if version %s is older than v21.03.0", c.GetVersion())
+	}
+	c.lowerThanV21 = !higher
+
+	return nil
+}
+
 // Upgrades the cluster to the provided dgraph version
 func (c *LocalCluster) Upgrade(version string, strategy UpgradeStrategy) error {
 	if version == c.conf.version {
@@ -517,7 +536,9 @@ func (c *LocalCluster) Upgrade(version string, strategy UpgradeStrategy) error {
 			return err
 		}
 
-		c.conf.version = version
+		if err := c.changeVersion(version); err != nil {
+			return err
+		}
 		if err := c.setupBinary(); err != nil {
 			return err
 		}
@@ -567,7 +588,9 @@ func (c *LocalCluster) Upgrade(version string, strategy UpgradeStrategy) error {
 			return err
 		}
 
-		c.conf.version = version
+		if err := c.changeVersion(version); err != nil {
+			return err
+		}
 		if err := c.setupBinary(); err != nil {
 			return err
 		}
@@ -586,7 +609,9 @@ func (c *LocalCluster) Upgrade(version string, strategy UpgradeStrategy) error {
 		if err := c.Stop(); err != nil {
 			return err
 		}
-		c.conf.version = version
+		if err := c.changeVersion(version); err != nil {
+			return err
+		}
 		if err := c.setupBinary(); err != nil {
 			return err
 		}

diff --git a/ee/acl/upgrade_test.go b/ee/acl/upgrade_test.go
@@ -53,7 +53,7 @@ func (asuite *AclTestSuite) Upgrade() {
 }
 
 func TestACLSuite(t *testing.T) {
-	for _, uc := range dgraphtest.AllUpgradeCombos() {
+	for _, uc := range dgraphtest.AllUpgradeCombos(false) {
 		log.Printf("running upgrade tests for confg: %+v", uc)
 		aclSuite := AclTestSuite{uc: uc}
 		suite.Run(t, &aclSuite)

diff --git a/query/upgrade_test.go b/query/upgrade_test.go
@@ -75,7 +75,7 @@ func TestMain(m *testing.M) {
 		}
 	}
 
-	for _, uc := range dgraphtest.AllUpgradeCombos() {
+	for _, uc := range dgraphtest.AllUpgradeCombos(true) {
 		log.Printf("running upgrade tests for confg: %+v", uc)
 		runTest(uc)
 	}

diff --git a/systest/license/upgrade_test.go b/systest/license/upgrade_test.go
@@ -62,7 +62,7 @@ func (lsuite *LicenseTestSuite) Upgrade() {
 }
 
 func TestLicenseTestSuite(t *testing.T) {
-	for _, uc := range dgraphtest.AllUpgradeCombos() {
+	for _, uc := range dgraphtest.AllUpgradeCombos(false) {
 		log.Printf("running: backup in [%v], restore in [%v]", uc.Before, uc.After)
 		var tsuite LicenseTestSuite
 		tsuite.uc = uc

diff --git a/systest/multi-tenancy/upgrade_test.go b/systest/multi-tenancy/upgrade_test.go
@@ -60,7 +60,7 @@ func (msuite *MultitenancyTestSuite) Upgrade() {
 }
 
 func TestMultitenancySuite(t *testing.T) {
-	for _, uc := range dgraphtest.AllUpgradeCombos() {
+	for _, uc := range dgraphtest.AllUpgradeCombos(false) {
 		log.Printf("running upgrade tests for confg: %+v", uc)
 		var msuite MultitenancyTestSuite
 		msuite.uc = uc