Compare commits

...

5 Commits

Author SHA1 Message Date
pulumi-bot
6fd6ecace1 Updated modules 2026-02-26 12:58:13 +00:00
pulumi-provider-automation[bot]
7a9b31c60f Update GitHub Actions workflows. (#777)
This PR was triggered by @t0yv0 generated by the
update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt
repo, from commit
[599b3ade95c3408830d062a38ea7cf9c8607a12f](599b3ade95).

Co-authored-by: Pulumi Bot <bot@pulumi.com>
2026-02-26 06:00:24 +00:00
Pulumi Bot
e5da099be4 Upgrade to golangci-lint v2 (#775)
Upgrades golangci-lint from v1 to v2. Automated by Linear issue IT-144.

Co-authored-by: CI <ci@pulumi.com>
2026-02-25 12:40:02 -08:00
pulumi-provider-automation[bot]
1b95d18edc Update GitHub Actions workflows. (#773)
This PR was triggered by @t0yv0 generated by the
update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt
repo, from commit
[b8b29dc51d452160accc76a310efd6eb38760b50](b8b29dc51d).

Co-authored-by: Pulumi Bot <bot@pulumi.com>
2026-02-24 06:01:23 +00:00
pulumi-provider-automation[bot]
5eabae0608 Update GitHub Actions workflows. (#772)
This PR was triggered by @t0yv0 generated by the
update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt
repo, from commit
[f591fbcab3c096e497ab858d7155b31b12495ed1](f591fbcab3).

Co-authored-by: Pulumi Bot <bot@pulumi.com>
2026-02-20 05:57:28 +00:00
15 changed files with 79 additions and 58 deletions

View File

@@ -8,8 +8,7 @@ PULUMI_HOME = "{{config_root}}/.pulumi"
[tools] [tools]
# Runtimes # Runtimes
# TODO: we may not need 'get_env' once https://github.com/jdx/mise/discussions/6339 is fixed go = "{{ env.GO_VERSION_MISE }}"
go = "{{ get_env(name='GO_VERSION_MISE', default='latest') }}"
node = '20.19.5' node = '20.19.5'
python = '3.11.8' python = '3.11.8'
"vfox:version-fox/vfox-dotnet" = "8.0.20" # vfox backend doesn't work on Windows, gives "error converting Lua table to PreInstall (no version returned from vfox plugin)" https://github.com/jdx/mise/discussions/5876 https://github.com/jdx/mise/discussions/5550 "vfox:version-fox/vfox-dotnet" = "8.0.20" # vfox backend doesn't work on Windows, gives "error converting Lua table to PreInstall (no version returned from vfox plugin)" https://github.com/jdx/mise/discussions/5876 https://github.com/jdx/mise/discussions/5550
@@ -17,7 +16,7 @@ python = '3.11.8'
java = 'corretto-11' java = 'corretto-11'
# Executable tools # Executable tools
"github:pulumi/pulumi" = "{{ get_env(name='PULUMI_VERSION_MISE', default='latest') }}" "github:pulumi/pulumi" = "{{ env.PULUMI_VERSION_MISE }}"
"github:pulumi/pulumictl" = '0.0.50' "github:pulumi/pulumictl" = '0.0.50'
"github:pulumi/schema-tools" = "0.6.0" "github:pulumi/schema-tools" = "0.6.0"
"aqua:gradle/gradle-distributions" = '7.6.6' "aqua:gradle/gradle-distributions" = '7.6.6'

View File

@@ -64,6 +64,11 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }}
# only saving the cache in the prerequisites job # only saving the cache in the prerequisites job
cache_save: false cache_save: false
- name: Set git identity
run: |-
git config user.name "claude[bot]"
git config user.email "bot@pulumi.com"
shell: bash
- name: Prepare local workspace - name: Prepare local workspace
# this runs install_plugins and upstream # this runs install_plugins and upstream
run: make prepare_local_workspace run: make prepare_local_workspace
@@ -115,7 +120,7 @@ jobs:
} }
claude_args: | claude_args: |
--max-turns 50 --max-turns 50
--allowedTools "Skill,Edit,MultiEdit,Write,Read,Glob,Grep,LS,Bash(upgrade-provider *),Bash(./scripts/upstream.sh *),Bash(git *),Bash(GIT_EDITOR=* git *),Bash(make *),Bash(gh *),Bash(mkdir *),Bash(go install *),Bash(ls *),Bash(test *),Bash(cat *),Bash(pwd),Bash(head *),Bash(tail *),Bash(tee *),Bash(rg *),Bash(grep *),Bash(sed *),Bash(awk *),Bash(find *)" --allowedTools "Skill,Edit,MultiEdit,Write,Read,Glob,Grep,LS,Bash(upgrade-provider *),Bash(./scripts/upstream.sh *),Bash(git *),Bash(GIT_EDITOR=* git *),Bash(make *),Bash(gh *),Bash(mkdir *),Bash(go install *),Bash(go mod tidy *),Bash(ls *),Bash(test *),Bash(cat *),Bash(pwd),Bash(head *),Bash(tail *),Bash(tee *),Bash(rg *),Bash(grep *),Bash(sed *),Bash(awk *),Bash(find *)"
# If the claude action fails you don't get any logs on what claude was doing # If the claude action fails you don't get any logs on what claude was doing
# Uploading the artifact allows you to download the artifact from the UI # Uploading the artifact allows you to download the artifact from the UI
- name: Upload Claude review output on failure - name: Upload Claude review output on failure

