Skip to content

Commit

Permalink
Merge branch 'master' into joerger/sso-mfa-web
Browse files Browse the repository at this point in the history
  • Loading branch information
Joerger authored Nov 5, 2024
2 parents 6f3674e + ecd5500 commit 5fe895b
Show file tree
Hide file tree
Showing 77 changed files with 1,807 additions and 679 deletions.
17 changes: 6 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1543,8 +1543,7 @@ derive:
.PHONY: derive-up-to-date
derive-up-to-date: must-start-clean/host derive
@if ! git diff --quiet; then \
echo 'Please run make derive.'; \
git diff; \
./build.assets/please-run.sh "derived functions" "make derive"; \
exit 1; \
fi

Expand Down Expand Up @@ -1579,15 +1578,14 @@ endif
.PHONY: protos-up-to-date/host
protos-up-to-date/host: must-start-clean/host grpc/host
@if ! git diff --quiet; then \
echo 'Please run make grpc.'; \
git diff; \
./build.assets/please-run.sh "protos gRPC" "make grpc"; \
exit 1; \
fi

.PHONY: must-start-clean/host
must-start-clean/host:
@if ! git diff --quiet; then \
echo 'This must be run from a repo with no unstaged commits.'; \
@echo 'This must be run from a repo with no unstaged commits.'; \
git diff; \
exit 1; \
fi
Expand All @@ -1597,14 +1595,12 @@ must-start-clean/host:
crds-up-to-date: must-start-clean/host
$(MAKE) -C integrations/operator manifests
@if ! git diff --quiet; then \
echo 'Please run make -C integrations/operator manifests.'; \
git diff; \
./build.assets/please-run.sh "operator CRD manifests" "make -C integrations/operator crd"; \
exit 1; \
fi
$(MAKE) -C integrations/operator crd-docs
@if ! git diff --quiet; then \
echo 'Please run make -C integrations/operator crd-docs.'; \
git diff; \
./build.assets/please-run.sh "operator CRD docs" "make -C integrations/operator crd"; \
exit 1; \
fi

Expand All @@ -1613,8 +1609,7 @@ crds-up-to-date: must-start-clean/host
terraform-resources-up-to-date: must-start-clean/host
$(MAKE) -C integrations/terraform docs
@if ! git diff --quiet; then \
echo 'Please run make -C integrations/terraform docs.'; \
git diff; \
./build.assets/please-run.sh "TF provider docs" "make -C integrations/terraform docs"; \
exit 1; \
fi

