Skip to content

Commit 060520f

Browse files
MpdreamzMpdreamz
committed
Merge remote-tracking branch 'origin/main' into refactor/navigation
2 parents afd5456 + 224b089 commit 060520f

File tree

176 files changed

+11211
-3501
lines changed

Some content is hidden

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

176 files changed

+11211
-3501
lines changed

‎.github/actions/aws-auth/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ runs:
3737
with open(os.environ["GITHUB_OUTPUT"], "a") as f:
3838
f.write(f"result=arn:aws:iam::{os.environ["AWS_ACCOUNT_ID"]}:role/{prefix}{hash}")
3939
- name: Configure AWS Credentials
40-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0
40+
uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0
4141
with:
4242
role-to-assume: ${{ steps.role_arn.outputs.result }}
4343
aws-region: ${{ inputs.aws_region }}

‎.github/actions/bootstrap/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ runs:
3838
echo "full-version=${REPO_VERSION}" >> $GITHUB_OUTPUT
3939
echo "major-version=$(echo ${REPO_VERSION} | cut -d"." -f1)" >> $GITHUB_OUTPUT
4040
41-
- uses: actions/setup-node@v5
41+
- uses: actions/setup-node@v6
4242
with:
4343
cache: npm
4444
cache-dependency-path: src/Elastic.Documentation.Site/package-lock.json

‎.github/workflows/ci.yml‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,38 @@ jobs:
3737

3838
build-api-lambda:
3939
uses: ./.github/workflows/build-api-lambda.yml
40+
4041

42+
synthetics:
43+
runs-on: ubuntu-latest
44+
steps:
45+
- uses: actions/checkout@v5
46+
47+
- name: Bootstrap Action Workspace
48+
id: bootstrap
49+
uses: ./.github/actions/bootstrap
50+
51+
- name: Install dependencies
52+
working-directory: src/Elastic.Documentation.Site
53+
run: npm ci
54+
55+
- name: Run assembler
56+
run: |
57+
mkdir ../assembler-workspace
58+
cd ../assembler-workspace
59+
dotnet run --project ../docs-builder/src/tooling/docs-builder -- assembler config init --local
60+
dotnet run --project ../docs-builder/src/tooling/docs-builder -- assembler clone -c local --skip-private-repositories
61+
dotnet run --project ../docs-builder/src/tooling/docs-builder -- assembler build -c local --skip-private-repositories
62+
dotnet run --project ../docs-builder/src/tooling/docs-builder -- assembler serve &
63+
64+
- name: Wait for docs
65+
working-directory: src/Elastic.Documentation.Site
66+
run: npx wait-on http-get://localhost:4000/docs
67+
68+
- name: Run synthetics
69+
working-directory: src/Elastic.Documentation.Site
70+
run: npm run synthetics:test
71+
4172
npm:
4273
runs-on: ubuntu-latest
4374
defaults:
@@ -46,7 +77,7 @@ jobs:
4677
steps:
4778
- uses: actions/checkout@v5
4879

49-
- uses: actions/setup-node@v5
80+
- uses: actions/setup-node@v6
5081
with:
5182
cache: npm
5283
cache-dependency-path: src/Elastic.Documentation.Site/package-lock.json

‎.github/workflows/deploy-api-lambda.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
run: |
4646
zip -j "${ZIP_FILE}" ./bootstrap
4747
48-
- uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0
48+
- uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0
4949
with:
5050
role-to-assume: arn:aws:iam::197730964718:role/elastic-docs-v3-api-deployer-${{ inputs.environment }}
5151
aws-region: us-east-1

‎.github/workflows/detect-duplicate-issues.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Detect potential duplicate issues
19-
uses: actions/github-script@v7
19+
uses: actions/github-script@v8
2020
with:
2121
script: |
2222
const { owner, repo } = context.repo;

