Skip to content

Commit 5dcb19d

Browse files
committed
Merge branch 'master' into bernard/condition-schedules
2 parents b5afa73 + 10095eb commit 5dcb19d

File tree

1,121 files changed

+46470
-30650
lines changed

Some content is hidden

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

1,121 files changed

+46470
-30650
lines changed

.github/ISSUE_TEMPLATE/testplan.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2206,6 +2206,16 @@ Docs: [IP Pinning](https://goteleport.com/docs/admin-guides/access-controls/guid
22062206
- [ ] Verify that manually deleting a nested Access List used as a member or owner does not break UserLoginState generation or listing Access Lists.
22072207
- [ ] Verify that an Access List can be added as a member or owner of another Access List using `tctl`.
22082208
- [ ] 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)
22092219

22102220
- [ ] Verify Okta Sync Service
22112221
- [ ] Verify Okta Plugin configuration.

.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
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323
- name: Generate GitHub Token
2424
id: generate_token
25-
uses: actions/create-github-app-token@v1
25+
uses: actions/create-github-app-token@v2
2626
with:
2727
app-id: ${{ secrets.BACKPORT_APP_ID }}
2828
private-key: ${{ secrets.BACKPORT_PRIVATE_KEY }}

.github/workflows/bloat.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ jobs:
2929

3030
steps:
3131
- name: Checkout base
32-
uses: actions/checkout@v3 # Cannot upgrade to v4 while this runs in centos:7 due to nodejs GLIBC incompatibility
32+
uses: actions/checkout@v5
3333
with:
3434
ref: ${{ github.event.before }}
3535

3636
- name: Prepare workspace
3737
uses: ./.github/actions/prepare-workspace
3838

3939
- name: Checkout shared-workflow
40-
uses: actions/checkout@v3 # Cannot upgrade to v4 while this runs in centos:7 due to nodejs GLIBC incompatibility
40+
uses: actions/checkout@v5
4141
with:
4242
repository: gravitational/shared-workflows
4343
path: .github/shared-workflows
@@ -53,10 +53,10 @@ jobs:
5353

5454
- name: Generate GitHub Token
5555
id: generate_token
56-
uses: actions/create-github-app-token@v1.0.5 # Cannot upgrade past v1.1 while this runs in centos:7 due to nodejs GLIBC incompatibility
56+
uses: actions/create-github-app-token@v2
5757
with:
58-
app_id: ${{ secrets.REVIEWERS_APP_ID }}
59-
private_key: ${{ secrets.REVIEWERS_PRIVATE_KEY }}
58+
app-id: ${{ secrets.REVIEWERS_APP_ID }}
59+
private-key: ${{ secrets.REVIEWERS_PRIVATE_KEY }}
6060

6161
- if: ${{ steps.cache-build-restore.outputs.cache-hit != 'true' }}
6262
name: Build base
@@ -83,13 +83,13 @@ jobs:
8383
echo "base_stats=$(cat ~/teleport_base_build_stats)" >> $GITHUB_ENV
8484
8585
- name: Checkout branch
86-
uses: actions/checkout@v3 # Cannot upgrade to v4 while this runs in centos:7 due to nodejs GLIBC incompatibility
86+
uses: actions/checkout@v5
8787
with:
8888
clean: false
8989
ref: ${{ github.event.after }}
9090

9191
- name: Checkout shared-workflow
92-
uses: actions/checkout@v3 # Cannot upgrade to v4 while this runs in centos:7 due to nodejs GLIBC incompatibility
92+
uses: actions/checkout@v5
9393
with:
9494
repository: gravitational/shared-workflows
9595
path: .github/shared-workflows

.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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ jobs:
4848
echo "rust: ${RUST_VERSION}"
4949
5050
- name: Install Node Toolchain
51-
uses: actions/setup-node@v4
51+
uses: actions/setup-node@v5
5252
with:
5353
node-version: ${{ env.NODE_VERSION }}
54+
package-manager-cache: false
5455

5556
- name: Setup pnpm
5657
run: |

.github/workflows/build-usage-image.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT
1717
- uses: actions/checkout@v4
1818
- uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
19-
- uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
19+
- uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0
2020
with:
2121
role-to-assume: ${{ secrets.TELEPORT_USAGE_IAM_ROLE_ARN }}
2222
aws-region: us-east-1
2323
- uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2.0.1
2424
with:
2525
registry-type: public
2626
# Build and publish container image on ECR.
27-
- uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
27+
- uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
2828
with:
2929
context: "examples/teleport-usage"
3030
tags: public.ecr.aws/gravitational/teleport-usage:${{ steps.version.outputs.version }}

.github/workflows/check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
steps:
3838
- name: Generate GitHub Token
3939
id: generate_token
40-
uses: actions/create-github-app-token@v1
40+
uses: actions/create-github-app-token@v2
4141
with:
4242
app-id: ${{ secrets.REVIEWERS_APP_ID }}
4343
private-key: ${{ secrets.REVIEWERS_PRIVATE_KEY }}

.github/workflows/cla-assistant.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
- name: Fetch installation token
2828
id: fetch-token
29-
uses: actions/create-github-app-token@v1
29+
uses: actions/create-github-app-token@v2
3030
with:
3131
app-id: ${{ secrets.CLA_ASSISTANT_APP_ID }}
3232
private-key: ${{ secrets.CLA_ASSISTANT_APP_PRIVATE_KEY }}

.github/workflows/doc-tests.yaml

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

6060
- name: Generate GitHub Token
6161
id: generate_token
62-
uses: actions/create-github-app-token@v1
62+
uses: actions/create-github-app-token@v2
6363
with:
6464
app-id: ${{ secrets.REVIEWERS_APP_ID }}
6565
private-key: ${{ secrets.REVIEWERS_PRIVATE_KEY }}

0 commit comments

Comments
 (0)