Skip to content

Commit 95ce34b

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents e4cd746 + 89b3e7e commit 95ce34b

4,250 files changed

Lines changed: 306268 additions & 131751 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ docs/theme/js/theme.js linguist-vendored=false
99
*_pb.ts linguist-generated
1010
*_pb.grpc-*.ts linguist-generated
1111
*_pb.client.ts linguist-generated
12+
13+
*.golden -text

.github/CODEOWNERS

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,27 @@
11
* @loadsmart/platform-operations
2+
# Merge rules are governed by logic in the Workflow Bot. Protect the
3+
# .github/workflows directory (and the merge logic) using CODEOWNERS.
4+
/.github/workflows/ @klizhentas @russjones @r0mant @zmb3 @fheinecke @camscale @doggydogworld @rosstimothy
5+
/.github/actions/ @klizhentas @russjones @r0mant @zmb3 @fheinecke @camscale @doggydogworld @rosstimothy
6+
/build.assets/tooling/cmd/difftest/ @klizhentas @russjones @r0mant @zmb3 @rosstimothy
7+
8+
# Owners for JS dependency updates.
9+
/pnpm-lock.yaml @avatus @gzdunek @ravicious @zmb3 @r0mant
10+
/web/packages/teleterm/package.json @gzdunek @ravicious
11+
12+
# Owners for Go dependency updates.
13+
/go.mod @russjones @r0mant @zmb3 @rosstimothy
14+
/api/go.mod @russjones @r0mant @zmb3 @rosstimothy
15+
/assets/aws/go.mod @russjones @r0mant @zmb3 @rosstimothy
16+
/assets/backport/go.mod @russjones @r0mant @zmb3 @rosstimothy
17+
/build.assets/tooling/go.mod @russjones @r0mant @zmb3 @rosstimothy @fheinecke @camscale @doggydogworld
18+
/integrations/terraform/go.mod @russjones @r0mant @zmb3 @rosstimothy @hugoShaka @tigrato
19+
/integrations/terraform-mwi/go.mod @russjones @r0mant @zmb3 @rosstimothy @hugoShaka @tigrato @strideynet
20+
/integrations/event-handler/go.mod @russjones @r0mant @zmb3 @rosstimothy @hugoShaka @tigrato
21+
22+
# Owners for Rust dependency updates.
23+
/Cargo.toml @russjones @r0mant @zmb3 @rosstimothy @fspmarshall @espadolini
24+
/tool/fdpass-teleport/Cargo.toml @russjones @r0mant @zmb3 @rosstimothy @fspmarshall @espadolini
25+
/web/packages/shared/libs/ironrdp/Cargo.toml @russjones @r0mant @zmb3 @rosstimothy @fspmarshall @espadolini @probakowski
26+
/lib/srv/desktop/rdp/rdpclient/Cargo.toml @russjones @r0mant @zmb3 @rosstimothy @fspmarshall @espadolini @probakowski
27+
>>>>>>> upstream/master