Expand Down
6 changes: 3 additions & 3 deletions api/types/autoupdate/rollout.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ import (

// NewAutoUpdateAgentRollout creates a new auto update version resource.
func NewAutoUpdateAgentRollout(spec *autoupdate.AutoUpdateAgentRolloutSpec) (*autoupdate.AutoUpdateAgentRollout, error) {
version := &autoupdate.AutoUpdateAgentRollout{
rollout := &autoupdate.AutoUpdateAgentRollout{
Kind: types.KindAutoUpdateAgentRollout,
Version: types.V1,
Metadata: &headerv1.Metadata{
Name: types.MetaNameAutoUpdateAgentRollout,
},
Spec: spec,
}
if err := ValidateAutoUpdateAgentRollout(version); err != nil {
if err := ValidateAutoUpdateAgentRollout(rollout); err != nil {
return nil, trace.Wrap(err)
}

return version, nil
return rollout, nil
}

// ValidateAutoUpdateAgentRollout checks that required parameters are set
Expand Down
40 changes: 40 additions & 0 deletions build.assets/please-run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/bin/sh

# This script is a helper that tells developers what generated content is out of date
# and which command to run.
# When running on GitHub actions, the script will also create an error in the PR and
# collapse the diff to improve readability.

set -eu

# only echoes the string if we are in GitHub Actions
echo_gha() {
[ -n "${GITHUB_ACTIONS+x}" ] && echo "$@"
}

main() {
if [ $# -ne 2 ]; then
echo "Usage: $0 <kind> <generate command>" >&2
exit 1
fi

KIND="$1"
GENERATE_COMMAND="$2"

TITLE="$KIND are out-of-date"
MESSAGE="Please run the command \`$GENERATE_COMMAND\`"

# Create a GitHub error
echo_gha "::error file=Makefile,title=$TITLE::$MESSAGE"

echo "============="
echo "$TITLE"
echo "$MESSAGE"
echo "============="

echo_gha "::group::Diff output"
git diff || true
echo_gha "::endgroup::"
}

main "$@"
2 changes: 2 additions & 0 deletions docs/pages/admin-guides/management/guides/guides.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ You can integrate Teleport with third-party tools in order to complete various
tasks in your cluster. These guides describe Teleport integrations that are not
documented elsewhere:

- [AWS OIDC Integration with Teleport](awsoidc-integration.mdx). How
to set up the AWS OIDC integration to allow Teleport to interact with AWS.
- [EC2 tags as Teleport agent labels](ec2-tags.mdx). How to set up
Teleport agent labels based on EC2 tags.
- [GCP tags and labels as Teleport agent labels](gcp-tags.mdx). How
Expand Down
66 changes: 33 additions & 33 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ require (
cloud.google.com/go/spanner v1.68.0
cloud.google.com/go/storage v1.43.0
connectrpc.com/connect v1.17.0
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v3 v3.0.1
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v2 v2.4.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.2.0
Expand All @@ -29,16 +29,16 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/subscription/armsubscription v1.2.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.1
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161
github.com/ClickHouse/ch-go v0.62.0
github.com/ClickHouse/clickhouse-go/v2 v2.29.0
github.com/ClickHouse/ch-go v0.63.1
github.com/ClickHouse/clickhouse-go/v2 v2.30.0
github.com/DanielTitkov/go-adaptive-cards v0.2.2
github.com/HdrHistogram/hdrhistogram-go v1.1.2
github.com/Masterminds/sprig/v3 v3.3.0
github.com/Microsoft/go-winio v0.6.2
github.com/ThalesIgnite/crypto11 v1.2.5
github.com/alecthomas/kingpin/v2 v2.4.0 // replaced
github.com/alicebob/miniredis/v2 v2.33.0
github.com/andybalholm/brotli v1.1.0
github.com/andybalholm/brotli v1.1.1
github.com/aquasecurity/libbpfgo v0.5.1-libbpf-1.2
github.com/armon/go-radix v1.0.0
github.com/aws/aws-sdk-go v1.55.5
Expand Down Expand Up @@ -77,22 +77,22 @@ require (
github.com/beevik/etree v1.4.1
github.com/buildkite/bintest/v3 v3.3.0
github.com/charmbracelet/bubbles v0.20.0
github.com/charmbracelet/bubbletea v1.1.0
github.com/charmbracelet/bubbletea v1.1.2
github.com/charmbracelet/lipgloss v1.0.0
github.com/coreos/go-oidc v2.2.1+incompatible // replaced
github.com/coreos/go-semver v0.3.1
github.com/creack/pty v1.1.23
github.com/creack/pty v1.1.24
github.com/crewjam/saml v0.4.14
github.com/datastax/go-cassandra-native-protocol v0.0.0-20220706104457-5e8aad05cf90
github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352
github.com/distribution/reference v0.6.0
github.com/dustin/go-humanize v1.0.1
github.com/elastic/go-elasticsearch/v8 v8.15.0
github.com/elimity-com/scim v0.0.0-20240320110924-172bf2aee9c8
github.com/envoyproxy/go-control-plane v0.13.0
github.com/envoyproxy/go-control-plane v0.13.1
github.com/evanphx/json-patch v5.9.0+incompatible
github.com/fatih/color v1.17.0
github.com/fsnotify/fsnotify v1.7.0
github.com/fatih/color v1.18.0
github.com/fsnotify/fsnotify v1.8.0
github.com/fsouza/fake-gcs-server v1.49.3
github.com/fxamacker/cbor/v2 v2.7.0
github.com/ghodss/yaml v1.0.0
Expand All @@ -108,7 +108,7 @@ require (
github.com/gocql/gocql v1.7.0
github.com/gofrs/flock v0.12.1
github.com/gogo/protobuf v1.3.2 // replaced
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/golang-jwt/jwt/v4 v4.5.1
github.com/google/btree v1.1.3
github.com/google/go-attestation v0.5.1
github.com/google/go-cmp v0.6.0
Expand All @@ -128,13 +128,13 @@ require (
github.com/gravitational/trace v1.4.0
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
github.com/guptarohit/asciigraph v0.7.2
github.com/guptarohit/asciigraph v0.7.3
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/icza/mjpeg v0.0.0-20230330134156-38318e5ab8f4
github.com/jackc/pgconn v1.14.3
github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438
github.com/jackc/pgproto3/v2 v2.3.3
github.com/jackc/pgtype v1.14.3
github.com/jackc/pgtype v1.14.4
github.com/jackc/pgx/v4 v4.18.3
github.com/jackc/pgx/v5 v5.7.1
github.com/jcmturner/gokrb5/v8 v8.4.4
Expand All @@ -145,8 +145,8 @@ require (
github.com/julienschmidt/httprouter v1.3.0 // replaced
github.com/keys-pub/go-libfido2 v1.5.3-0.20220306005615-8ab03fb1ec27 // replaced
github.com/lib/pq v1.10.9
github.com/mailgun/mailgun-go/v4 v4.16.0
github.com/mattn/go-sqlite3 v1.14.23
github.com/mailgun/mailgun-go/v4 v4.18.1
github.com/mattn/go-sqlite3 v1.14.24
github.com/mdlayher/netlink v1.7.2
github.com/microsoft/go-mssqldb v1.7.2 // replaced
github.com/miekg/pkcs11 v1.1.1
Expand All @@ -159,29 +159,29 @@ require (
github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627
github.com/pavlo-v-chernykh/keystore-go/v4 v4.5.0
github.com/pelletier/go-toml v1.9.5
github.com/pkg/sftp v1.13.6
github.com/pkg/sftp v1.13.7
github.com/pquerna/otp v1.4.0
github.com/prometheus/client_golang v1.20.4
github.com/prometheus/client_golang v1.20.5
github.com/prometheus/client_model v0.6.1
github.com/prometheus/common v0.55.0
github.com/quic-go/quic-go v0.47.0
github.com/redis/go-redis/v9 v9.5.1 // replaced
github.com/quic-go/quic-go v0.48.1
github.com/redis/go-redis/v9 v9.6.1 // replaced
github.com/russellhaering/gosaml2 v0.9.1
github.com/russellhaering/goxmldsig v1.4.0
github.com/schollz/progressbar/v3 v3.16.0
github.com/schollz/progressbar/v3 v3.17.0
github.com/scim2/filter-parser/v2 v2.2.0
github.com/shirou/gopsutil/v4 v4.24.9
github.com/sigstore/cosign/v2 v2.4.0
github.com/sigstore/sigstore v1.8.9
github.com/shirou/gopsutil/v4 v4.24.10
github.com/sigstore/cosign/v2 v2.4.1
github.com/sigstore/sigstore v1.8.10
github.com/sijms/go-ora/v2 v2.8.22
github.com/sirupsen/logrus v1.9.3
github.com/snowflakedb/gosnowflake v1.11.1
github.com/snowflakedb/gosnowflake v1.12.0
github.com/spf13/cobra v1.8.1
github.com/spiffe/go-spiffe/v2 v2.3.0
github.com/stretchr/testify v1.9.0
github.com/ucarion/urlpath v0.0.0-20200424170820-7ccc79b76bbb
github.com/vulcand/predicate v1.2.0 // replaced
github.com/xanzy/go-gitlab v0.109.0
github.com/xanzy/go-gitlab v0.112.0
go.etcd.io/etcd/api/v3 v3.5.16
go.etcd.io/etcd/client/v3 v3.5.16
go.mongodb.org/mongo-driver v1.14.0
Expand Down Expand Up @@ -219,7 +219,7 @@ require (
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259
helm.sh/helm/v3 v3.16.1
helm.sh/helm/v3 v3.16.2
k8s.io/api v0.31.1
k8s.io/apiextensions-apiserver v0.31.1
k8s.io/apimachinery v0.31.1
Expand All @@ -230,7 +230,7 @@ require (
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.31.1
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
sigs.k8s.io/controller-runtime v0.19.0
sigs.k8s.io/controller-runtime v0.19.1
sigs.k8s.io/controller-tools v0.16.3
sigs.k8s.io/yaml v1.4.0
software.sslmate.com/src/go-pkcs12 v0.5.0
Expand All @@ -251,7 +251,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/BurntSushi/toml v1.4.0 // indirect
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
Expand Down Expand Up @@ -308,15 +308,15 @@ require (
github.com/di-wu/parser v0.3.0 // indirect
github.com/di-wu/xsd-datetime v1.0.0 // indirect
github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 // indirect
github.com/dmarkham/enumer v1.5.9 // indirect
github.com/dmarkham/enumer v1.5.10 // indirect
github.com/docker/cli v27.1.1+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v27.3.0+incompatible // indirect
github.com/docker/docker-credential-helpers v0.8.2 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
github.com/ebitengine/purego v0.8.0 // indirect
github.com/ebitengine/purego v0.8.1 // indirect
github.com/elastic/elastic-transport-go/v8 v8.6.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.3 // indirect
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
Expand All @@ -333,7 +333,7 @@ require (
github.com/go-faster/city v1.0.1 // indirect
github.com/go-faster/errors v0.7.1 // indirect
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
Expand Down Expand Up @@ -382,7 +382,7 @@ require (
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
Expand All @@ -405,7 +405,7 @@ require (
github.com/josharian/native v1.1.0 // indirect
github.com/joshlf/testutil v0.0.0-20170608050642-b5d8aa79d93d // indirect
github.com/kelseyhightower/envconfig v1.4.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
Expand Down
Loading

0 comments on commit 5fe895b

Please sign in to comment.