View File

@@ -109,9 +109,7 @@ jobs:
msg="Automated upgrade: bump pulumi/pulumi to ${ver}" msg="Automated upgrade: bump pulumi/pulumi to ${ver}"
# See https://github.com/cli/cli/issues/6485#issuecomment-2560935183 for --head workaround gh pr create -t "$msg" -b "$msg"
gh pr create -t "$msg" -b "$msg" --head "$(git branch --show-current)"
env: env:
GITHUB_TOKEN: ${{ steps.esc-secrets.outputs.PULUMI_BOT_TOKEN }} GITHUB_TOKEN: ${{ steps.esc-secrets.outputs.PULUMI_BOT_TOKEN }}
name: weekly-pulumi-update name: weekly-pulumi-update

View File

@@ -1,37 +1,46 @@
# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt version: "2"
linters: linters:
enable: enable:
- errcheck - goconst
- gci - gosec
- goconst - lll
- gofmt - misspell
- gosec - nakedret
- govet - revive
- ineffassign - unconvert
- lll exclusions:
- gosimple generated: lax
- staticcheck presets:
- misspell - comments
- nakedret - common-false-positives
- revive - legacy
- unconvert - std-error-handling
- unused paths:
enable-all: false - schema.go
issues: - pulumiManifest.go
exclude-dirs: - pkg/vendored
- pkg/vendored - third_party$
exclude-files: - builtin$
- schema.go - examples$
- pulumiManifest.go formatters:
run: enable:
timeout: 20m - gci
linters-settings: - gofmt
gci: settings:
sections: gci:
- standard # Standard section: captures all standard library packages. sections:
- blank # Blank section: contains all blank imports. - standard
- default # Default section: contains all imports that could not be matched to another section type. - blank
- prefix(github.com/pulumi/) # Custom section: groups all imports with the github.com/pulumi/ prefix. - default
- prefix(github.com/pulumi/pulumi-docker-build) # Custom section: local imports - prefix(github.com/pulumi/)
custom-order: true - prefix(github.com/pulumi/pulumi-docker-build)
custom-order: true
exclusions:
generated: lax
paths:
- schema.go
- pulumiManifest.go
- pkg/vendored
- third_party$
- builtin$
- examples$

View File

@@ -1 +1 @@
3.192.0 3.223.0

View File

