Browse Source

e2e: replace v3alpha with v3beta in curl grpc-gateway tests

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
Gyu-Ho Lee 8 years ago
parent
commit
02be1ace59
1 changed files with 14 additions and 15 deletions
  1. 14 15
      e2e/v3_curl_test.go

+ 14 - 15
e2e/v3_curl_test.go

@@ -63,15 +63,15 @@ func testCurlPutGetGRPCGateway(t *testing.T, cfg *etcdProcessClusterConfig) {
 		t.Fatal(err)
 	}
 
-	if err := cURLPost(epc, cURLReq{endpoint: "/v3alpha/kv/put", value: string(putData), expected: expectPut}); err != nil {
+	if err := cURLPost(epc, cURLReq{endpoint: "/v3beta/kv/put", value: string(putData), expected: expectPut}); err != nil {
 		t.Fatalf("failed put with curl (%v)", err)
 	}
-	if err := cURLPost(epc, cURLReq{endpoint: "/v3alpha/kv/range", value: string(rangeData), expected: expectGet}); err != nil {
+	if err := cURLPost(epc, cURLReq{endpoint: "/v3beta/kv/range", value: string(rangeData), expected: expectGet}); err != nil {
 		t.Fatalf("failed get with curl (%v)", err)
 	}
 
 	if cfg.clientTLS == clientTLSAndNonTLS {
-		if err := cURLPost(epc, cURLReq{endpoint: "/v3alpha/kv/range", value: string(rangeData), expected: expectGet, isTLS: true}); err != nil {
+		if err := cURLPost(epc, cURLReq{endpoint: "/v3beta/kv/range", value: string(rangeData), expected: expectGet, isTLS: true}); err != nil {
 			t.Fatalf("failed get with curl (%v)", err)
 		}
 	}
@@ -95,7 +95,7 @@ func TestV3CurlWatch(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err = cURLPost(epc, cURLReq{endpoint: "/v3alpha/kv/put", value: string(putreq), expected: "revision"}); err != nil {
+	if err = cURLPost(epc, cURLReq{endpoint: "/v3beta/kv/put", value: string(putreq), expected: "revision"}); err != nil {
 		t.Fatalf("failed put with curl (%v)", err)
 	}
 	// watch for first update to "foo"
@@ -109,7 +109,7 @@ func TestV3CurlWatch(t *testing.T) {
 	// but the gprc-gateway expects a different format..
 	wstr := `{"create_request" : ` + string(wreq) + "}"
 	// expects "bar", timeout after 2 seconds since stream waits forever
-	if err = cURLPost(epc, cURLReq{endpoint: "/v3alpha/watch", value: wstr, expected: `"YmFy"`, timeout: 2}); err != nil {
+	if err = cURLPost(epc, cURLReq{endpoint: "/v3beta/watch", value: wstr, expected: `"YmFy"`, timeout: 2}); err != nil {
 		t.Fatal(err)
 	}
 }
@@ -152,13 +152,13 @@ func TestV3CurlTxn(t *testing.T) {
 		t.Fatal(jerr)
 	}
 	expected := `"succeeded":true,"responses":[{"response_put":{"header":{"revision":"2"}}}]`
-	if err = cURLPost(epc, cURLReq{endpoint: "/v3alpha/kv/txn", value: string(jsonDat), expected: expected}); err != nil {
+	if err = cURLPost(epc, cURLReq{endpoint: "/v3beta/kv/txn", value: string(jsonDat), expected: expected}); err != nil {
 		t.Fatalf("failed txn with curl (%v)", err)
 	}
 
 	// was crashing etcd server
 	malformed := `{"compare":[{"result":0,"target":1,"key":"Zm9v","TargetUnion":null}],"success":[{"Request":{"RequestPut":{"key":"Zm9v","value":"YmFy"}}}]}`
-	if err = cURLPost(epc, cURLReq{endpoint: "/v3alpha/kv/txn", value: malformed, expected: "error"}); err != nil {
+	if err = cURLPost(epc, cURLReq{endpoint: "/v3beta/kv/txn", value: malformed, expected: "error"}); err != nil {
 		t.Fatalf("failed put with curl (%v)", err)
 	}
 }
@@ -179,7 +179,7 @@ func TestV3CurlAuth(t *testing.T) {
 	userreq, err := json.Marshal(&pb.AuthUserAddRequest{Name: string("root"), Password: string("toor")})
 	testutil.AssertNil(t, err)
 
-	if err = cURLPost(epc, cURLReq{endpoint: "/v3alpha/auth/user/add", value: string(userreq), expected: "revision"}); err != nil {
+	if err = cURLPost(epc, cURLReq{endpoint: "/v3beta/auth/user/add", value: string(userreq), expected: "revision"}); err != nil {
 		t.Fatalf("failed add user with curl (%v)", err)
 	}
 
@@ -187,7 +187,7 @@ func TestV3CurlAuth(t *testing.T) {
 	rolereq, err := json.Marshal(&pb.AuthRoleAddRequest{Name: string("root")})
 	testutil.AssertNil(t, err)
 
-	if err = cURLPost(epc, cURLReq{endpoint: "/v3alpha/auth/role/add", value: string(rolereq), expected: "revision"}); err != nil {
+	if err = cURLPost(epc, cURLReq{endpoint: "/v3beta/auth/role/add", value: string(rolereq), expected: "revision"}); err != nil {
 		t.Fatalf("failed create role with curl (%v)", err)
 	}
 
@@ -195,12 +195,12 @@ func TestV3CurlAuth(t *testing.T) {
 	grantrolereq, err := json.Marshal(&pb.AuthUserGrantRoleRequest{User: string("root"), Role: string("root")})
 	testutil.AssertNil(t, err)
 
-	if err = cURLPost(epc, cURLReq{endpoint: "/v3alpha/auth/user/grant", value: string(grantrolereq), expected: "revision"}); err != nil {
+	if err = cURLPost(epc, cURLReq{endpoint: "/v3beta/auth/user/grant", value: string(grantrolereq), expected: "revision"}); err != nil {
 		t.Fatalf("failed grant role with curl (%v)", err)
 	}
 
 	// enable auth
-	if err = cURLPost(epc, cURLReq{endpoint: "/v3alpha/auth/enable", value: string("{}"), expected: "revision"}); err != nil {
+	if err = cURLPost(epc, cURLReq{endpoint: "/v3beta/auth/enable", value: string("{}"), expected: "revision"}); err != nil {
 		t.Fatalf("failed enable auth with curl (%v)", err)
 	}
 
@@ -209,7 +209,7 @@ func TestV3CurlAuth(t *testing.T) {
 	testutil.AssertNil(t, err)
 
 	// fail put no auth
-	if err = cURLPost(epc, cURLReq{endpoint: "/v3alpha/kv/put", value: string(putreq), expected: "error"}); err != nil {
+	if err = cURLPost(epc, cURLReq{endpoint: "/v3beta/kv/put", value: string(putreq), expected: "error"}); err != nil {
 		t.Fatalf("failed no auth put with curl (%v)", err)
 	}
 
@@ -223,7 +223,7 @@ func TestV3CurlAuth(t *testing.T) {
 		lineFunc   = func(txt string) bool { return true }
 	)
 
-	cmdArgs = cURLPrefixArgs(epc, "POST", cURLReq{endpoint: "/v3alpha/auth/authenticate", value: string(authreq)})
+	cmdArgs = cURLPrefixArgs(epc, "POST", cURLReq{endpoint: "/v3beta/auth/authenticate", value: string(authreq)})
 	proc, err := spawnCmd(cmdArgs)
 	testutil.AssertNil(t, err)
 
@@ -241,8 +241,7 @@ func TestV3CurlAuth(t *testing.T) {
 	authHeader = "Authorization : " + token
 
 	// put with auth
-	if err = cURLPost(epc, cURLReq{endpoint: "/v3alpha/kv/put", value: string(putreq), header: authHeader, expected: "revision"}); err != nil {
+	if err = cURLPost(epc, cURLReq{endpoint: "/v3beta/kv/put", value: string(putreq), header: authHeader, expected: "revision"}); err != nil {
 		t.Fatalf("failed auth put with curl (%v)", err)
 	}
-
 }