Merge branch 'master' into tross/upload_completed_fixes

.cloudbuild/ci/integration-tests.yaml

@@ -1,27 +1,28 @@
 timeout: 25m
+
 options:
   machineType: E2_HIGHCPU_32
-  
+
   # This build needs to run in environments where the _GITHUB_DEPLOY_KEY_SRC
   # substitution is defined, but also environments where it isn't. The
   # ALLOW_LOOSE option disables GCBs strict checking of substitution usage,
   # so that the build will still run if _GITHUB_DEPLOY_KEY_SRC is not defined.
   substitution_option: ALLOW_LOOSE
 
 steps:
-  # Run the integration tests. Actual content of this job depends on the changes 
+  # Run the integration tests. Actual content of this job depends on the changes
   # detected in the PR
   - name: quay.io/gravitational/teleport-buildbox:teleport10
     id: run-tests
     dir: /workspace/.cloudbuild/scripts
     entrypoint: bash
-    args: 
+    args:
       - -c
       - |
         go run ./cmd/integration-tests          \
           -target "$_BASE_BRANCH"               \
           -bucket test-logs                     \
-          -build $BUILD_ID                      \
+          -build "$BUILD_ID"                    \
           -key-secret "$_GITHUB_DEPLOY_KEY_SRC" \
-          -a "test-logs/*.json"          
+          -a "test-logs/*.json"
     timeout: 25m

.cloudbuild/ci/unit-tests.yaml

@@ -1,28 +1,28 @@
 timeout: 25m
 
 options:
-  machineType: 'E2_HIGHCPU_32'
-  
-  # This build needs to run in environments where the _GITHUB_DEPLOY_KEY_SRC  
+  machineType: E2_HIGHCPU_32
+
+  # This build needs to run in environments where the _GITHUB_DEPLOY_KEY_SRC
   # substitution is defined, but also environments where it isn't. The
   # ALLOW_LOOSE option disables GCBs strict checking of substitution usage,
   # so that the build will still run if _GITHUB_DEPLOY_KEY_SRC is not defined.
   substitution_option: ALLOW_LOOSE
-  
+
 steps:
-  # Run the unit tests. Actual content of this job depends on the changes 
+  # Run the unit tests. Actual content of this job depends on the changes
   # detected in the PR
   - name: quay.io/gravitational/teleport-buildbox:teleport10
     id: run-tests
     dir: /workspace/.cloudbuild/scripts
-    entrypoint: bash 
-    args: 
+    entrypoint: bash
+    args:
       - -c
       - |
         go run ./cmd/unit-tests                 \
-          -target $_BASE_BRANCH                 \
+          -target "$_BASE_BRANCH"               \
           -bucket test-logs                     \
-          -build $BUILD_ID                      \
+          -build "$BUILD_ID"                    \
           -key-secret "$_GITHUB_DEPLOY_KEY_SRC" \
           -a "test-logs/*.json"
     timeout: 25m

examples/go-client/go.mod

@@ -3,6 +3,6 @@ module go-client
 go 1.15
 
 require (
-	github.com/google/uuid v1.0.0
-	github.com/gravitational/teleport/api v0.0.0-20210824015240-4aa94989f6d6
+	github.com/google/uuid v1.1.2
+	github.com/gravitational/teleport/api v0.0.0-20220330155827-83a32f49e14e
 )

examples/workflows/go.mod

@@ -3,7 +3,7 @@ module workflows
 go 1.16
 
 require (
-	github.com/gravitational/teleport/api v0.0.0-20210824015240-4aa94989f6d6
-	github.com/gravitational/trace v1.1.15
+	github.com/gravitational/teleport/api v0.0.0-20220330155827-83a32f49e14e
+	github.com/gravitational/trace v1.1.17
 	github.com/pelletier/go-toml v1.9.0
 )

lib/web/terminal.go

@@ -197,7 +197,10 @@ func (t *TerminalHandler) Serve(w http.ResponseWriter, r *http.Request) {
 
 	ws, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
-		t.log.Errorf("Error upgrading to websocket: %v", err)
+		errMsg := "Error upgrading to websocket"
+		t.log.Errorf("%v: %v", errMsg, err)
+		http.Error(w, errMsg, http.StatusInternalServerError)
+		return
 	}
 
 	t.handler(ws, r)