Merge branch 'main' into willdavsmith/readd-ghcr

radius-project · Apr 16, 2024 · 6946703 · 6946703
2 parents 2b4c56d + c756ab2
commit 6946703
Show file tree

Hide file tree

Showing 115 changed files with 1,105 additions and 4,659 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -11,6 +11,8 @@ coverage:
         informational: true
         target: auto
         threshold: 0%
+    patch:
+      default: false
 
 ignore:
   - "**/mock_*.go"                     # ignore all mock files

diff --git a/.github/workflows/long-running-azure.yaml b/.github/workflows/long-running-azure.yaml
@@ -485,6 +485,13 @@ jobs:
         if: failure()
         run: |
           echo ":x: functional test failed." >> $GITHUB_STEP_SUMMARY
+      - name: Login to Azure
+        if: always()
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_SP_TESTS_APPID }}
+          tenant-id: ${{ secrets.AZURE_SP_TESTS_TENANTID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTIONID_TESTS }}
       - name: Delete azure resource group - ${{ env.AZURE_TEST_RESOURCE_GROUP }}
         if: always()
         run: |

diff --git a/deploy/Chart/templates/dashboard/rbac.yaml b/deploy/Chart/templates/dashboard/rbac.yaml
@@ -10,7 +10,8 @@ metadata:
 rules:
   - apiGroups: ['api.ucp.dev']
     resources: ['*']
-    verbs: ['get', 'list']
+    # dashboard needs get, list, and post privileges for api.ucp.dev
+    verbs: ['*']
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

