[branch/v6] Backport "RFD 19 implementation (#6731)"

Makefile

@@ -11,7 +11,7 @@
 #   Stable releases:   "1.0.0"
 #   Pre-releases:      "1.0.0-alpha.1", "1.0.0-beta.2", "1.0.0-rc.3"
 #   Master/dev branch: "1.0.0-dev"
-VERSION=6.0.0-alpha.2
+VERSION=6.2.0-beta.1
 
 DOCKER_IMAGE ?= quay.io/gravitational/teleport
 DOCKER_IMAGE_CI ?= quay.io/gravitational/teleport-ci
@@ -178,6 +178,23 @@ else
 	$(MAKE) --no-print-directory release-unix
 endif
 
+# These are aliases used to make build commands uniform.
+.PHONY: release-amd64
+release-amd64:
+	$(MAKE) release ARCH=amd64
+
+.PHONY: release-386
+release-386:
+	$(MAKE) release ARCH=386
+
+.PHONY: release-arm
+release-arm:
+	$(MAKE) release ARCH=arm
+
+.PHONY: release-arm64
+release-arm64:
+	$(MAKE) release ARCH=arm64
+
 #
 # make release-unix - Produces a binary release tarball containing teleport,
 # tctl, and tsh.
@@ -216,21 +233,6 @@ release-windows: clean all
 	rm -rf teleport/
 	@echo "---> Created $(RELEASE).zip."
 
-#
-# Builds docs using containerized mkdocs
-#
-.PHONY:docs
-docs: docs-test
-	$(MAKE) -C build.assets docs
-
-#
-# Runs the documentation site inside a container on localhost with live updates
-# Convenient for editing documentation.
-#
-.PHONY:run-docs
-run-docs:
-	$(MAKE) -C build.assets run-docs
-
 #
 # Remove trailing whitespace in all markdown files under docs/.
 #
@@ -246,7 +248,7 @@ docs-fix-whitespace:
 # Test docs for trailing whitespace and broken links
 #
 .PHONY:docs-test
-docs-test: docs-test-whitespace docs-test-links
+docs-test: docs-test-whitespace
 
 #
 # Check for trailing whitespace in all markdown files under docs/
@@ -259,17 +261,6 @@ docs-test-whitespace:
 		exit 1; \
 	fi
 
-#
-# Run milv in docs to detect broken internal links.
-# milv is installed if missing.
-#
-.PHONY:docs-test-links
-docs-test-links: DOCS_FOLDERS := $(shell find . -name milv.config.yaml -exec dirname {} \;)
-docs-test-links:
-	for docs_dir in $(DOCS_FOLDERS); do \
-		echo "running milv -ignore-external in $${docs_dir}"; \
-		cd $${docs_dir} && milv -ignore-external; cd $(PWD); \
-	done
 
 #
 # Runs all tests except integration, called by CI/CD.
@@ -641,3 +632,16 @@ update-vendor:
 	# create a symlink to the the original api package
 	rm -r vendor/github.com/gravitational/teleport/api
 	ln -s -r $(shell readlink -f api) vendor/github.com/gravitational/teleport
+
+# update-webassets updates the minified code in the webassets repo using the latest webapps
+# repo and creates a PR in the teleport repo to update webassets submodule.
+.PHONY: update-webassets
+update-webassets: WEBAPPS_BRANCH ?= 'master'
+update-webassets: TELEPORT_BRANCH ?= 'master'
+update-webassets:
+	build.assets/webapps/update-teleport-webassets.sh -w $(WEBAPPS_BRANCH) -t $(TELEPORT_BRANCH)
+
+# dronegen generates .drone.yml config
+.PHONY: dronegen
+dronegen:
+	go run ./dronegen

README.md

@@ -99,9 +99,12 @@ will not work.
 
 NOTE: This will build the latest version of Teleport, regardless of whether it is stable. If you want to build the latest stable release, `git checkout` to that tag (e.g. `git checkout v5.0.0`) before running `make full`.
 
-### Rebuilding Web UI
+### Web UI
+
+Teleport Web UI is located in the [Gravitational Webapps](https://github.com/gravitational/webapps) repo.
+
+#### Rebuilding Web UI for development
 
-Teleport Web UI is located in the [Gravitational Webapps](https://github.com/gravitational/webapps) monorepo.
 You can clone that repository and rebuild teleport UI package with:
 
 ```bash
@@ -110,12 +113,12 @@ $ cd webapps
 $ make build-teleport
 ```
 
-Then you can replace Teleport web UI files with the one found in the generated `/dist` folder.
+Then you can replace Teleport Web UI files with the one found in the generated `/dist` folder.
 
 To enable speedy iterations on the Web UI, you can run a
 [local web-dev server](https://github.com/gravitational/webapps/tree/master/packages/teleport).
 
-You can also tell teleport to load the web UI assets from the source directory.
+You can also tell teleport to load the Web UI assets from the source directory.
 To enable this behavior, set the environment variable `DEBUG=1` and rebuild with the default target:
 
 ```bash
@@ -126,6 +129,18 @@ $ DEBUG=1 ./build/teleport start -d
 Keep the server running in this mode, and make your UI changes in `/dist` directory.
 Refer to [the webapps README](https://github.com/gravitational/webapps/blob/master/README.md) for instructions on how to update the Web UI.
 
+#### Updating Web UI assets
+
+After you commit a change to [the webapps
+repo](https://github.com/gravitational/webapps), you need to update the Web UI
+assets in the `webassets/` git submodule.
+
+Use `make update-webassets` to update the `webassets` repo and create a PR for
+`teleport` to update its git submodule.
+
+You will need to have the `gh` utility installed on your system for the script
+to work. You can download it from https://github.com/cli/cli/releases/latest
+
 ### Updating Documentation
 
 TL;DR version:

api/client/README.md

@@ -0,0 +1,10 @@
+This package is documented using a combination of [pkg.go.dev](https://pkg.go.dev/github.com/gravitational/teleport/api/client) and Teleport [Docs](https://goteleport.com/docs/).
+
+## Reference
+
+- [Introduction](https:/goteleport.com/docs/reference/api/introduction/)
+- [Getting Started](https:/goteleport.com/docs/reference/api/getting-started/)
+- [Architecture](https:/goteleport.com/docs/reference/api/architecture/)
+- [pkg.go.dev](https://pkg.go.dev/github.com/gravitational/teleport/api/client/)
+  - [Using the client](https://pkg.go.dev/github.com/gravitational/teleport/api/client#Client/)
+  - [Working with credentials](https://pkg.go.dev/github.com/gravitational/teleport/api/client#Credentials/)

api/client/auditstreamer.go

@@ -32,7 +32,8 @@ import (
 // createOrResumeAuditStream creates or resumes audit stream described in the request.
 func (c *Client) createOrResumeAuditStream(ctx context.Context, request proto.AuditStreamRequest) (events.Stream, error) {
 	closeCtx, cancel := context.WithCancel(ctx)
-	stream, err := c.grpc.CreateAuditStream(closeCtx, grpc.UseCompressor(ggzip.Name))
+	callOpts := append(c.callOpts, grpc.UseCompressor(ggzip.Name))
+	stream, err := c.grpc.CreateAuditStream(closeCtx, callOpts...)
 	if err != nil {
 		cancel()
 		return nil, trail.FromGRPC(err)