.github/ISSUE_TEMPLATE/testplan.md

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,6 +1009,10 @@ on the remote host. Note that the `--callback` URL must be able to resolve to th
10091009
[Docs](https://goteleport.com/docs/enroll-resources/agents/gcp/)
10101010
- [ ] Join a Teleport node running in a GCP VM.
10111011
1012+
### Oracle Node Joining
1013+
[Docs](https://goteleport.com/docs/enroll-resources/agents/oracle/)
1014+
- [ ] Join a Teleport node running in an OCI VM.
1015+
10121016
### Cloud Labels
10131017
- [ ] Create an EC2 instance with [tags in instance metadata enabled](https://goteleport.com/docs/admin-guides/management/guides/ec2-tags/)
10141018
and with tag `foo`: `bar`. Verify that a node running on the instance has label
@@ -1180,6 +1184,8 @@ tsh ssh node-that-requires-device-trust
11801184
- [ ] K8s Access
11811185
- [ ] App Access NOT enforced in global mode
11821186
- [ ] Desktop Access NOT enforced in global mode
1187+
- [ ] device_trust.mode="required-for-humans" enforces enrolled devices for
1188+
humans, but bots (e.g. `tbot`) function on any device
11831189
- [ ] Role-based authz enforces enrolled devices
11841190
(device_trust.mode="optional" and role.spec.options.device_trust_mode="required")
11851191
- [ ] SSH
@@ -1491,8 +1497,9 @@ GODEBUG='inittrace=1' teleport version 2>&1 | rg '^init' | awk '{print $8 " byte
14911497
- [ ] Verify [AWS console access](https://goteleport.com/docs/enroll-resources/application-access/cloud-apis/aws-console/).
14921498
- [ ] Can log into AWS web console through the web UI.
14931499
- [ ] Can interact with AWS using `tsh` commands.
1494-
- [ ] `tsh aws`
1495-
- [ ] `tsh aws --endpoint-url` (this is a hidden flag)
1500+
- [ ] `tsh aws sts get-caller-identity`
1501+
- [ ] `tsh aws s3 ls`
1502+
- [ ] `tsh aws s3 cp ./file s3://<bucket>/test`
14961503
- [ ] Verify [Azure CLI access](https://goteleport.com/docs/enroll-resources/application-access/cloud-apis/azure/) with `tsh apps login`.
14971504
- [ ] Can interact with Azure using `tsh az` commands.
14981505
- [ ] Can interact with Azure using a combination of `tsh proxy az` and `az` commands.
@@ -1538,6 +1545,7 @@ manualy testing.
15381545
- [ ] Amazon Redshift Serverless.
15391546
- [ ] Verify connection to external AWS account works with `assume_role_arn: ""` and `external_id: "<id>"`
15401547
- [ ] Amazon ElastiCache.
1548+
- [ ] Amazon ElastiCache Serverless.
15411549
- [ ] Amazon MemoryDB.
15421550
- [ ] Amazon OpenSearch.
15431551
- [ ] Amazon Dynamodb.
@@ -1576,6 +1584,7 @@ manualy testing.
15761584
- [ ] Amazon Redshift.
15771585
- [ ] Amazon Redshift Serverless.
15781586
- [ ] Amazon ElastiCache.
1587+
- [ ] Amazon ElastiCache Serverless.
15791588
- [ ] Amazon MemoryDB.
15801589
- [ ] Amazon OpenSearch.
15811590
- [ ] Amazon Dynamodb.
@@ -1636,6 +1645,7 @@ manualy testing.
16361645
- [x] Can detect and register Redshift clusters. (covered by E2E test)
16371646
- [x] Can detect and register Redshift serverless workgroups, and their VPC endpoints. (covered by E2E test)
16381647
- [ ] Can detect and register ElastiCache Redis clusters.
1648+
- [ ] Can detect and register ElastiCache Serverless Redis/Valkey clusters.
16391649
- [ ] Can detect and register MemoryDB clusters.
16401650
- [ ] Can detect and register OpenSearch domains.
16411651
- [ ] Can detect and register DocumentDB clusters.
@@ -1660,6 +1670,8 @@ manualy testing.
16601670
- [ ] Postgres
16611671
- [ ] Verify database access via Web UI
16621672
- [ ] Postgres
1673+
- [ ] CockroachDB
1674+
- [ ] MySQL
16631675
- [ ] Verify database health checks
16641676
- [ ] Dynamic `health_check_config` resource create, read, update, delete operations are supported using `tctl`
16651677
- [ ] Database servers (`$ tctl get db_server`) include `db_server.status.target_health` info
@@ -2093,6 +2105,7 @@ Verify that SSH works, and that resumable SSH is not interrupted across a contro
20932105
- [ ] New EC2 instances with matching AWS tags are discovered and added to the teleport cluster
20942106
- [ ] Large numbers of EC2 instances (51+) are all successfully added to the cluster
20952107
- [ ] Nodes that have been discovered do not have the install script run on the node multiple times
2108+
- [ ] EC2 instances can be discovered in multiple accounts
20962109

20972110
## Azure Discovery
20982111

@@ -2193,6 +2206,16 @@ Docs: [IP Pinning](https://goteleport.com/docs/admin-guides/access-controls/guid
21932206
- [ ] Verify that manually deleting a nested Access List used as a member or owner does not break UserLoginState generation or listing Access Lists.
21942207
- [ ] Verify that an Access List can be added as a member or owner of another Access List using `tctl`.
21952208
- [ ] Verify that Access Lists added as members or owners of other Access Lists using `tctl` are validated (no circular references, no nesting > 10 levels).
2209+
- [ ] For Access Lists of "static" type:
2210+
- [ ] Verify that static Access List and its members (including nested list members) can be [created/modified/deleted with Terraform](../../docs/pages/identity-governance/access-lists/terraform.mdx) ([teleport_access_list_member ref](../../docs/pages/reference/terraform-provider/resources/access_list_member.mdx))
2211+
- [ ] Verify non-static Access List members cannot be imported to Terraform (Create an Access List in the web UI and add a member and try to import the member to Terraform)
2212+
- [ ] In Terraform: check if member's MEMBERSHIP_KIND_USER (1) is changed to MEMBERSHIP_KIND_LIST (2) forces re-creation
2213+
- [ ] Verify setting audit to past date/zero date doesn't create a review badge on the list in the UI
2214+
- [ ] Verify changing spec.type is forbidden
2215+
- [ ] Verify other lists cannot be converted to "static"
2216+
- [ ] Verify expiration and eligibility of members
2217+
- [ ] In the web UI: check if modifications/deletion of static lists are blocked
2218+
- [ ] In the web UI: check if the review is blocked (add `#review` at the end of the Access List URL)
21962219

21972220
- [ ] Verify Okta Sync Service
21982221
- [ ] Verify Okta Plugin configuration.

.github/dependabot.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ updates:
1818
- dependency-name: github.com/microsoft/go-mssqldb
1919
- dependency-name: github.com/redis/go-redis/v9
2020
- dependency-name: github.com/vulcand/predicate
21+
- dependency-name: github.com/hinshun/vt10x
2122
open-pull-requests-limit: 20
2223
groups:
2324
go:
@@ -238,15 +239,18 @@ updates:
238239
- 'ui'
239240
- 'no-changelog'
240241
groups:
242+
# These packages are either directly involved in the process of building Teleport Connect or
243+
# they make use of native dependencies. Verifying that updating them didn't break anything
244+
# involves making a tag build.
241245
electron:
242246
patterns:
243247
- 'electron*'
248+
- node-gyp
249+
- node-pty
244250
ui:
245251
update-types:
246252
- 'minor'
247253
- 'patch'
248-
exclude-patterns:
249-
- 'electron*'
250254
open-pull-requests-limit: 20
251255
- package-ecosystem: github-actions
252256
directory: '/.github/workflows'

.github/workflows/assign.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
repository: gravitational/shared-workflows
4141
path: .github/shared-workflows
42-
ref: 5213479ba6a7b41a0ee5e5adf72360e6ac4e9b93 # workflows/v0.0.1
42+
ref: 664e788d45a7f56935cf63094b4fb52a41b12015 # workflows/v0.0.2
4343
- name: Installing Go
4444
uses: actions/setup-go@v5
4545
with:

.github/workflows/aws-e2e-tests-non-root.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
continue-on-error: true
8989

9090
- name: Configure AWS Credentials
91-
uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
91+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0
9292
with:
9393
aws-region: ${{ env.AWS_REGION }}
9494
role-to-assume: ${{ env.GHA_ASSUME_ROLE }}

.github/workflows/backport.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
repository: gravitational/shared-workflows
3939
path: .github/shared-workflows
40-
ref: 5213479ba6a7b41a0ee5e5adf72360e6ac4e9b93 # workflows/v0.0.1
40+
ref: 664e788d45a7f56935cf63094b4fb52a41b12015 # workflows/v0.0.2
4141
- name: Installing Go
4242
uses: actions/setup-go@v5
4343
with:

.github/workflows/bloat.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
with:
4242
repository: gravitational/shared-workflows
4343
path: .github/shared-workflows
44-
ref: 5213479ba6a7b41a0ee5e5adf72360e6ac4e9b93 # workflows/v0.0.1
44+
ref: 664e788d45a7f56935cf63094b4fb52a41b12015 # workflows/v0.0.2
4545

4646
- name: Setup base cache
4747
uses: actions/cache/restore@v3
@@ -93,7 +93,7 @@ jobs:
9393
with:
9494
repository: gravitational/shared-workflows
9595
path: .github/shared-workflows
96-
ref: 5213479ba6a7b41a0ee5e5adf72360e6ac4e9b93 # workflows/v0.0.1
96+
ref: 664e788d45a7f56935cf63094b4fb52a41b12015 # workflows/v0.0.2
9797

9898
- name: Build Binaries
9999
id: build_branch

.github/workflows/build-ci-service-images.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
- name: Build etcd image
4646
id: docker_build
47-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
47+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
4848
with:
4949
context: ${{ github.workspace }}
5050
file: .github/services/Dockerfile.etcd

.github/workflows/build-macos.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,7 @@ jobs:
6262
cache: false
6363
go-version: ${{ env.GOLANG_VERSION }}
6464

65-
- name: Configure Rust Toolchain
66-
run: |
67-
rustup override set ${{ env.RUST_VERSION }}
68-
69-
- name: Install wasm-pack
65+
- name: Install wasm-deps
7066
run: make ensure-wasm-deps
7167

7268
- name: Build

0 commit comments

Comments
 (0)