Fix assorted Kubernetes issues (#511)

Author: 0x2b3bfa0

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/Azure/go-autorest/autorest/azure/auth v0.5.8
 	github.com/Azure/go-autorest/autorest/to v0.4.0
 	github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
-	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
+	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
 	github.com/alessio/shellescape v1.4.1 // indirect
 	github.com/aohorodnyk/uid v1.1.0
 	github.com/aws/aws-sdk-go v1.40.27 // indirect
@@ -22,7 +22,7 @@ require (
 	github.com/blang/semver/v4 v4.0.0
 	github.com/brianvoe/gofakeit/v6 v6.9.0
 	github.com/cloudflare/gokey v0.1.0
-	github.com/docker/go-units v0.4.0 // indirect
+	github.com/docker/go-units v0.4.0
 	github.com/gobwas/glob v0.2.3
 	github.com/google/go-github/v42 v42.0.0
 	github.com/hashicorp/hcl/v2 v2.8.0 // indirect

iterative/resource_task.go

@@ -201,22 +201,23 @@ func resourceTaskRead(ctx context.Context, d *schema.ResourceData, m interface{}
 		return diagnostic(diags, err, diag.Warning)
 	}
 
-	keyPair, err := task.GetKeyPair(ctx)
-	if err != nil {
-		return diagnostic(diags, err, diag.Warning)
-	}
-
-	publicKey, err := keyPair.PublicString()
-	if err != nil {
-		return diagnostic(diags, err, diag.Warning)
-	}
-	d.Set("ssh_public_key", publicKey)
+	if keyPair, err := task.GetKeyPair(ctx); err != nil {
+		if err != common.NotImplementedError {
+			return diagnostic(diags, err, diag.Warning)
+		}
+	} else {
+		publicKey, err := keyPair.PublicString()
+		if err != nil {
+			return diagnostic(diags, err, diag.Warning)
+		}
+		d.Set("ssh_public_key", publicKey)
 
-	privateKey, err := keyPair.PrivateString()
-	if err != nil {
-		return diagnostic(diags, err, diag.Warning)
+		privateKey, err := keyPair.PrivateString()
+		if err != nil {
+			return diagnostic(diags, err, diag.Warning)
+		}
+		d.Set("ssh_private_key", privateKey)
 	}
-	d.Set("ssh_private_key", privateKey)
 
 	var addresses []string
 	for _, address := range task.GetAddresses(ctx) {

task/k8s/resources/common.go

@@ -5,7 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 
 	"terraform-provider-iterative/task/k8s/client"
@@ -14,13 +15,19 @@ import (
 // Wait for the pods matching the specified selector to pass their respective readiness probes.
 func WaitForPods(ctx context.Context, client *client.Client, interval time.Duration, timeout time.Duration, namespace string, selector string) (string, error) {
 	// Retrieve all the pods matching the given selector.
-	pods, err := client.Services.Core.Pods(namespace).
-		List(ctx, v1.ListOptions{LabelSelector: selector})
-
-	if err != nil {
-		return "", err
-	} else if len(pods.Items) == 0 {
-		return "", fmt.Errorf("no pods in %s matching %s", namespace, selector)
+	var pods *corev1.PodList
+	function := func() (done bool, err error) {
+		pods, err = client.Services.Core.Pods(namespace).
+			List(ctx, metav1.ListOptions{LabelSelector: selector})
+		if err != nil {
+			return false, err
+		} else if len(pods.Items) > 0 {
+			return true, nil
+		}
+		return false, nil
+	}
+	if err := wait.PollImmediate(interval, timeout, function); err != nil {
+		return "", fmt.Errorf("no pods in %s matching %s: %w", namespace, selector, err)
 	}
 
 	var podName string
@@ -29,7 +36,7 @@ func WaitForPods(ctx context.Context, client *client.Client, interval time.Durat
 		// Define a closured function in charge of checking the state of the current pod.
 		function := func() (bool, error) {
 			pod, err := client.Services.Core.Pods(namespace).
-				Get(ctx, currentPod.Name, v1.GetOptions{})
+				Get(ctx, currentPod.Name, metav1.GetOptions{})
 
 			if err != nil {
 				return false, err

task/k8s/task.go

@@ -273,7 +273,7 @@ func (t *Task) GetAddresses(ctx context.Context) []net.IP {
 }
 
 func (t *Task) GetKeyPair(ctx context.Context) (*ssh.DeterministicSSHKeyPair, error) {
-	return nil, common.NotFoundError
+	return nil, common.NotImplementedError
 }
 
 func (t *Task) GetIdentifier(ctx context.Context) common.Identifier {