diff --git a/internal/cmd/all/list_test.go b/internal/cmd/all/list_test.go index ee8f7661b..bed51424a 100644 --- a/internal/cmd/all/list_test.go +++ b/internal/cmd/all/list_test.go @@ -238,12 +238,12 @@ func TestListAll(t *testing.T) { expOut := `SERVERS --- ID NAME STATUS IPV4 IPV6 PRIVATE NET LOCATION AGE -123 my server running 192.0.2.1 - - hel1 3d +123 my server running 192.0.2.1 - - hel1 3d IMAGES --- ID TYPE NAME DESCRIPTION ARCHITECTURE IMAGE SIZE DISK SIZE CREATED DEPRECATED -1 backup test - arm - 20 GB 2036-08-20 12:00:00 UTC - +1 backup test - arm - 20 GB 2036-08-20 12:00:00 UTC - PLACEMENT GROUPS --- @@ -253,12 +253,12 @@ ID NAME SERVERS TYPE AGE PRIMARY IPS --- ID TYPE NAME IP ASSIGNEE DNS AUTO DELETE AGE -123 ipv4 test 127.0.0.1 - - no 2h +123 ipv4 test 127.0.0.1 - - no 2h ISOS --- ID NAME DESCRIPTION TYPE ARCHITECTURE -123 test - private arm +123 test - private arm VOLUMES --- @@ -268,12 +268,12 @@ ID NAME SIZE SERVER LOCATION AGE LOAD BALANCER --- ID NAME HEALTH IPV4 IPV6 TYPE LOCATION NETWORK ZONE AGE -123 foobar healthy 192.0.2.1 :: lb11 fsn1 eu-central 5h +123 foobar healthy 192.0.2.1 :: lb11 fsn1 eu-central 5h FLOATING IPS --- ID TYPE NAME DESCRIPTION IP HOME SERVER DNS AGE -123 ipv4 test - 127.0.0.1 fsn1 - - 1d +123 ipv4 test - 127.0.0.1 fsn1 - - 1d NETWORKS --- @@ -283,7 +283,7 @@ ID NAME IP RANGE SERVERS AGE FIREWALLS --- ID NAME RULES COUNT APPLIED TO COUNT AGE -123 test 5 Rules 2 Servers | 0 Label Selectors 7m +123 test 5 Rules 2 Servers | 0 Label Selectors 7m CERTIFICATES --- @@ -293,12 +293,12 @@ ID NAME TYPE DOMAIN NAMES NOT VALID AFTER AGE SSH KEYS --- ID NAME FINGERPRINT AGE -123 test - 2h +123 test - 2h STORAGE BOXES --- ID NAME USERNAME SERVER TYPE SIZE LOCATION AGE -123 test u12345 u1337.your-storagebox.de bx11 42 GiB fsn1 3h +123 test u12345 u1337.your-storagebox.de bx11 42 GiB fsn1 3h ZONES --- diff --git a/internal/cmd/base/list_test.go b/internal/cmd/base/list_test.go index 3487ea6cd..048e7e53a 100644 --- a/internal/cmd/base/list_test.go +++ b/internal/cmd/base/list_test.go @@ -84,8 +84,8 @@ func TestList(t *testing.T) { testutil.TestCommand(t, fakeListCmd, map[string]testutil.TestCase{ "no flags": { Args: []string{"list"}, - ExpOut: `ID NAME -123 test + ExpOut: `ID NAME +123 test 456 test2 789 test3 `, @@ -102,8 +102,8 @@ func TestList(t *testing.T) { }, "quiet": { Args: []string{"list", "--quiet"}, - ExpOut: `ID NAME -123 test + ExpOut: `ID NAME +123 test 456 test2 789 test3 `, diff --git a/internal/cmd/config/list_test.go b/internal/cmd/config/list_test.go index 85ea6d327..8eddc38e3 100644 --- a/internal/cmd/config/list_test.go +++ b/internal/cmd/config/list_test.go @@ -58,52 +58,52 @@ func TestList(t *testing.T) { { name: "default", args: []string{}, - expOut: `KEY VALUE -context test_context -debug yes -deeply.nested.option bar + expOut: `KEY VALUE +context test_context +debug yes +deeply.nested.option bar endpoint https://example.com -poll-interval 1.234s -quiet yes -token [redacted] +poll-interval 1.234s +quiet yes +token [redacted] `, }, { name: "only key", args: []string{"-o=columns=key"}, - expOut: `KEY -context -debug + expOut: `KEY +context +debug deeply.nested.option -endpoint -poll-interval -quiet -token +endpoint +poll-interval +quiet +token `, }, { name: "no header", args: []string{"-o=noheader"}, - expOut: `context test_context -debug yes -deeply.nested.option bar + expOut: `context test_context +debug yes +deeply.nested.option bar endpoint https://example.com -poll-interval 1.234s -quiet yes -token [redacted] +poll-interval 1.234s +quiet yes +token [redacted] `, }, { name: "allow sensitive", args: []string{"--allow-sensitive"}, - expOut: `KEY VALUE -context test_context -debug yes -deeply.nested.option bar + expOut: `KEY VALUE +context test_context +debug yes +deeply.nested.option bar endpoint https://example.com -poll-interval 1.234s -quiet yes -token super secret token +poll-interval 1.234s +quiet yes +token super secret token `, }, { diff --git a/internal/cmd/context/list_test.go b/internal/cmd/context/list_test.go index 02477ae7d..0884d2ee5 100644 --- a/internal/cmd/context/list_test.go +++ b/internal/cmd/context/list_test.go @@ -44,8 +44,8 @@ token = "yet another super secret token" name: "default", args: []string{}, config: testConfig, - expOut: `ACTIVE NAME -* my-context + expOut: `ACTIVE NAME +* my-context my-other-context my-third-context `, @@ -59,7 +59,7 @@ token = "yet another super secret token" name: "no header", args: []string{"-o=noheader"}, config: testConfig, - expOut: `* my-context + expOut: `* my-context my-other-context my-third-context `, @@ -68,7 +68,7 @@ token = "yet another super secret token" name: "no header only name", args: []string{"-o=noheader", "-o=columns=name"}, config: testConfig, - expOut: `my-context + expOut: `my-context my-other-context my-third-context `, @@ -83,8 +83,8 @@ my-third-context postRun: func() { _ = os.Unsetenv("HCLOUD_CONTEXT") }, - expOut: `ACTIVE NAME - my-context + expOut: `ACTIVE NAME + my-context * my-other-context my-third-context `, diff --git a/internal/cmd/datacenter/list_test.go b/internal/cmd/datacenter/list_test.go index 6c4ded209..5afa1c18e 100644 --- a/internal/cmd/datacenter/list_test.go +++ b/internal/cmd/datacenter/list_test.go @@ -42,7 +42,7 @@ func TestList(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{}) expOut := `ID NAME DESCRIPTION LOCATION -4 fsn1-dc14 Falkenstein 1 virtual DC 14 fsn1 +4 fsn1-dc14 Falkenstein 1 virtual DC 14 fsn1 ` require.NoError(t, err) diff --git a/internal/cmd/image/list_test.go b/internal/cmd/image/list_test.go index a2daf90ad..eef15496d 100644 --- a/internal/cmd/image/list_test.go +++ b/internal/cmd/image/list_test.go @@ -46,7 +46,7 @@ func TestList(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{}) expOut := `ID TYPE NAME DESCRIPTION ARCHITECTURE IMAGE SIZE DISK SIZE CREATED DEPRECATED -123 system test - x86 20.00 GB 15 GB 2036-08-20 12:00:00 UTC - +123 system test - x86 20.00 GB 15 GB 2036-08-20 12:00:00 UTC - ` require.NoError(t, err) diff --git a/internal/cmd/iso/list_test.go b/internal/cmd/iso/list_test.go index bc2bdd5df..8d3a09665 100644 --- a/internal/cmd/iso/list_test.go +++ b/internal/cmd/iso/list_test.go @@ -43,7 +43,7 @@ func TestList(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{}) expOut := `ID NAME DESCRIPTION TYPE ARCHITECTURE -123 test Test ISO public x86 +123 test Test ISO public x86 ` require.NoError(t, err) @@ -95,8 +95,8 @@ func TestListPrivate(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{"--type=private"}) expOut := `ID NAME DESCRIPTION TYPE ARCHITECTURE -456 private1 Test Private ISO 1 private x86 -789 private2 Test Private ISO 2 private x86 +456 private1 Test Private ISO 1 private x86 +789 private2 Test Private ISO 2 private x86 ` require.NoError(t, err) diff --git a/internal/cmd/loadbalancertype/list_test.go b/internal/cmd/loadbalancertype/list_test.go index 6d231cc25..48477e0ef 100644 --- a/internal/cmd/loadbalancertype/list_test.go +++ b/internal/cmd/loadbalancertype/list_test.go @@ -43,7 +43,7 @@ func TestList(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{}) expOut := `ID NAME DESCRIPTION MAX SERVICES MAX CONNECTIONS MAX TARGETS -123 test - 12 100 5 +123 test - 12 100 5 ` require.NoError(t, err) diff --git a/internal/cmd/location/list_test.go b/internal/cmd/location/list_test.go index ed13d83ef..04e66cf40 100644 --- a/internal/cmd/location/list_test.go +++ b/internal/cmd/location/list_test.go @@ -42,7 +42,7 @@ func TestList(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{}) - expOut := `ID NAME DESCRIPTION NETWORK ZONE COUNTRY CITY + expOut := `ID NAME DESCRIPTION NETWORK ZONE COUNTRY CITY 1 fsn1 - eu-central DE Falkenstein ` diff --git a/internal/cmd/output/output.go b/internal/cmd/output/output.go index e15817c33..c207752ce 100644 --- a/internal/cmd/output/output.go +++ b/internal/cmd/output/output.go @@ -166,6 +166,7 @@ func NewTable[T any](out io.Writer) *Table[T] { w := table.NewWriter() w.SetStyle(style) + w.SuppressTrailingSpaces() return &Table[T]{ out: out, diff --git a/internal/cmd/servertype/list_test.go b/internal/cmd/servertype/list_test.go index d598980df..397379989 100644 --- a/internal/cmd/servertype/list_test.go +++ b/internal/cmd/servertype/list_test.go @@ -46,7 +46,7 @@ func TestList(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{}) expOut := `ID NAME CORES CPU TYPE ARCHITECTURE MEMORY DISK STORAGE TYPE -123 test 2 shared arm 8.0 GB 80 GB local +123 test 2 shared arm 8.0 GB 80 GB local ` require.NoError(t, err) @@ -100,9 +100,9 @@ func TestListColumnDeprecated(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{"-o=columns=id,name,deprecated"}) - expOut := `ID NAME DEPRECATED + expOut := `ID NAME DEPRECATED 123 deprecated fsn1=2025-04-01,nbg1=2025-05-01 -124 current - +124 current - ` require.NoError(t, err) diff --git a/internal/cmd/sshkey/list_test.go b/internal/cmd/sshkey/list_test.go index e1308c7e8..28371f1c1 100644 --- a/internal/cmd/sshkey/list_test.go +++ b/internal/cmd/sshkey/list_test.go @@ -41,7 +41,7 @@ func TestList(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{}) expOut := `ID NAME FINGERPRINT AGE -123 test - 1h +123 test - 1h ` require.NoError(t, err) diff --git a/internal/cmd/storagebox/list_test.go b/internal/cmd/storagebox/list_test.go index 416b0adba..b1169668b 100644 --- a/internal/cmd/storagebox/list_test.go +++ b/internal/cmd/storagebox/list_test.go @@ -70,7 +70,7 @@ func TestList(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{}) expOut := `ID NAME USERNAME SERVER TYPE SIZE LOCATION AGE -123 test u12345 u1337.your-storagebox.de bx11 42 GiB fsn1 3h +123 test u12345 u1337.your-storagebox.de bx11 42 GiB fsn1 3h ` require.NoError(t, err) diff --git a/internal/cmd/storagebox/snapshot/list_test.go b/internal/cmd/storagebox/snapshot/list_test.go index 8f7078d83..f997cb652 100644 --- a/internal/cmd/storagebox/snapshot/list_test.go +++ b/internal/cmd/storagebox/snapshot/list_test.go @@ -61,7 +61,7 @@ func TestList(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{"test"}) - expOut := fmt.Sprintf(`ID NAME DESCRIPTION SIZE IS AUTOMATIC AGE + expOut := fmt.Sprintf(`ID NAME DESCRIPTION SIZE IS AUTOMATIC AGE 456 snapshot-1 some-description 50 GiB no %s `, util.Age(sbs.Created, time.Now())) diff --git a/internal/cmd/storagebox/subaccount/list_test.go b/internal/cmd/storagebox/subaccount/list_test.go index 813202814..955b3abd7 100644 --- a/internal/cmd/storagebox/subaccount/list_test.go +++ b/internal/cmd/storagebox/subaccount/list_test.go @@ -66,7 +66,7 @@ func TestList(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{"test"}) - expOut := fmt.Sprintf(`ID NAME HOME DIRECTORY DESCRIPTION USERNAME SERVER AGE + expOut := fmt.Sprintf(`ID NAME HOME DIRECTORY DESCRIPTION USERNAME SERVER AGE 42 u1337-sub1 my_backups/host01.my.company host01 backup u1337-sub1 u1337-sub1.your-storagebox.de %s `, util.Age(sbs.Created, time.Now())) diff --git a/internal/cmd/storageboxtype/list_test.go b/internal/cmd/storageboxtype/list_test.go index 911302a73..4e60e9dcf 100644 --- a/internal/cmd/storageboxtype/list_test.go +++ b/internal/cmd/storageboxtype/list_test.go @@ -45,7 +45,7 @@ func TestList(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{}) expOut := `ID NAME DESCRIPTION SIZE SNAPSHOT LIMIT AUTOMATIC SNAPSHOT LIMIT SUBACCOUNTS LIMIT -42 bx11 BX11 1.0 GiB 10 10 200 +42 bx11 BX11 1.0 GiB 10 10 200 ` require.NoError(t, err) @@ -88,9 +88,9 @@ func TestListColumnDeprecated(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{"-o=columns=id,name,deprecated"}) - expOut := `ID NAME DEPRECATED + expOut := `ID NAME DEPRECATED 123 deprecated 2037-08-20 12:00:00 UTC -124 current - +124 current - ` require.NoError(t, err) diff --git a/internal/cmd/volume/list_test.go b/internal/cmd/volume/list_test.go index f5d67a583..d1f404b44 100644 --- a/internal/cmd/volume/list_test.go +++ b/internal/cmd/volume/list_test.go @@ -47,7 +47,7 @@ func TestList(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{}) expOut := `ID NAME SIZE SERVER LOCATION AGE -123 test 50 GB myServer fsn1 1h +123 test 50 GB myServer fsn1 1h ` require.NoError(t, err) diff --git a/internal/cmd/zone/list_test.go b/internal/cmd/zone/list_test.go index f195baae0..c60511284 100644 --- a/internal/cmd/zone/list_test.go +++ b/internal/cmd/zone/list_test.go @@ -55,7 +55,7 @@ func TestList(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{}) - expOut := fmt.Sprintf(`ID NAME STATUS MODE RECORD COUNT AGE + expOut := fmt.Sprintf(`ID NAME STATUS MODE RECORD COUNT AGE 42 example.com ok primary 0 %s `, util.Age(z.Created, time.Now())) @@ -98,7 +98,7 @@ func TestListPrimaryNameservers(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{"-o=columns=id,primary_nameservers"}) - expOut := `ID PRIMARY NAMESERVERS + expOut := `ID PRIMARY NAMESERVERS 42 primary.example.com:53, 192.0.2.7:53, [2001:db8::7]:53 ` @@ -136,7 +136,7 @@ func TestListAuthoritativeNameservers(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{"-o=columns=id,authoritative_nameservers"}) - expOut := `ID AUTHORITATIVE NAMESERVERS + expOut := `ID AUTHORITATIVE NAMESERVERS 42 helium.ns.hetzner.de., hydrogen.ns.hetzner.com., oxygen.ns.hetzner.com. ` diff --git a/internal/cmd/zone/rrset/list_test.go b/internal/cmd/zone/rrset/list_test.go index 2425e9028..936b1c407 100644 --- a/internal/cmd/zone/rrset/list_test.go +++ b/internal/cmd/zone/rrset/list_test.go @@ -63,9 +63,9 @@ func TestList(t *testing.T) { out, errOut, err := fx.Run(cmd, []string{"example.com", "-o=columns=name,type,ttl,protection,records,labels"}) - expOut := `NAME TYPE TTL PROTECTION RECORDS LABELS + expOut := `NAME TYPE TTL PROTECTION RECORDS LABELS www A 600 change 198.51.100.1 environment=prod, example.com/my=label, just-a-key - 198.51.100.2 + 198.51.100.2 ` require.NoError(t, err) diff --git a/test/e2e/certificate_test.go b/test/e2e/certificate_test.go index 65cad3fdb..a318caa0c 100644 --- a/test/e2e/certificate_test.go +++ b/test/e2e/certificate_test.go @@ -108,7 +108,7 @@ func runCertificateTestSuite(t *testing.T, certName string, certID int64, certTy SeparatedByWhitespace( "ID", "NAME", "LABELS", "TYPE", "CREATED", "NOT VALID BEFORE", "NOT VALID AFTER", "DOMAIN NAMES", "FINGERPRINT", "ISSUANCE STATUS", "RENEWAL STATUS", "AGE", - ).OptionalWhitespace().Newline(). + ).Newline(). Lit(strconv.FormatInt(certID, 10)).Whitespace(). Lit(certName).Whitespace(). Lit(strings.Join(labels, ", ")).Whitespace(). @@ -120,7 +120,7 @@ func runCertificateTestSuite(t *testing.T, certName string, certID int64, certTy Raw(fingerprintRegex).Whitespace(). OneOf("completed", "n/a").Whitespace(). Lit("n/a").Whitespace(). - Age().OptionalWhitespace().Newline(). + Age().Newline(). End(), out, ) diff --git a/test/e2e/datacenter_test.go b/test/e2e/datacenter_test.go index 5111cc2fa..8cc9ee56b 100644 --- a/test/e2e/datacenter_test.go +++ b/test/e2e/datacenter_test.go @@ -19,8 +19,8 @@ func TestDatacenter(t *testing.T) { require.NoError(t, err) assert.Regexp(t, NewRegex().Start(). - SeparatedByWhitespace("ID", "NAME", "DESCRIPTION", "LOCATION").OptionalWhitespace().Newline(). - AnyTimes(NewRegex().Int().Whitespace().Identifier().Whitespace().AnyString().Whitespace().LocationName().OptionalWhitespace().Newline()). + SeparatedByWhitespace("ID", "NAME", "DESCRIPTION", "LOCATION").Newline(). + AnyTimes(NewRegex().Int().Whitespace().Identifier().Whitespace().AnyString().Whitespace().LocationName().Newline()). End(), out, ) diff --git a/test/e2e/firewall_test.go b/test/e2e/firewall_test.go index 1404ec9fa..c60163ed4 100644 --- a/test/e2e/firewall_test.go +++ b/test/e2e/firewall_test.go @@ -226,7 +226,7 @@ func TestFirewall(t *testing.T) { Lit("0 Servers | 1 Label Selector").Whitespace(). Lit("foo=bar").Whitespace(). Datetime().Whitespace(). - Age().OptionalWhitespace().Newline(). + Age().Newline(). End(), out, ) diff --git a/test/e2e/floatingip_test.go b/test/e2e/floatingip_test.go index 935cee128..0e9aef059 100644 --- a/test/e2e/floatingip_test.go +++ b/test/e2e/floatingip_test.go @@ -161,7 +161,7 @@ func TestFloatingIP(t *testing.T) { Lit("delete").Whitespace(). Lit("foo=bar").Whitespace(). Datetime().Whitespace(). - Age().OptionalWhitespace().Newline(). + Age().Newline(). End(), out, ) @@ -309,8 +309,8 @@ func TestFloatingIP(t *testing.T) { require.NoError(t, err) assert.Regexp(t, NewRegex().Start(). - SeparatedByWhitespace("IP", "DNS").OptionalWhitespace().Newline(). - Lit(ipStr).Lit("/64").Whitespace().Lit("2 entries").OptionalWhitespace().Newline(). + SeparatedByWhitespace("IP", "DNS").Newline(). + Lit(ipStr).Lit("/64").Whitespace().Lit("2 entries").Newline(). End(), out, ) diff --git a/test/e2e/image_test.go b/test/e2e/image_test.go index 4171ede73..9a3625204 100644 --- a/test/e2e/image_test.go +++ b/test/e2e/image_test.go @@ -20,7 +20,7 @@ func TestImage(t *testing.T) { assert.Regexp(t, NewRegex().Start(). - SeparatedByWhitespace("ID", "TYPE", "NAME", "DESCRIPTION", "ARCHITECTURE", "IMAGE SIZE", "DISK SIZE", "CREATED", "DEPRECATED").OptionalWhitespace().Newline(). + SeparatedByWhitespace("ID", "TYPE", "NAME", "DESCRIPTION", "ARCHITECTURE", "IMAGE SIZE", "DISK SIZE", "CREATED", "DEPRECATED").Newline(). AnyTimes( NewRegex(). Int().Whitespace(). @@ -31,8 +31,7 @@ func TestImage(t *testing.T) { OneOf("-", NewRegex().FileSize()).Whitespace(). FileSize().Whitespace(). Datetime().Whitespace(). - OneOf("-", NewRegex().Datetime()). - OptionalWhitespace().Newline(), + OneOf("-", NewRegex().Datetime()).Newline(), ). End(), out, diff --git a/test/e2e/iso_test.go b/test/e2e/iso_test.go index c3baccdc7..9d1f0386b 100644 --- a/test/e2e/iso_test.go +++ b/test/e2e/iso_test.go @@ -29,7 +29,7 @@ func TestISO(t *testing.T) { Identifier().Whitespace(). AnyString().Whitespace(). OneOfLit("public", "private").Whitespace(). - OneOf("arm", "x86").OptionalWhitespace().Newline()). + OneOf("arm", "x86").Newline()). End(), out, ) diff --git a/test/e2e/load_balancer_type_test.go b/test/e2e/load_balancer_type_test.go index 97ff3f086..a4f404e72 100644 --- a/test/e2e/load_balancer_type_test.go +++ b/test/e2e/load_balancer_type_test.go @@ -30,7 +30,7 @@ func TestLoadBalancerType(t *testing.T) { AnyString().Whitespace(). Int().Whitespace(). Int().Whitespace(). - Int().OptionalWhitespace().Newline()). + Int().Newline()). End(), out, ) diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index f09a393c4..30c674ccb 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -55,12 +55,12 @@ func TestNetwork(t *testing.T) { require.NoError(t, err) assert.Regexp(t, NewRegex().Start(). - SeparatedByWhitespace("SERVERS", "IP", "RANGE", "LABELS", "PROTECTION", "CREATED", "AGE").OptionalWhitespace().Newline(). + SeparatedByWhitespace("SERVERS", "IP", "RANGE", "LABELS", "PROTECTION", "CREATED", "AGE").Newline(). Lit("0 servers").Whitespace(). Lit("10.0.0.0/24").Whitespace(). Lit("delete").Whitespace(). Datetime().Whitespace(). - Age().OptionalWhitespace().Newline().End(), + Age().Newline().End(), out, ) }) diff --git a/test/e2e/placement_group_test.go b/test/e2e/placement_group_test.go index a7c7a6e39..3c2b45bc3 100644 --- a/test/e2e/placement_group_test.go +++ b/test/e2e/placement_group_test.go @@ -62,13 +62,13 @@ func TestPlacementGroup(t *testing.T) { assert.Regexp(t, NewRegex().Start(). - SeparatedByWhitespace("ID", "NAME", "SERVERS", "TYPE", "CREATED", "AGE").OptionalWhitespace().Newline(). + SeparatedByWhitespace("ID", "NAME", "SERVERS", "TYPE", "CREATED", "AGE").Newline(). Int().Whitespace(). Raw(`new-test-placement-group-[0-9a-f]{8}`).Whitespace(). Lit("0 servers").Whitespace(). Lit("spread").Whitespace(). Datetime().Whitespace(). - Age().OptionalWhitespace().Newline().End(), + Age().Newline().End(), out, ) }) diff --git a/test/e2e/sshkey_test.go b/test/e2e/sshkey_test.go index 6ed7eb346..7e1fc856b 100644 --- a/test/e2e/sshkey_test.go +++ b/test/e2e/sshkey_test.go @@ -53,14 +53,14 @@ func TestSSHKey(t *testing.T) { require.NoError(t, err) assert.Regexp(t, NewRegex().Start(). - SeparatedByWhitespace("ID", "NAME", "FINGERPRINT", "PUBLIC KEY", "LABELS", "CREATED", "AGE").OptionalWhitespace().Newline(). + SeparatedByWhitespace("ID", "NAME", "FINGERPRINT", "PUBLIC KEY", "LABELS", "CREATED", "AGE").Newline(). Lit(strconv.FormatInt(sshKeyID, 10)).Whitespace(). Lit(sshKeyName).Whitespace(). Lit(fingerprint).Whitespace(). Lit(pubKey).Whitespace(). Lit("baz=qux, foo=bar").Whitespace(). Datetime().Whitespace(). - Age().OptionalWhitespace().Newline(). + Age().Newline(). End(), out, )