diff --git a/...tributing/contributing-code/contributing-code-tests/tests-naming-conventions.md b/...tributing/contributing-code/contributing-code-tests/tests-naming-conventions.md
@@ -7,7 +7,6 @@ Today, the [functional tests](https://github.com/radius-project/radius/tree/main
 |environment|env|
 |container|ctnr|
 |gateway|gtwy|
-|httpRoute|rte|
 |generic|gnrc|
 |servicebus|sb|
 |secretstore|scs|
@@ -32,8 +31,8 @@ resource gateway 'Applications.Core/gateways@2023-10-01-preview' = {
   ...
 }
 
-resource frontendRoute 'Applications.Core/httpRoutes@2023-10-01-preview' = {
-  name: 'gtwy-front-rte'
+resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
+  name: 'gtwy-front-cntr'
   ...
 }
 ```

diff --git a/docs/contributing/contributing-releases/README.md b/docs/contributing/contributing-releases/README.md
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/...bicep-types-radius/generated/applications/applications.core/2023-10-01-preview/types.json b/...bicep-types-radius/generated/applications/applications.core/2023-10-01-preview/types.json
diff --git a/hack/bicep-types-radius/generated/index.json b/hack/bicep-types-radius/generated/index.json
@@ -1 +1 @@
-{"Resources":{"Applications.Core/applications@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":58},"Applications.Core/containers@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":123},"Applications.Core/environments@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":158},"Applications.Core/extenders@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":176},"Applications.Core/gateways@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":197},"Applications.Core/httpRoutes@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":211},"Applications.Core/secretStores@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":234},"Applications.Core/volumes@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":271},"Applications.Dapr/pubSubBrokers@2023-10-01-preview":{"RelativePath":"applications/applications.dapr/2023-10-01-preview/types.json","Index":49},"Applications.Dapr/secretStores@2023-10-01-preview":{"RelativePath":"applications/applications.dapr/2023-10-01-preview/types.json","Index":66},"Applications.Dapr/stateStores@2023-10-01-preview":{"RelativePath":"applications/applications.dapr/2023-10-01-preview/types.json","Index":84},"Applications.Datastores/mongoDatabases@2023-10-01-preview":{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":50},"Applications.Datastores/redisCaches@2023-10-01-preview":{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":69},"Applications.Datastores/sqlDatabases@2023-10-01-preview":{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":88},"Applications.Messaging/rabbitMQQueues@2023-10-01-preview":{"RelativePath":"applications/applications.messaging/2023-10-01-preview/types.json","Index":50}},"Functions":{"applications.core/extenders":{"2023-10-01-preview":[{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":272}]},"applications.core/secretstores":{"2023-10-01-preview":[{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":278}]},"applications.datastores/mongodatabases":{"2023-10-01-preview":[{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":90}]},"applications.datastores/rediscaches":{"2023-10-01-preview":[{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":92}]},"applications.datastores/sqldatabases":{"2023-10-01-preview":[{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":94}]},"applications.messaging/rabbitmqqueues":{"2023-10-01-preview":[{"RelativePath":"applications/applications.messaging/2023-10-01-preview/types.json","Index":52}]}}}
+{"Resources":{"Applications.Core/applications@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":58},"Applications.Core/containers@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":123},"Applications.Core/environments@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":158},"Applications.Core/extenders@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":176},"Applications.Core/gateways@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":197},"Applications.Core/secretStores@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":220},"Applications.Core/volumes@2023-10-01-preview":{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":257},"Applications.Dapr/pubSubBrokers@2023-10-01-preview":{"RelativePath":"applications/applications.dapr/2023-10-01-preview/types.json","Index":49},"Applications.Dapr/secretStores@2023-10-01-preview":{"RelativePath":"applications/applications.dapr/2023-10-01-preview/types.json","Index":66},"Applications.Dapr/stateStores@2023-10-01-preview":{"RelativePath":"applications/applications.dapr/2023-10-01-preview/types.json","Index":84},"Applications.Datastores/mongoDatabases@2023-10-01-preview":{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":50},"Applications.Datastores/redisCaches@2023-10-01-preview":{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":69},"Applications.Datastores/sqlDatabases@2023-10-01-preview":{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":88},"Applications.Messaging/rabbitMQQueues@2023-10-01-preview":{"RelativePath":"applications/applications.messaging/2023-10-01-preview/types.json","Index":50}},"Functions":{"applications.core/extenders":{"2023-10-01-preview":[{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":258}]},"applications.core/secretstores":{"2023-10-01-preview":[{"RelativePath":"applications/applications.core/2023-10-01-preview/types.json","Index":264}]},"applications.datastores/mongodatabases":{"2023-10-01-preview":[{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":90}]},"applications.datastores/rediscaches":{"2023-10-01-preview":[{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":92}]},"applications.datastores/sqldatabases":{"2023-10-01-preview":[{"RelativePath":"applications/applications.datastores/2023-10-01-preview/types.json","Index":94}]},"applications.messaging/rabbitmqqueues":{"2023-10-01-preview":[{"RelativePath":"applications/applications.messaging/2023-10-01-preview/types.json","Index":52}]}}}
diff --git a/pkg/cli/clients/management.go b/pkg/cli/clients/management.go
@@ -32,7 +32,6 @@ import (
 	cntr_ctrl "github.com/radius-project/radius/pkg/corerp/frontend/controller/containers"
 	ext_ctrl "github.com/radius-project/radius/pkg/corerp/frontend/controller/extenders"
 	gtwy_ctrl "github.com/radius-project/radius/pkg/corerp/frontend/controller/gateways"
-	hrt_ctrl "github.com/radius-project/radius/pkg/corerp/frontend/controller/httproutes"
 	sstr_ctrl "github.com/radius-project/radius/pkg/corerp/frontend/controller/secretstores"
 	dapr_ctrl "github.com/radius-project/radius/pkg/daprrp/frontend/controller"
 	ds_ctrl "github.com/radius-project/radius/pkg/datastoresrp/frontend/controller"
@@ -60,7 +59,6 @@ var (
 		dapr_ctrl.DaprPubSubBrokersResourceType,
 		ext_ctrl.ResourceTypeName,
 		gtwy_ctrl.ResourceTypeName,
-		hrt_ctrl.ResourceTypeName,
 		cntr_ctrl.ResourceTypeName,
 		sstr_ctrl.ResourceTypeName,
 	}

diff --git a/pkg/cli/clivalidation.go b/pkg/cli/clivalidation.go
@@ -259,7 +259,7 @@ func RequireResourceTypeAndName(args []string) (string, string, error) {
 	return resourceType, resourceName, nil
 }
 
-// example of resource Type: Applications.Core/httpRoutes, Applications.Datastores/redisCaches
+// example of resource Type: Applications.Datastores/redisCaches
 //
 
 // RequireResourceType checks if the first argument provided is a valid resource type and returns it if it is. If the

diff --git a/pkg/cli/cmd/app/graph/display_test.go b/pkg/cli/cmd/app/graph/display_test.go
@@ -36,9 +36,9 @@ func Test_display(t *testing.T) {
 	})
 
 	t.Run("complex application", func(t *testing.T) {
-		sqlRteID := "/planes/radius/local/resourcegroups/default/providers/Applications.Core/httpRoutes/sql-rte"
-		sqlRteType := "Applications.Core/httpRoutes"
-		sqlRteName := "sql-rte"
+		backendID := "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backend"
+		backendType := "Applications.Core/containers"
+		backendName := "backend"
 
 		sqlAppCntrID := "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/sql-app-ctnr"
 		sqlAppCntrName := "sql-app-ctnr"
@@ -62,15 +62,15 @@ func Test_display(t *testing.T) {
 
 		graph := []*corerpv20231001preview.ApplicationGraphResource{
 			{
-				ID:                &sqlRteID,
-				Name:              &sqlRteName,
-				Type:              &sqlRteType,
+				ID:                &backendID,
+				Name:              &backendName,
+				Type:              &backendType,
 				ProvisioningState: &provisioningStateSuccess,
 				OutputResources:   []*corerpv20231001preview.ApplicationGraphOutputResource{},
 				Connections: []*corerpv20231001preview.ApplicationGraphConnection{
 					{
-						ID:        &sqlCntrID,
 						Direction: &dirInbound,
+						ID:        &sqlCntrID,
 					},
 				},
 			},
@@ -82,8 +82,8 @@ func Test_display(t *testing.T) {
 				OutputResources:   []*corerpv20231001preview.ApplicationGraphOutputResource{},
 				Connections: []*corerpv20231001preview.ApplicationGraphConnection{
 					{
+						ID:        &backendID,
 						Direction: &dirOutbound,
-						ID:        &sqlRteID,
 					},
 				},
 			},
@@ -130,19 +130,19 @@ func Test_display(t *testing.T) {
 
 		expected := `Displaying application: test-app
 
-Name: sql-app-ctnr (Applications.Core/containers)
+Name: backend (Applications.Core/containers)
 Connections:
-  sql-db (Applications.Datastores/sqlDatabases) -> sql-app-ctnr
+  sql-ctnr (Applications.Core/containers) -> backend
 Resources: (none)
 
-Name: sql-ctnr (Applications.Core/containers)
+Name: sql-app-ctnr (Applications.Core/containers)
 Connections:
-  sql-ctnr -> sql-rte (Applications.Core/httpRoutes)
+  sql-db (Applications.Datastores/sqlDatabases) -> sql-app-ctnr
 Resources: (none)
 
-Name: sql-rte (Applications.Core/httpRoutes)
+Name: sql-ctnr (Applications.Core/containers)
 Connections:
-  sql-ctnr (Applications.Core/containers) -> sql-rte
+  sql-ctnr -> backend (Applications.Core/containers)
 Resources: (none)
 
 Name: redis (Applications.Datastores/redis)

diff --git a/pkg/cli/cmd/app/status/status_test.go b/pkg/cli/cmd/app/status/status_test.go
@@ -116,10 +116,6 @@ func Test_Run(t *testing.T) {
 				Name: to.Ptr("test-container"),
 				ID:   to.Ptr("/planes/radius/local/resourceGroups/test-group/providers/Applications.Core/containers/test-container"),
 			},
-			{
-				Name: to.Ptr("test-route"),
-				ID:   to.Ptr("/planes/radius/local/resourceGroups/test-group/providers/Applications.Core/httpRoutes/test-route"),
-			},
 			{
 				Name: to.Ptr("test-gateway"),
 				ID:   to.Ptr("/planes/radius/local/resourceGroups/test-group/providers/Applications.Core/gateways/test-gateway"),
@@ -137,11 +133,6 @@ func Test_Run(t *testing.T) {
 			Return(nil, nil).
 			Times(1)
 
-		diagnosticsClient.EXPECT().
-			GetPublicEndpoint(gomock.Any(), clients.EndpointOptions{ResourceID: mustParse(t, "/planes/radius/local/resourceGroups/test-group/providers/Applications.Core/httpRoutes/test-route")}).
-			Return(nil, nil).
-			Times(1)
-
 		diagnosticsClient.EXPECT().
 			GetPublicEndpoint(gomock.Any(), clients.EndpointOptions{ResourceID: mustParse(t, "/planes/radius/local/resourceGroups/test-group/providers/Applications.Core/gateways/test-gateway")}).
 			Return(to.Ptr("http://some-url.example.com"), nil).
@@ -172,7 +163,7 @@ func Test_Run(t *testing.T) {
 
 		applicationStatus := clients.ApplicationStatus{
 			Name:          "test-app",
-			ResourceCount: 3,
+			ResourceCount: 2,
 			Gateways: []clients.GatewayStatus{
 				{
 					Name:     "test-gateway",

diff --git a/pkg/cli/cmd/bicep/publish/publish.go b/pkg/cli/cmd/bicep/publish/publish.go
@@ -22,17 +22,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
 	"strings"
 
-	credentials "github.com/oras-project/oras-credentials-go"
 	"github.com/radius-project/radius/pkg/cli/bicep"
 	"github.com/radius-project/radius/pkg/cli/clierrors"
 	"github.com/radius-project/radius/pkg/cli/connections"
 	"github.com/radius-project/radius/pkg/cli/framework"
 	"github.com/radius-project/radius/pkg/cli/output"
 
-	"net/http"
-
 	"github.com/opencontainers/go-digest"
 	specs "github.com/opencontainers/image-spec/specs-go"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@@ -42,6 +40,7 @@ import (
 	"oras.land/oras-go/v2/registry"
 	"oras.land/oras-go/v2/registry/remote"
 	"oras.land/oras-go/v2/registry/remote/auth"
+	credentials "oras.land/oras-go/v2/registry/remote/credentials"
 	"oras.land/oras-go/v2/registry/remote/errcode"
 	"oras.land/oras-go/v2/registry/remote/retry"
 )

diff --git a/pkg/cli/cmd/group/groupswitch/switch.go b/pkg/cli/cmd/group/groupswitch/switch.go
@@ -25,6 +25,7 @@ import (
 	"github.com/radius-project/radius/pkg/cli/cmd/commonflags"
 	"github.com/radius-project/radius/pkg/cli/connections"
 	"github.com/radius-project/radius/pkg/cli/framework"
+	"github.com/radius-project/radius/pkg/cli/output"
 	"github.com/radius-project/radius/pkg/cli/workspaces"
 	"github.com/spf13/cobra"
 )
@@ -62,6 +63,7 @@ func NewCommand(factory framework.Factory) (*cobra.Command, framework.Runner) {
 type Runner struct {
 	ConfigHolder         *framework.ConfigHolder
 	ConnectionFactory    connections.Factory
+	Output               output.Interface
 	Workspace            *workspaces.Workspace
 	UCPResourceGroupName string
 }
@@ -71,6 +73,7 @@ func NewRunner(factory framework.Factory) *Runner {
 	return &Runner{
 		ConnectionFactory: factory.GetConnectionFactory(),
 		ConfigHolder:      factory.GetConfigHolder(),
+		Output:            factory.GetOutput(),
 	}
 }
 
@@ -128,6 +131,11 @@ func (r *Runner) Run(ctx context.Context) error {
 
 		return nil
 	})
-	return err
+	if err != nil {
+		return err
+	}
+
+	r.Output.LogInfo("Switched to resource group %q", r.UCPResourceGroupName)
+	return nil
 
 }
diff --git a/pkg/cli/cmd/group/groupswitch/switch_test.go b/pkg/cli/cmd/group/groupswitch/switch_test.go
@@ -28,6 +28,7 @@ import (
 	"github.com/radius-project/radius/pkg/cli/clierrors"
 	"github.com/radius-project/radius/pkg/cli/connections"
 	"github.com/radius-project/radius/pkg/cli/framework"
+	"github.com/radius-project/radius/pkg/cli/output"
 	"github.com/radius-project/radius/pkg/cli/workspaces"
 	"github.com/radius-project/radius/pkg/ucp/api/v20231001preview"
 	"github.com/radius-project/radius/test/radcli"
@@ -148,6 +149,7 @@ func Test_Run(t *testing.T) {
 				Scope: "/planes/radius/local/resourceGroups/b",
 			}
 
+			outputSink := &output.MockOutput{}
 			runner := &Runner{
 				ConfigHolder: &framework.ConfigHolder{
 					Config:         config,
@@ -156,6 +158,7 @@ func Test_Run(t *testing.T) {
 				ConnectionFactory:    &connections.MockFactory{ApplicationsManagementClient: appManagementClient},
 				Workspace:            workspace,
 				UCPResourceGroupName: "a",
+				Output:               outputSink,
 			}
 
 			err = runner.Run(context.Background())
@@ -164,6 +167,16 @@ func Test_Run(t *testing.T) {
 			actualConfig, err := cli.ReadWorkspaceSection(config)
 			require.NoError(t, err)
 			require.Equal(t, expectedConfig, actualConfig)
+
+			expected := []any{
+				output.LogOutput{
+					Format: "Switched to resource group %q",
+					Params: []any{"a"},
+				},
+			}
+
+			require.Equal(t, expected, outputSink.Writes)
+
 		})
 
 		t.Run("Switch (not existent)", func(t *testing.T) {

diff --git a/pkg/cli/cmd/resource/delete/delete.go b/pkg/cli/cmd/resource/delete/delete.go
@@ -50,7 +50,7 @@ func NewCommand(factory framework.Factory) (*cobra.Command, framework.Runner) {
 		Short: "Delete a Radius resource",
 		Long:  "Deletes a Radius resource with the given name",
 		Example: `
-		sample list of resourceType: containers, gateways, httpRoutes, daprPubSubBrokers, extenders, mongoDatabases, rabbitMQMessageQueues, redisCaches, sqlDatabases, daprStateStores, daprSecretStores
+		sample list of resourceType: containers, gateways, daprPubSubBrokers, extenders, mongoDatabases, rabbitMQMessageQueues, redisCaches, sqlDatabases, daprStateStores, daprSecretStores
 		
 		# Delete a container named orders
 		rad resource delete containers orders`,

diff --git a/pkg/cli/cmd/resource/list/list.go b/pkg/cli/cmd/resource/list/list.go
@@ -45,13 +45,12 @@ func NewCommand(factory framework.Factory) (*cobra.Command, framework.Runner) {
 		Short: "Lists resources",
 		Long:  "List all resources of specified type",
 		Example: `
-	sample list of resourceType: containers, gateways, httpRoutes, pubSubBrokers, extenders, mongoDatabases, rabbitMQMessageQueues, redisCaches, sqlDatabases, stateStores, secretStores
+	sample list of resourceType: containers, gateways, pubSubBrokers, extenders, mongoDatabases, rabbitMQMessageQueues, redisCaches, sqlDatabases, stateStores, secretStores
 
 	# list all resources of a specified type in the default environment
 
 	rad resource list containers
 	rad resource list gateways
-	rad resource list httpRoutes
 
 	# list all resources of a specified type in an application
 	rad resource list containers --application icecream-store

diff --git a/pkg/cli/cmd/resource/show/show.go b/pkg/cli/cmd/resource/show/show.go
@@ -43,13 +43,12 @@ func NewCommand(factory framework.Factory) (*cobra.Command, framework.Runner) {
 		Short: "Show Radius resource details",
 		Long:  "Show details of the specified Radius resource",
 		Example: `
-	sample list of resourceType: containers, gateways, httpRoutes, daprPubSubBrokers, extenders, mongoDatabases, rabbitMQMessageQueues, redisCaches, sqlDatabases, daprStateStores, daprSecretStores
+	sample list of resourceType: containers, gateways, daprPubSubBrokers, extenders, mongoDatabases, rabbitMQMessageQueues, redisCaches, sqlDatabases, daprStateStores, daprSecretStores
 
 	# show details of a specified resource in the default environment
 
 	rad resource show containers orders
 	rad resource show gateways orders_gateways
-	rad resource show httpRoutes orders_routes
 
 	# show details of a specified resource in an application
 	rad resource show containers orders --application icecream-store

diff --git a/pkg/cli/helm/radiusclient.go b/pkg/cli/helm/radiusclient.go
@@ -21,6 +21,8 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
+	"runtime"
 	"strings"
 
 	"github.com/radius-project/radius/pkg/cli/output"
@@ -141,6 +143,10 @@ func AddRadiusValues(helmChart *chart.Chart, options *RadiusOptions) error {
 	}
 
 	for _, arg := range options.SetFileArgs {
+		if runtime.GOOS == "windows" {
+			arg = filepath.ToSlash(arg)
+		}
+
 		reader := func(rs []rune) (any, error) {
 			data, err := os.ReadFile(string(rs))
 			return string(data), err

diff --git a/pkg/cli/prompt/text/text_test.go b/pkg/cli/prompt/text/text_test.go
@@ -84,6 +84,7 @@ func Test_E2E(t *testing.T) {
 	normalizeOutput := func(bts []byte) string {
 		return stripansi.Strip(strings.ReplaceAll(string(bts), "\r\n", "\n"))
 	}
+
 	waitForContains := func(t *testing.T, reader io.Reader, target string) string {
 		normalized := ""
 		teatest.WaitFor(t, reader, func(bts []byte) bool {
@@ -94,6 +95,7 @@ func Test_E2E(t *testing.T) {
 
 		return normalized
 	}
+
 	waitForInitialRender := func(t *testing.T, reader io.Reader) string {
 		return waitForContains(t, reader, ">")
 	}