‎.github/workflows/preview-build.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ jobs:
8282
content-source-match: ${{ steps.event-check.outputs.content-source-match != '' && steps.event-check.outputs.content-source-match || steps.match.outputs.content-source-match }}
8383
content-source-next: ${{ steps.event-check.outputs.content-source-next != '' && steps.event-check.outputs.content-source-next || steps.match.outputs.content-source-next }}
8484
content-source-current: ${{ steps.event-check.outputs.content-source-current != '' && steps.event-check.outputs.content-source-current || steps.match.outputs.content-source-current }}
85+
content-source-edge: ${{ steps.event-check.outputs.content-source-edge != '' && steps.event-check.outputs.content-source-edge || steps.match.outputs.content-source-edge }}
8586
content-source-speculative: ${{ steps.event-check.outputs.content-source-speculative != '' && steps.event-check.outputs.content-source-speculative || steps.match.outputs.content-source-speculative }}
8687
steps:
8788
- name: Not a push event
@@ -92,6 +93,7 @@ jobs:
9293
echo "content-source-match=true" >> $GITHUB_OUTPUT
9394
echo "content-source-next=false" >> $GITHUB_OUTPUT
9495
echo "content-source-current=false" >> $GITHUB_OUTPUT
96+
echo "content-source-edge=false" >> $GITHUB_OUTPUT
9597
echo "content-source-speculative=false" >> $GITHUB_OUTPUT
9698
- name: Match for push events
9799
id: match
@@ -106,6 +108,7 @@ jobs:
106108
echo "content-source-match=${{ steps.event-check.outputs.content-source-match != '' && steps.event-check.outputs.content-source-match || steps.match.outputs.content-source-match }}"
107109
echo "content-source-next=${{ steps.event-check.outputs.content-source-next != '' && steps.event-check.outputs.content-source-next || steps.match.outputs.content-source-next }}"
108110
echo "content-source-current=${{ steps.event-check.outputs.content-source-current != '' && steps.event-check.outputs.content-source-current || steps.match.outputs.content-source-current }}"
111+
echo "content-source-current=${{ steps.event-check.outputs.content-source-edge != '' && steps.event-check.outputs.content-source-edge || steps.match.outputs.content-source-edge }}"
109112
echo "content-source-speculative=${{ steps.event-check.outputs.content-source-speculative != '' && steps.event-check.outputs.content-source-speculative || steps.match.outputs.content-source-speculative }}"
110113
echo "ref=${{ github.ref_name }}"
111114
echo "repo=${{ github.repository }}"
@@ -449,6 +452,10 @@ jobs:
449452
&& (steps.docs-build.outputs.skip != 'true' || steps.internal-docs-build.outputs.skip != 'true')
450453
&& steps.deployment.outputs.result
451454
&& (steps.docs-build.outcome == 'success' || steps.internal-docs-build.outcome == 'success')
455+
env:
456+
# https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-retries.html#cli-usage-retries-configure
457+
AWS_RETRY_MODE: standard
458+
AWS_MAX_ATTEMPTS: 6
452459
run: |
453460
aws s3 sync .artifacts/docs/html "s3://elastic-docs-v3-website-preview${PATH_PREFIX}" --delete --no-follow-symlinks
454461
aws cloudfront create-invalidation \
@@ -460,11 +467,6 @@ jobs:
460467
env.MATCH == 'true'
461468
&& (
462469
contains(fromJSON('["push", "workflow_dispatch"]'), github.event_name)
463-
&& (
464-
needs.match.outputs.content-source-current == 'true'
465-
|| needs.match.outputs.content-source-next == 'true'
466-
|| needs.match.outputs.content-source-speculative == 'true'
467-
)
468470
&& steps.s3-upload.outcome == 'success'
469471
)
470472
uses: elastic/docs-builder/actions/update-link-index@main

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
run: |
111111
zip -j "${ZIP_FILE}" ./bootstrap
112112
113-
- uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0
113+
- uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0
114114
with:
115115
role-to-assume: arn:aws:iam::197730964718:role/elastic-docs-v3-link-index-updater-deployer
116116
aws-region: us-east-2

‎.github/workflows/required-labels.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- uses: actions/checkout@v5
22+
- name: Wait for PR to be ready (if just opened)
23+
if: github.event_name == 'pull_request_target' && github.event.action == 'opened'
24+
run: sleep 30
2225
- id: get-labels
2326
run: |
2427
labels=$(yq '[.categories[].labels] + .exclude-labels | flatten | unique | sort | @tsv' .github/release-drafter.yml | tr '\t' ',')

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,3 +397,6 @@ FodyWeavers.xsd
397397

398398
# JetBrains Rider
399399
*.sln.iml
400+
401+
# Elastic synthetics
402+
.synthetics/

‎Directory.Packages.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@
2323
<PackageVersion Include="AWSSDK.Core" Version="4.0.0.2" />
2424
<PackageVersion Include="AWSSDK.SQS" Version="4.0.0.1" />
2525
<PackageVersion Include="AWSSDK.S3" Version="4.0.0.1" />
26+
<PackageVersion Include="Elastic.OpenTelemetry" Version="1.1.0" />
27+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
2628
<PackageVersion Include="Generator.Equals" Version="3.2.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"/>
2729
<PackageVersion Include="KubernetesClient" Version="17.0.14" />
2830
<PackageVersion Include="Elastic.Aspire.Hosting.Elasticsearch" Version="9.3.0" />
2931
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.1.4" />
3032
<PackageVersion Include="FakeItEasy" Version="8.3.0" />
31-
<PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.14.0" />
33+
<PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.16.3" />
3234
<PackageVersion Include="InMemoryLogger" Version="1.0.66" />
3335
<PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.6.0" />
3436
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
@@ -76,7 +78,6 @@
7678
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.0" />
7779
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
7880
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
79-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
8081
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
8182
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
8283
</ItemGroup>

0 commit comments

Comments
 (0)