Merge pull request #5951 from sjenning/e2e-set-default-expiration-date

NO-JIRA: set default expriationDate tag in AWS if not set

Author: openshift-merge-bot[bot]

test/e2e/util/options.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"strings"
 	"testing"
+	"time"
 
 	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	hypershiftaws "github.com/openshift/hypershift/cmd/cluster/aws"
@@ -254,6 +255,20 @@ func (o *Options) DefaultAWSOptions() hypershiftaws.RawCreateOptions {
 		opts.PublicOnly = false
 	}
 
+	// Set an expiration date tag if it's not already set
+	expirationDateTagSet := false
+	for _, tag := range o.AdditionalTags {
+		key := strings.Split(tag, "=")[0]
+		if key == "expirationDate" {
+			expirationDateTagSet = true
+			break
+		}
+	}
+	if !expirationDateTagSet {
+		// Set the expiration date tag to be 4 hours from now
+		o.AdditionalTags = append(o.AdditionalTags, fmt.Sprintf("expirationDate=%s", time.Now().Add(4*time.Hour).UTC().Format(time.RFC3339)))
+	}
+
 	opts.AdditionalTags = append(opts.AdditionalTags, o.AdditionalTags...)
 	if len(o.ConfigurableClusterOptions.Zone) == 0 {
 		// align with default for e2e.aws-region flag