Wait improvements

iterative · Jul 9, 2021 · 05aa3a3 · 05aa3a3
1 parent 65a1177
commit 05aa3a3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/iterative/aws/provider.go b/iterative/aws/provider.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"net"
 	"regexp"
 	"sort"
 	"strconv"
@@ -16,8 +15,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/sts"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-
-	"terraform-provider-iterative/iterative/utils"
 )
 
 //ResourceMachineCreate creates AWS instance
@@ -440,7 +437,3 @@ func decodeAWSError(region string, err error) error {
 
 	return fmt.Errorf("Not able to decode: %s", err.Error())
 }
-
-func ResourceMachineLogs(ctx context.Context, d *schema.ResourceData, m interface{}) (string, error) {
-	return utils.RunCommand("journalctl --no-pager", 10*time.Second, net.JoinHostPort(d.Get("instance_ip").(string), "22"), "ubuntu", d.Get("ssh_private").(string))
-}
diff --git a/iterative/azure/provider.go b/iterative/azure/provider.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"net"
 	"os"
 	"strings"
 	"time"
@@ -17,8 +16,6 @@ import (
 	"github.com/Azure/go-autorest/autorest/to"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-
-	"terraform-provider-iterative/iterative/utils"
 )
 
 //ResourceMachineCreate creates AWS instance
@@ -396,7 +393,3 @@ func subscriptionID() (string, error) {
 
 	return "", errors.New("AZURE_SUBSCRIPTION_ID is not present")
 }
-
-func ResourceMachineLogs(ctx context.Context, d *schema.ResourceData, m interface{}) (string, error) {
-	return utils.RunCommand("journalctl --no-pager", 10*time.Second, net.JoinHostPort(d.Get("instance_ip").(string), "22"), "ubuntu", d.Get("ssh_private").(string))
-}
diff --git a/iterative/resource_machine.go b/iterative/resource_machine.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
+	"net"
 	"time"
 
 	"terraform-provider-iterative/iterative/aws"
@@ -236,13 +237,13 @@ func resourceMachineRead(ctx context.Context, d *schema.ResourceData, m interfac
 
 func resourceMachineLogs(ctx context.Context, d *schema.ResourceData, m interface{}) (string, error) {
 	switch cloud := d.Get("cloud").(string); cloud {
-	case "aws":
-		return aws.ResourceMachineLogs(ctx, d, m)
-	case "azure":
-		return azure.ResourceMachineLogs(ctx, d, m)
 	case "kubernetes":
 		return kubernetes.ResourceMachineLogs(ctx, d, m)
 	default:
-		return "", fmt.Errorf("Unknown cloud: %s", cloud)
+		return utils.RunCommand("journalctl --no-pager",
+			2*time.Second,
+			net.JoinHostPort(d.Get("instance_ip").(string), "22"),
+			"ubuntu",
+			d.Get("ssh_private").(string))
 	}
 }
diff --git a/iterative/resource_runner.go b/iterative/resource_runner.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"net"
 	"os"
 	"strconv"
 	"text/template"
@@ -210,7 +211,17 @@ func resourceRunnerCreate(ctx context.Context, d *schema.ResourceData, m interfa
 	var logError error
 	var logEvents string
 	err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
-		logEvents, logError = resourceMachineLogs(ctx, d, m)
+		switch cloud := d.Get("cloud").(string); cloud {
+		case "kubernetes":
+			logEvents, logError = resourceMachineLogs(ctx, d, m)
+		default:
+			logEvents, logError = utils.RunCommand("journalctl --unit cml --no-pager",
+				2*time.Second,
+				net.JoinHostPort(d.Get("instance_ip").(string), "22"),
+				"ubuntu",
+				d.Get("ssh_private").(string))
+		}
+
 		log.Printf("[DEBUG] Collected log events: %#v", logEvents)
 		log.Printf("[DEBUG] Connection errors: %#v", logError)