Issue 12-13 (#14)

added --legacy and --opdk flags in token

apigee/revision.go

@@ -26,10 +26,10 @@ type Revision int
 
 // MarshalJSON implements the json.Marshaler interface. It marshals from
 // a Revision holding an integer value like 2, into a string like "2".
-func (r *Revision) MarshalJSON() ([]byte, error) {
-	rev := fmt.Sprintf("%d", r)
-	return []byte(rev), nil
-}
+// func (r *Revision) MarshalJSON() ([]byte, error) {
+// 	rev := fmt.Sprintf("%d", r)
+// 	return []byte(rev), nil
+// }
 
 // UnmarshalJSON implements the json.Unmarshaler interface. It unmarshals from
 // a string like "2" (including the quotes), into an integer 2.

cmd/bindings/bindings_test.go

@@ -69,6 +69,9 @@ func TestBindingListOPDK(t *testing.T) {
 		"/product/",
 		":",
 		"\n",
+		"/product1/",
+		":",
+		"\n",
 	}
 	print.Check(t, wants)
 }
@@ -106,6 +109,17 @@ func TestBindingAddOPDK(t *testing.T) {
 	}
 	wants = []string{"target /target/ is already bound to /product2/"}
 	print.Check(t, wants)
+
+	flags = []string{"bindings", "add", "/target/", "/product3/", "--opdk", "--runtime", ts.URL,
+		"-o", "/org/", "-e", "/env/", "-u", "/username/", "-p", "password"}
+	rootArgs = &shared.RootArgs{}
+	rootCmd = cmd.GetRootCmd(flags, print.Printf)
+	shared.AddCommandWithFlags(rootCmd, rootArgs, Cmd(rootArgs, print.Printf))
+	wantErr := "invalid product name: /product3/"
+	err = rootCmd.Execute()
+	if err == nil || err.Error() != wantErr {
+		t.Errorf("add want %s, got: %v", wantErr, err)
+	}
 }
 
 func TestBindingRemoveOPDK(t *testing.T) {
@@ -141,12 +155,26 @@ func TestBindingRemoveOPDK(t *testing.T) {
 	}
 	wants = []string{"product /product2/ is no longer bound to: /target/"}
 	print.Check(t, wants)
+
+	flags = []string{"bindings", "remove", "/target/", "/product3/", "--opdk", "--runtime", ts.URL,
+		"-o", "/org/", "-e", "/env/", "-u", "/username/", "-p", "password"}
+	rootArgs = &shared.RootArgs{}
+	rootCmd = cmd.GetRootCmd(flags, print.Printf)
+	shared.AddCommandWithFlags(rootCmd, rootArgs, Cmd(rootArgs, print.Printf))
+	wants = []string{"invalid product name: /product3/"}
+	if err = rootCmd.Execute(); err != nil {
+		t.Errorf("want no error, got: %v", err)
+	}
+	print.Check(t, wants)
 }
 
 func productTestServer(t *testing.T) *httptest.Server {
 
 	res := product.APIResponse{
 		APIProducts: []product.APIProduct{
+			{
+				Name: "/product1/",
+			},
 			{
 				Name: "/product/",
 			},
@@ -158,6 +186,8 @@ func productTestServer(t *testing.T) *httptest.Server {
 						Value: "/target/",
 					},
 				},
+				QuotaLimit: "null",
+				Scopes:     []string{""},
 			},
 		},
 	}