review findings

- remove unneeded struct
- remove newline
- go fmt

Author: nouseforaname

src/jetstream/plugins/cfappssh/app_ssh.go

@@ -46,6 +46,8 @@ type KeyCode struct {
 	Rows int    `json:"rows"`
 }
 
+// When dealing with a v3 enabled cf api, we need to use the processID to build the username to create an SSH
+// connection to the app instances web process.
 func CheckForV3AvailabilityAndReturnProcessID(appID, baseURL, clientID, token string, apiClient http.Client) (string, error) {
 	resp, err := apiClient.Head(fmt.Sprintf("%s/%s", baseURL, "v3"))
 	if resp.StatusCode == http.StatusNotFound {
@@ -63,10 +65,10 @@ func CheckForV3AvailabilityAndReturnProcessID(appID, baseURL, clientID, token st
 		defer resp.Body.Close()
 		respBytes, err := io.ReadAll(resp.Body)
 		if err != nil {
-			return appID, sendSSHError("failed reading response for '%s': %s", resp.Request.URL.Path , err)
+			return appID, sendSSHError("failed reading response for '%s': %s", resp.Request.URL.Path, err)
 		}
-	    appWebProcess := &cloudFoundryResource.Process{}
-		err = appWebProcess.UnmarshalJSON(respBytes);
+		appWebProcess := &cloudFoundryResource.Process{}
+		err = appWebProcess.UnmarshalJSON(respBytes)
 		if err != nil {
 			return appID, sendSSHError("failed unmarshaling response: '%s' for app_guid '%s': %s", string(respBytes), appID, err)
 		}
@@ -96,7 +98,6 @@ func (cfAppSsh *CFAppSSH) appSSH(c echo.Context) error {
 	apiEndpoint := cnsiRecord.APIEndpoint
 
 	cfPlugin, err := p.GetEndpointTypeSpec("cf")
-
 	if err != nil {
 		return sendSSHError("Can not get Cloud Foundry endpoint plugin")
 	}
@@ -111,7 +112,6 @@ func (cfAppSsh *CFAppSSH) appSSH(c echo.Context) error {
 		return sendSSHError("Can not get Cloud Foundry Endpoint info")
 	}
 	cfInfo := cfInfoEndpoint.V2Info
-
 	appOrProcessGUID := c.Param("appGuid")
 
 	// Refresh token first - makes sure it will be valid when we make the request to get the code

src/jetstream/plugins/cfappssh/app_ssh_test.go

@@ -9,22 +9,17 @@ import (
 	"testing"
 
 	"github.com/cloudfoundry/stratos/src/jetstream/plugins/cfappssh"
-	"github.com/labstack/echo/v4"
 )
 
-type FakeContext struct {
-	echo.Context
-}
-
 func TestCheckForV3Availability(t *testing.T) {
 	expectedProcessID := "i-am-process-id"
 	appGUID := "some-guid"
 
-	testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request){
+	testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		appWebProcess := map[string]string{
 			"AppGUID": "one two three",
-			"guid": "i-am-process-id",
-			"Type": "web",
+			"guid":    "i-am-process-id",
+			"Type":    "web",
 		}
 		re := regexp.MustCompile("^/v3")
 
@@ -48,7 +43,7 @@ func TestCheckForV3Availability(t *testing.T) {
 	apiClient := http.Client{}
 	processID, err := cfappssh.CheckForV3AvailabilityAndReturnProcessID(appGUID, testServer.URL, "","", apiClient)
 	if err != nil {
-		t.Errorf("I didn't expect that: %s",err)
+		t.Errorf("I didn't expect that: %s", err)
 	}
 	if processID != expectedProcessID {
 		t.Errorf("the value should have changed to %s but was %s", expectedProcessID, appGUID)
@@ -62,6 +57,7 @@ func TestV2InstanceWebProcessSSH(t *testing.T) {
 
 	testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		re := regexp.MustCompile("^/v3")
+		t.Log("path", r.URL.Path, "method", r.Method)
 
 		if re.Match([]byte(r.URL.Path)) && r.Method == http.MethodHead {
 			w.WriteHeader(http.StatusNotFound)
@@ -73,7 +69,7 @@ func TestV2InstanceWebProcessSSH(t *testing.T) {
 	apiClient := http.Client{}
 	processID, err := cfappssh.CheckForV3AvailabilityAndReturnProcessID(appGUID, testServer.URL, "","", apiClient)
 	if err != nil {
-		t.Errorf("I didn't expect that: %s",err)
+		t.Errorf("I didn't expect that: %s", err)
 	}
 	if processID != expectedProcessID {
 		t.Errorf("the value should NOT have changed. expected %s but was %s", expectedProcessID, processID)