all: update swagger definitions and fix failing tests

matsuu · Oct 5, 2017 · 92fe6bb · 92fe6bb
1 parent b5109f8
commit 92fe6bb
Show file tree

Hide file tree

Showing 24 changed files with 1,989 additions and 287 deletions.
diff --git a/cmd/cli/handler_jwk.go b/cmd/cli/handler_jwk.go
@@ -41,7 +41,7 @@ func (h *JWKHandler) CreateKeys(cmd *cobra.Command, args []string) {
 	}
 
 	alg, _ := cmd.Flags().GetString("alg")
-	keys, response, err := m.CreateJsonWebKeySet(args[0], hydra.CreateJsonWebKeySetPayload{Alg: alg, Kid: kid})
+	keys, response, err := m.CreateJsonWebKeySet(args[0], hydra.JsonWebKeySetGeneratorRequest{Alg: alg, Kid: kid})
 	checkResponse(response, err, http.StatusCreated)
 	fmt.Printf("%s\n", formatResponse(keys))
 }

diff --git a/cmd/cli/handler_recovation.go b/cmd/cli/handler_recovation.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"net/http"
 
+	"crypto/tls"
+
 	"github.com/ory/hydra/config"
 	hydra "github.com/ory/hydra/sdk/go/hydra/swagger"
 	"github.com/spf13/cobra"
@@ -24,7 +26,14 @@ func (h *RevocationHandler) RevokeToken(cmd *cobra.Command, args []string) {
 	}
 
 	handler := hydra.NewOAuth2ApiWithBasePath(h.Config.ClusterURL)
-	handler.Configuration.Transport = h.Config.OAuth2Client(cmd).Transport
+	handler.Configuration.Username = h.Config.ClientID
+	handler.Configuration.Password = h.Config.ClientSecret
+
+	if skip, _ := cmd.Flags().GetBool("skip-tls-verify"); skip {
+		handler.Configuration.Transport = &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+		}
+	}
 
 	if term, _ := cmd.Flags().GetBool("fake-tls-termination"); term {
 		handler.Configuration.DefaultHeader["X-Forwarded-Proto"] = "https"

diff --git a/cmd/root_test.go b/cmd/root_test.go
@@ -40,7 +40,7 @@ func TestExecute(t *testing.T) {
 				return err != nil
 			},
 		},
-		{args: []string{"connect", "--id", "admin", "--secret", "pw", "--url", "https://127.0.0.1:4444/"}},
+		{args: []string{"connect", "--id", "admin", "--secret", "pw", "--url", "https://127.0.0.1:4444"}},
 		{args: []string{"clients", "create", "--id", "foobarbaz"}},
 		{args: []string{"clients", "get", "foobarbaz"}},
 		{args: []string{"clients", "create", "--id", "public-foo", "--is-public"}},