8000 Merge remote-tracking branch 'origin/main' into prebuilds-db · coder/coder@e489e1b · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit e489e1b

Browse files
evgeniy-scherbinaevgeniy-scherbina
committed
Merge remote-tracking branch 'origin/main' into prebuilds-db
2 parents 205d6af + 4c33846 commit e489e1b

File tree

429 files changed

+14732
-2922
lines changed
  • workspacebuilds.go
  • workspaces.go
  • codersdk
  • docs
  • dogfood
  • enterprise
  • go.mod
  • go.sum
  • install.sh
  • offlinedocs
  • package.json
  • pnpm-lock.yaml
  • provisionerd
  • provisionersdk/proto
  • provisioner
  • scripts
  • site
  • tailnet
  • testutil
  • vpn

    • Some content is hidden

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

    429 files changed

    +14732
    -2922
    lines changed

    ‎.gitattributes

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,6 @@
    11
    # Generated files
    22
    agent/agentcontainers/acmock/acmock.go linguist-generated=true
    3+
    agent/agentcontainers/dcspec/dcspec_gen.go linguist-generated=true
    34
    coderd/apidoc/docs.go linguist-generated=true
    45
    docs/reference/api/*.md linguist-generated=true
    56
    docs/reference/cli/*.md linguist-generated=true

    ‎.github/.linkspector.yml

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -21,5 +21,6 @@ ignorePatterns:
    2121
    - pattern: "linux.die.net/man"
    2222
    - pattern: "www.gnu.org"
    2323
    - pattern: "wiki.ubuntu.com"
    24+
    - pattern: "mutagen.io"
    2425
    aliveStatusCodes:
    2526
    - 200

    ‎.github/actions/install-cosign/action.yaml

    Lines changed: 10 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,10 @@
    1+
    name: "Install cosign"
    2+
    description: |
    3+
    Cosign Github Action.
    4+
    runs:
    5+
    using: "composite"
    6+
    steps:
    7+
    - name: Install cosign
    8+
    uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
    9+
    with:
    10+
    cosign-release: "v2.4.3"

    ‎.github/actions/install-syft/action.yaml

    Lines changed: 10 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,10 @@
    1+
    name: "Install syft"
    2+
    description: |
    3+
    Downloads Syft to the Action tool cache and provides a reference.
    4+
    runs:
    5+
    using: "composite"
    6+
    steps:
    7+
    - name: Install syft
    8+
    uses: anchore/sbom-action/download-syft@f325610c9f50a54015d37c8d16cb3b0e2c8f4de0 # v0.18.0
    9+
    with:
    10+
    syft-version: "v1.20.0"

    ‎.github/actions/setup-go/action.yaml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -4,7 +4,7 @@ description: |
    44
    inputs:
    55
    version:
    66
    description: "The Go version to use."
    7-
    default: "1.22.8"
    7+
    default: "1.22.12"
    88
    runs:
    99
    using: "composite"
    1010
    steps:

    ‎.github/actions/setup-tf/action.yaml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -7,5 +7,5 @@ runs:
    77
    - name: Install Terraform
    88
    uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
    99
    with:
    10-
    terraform_version: 1.11.0
    10+
    terraform_version: 1.11.2
    1111
    terraform_wrapper: false

    ‎.github/workflows/ci.yaml

    Lines changed: 12 additions & 19 deletions
    Original file line numberDiff line numberDiff line change
    @@ -178,7 +178,7 @@ jobs:
    178178
    echo "LINT_CACHE_DIR=$dir" >> $GITHUB_ENV
    179179
    180180
    - name: golangci-lint cache
    181-
    uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
    181+
    uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
    182182
    with:
    183183
    path: |
    184184
    ${{ env.LINT_CACHE_DIR }}
    @@ -267,18 +267,15 @@ jobs:
    267267
    popd
    268268
    269269
    - name: make gen
    270-
    # no `-j` flag as `make` fails with:
    271-
    # coderd/rbac/object_gen.go:1:1: syntax error: package statement must be first
    272-
    run: "make --output-sync -B gen"
    273-
    274-
    - name: make update-golden-files
    275270
    run: |
    271+
    # Remove golden files to detect discrepancy in generated files.
    276272
    make clean/golden-files
    277273
    # Notifications require DB, we could start a DB instance here but
    278274
    # let's just restore for now.
    279275
    git checkout -- coderd/notifications/testdata/rendered-templates
    280-
    # As above, skip `-j` flag.
    281-
    make --output-sync -B update-golden-files
    276+
    # no `-j` flag as `make` fails with:
    277+
    # coderd/rbac/object_gen.go:1:1: syntax error: package statement must be first
    278+
    make --output-sync -B gen
    282279
    283280
    - name: Check for unstaged files
    284281
    run: ./scripts/check_unstaged.sh
    @@ -733,15 +730,15 @@ jobs:
    733730

    734731
    - name: Upload Playwright Failed Tests
    735732
    if: always() && github.actor != 'dependabot[bot]' && runner.os == 'Linux' && !github.event.pull_request.head.repo.fork
    736-
    uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
    733+
    uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
    737734
    with:
    738735
    name: failed-test-videos${{ matrix.variant.premium && '-premium' || '' }}
    739736
    path: ./site/test-results/**/*.webm
    740737
    retention-days: 7
    741738

    742739
    - name: Upload pprof dumps
    743740
    if: always() && github.actor != 'dependabot[bot]' && runner.os == 'Linux' && !github.event.pull_request.head.repo.fork
    744-
    uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
    741+
    uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
    745742
    with:
    746743
    name: debug-pprof-dumps${{ matrix.variant.premium && '-premium' || '' }}
    747744
    path: ./site/test-results/**/debug-pprof-*.txt
    @@ -1000,7 +997,7 @@ jobs:
    1000997

    1001998
    - name: Upload build artifacts
    1002999
    if: ${{ github.repository_owner == 'coder' && github.ref == 'refs/heads/main' }}
    1003-
    uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
    1000+
    uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
    10041001
    with:
    10051002
    name: dylibs
    10061003
    path: |
    @@ -1074,14 +1071,10 @@ jobs:
    10741071
    run: sudo apt-get install -y zstd
    10751072

    10761073
    - name: Install cosign
    1077-
    uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
    1078-
    with:
    1079-
    cosign-release: "v2.4.3"
    1074+
    uses: ./.github/actions/install-cosign
    10801075

    10811076
    - name: Install syft
    1082-
    uses: anchore/sbom-action/download-syft@f325610c9f50a54015d37c8d16cb3b0e2c8f4de0 # v0.18.0
    1083-
    with:
    1084-
    syft-version: "v1.20.0"
    1077+
    uses: ./.github/actions/install-syft
    10851078

    10861079
    - name: Setup Windows EV Signing Certificate
    10871080
    run: |
    @@ -1106,7 +1099,7 @@ jobs:
    11061099
    uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
    11071100

    11081101
    - name: Download dylibs
    1109-
    uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
    1102+
    uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
    11101103
    with:
    11111104
    name: dylibs
    11121105
    path: ./build
    @@ -1333,7 +1326,7 @@ jobs:
    13331326

    13341327
    - name: Upload build artifacts
    13351328
    if: github.ref == 'refs/heads/main'
    1336-
    uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
    1329+
    uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
    13371330
    with:
    13381331
    name: coder
    13391332
    path: |

    ‎.github/workflows/docs-ci.yaml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -28,7 +28,7 @@ jobs:
    2828
    - name: Setup Node
    2929
    uses: ./.github/actions/setup-node
    3030

    31-
    - uses: tj-actions/changed-files@531f5f7d163941f0c1c04e0ff4d8bb243ac4366f # v45.0.7
    31+
    - uses: tj-actions/changed-files@27ae6b33eaed7bf87272fdeb9f1c54f9facc9d99 # v45.0.7
    3232
    id: changed-files
    3333
    with:
    3434
    files: |

    ‎.github/workflows/dogfood.yaml

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

    5959
    - name: Get branch name
    6060
    id: branch-name
    61-
    uses: tj-actions/branch-names@6871f53176ad61624f978536bbf089c574dc19a2 # v8.0.1
    61+
    uses: tj-actions/branch-names@f44339b51f74753b57583fbbd124e18a81170ab1 # v8.1.0
    6262

    6363
    - name: "Branch name to Docker tag name"
    6464
    id: docker-tag-name

    ‎.github/workflows/release.yaml

    Lines changed: 5 additions & 9 deletions
    Original file line numberDiff line numberDiff line change
    @@ -101,7 +101,7 @@ jobs:
    101101
    AC_CERTIFICATE_PASSWORD_FILE: /tmp/apple_cert_password.txt
    102102

    103103
    - name: Upload build artifacts
    104-
    uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
    104+
    uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
    105105
    with:
    106106
    name: dylibs
    107107
    path: |
    @@ -251,14 +251,10 @@ jobs:
    251251
    rm /tmp/rcodesign.tar.gz
    252252
    253253
    - name: Install cosign
    254-
    uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
    255-
    with:
    256-
    cosign-release: "v2.4.3"
    254+
    uses: ./.github/actions/install-cosign
    257255

    258256
    - name: Install syft
    259-
    uses: anchore/sbom-action/download-syft@f325610c9f50a54015d37c8d16cb3b0e2c8f4de0 # v0.18.0
    260-
    with:
    261-
    syft-version: "v1.20.0"
    257+
    uses: ./.github/actions/install-syft
    262258

    263259
    - name: Setup Apple Developer certificate and API key
    264260
    run: |
    @@ -300,7 +296,7 @@ jobs:
    300296
    uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
    301297

    302298
    - name: Download dylibs
    303-
    uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
    299+
    uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
    304300
    with:
    305301
    name: dylibs
    306302
    path: ./build
    @@ -656,7 +652,7 @@ jobs:
    656652
    657653
    - name: Upload artifacts to actions (if dry-run)
    658654
    if: ${{ inputs.dry_run }}
    659-
    uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
    655+
    uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
    660656
    with:
    661657
    name: release-artifacts
    662658
    path: |

    ‎.github/workflows/scorecard.yml

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -39,14 +39,14 @@ jobs:
    3939

    4040
    # Upload the results as artifacts.
    4141
    - name: "Upload artifact"
    42-
    uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
    42+
    uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
    4343
    with:
    4444
    name: SARIF file
    4545
    path: results.sarif
    4646
    retention-days: 5
    4747

    4848
    # Upload the results to GitHub's code scanning dashboard.
    4949
    - name: "Upload to code-scanning"
    50-
    uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
    50+
    uses: github/codeql-action/upload-sarif@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
    5151
    with:
    5252
    sarif_file: results.sarif

    ‎.github/workflows/security.yaml

    Lines changed: 10 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -38,7 +38,7 @@ jobs:
    3838
    uses: ./.github/actions/setup-go
    3939

    4040
    - name: Initialize CodeQL
    41-
    uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
    41+
    uses: github/codeql-action/init@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
    4242
    with:
    4343
    languages: go, javascript
    4444

    @@ -48,7 +48,7 @@ jobs:
    4848
    rm Makefile
    4949
    5050
    - name: Perform CodeQL Analysis
    51-
    uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
    51+
    uses: github/codeql-action/analyze@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
    5252

    5353
    - name: Send Slack notification on failure
    5454
    if: ${{ failure() }}
    @@ -85,6 +85,12 @@ jobs:
    8585
    - name: Setup sqlc
    8686
    uses: ./.github/actions/setup-sqlc
    8787

    88+
    - name: Install cosign
    89+
    uses: ./.github/actions/install-cosign
    90+
    91+
    - name: Install syft
    92+
    uses: ./.github/actions/install-syft
    93+
    8894
    - name: Install yq
    8995
    run: go run github.com/mikefarah/yq/v4@v4.44.3
    9096
    - name: Install mockgen
    @@ -144,13 +150,13 @@ jobs:
    144150
    severity: "CRITICAL,HIGH"
    145151

    146152
    - name: Upload Trivy scan results to GitHub Security tab
    147-
    uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
    153+
    uses: github/codeql-action/upload-sarif@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
    148154
    with:
    149155
    sarif_file: trivy-results.sarif
    150156
    category: "Trivy"
    151157

    152158
    - name: Upload Trivy scan results as an artifact
    153-
    uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
    159+
    uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
    154160
    with:
    155161
    name: trivy
    156162
    path: trivy-results.sarif

    ‎.github/workflows/stale.yaml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -103,7 +103,7 @@ jobs:
    103103
    - name: Checkout repository
    104104
    uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
    105105
    - name: Run delete-old-branches-action
    106-
    uses: beatlabs/delete-old-branches-action@6e94df089372a619c01ae2c2f666bf474f890911 # v0.0.10
    106+
    uses: beatlabs/delete-old-branches-action@4eeeb8740ff8b3cb310296ddd6b43c3387734588 # v0.0.11
    107107
    with:
    108108
    repo_token: ${{ github.token }}
    109109
    date: "6 months ago"

    ‎.github/workflows/start-workspace.yaml

    Lines changed: 32 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,32 @@
    1+
    name: Start Workspace On Issue Creation or Comment
    2+
    3+
    on:
    4+
    issues:
    5+
    types: [opened]
    6+
    issue_comment:
    7+
    types: [created]
    8+
    9+
    permissions:
    10+
    issues: write
    11+
    12+
    jobs:
    13+
    comment:
    14+
    runs-on: ubuntu-latest
    15+
    environment: aidev
    16+
    timeout-minutes: 5
    17+
    steps:
    18+
    - name: Start Coder workspace
    19+
    uses: coder/start-workspace-action@26d3600161d67901f24d8612793d3b82771cde2d
    20+
    with:
    21+
    github-token: ${{ secrets.GITHUB_TOKEN }}
    22+
    trigger-phrase: "@coder"
    23+
    coder-url: ${{ secrets.CODER_URL }}
    24+
    coder-token: ${{ secrets.CODER_TOKEN }}
    25+
    template-name: ${{ secrets.CODER_TEMPLATE_NAME }}
    26+
    workspace-name: issue-${{ github.event.issue.number }}
    27+
    parameters: |-
    28+
    Coder Image: codercom/oss-dogfood:latest
    29+
    Coder Repository Base Directory: "~"
    30+
    AI Code Prompt: "Use the gh CLI tool to read the details of issue https://github.com/${{ github.repository }}/issues/${{ github.event.issue.number }} and then address it."
    31+
    Region: us-pittsburgh
    32+
    user-mapping: ${{ secrets.CODER_USER_MAPPING }}

    ‎.github/workflows/weekly-docs.yaml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -29,7 +29,7 @@ jobs:
    2929
    uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
    3030

    3131
    - name: Check Markdown links
    32-
    uses: umbrelladocs/action-linkspector@de84085e0f51452a470558693d7d308fbb2fa261 # v1.2.5
    32+
    uses: umbrelladocs/action-linkspector@49cf4f8da82db70e691bb8284053add5028fa244 # v1.3.2
    3333
    id: markdown-link-check
    3434
    # checks all markdown files from /docs including all subfolders
    3535
    with:

    ‎.gitignore

    Lines changed: 2 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -32,7 +32,8 @@ site/e2e/.auth.json
    3232
    site/playwright-report/*
    3333
    site/.swc
    3434

    35-
    # Make target for updating golden files (any dir).
    35+
    # Make target for updating generated/golden files (any dir).
    36+
    .gen
    3637
    .gen-golden
    3738

    3839
    # Build

    0 commit comments

    Comments
     (0)
    0