@@ -10,8 +10,9 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/pulumi/pulumi/pkg/v3/testing/integration"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/pulumi/pulumi/pkg/v3/testing/integration"
) )
func TestDotNetExample(t *testing.T) { func TestDotNetExample(t *testing.T) {

View File

@@ -1,9 +1,10 @@
package main package main
import ( import (
"github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi" "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi/config" "github.com/pulumi/pulumi/sdk/v3/go/pulumi/config"
"github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild"
) )
func main() { func main() {

View File

@@ -8,8 +8,9 @@ import (
"path" "path"
"testing" "testing"
"github.com/pulumi/pulumi/pkg/v3/testing/integration"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/pulumi/pulumi/pkg/v3/testing/integration"
) )
func TestGoExample(t *testing.T) { func TestGoExample(t *testing.T) {

View File

@@ -8,8 +8,9 @@ import (
"path" "path"
"testing" "testing"
"github.com/pulumi/pulumi/pkg/v3/testing/integration"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/pulumi/pulumi/pkg/v3/testing/integration"
) )
func TestJavaExample(t *testing.T) { func TestJavaExample(t *testing.T) {

View File

@@ -16,14 +16,15 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/ecr" "github.com/aws/aws-sdk-go/service/ecr"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/pulumi/providertest" "github.com/pulumi/providertest"
"github.com/pulumi/providertest/optproviderupgrade" "github.com/pulumi/providertest/optproviderupgrade"
"github.com/pulumi/providertest/pulumitest" "github.com/pulumi/providertest/pulumitest"
"github.com/pulumi/providertest/pulumitest/assertpreview" "github.com/pulumi/providertest/pulumitest/assertpreview"
"github.com/pulumi/providertest/pulumitest/opttest" "github.com/pulumi/providertest/pulumitest/opttest"
"github.com/pulumi/pulumi/pkg/v3/testing/integration" "github.com/pulumi/pulumi/pkg/v3/testing/integration"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
) )
func TestNodeExample(t *testing.T) { func TestNodeExample(t *testing.T) {

View File

@@ -8,8 +8,9 @@ import (
"path" "path"
"testing" "testing"
"github.com/pulumi/pulumi/pkg/v3/testing/integration"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/pulumi/pulumi/pkg/v3/testing/integration"
) )
func TestPythonExample(t *testing.T) { func TestPythonExample(t *testing.T) {

View File

@@ -8,15 +8,17 @@ import (
"path" "path"
"testing" "testing"
"github.com/stretchr/testify/require"
"github.com/pulumi/providertest" "github.com/pulumi/providertest"
"github.com/pulumi/providertest/providers" "github.com/pulumi/providertest/providers"
"github.com/pulumi/providertest/pulumitest" "github.com/pulumi/providertest/pulumitest"
"github.com/pulumi/providertest/pulumitest/assertpreview" "github.com/pulumi/providertest/pulumitest/assertpreview"
"github.com/pulumi/providertest/pulumitest/opttest" "github.com/pulumi/providertest/pulumitest/opttest"
"github.com/pulumi/pulumi-docker-build/provider"
"github.com/pulumi/pulumi/pkg/v3/testing/integration" "github.com/pulumi/pulumi/pkg/v3/testing/integration"
pulumirpc "github.com/pulumi/pulumi/sdk/v3/proto/go" pulumirpc "github.com/pulumi/pulumi/sdk/v3/proto/go"
"github.com/stretchr/testify/require"
"github.com/pulumi/pulumi-docker-build/provider"
) )
func TestYAMLExample(t *testing.T) { func TestYAMLExample(t *testing.T) {

2
mise.toml Normal file
View File

@@ -0,0 +1,2 @@
[tools]
golangci-lint = "2.7.0"

View File

@@ -170,7 +170,7 @@ func hashFile(
if fileMode.IsDir() { if fileMode.IsDir() {
return nil return nil
} }
if !(fileMode.IsRegular() || fileMode.Type() == os.ModeSymlink) { if !fileMode.IsRegular() && fileMode.Type() != os.ModeSymlink {
return nil return nil
} }

View File

@@ -98,13 +98,13 @@ func (h *host) builderFor(ctx context.Context, build Build) (*cachedBuilder, err
if err != nil && build.ShouldExec() && strings.HasPrefix(opts.Builder, "cloud-") { if err != nil && build.ShouldExec() && strings.HasPrefix(opts.Builder, "cloud-") {
//nolint:revive // Human-readable. //nolint:revive // Human-readable.
err = errors.Join(err, err = errors.Join(err,
errors.New("Make sure you're logged in to Docker (`docker login`) if you're trying to use a cloud builder."), errors.New("Make sure you're logged in to Docker (`docker login`) if you're trying to use a cloud builder"), //nolint:lll,staticcheck
errors.New("Make sure you have the correct buildx plugin installed (https://github.com/docker/buildx-desktop)."), errors.New("Make sure you have the correct buildx plugin installed (https://github.com/docker/buildx-desktop)"), //nolint:lll,staticcheck
) )
} }
if err != nil && build.ShouldExec() { if err != nil && build.ShouldExec() {
//nolint:revive // Human-readable. //nolint:revive // Human-readable.
err = errors.Join(err, errors.New( err = errors.Join(err, errors.New( //nolint:staticcheck
"Make sure your buildx plugin is executable (`docker buildx version`)"), "Make sure your buildx plugin is executable (`docker buildx version`)"),
) )
} }
@@ -176,8 +176,8 @@ func (h *host) builderFor(ctx context.Context, build Build) (*cachedBuilder, err
if err != nil && !build.ShouldExec() { if err != nil && !build.ShouldExec() {
if strings.Contains(err.Error(), "failed to find driver") { if strings.Contains(err.Error(), "failed to find driver") {
//nolint:revive // Human-readable. //nolint:revive // Human-readable.
err = errors.Join(err, errors.New( err = errors.Join(err, errors.New( //nolint:staticcheck
"Use `exec: true` if you're trying to use Docker Build Cloud or other custom drivers.", "Use `exec: true` if you're trying to use Docker Build Cloud or other custom drivers",
)) ))
} }
return nil, fmt.Errorf("loading nodes: %w", err) return nil, fmt.Errorf("loading nodes: %w", err)