#23 #25 Tune client side timeout and add keycloak-less support

Author: lbroudoux

cmd/help.go

@@ -33,7 +33,7 @@ func (c *helpCommand) Execute() {
 	fmt.Println("Args: ")
 	fmt.Println("  <apiName:apiVersion>   Exemple: 'Beer Catalog API:0.9'")
 	fmt.Println("  <testEndpoint>         URL where is deployed implementation to test")
-	fmt.Println("  <runner>               Test strategy (one of: HTTP, SOAP, SOAP_UI, POSTMAN, OPEN_API_SCHEMA)")
+	fmt.Println("  <runner>               Test strategy (one of: HTTP, SOAP, SOAP_UI, POSTMAN, OPEN_API_SCHEMA, ASYNC_API_SCHEMA, GRPC_PROTOBUF, GRAPHQL_SCHEMA)")
 	fmt.Println("")
 	fmt.Println("Flags: ")
 	fmt.Println("  --microcksURL          Microcks API endpoint")

cmd/import.go

@@ -74,8 +74,6 @@ func (c *importComamnd) Execute() {
 		config.Verbose = true
 	}
 
-	//
-
 	// Now we seems to be good ...
 	// First - retrieve the Keycloak URL from Microcks configuration.
 	mc := connectors.NewMicrocksClient(microcksURL)
@@ -85,14 +83,16 @@ func (c *importComamnd) Execute() {
 		os.Exit(1)
 	}
 
-	// Second - retrieve an OAuth token using Keycloak Client.
-	kc := connectors.NewKeycloakClient(keycloakURL, keycloakClientID, keycloakClientSecret)
+	var oauthToken string = "unauthentifed-token"
+	if keycloakURL != "null" {
+		//  If Keycloak is enabled, retrieve an OAuth token using Keycloak Client.
+		kc := connectors.NewKeycloakClient(keycloakURL, keycloakClientID, keycloakClientSecret)
 
-	var oauthToken string
-	oauthToken, err = kc.ConnectAndGetToken()
-	if err != nil {
-		fmt.Printf("Got error when invoking Keycloack client: %s", err)
-		os.Exit(1)
+		oauthToken, err = kc.ConnectAndGetToken()
+		if err != nil {
+			fmt.Printf("Got error when invoking Keycloack client: %s", err)
+			os.Exit(1)
+		}
 	}
 
 	// Then - for each specificationFile, upload the artifact on Microcks Server.

cmd/test.go

@@ -131,16 +131,18 @@ func (c *testComamnd) Execute() {
 		os.Exit(1)
 	}
 
-	// Second - retrieve an OAuth token using Keycloak Client.
-	kc := connectors.NewKeycloakClient(keycloakURL, keycloakClientID, keycloakClientSecret)
+	var oauthToken string = "unauthentifed-token"
+	if keycloakURL != "null" {
+		// If Keycloak is enabled, retrieve an OAuth token using Keycloak Client.
+		kc := connectors.NewKeycloakClient(keycloakURL, keycloakClientID, keycloakClientSecret)
 
-	var oauthToken string
-	oauthToken, err = kc.ConnectAndGetToken()
-	if err != nil {
-		fmt.Printf("Got error when invoking Keycloack client: %s", err)
-		os.Exit(1)
+		oauthToken, err = kc.ConnectAndGetToken()
+		if err != nil {
+			fmt.Printf("Got error when invoking Keycloack client: %s", err)
+			os.Exit(1)
+		}
+		//fmt.Printf("Retrieve OAuthToken: %s", oauthToken)
 	}
-	//fmt.Printf("Retrieve OAuthToken: %s", oauthToken)
 
 	// Then - launch the test on Microcks Server.
 	mc.SetOAuthToken(oauthToken)
@@ -153,10 +155,12 @@ func (c *testComamnd) Execute() {
 	}
 	//fmt.Printf("Retrieve TestResult ID: %s", testResultID)
 
-	// Finally - wait for some time
-	// Add 5000ms to wait time as it's now representing the server timeout.
+	// Finally - wait before checking and loop for some time
+	time.Sleep(1 * time.Second)
+
+	// Add 10.000ms to wait time as it's now representing the server timeout.
 	now := nowInMilliseconds()
-	future := now + waitForMilliseconds + 5000
+	future := now + waitForMilliseconds + 10000
 
 	var success = false
 	for nowInMilliseconds() < future {