[FEATURE] JSONPath feature

src/cmd/tools/wait.go

@@ -25,6 +25,7 @@ import (
 var (
 	waitTimeout   string
 	waitNamespace string
+	waitType      string
 )
 
 var waitForCmd = &cobra.Command{
@@ -50,6 +51,13 @@ var waitForCmd = &cobra.Command{
 			condition = args[2]
 		}
 
+		// Check if waitType is JSONPath or condition
+		if utils.IsJSONPathWaitType(condition) {
+			waitType = "jsonpath="
+		} else {
+			waitType = "condition="
+		}
+
 		// Handle network endpoints.
 		switch kind {
 		case "http", "https", "tcp":
@@ -83,6 +91,7 @@ var waitForCmd = &cobra.Command{
 		conditionMsg := fmt.Sprintf("Waiting for %s%s%s to be %s.", kind, identifierMsg, namespaceMsg, condition)
 		existMsg := fmt.Sprintf("Waiting for %s%s%s to exist.", kind, identifierMsg, namespaceMsg)
 		spinner := message.NewProgressSpinner(existMsg)
+
 		defer spinner.Stop()
 
 		for {
@@ -112,7 +121,7 @@ var waitForCmd = &cobra.Command{
 				spinner.Updatef(conditionMsg)
 				// Wait for the resource to meet the given condition.
 				args = []string{"tools", "kubectl", "wait", "-n", waitNamespace,
-					kind, identifier, "--for", "condition=" + condition,
+					kind, identifier, "--for", waitType + condition,
 					"--timeout=" + waitTimeout}
 
 				// If there is an error, log it and try again.

src/pkg/utils/misc.go

@@ -7,9 +7,18 @@ package utils
 import (
 	"fmt"
 	"regexp"
+	"strings"
 	"time"
 )
 
+func IsJSONPathWaitType(condition string) bool {
+	if condition[0] != '{' || !strings.Contains(condition, "=") || !strings.Contains(condition, "}") {
+		return false
+	}
+
+	return true
+}
+
 // Unique returns a new slice with only unique elements.
 func Unique[T comparable](s []T) (r []T) {
 	exists := make(map[T]bool)

src/pkg/utils/misc_test.go

@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2021-Present The Zarf Authors
+
+// Package utils provides generic helper functions.
+package utils
+
+import (
+	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/suite"
+)
+
+type TestIsJSONPathWaitTypeSuite struct {
+	suite.Suite
+	*require.Assertions
+	waitTypes testWaitTypes
+}
+
+type testWaitTypes struct {
+	jsonPathType  []string
+	conditionType []string
+}
+
+func (suite *TestIsJSONPathWaitTypeSuite) SetupSuite() {
+	suite.Assertions = require.New(suite.T())
+
+	suite.waitTypes.jsonPathType = []string{
+		"{.status.availableReplicas}=1",
+		"{.status.containerStatuses[0].ready}=true",
+		"{.spec.containers[0].ports[0].containerPort}=80",
+		"{.spec.nodeName}=knode0",
+	}
+	suite.waitTypes.conditionType = []string{
+		"Ready",
+		"delete",
+		"",
+	}
+}
+
+func (suite *TestIsJSONPathWaitTypeSuite) Test_0_IsJSONPathWaitType() {
+	for _, waitType := range suite.waitTypes.conditionType {
+		suite.True(IsJSONPathWaitType(waitType), "Expected %s to be a JSONPath wait type", waitType)
+	}
+	for _, waitType := range suite.waitTypes.jsonPathType {
+		suite.False(IsJSONPathWaitType(waitType), "Expected %s not to be a JSONPath wait type", waitType)
+	}
+}