Don't tidy

This PR was automatically generated by the
update-native-provider-workflows workflow in the pulumi/ci-mgmt repo,
from commit 0f215352010902e51d20ed66185ecb6f5a403245.

.github/dependabot.yml

@@ -8,8 +8,6 @@ updates:
       pulumi:
         patterns:
           - "github.com/pulumi/*"
-        exclude-patterns:
-          - "k8s.io/utils"
     labels:
       - dependencies
       - impact/no-changelog-required

.github/workflows/build.yml

@@ -16,7 +16,7 @@ on:
   workflow_dispatch: {}
 env:
   GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
-  PROVIDER: dockerbuild
+  PROVIDER: docker-build
   PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
   PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -33,7 +33,7 @@ env:
   SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }}
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   GOVERSION: 1.21.x
-  NODEVERSION: 16.x
+  NODEVERSION: 20.x
   PYTHONVERSION: "3.11"
   DOTNETVERSION: |
     6.0.x
@@ -47,7 +47,6 @@ env:
   ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
   AZURE_LOCATION: westus
   DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }}
-  GOLANGCI_LINT_TIMEOUT: 10m
   GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-ci-gcp-provider.iam.gserviceaccount.com
   GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci
   GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci
@@ -76,6 +75,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -99,6 +99,8 @@ jobs:
         schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> $GITHUB_ENV
 
         echo 'EOF' >> $GITHUB_ENV
+      env:
+        GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
     - if: github.event_name == 'pull_request'
       name: Comment on PR with Details of Schema Check
       uses: thollander/actions-comment-pull-request@v2
@@ -171,6 +173,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -266,6 +269,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -378,6 +382,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Clear GitHub Actions Ubuntu runner disk space
       uses: jlumbroso/free-disk-space@v1.3.1
       with:
@@ -438,6 +443,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -516,6 +522,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -561,11 +568,12 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: golangci-lint provider pkg
       uses: golangci/golangci-lint-action@v4
       with:
         version: ${{ env.GOLANGCI_LINT_VERSION }}
-        args: -c ../.golangci.yml --timeout ${{ env.GOLANGCI_LINT_TIMEOUT }}
+        args: -c ../.golangci.yml
         working-directory: provider
     name: lint
     if: github.event_name == 'repository_dispatch' ||

.github/workflows/command-dispatch.yml

@@ -8,7 +8,7 @@ on:
     - edited
 env:
   GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
-  PROVIDER: dockerbuild
+  PROVIDER: docker-build
   PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
   PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -25,7 +25,7 @@ env:
   SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }}
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   GOVERSION: 1.21.x
-  NODEVERSION: 16.x
+  NODEVERSION: 20.x
   PYTHONVERSION: "3.11"
   DOTNETVERSION: |
     6.0.x
@@ -63,5 +63,5 @@ jobs:
         commands: run-acceptance-tests
         permission: write
         issue-type: pull-request
-        repository: pulumi/pulumi-dockerbuild
+        repository: pulumi/pulumi-docker-build
     if: ${{ github.event.issue.pull_request }}

.github/workflows/prerelease.yml

@@ -7,7 +7,7 @@ on:
     - v*.*.*-**
 env:
   GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
-  PROVIDER: dockerbuild
+  PROVIDER: docker-build
   PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
   PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -24,7 +24,7 @@ env:
   SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }}
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   GOVERSION: 1.21.x
-  NODEVERSION: 16.x
+  NODEVERSION: 20.x
   PYTHONVERSION: "3.11"
   DOTNETVERSION: |
     6.0.x
@@ -67,6 +67,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -90,6 +91,8 @@ jobs:
         schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> $GITHUB_ENV
 
         echo 'EOF' >> $GITHUB_ENV
+      env:
+        GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
     - if: github.event_name == 'pull_request'
       name: Comment on PR with Details of Schema Check
       uses: thollander/actions-comment-pull-request@v2
@@ -162,6 +165,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -256,6 +260,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -368,6 +373,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Clear GitHub Actions Ubuntu runner disk space
       uses: jlumbroso/free-disk-space@v1.3.1
       with:
@@ -428,6 +434,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -506,6 +513,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:

.github/workflows/pull-request.yml

@@ -5,7 +5,7 @@ on:
   pull_request_target: {}
 env:
   GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
-  PROVIDER: dockerbuild
+  PROVIDER: docker-build
   PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
   PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -22,7 +22,7 @@ env:
   SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }}
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   GOVERSION: 1.21.x
-  NODEVERSION: 16.x
+  NODEVERSION: 20.x
   PYTHONVERSION: "3.11"
   DOTNETVERSION: |
     6.0.x

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
     - "!v*.*.*-**"
 env:
   GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
-  PROVIDER: dockerbuild
+  PROVIDER: docker-build
   PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
   PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -25,7 +25,7 @@ env:
   SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }}
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   GOVERSION: 1.21.x
-  NODEVERSION: 16.x
+  NODEVERSION: 20.x
   PYTHONVERSION: "3.11"
   DOTNETVERSION: |
     6.0.x
@@ -67,6 +67,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -90,6 +91,8 @@ jobs:
         schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> $GITHUB_ENV
 
         echo 'EOF' >> $GITHUB_ENV
+      env:
+        GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
     - if: github.event_name == 'pull_request'
       name: Comment on PR with Details of Schema Check
       uses: thollander/actions-comment-pull-request@v2
@@ -162,6 +165,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -256,6 +260,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -368,6 +373,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Clear GitHub Actions Ubuntu runner disk space
       uses: jlumbroso/free-disk-space@v1.3.1
       with:
@@ -428,6 +434,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -506,6 +513,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:

.github/workflows/run-acceptance-tests.yml

@@ -14,7 +14,7 @@ on:
   workflow_dispatch: {}
 env:
   GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
-  PROVIDER: dockerbuild
+  PROVIDER: docker-build
   PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
   PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -31,7 +31,7 @@ env:
   SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }}
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   GOVERSION: 1.21.x
-  NODEVERSION: 16.x
+  NODEVERSION: 20.x
   PYTHONVERSION: "3.11"
   DOTNETVERSION: |
     6.0.x
@@ -45,7 +45,6 @@ env:
   ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
   AZURE_LOCATION: westus
   DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }}
-  GOLANGCI_LINT_TIMEOUT: 10m
   GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-ci-gcp-provider.iam.gserviceaccount.com
   GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci
   GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci
@@ -93,6 +92,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -116,6 +116,8 @@ jobs:
         schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> $GITHUB_ENV
 
         echo 'EOF' >> $GITHUB_ENV
+      env:
+        GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
     - if: github.event_name == 'pull_request'
       name: Comment on PR with Details of Schema Check
       uses: thollander/actions-comment-pull-request@v2
@@ -191,6 +193,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -289,6 +292,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:
@@ -411,11 +415,12 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: golangci-lint provider pkg
       uses: golangci/golangci-lint-action@v4
       with:
         version: ${{ env.GOLANGCI_LINT_VERSION }}
-        args: -c ../.golangci.yml --timeout ${{ env.GOLANGCI_LINT_TIMEOUT }}
+        args: -c ../.golangci.yml
         working-directory: provider
     name: lint
     if: github.event_name == 'repository_dispatch' ||

.github/workflows/weekly-pulumi-update.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch: {}
 env:
   GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
-  PROVIDER: dockerbuild
+  PROVIDER: docker-build
   PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
   PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -24,7 +24,7 @@ env:
   SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }}
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   GOVERSION: 1.21.x
-  NODEVERSION: 16.x
+  NODEVERSION: 20.x
   PYTHONVERSION: "3.11"
   DOTNETVERSION: |
     6.0.x
@@ -60,6 +60,7 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOVERSION }}
+        cache-dependency-path: "**/*.sum"
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.11.0
       with:

.golangci.yml

@@ -1,3 +1,6 @@
+run:
+  timeout: 10m
+
 linters:
   enable-all: false
   enable:

.goreleaser.prerelease.yml

@@ -1,6 +1,6 @@
 # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt
 
-project_name: pulumi-dockerbuild
+project_name: pulumi-docker-build
 builds:
 - dir: provider
   env:
@@ -14,10 +14,12 @@ builds:
   - amd64
   - arm64
   ignore: []
-  main: ./cmd/pulumi-resource-dockerbuild/
+  main: ./cmd/pulumi-resource-docker-build/
   ldflags:
-  - -X github.com/pulumi/pulumi-dockerbuild/provider/pkg/version.Version={{.Tag}}
-  binary: pulumi-resource-dockerbuild
+  - -X
+    github.com/pulumi/pulumi-docker-build/provider/pkg/version.Version={{.Tag}}
+  - -X github.com/pulumi/pulumi-docker-build/provider.Version={{.Tag}}
+  binary: pulumi-resource-docker-build
 archives:
 - name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}"
   id: archive

.goreleaser.yml

@@ -1,6 +1,6 @@
 # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt
 
-project_name: pulumi-dockerbuild
+project_name: pulumi-docker-build
 builds:
 - dir: provider
   env:
@@ -14,10 +14,12 @@ builds:
   - amd64
   - arm64
   ignore: []
-  main: ./cmd/pulumi-resource-dockerbuild/
+  main: ./cmd/pulumi-resource-docker-build/
   ldflags:
-  - -X github.com/pulumi/pulumi-dockerbuild/provider/pkg/version.Version={{.Tag}}
-  binary: pulumi-resource-dockerbuild
+  - -X
+    github.com/pulumi/pulumi-docker-build/provider/pkg/version.Version={{.Tag}}
+  - -X github.com/pulumi/pulumi-docker-build/provider.Version={{.Tag}}
+  binary: pulumi-resource-docker-build
 archives:
 - name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}"
   id: archive

Makefile

@@ -1,10 +1,10 @@
 PROJECT_NAME := Pulumi Docker Build Resource Provider
 
-PACK             := dockerbuild
+PACK             := docker-build
 PACKDIR          := sdk
-PROJECT          := github.com/pulumi/pulumi-dockerbuild
-NODE_MODULE_NAME := @pulumi/dockerbuild
-NUGET_PKG_NAME   := Pulumi.Dockerbuild
+PROJECT          := github.com/pulumi/pulumi-docker-build
+NODE_MODULE_NAME := @pulumi/docker-build
+NUGET_PKG_NAME   := Pulumi.DockerBuild
 
 PROVIDER         := pulumi-resource-${PACK}
 VERSION          ?= $(shell pulumictl get version)
@@ -25,7 +25,8 @@ GOGLANGCILINT    := bin/golangci-lint
 ensure:: tidy lint test_provider examples
 
 .PHONY: tidy
-tidy: go.sum
+tidy:
+	go mod tidy
 
 .PHONY: provider
 provider: bin/${PROVIDER} bin/pulumi-gen-${PACK} # Required by CI
@@ -65,7 +66,7 @@ examples/python: ${PULUMI} bin/${PROVIDER} ${WORKING_DIR}/examples/yaml/Pulumi.y
 
 examples/dotnet: ${PULUMI} bin/${PROVIDER} ${WORKING_DIR}/examples/yaml/Pulumi.yaml
 	$(call example,dotnet)
-	@git checkout examples/dotnet/provider-dockerbuild.csproj
+	@git checkout examples/dotnet/provider-docker-build.csproj
 
 examples/java: ${PULUMI} bin/${PROVIDER} ${WORKING_DIR}/examples/yaml/Pulumi.yaml
 	$(call example,java)
@@ -73,6 +74,7 @@ examples/java: ${PULUMI} bin/${PROVIDER} ${WORKING_DIR}/examples/yaml/Pulumi.yam
 
 ${PULUMI}: go.sum
 	GOBIN=${WORKING_DIR}/bin go install github.com/pulumi/pulumi/pkg/v3/cmd/pulumi
+	GOBIN=${WORKING_DIR}/bin go install github.com/pulumi/pulumi/sdk/go/pulumi-language-go/v3
 
 ${GOGLANGCILINT}: go.sum
 	GOBIN=${WORKING_DIR}/bin go install github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -122,13 +124,11 @@ only_build:: build
 
 .PHONY: lint
 lint: ${GOGLANGCILINT}
-	${GOGLANGCILINT} run --fix -c .golangci.yml --timeout 10m
+	${GOGLANGCILINT} run --fix -c .golangci.yml
 
 install:: install_nodejs_sdk install_dotnet_sdk
 	cp $(WORKING_DIR)/bin/${PROVIDER} ${GOPATH}/bin
 
-GO_TEST 	 := go test -v -count=1 -cover -timeout 2h -parallel ${TESTPARALLELISM}
-
 
 install_dotnet_sdk:: # Required by CI
 	rm -rf $(WORKING_DIR)/nuget/$(NUGET_PKG_NAME).*.nupkg
@@ -178,11 +178,8 @@ bin/${PROVIDER}: $(shell find ./provider -name '*.go') go.mod
 bin/pulumi-gen-${PACK}: # Required by CI
 	touch bin/pulumi-gen-${PACK}
 
-$(shell find . -name '*.go'):
-
 go.mod: $(shell find . -name '*.go')
 go.sum: go.mod
-	go mod tidy
 
 sdk: $(shell mkdir -p sdk)
 sdk: sdk/python sdk/nodejs sdk/java sdk/python sdk/go sdk/dotnet
@@ -218,14 +215,15 @@ sdk/nodejs: $(PULUMI) bin/${PROVIDER}
 	mv -f ${TMPDIR}/nodejs ${WORKING_DIR}/sdk/.
 
 sdk/go: TMPDIR := $(shell mktemp -d)
+sdk/go: PATH := "$(WORKING_DIR)/bin:$(PATH)"
 sdk/go: $(PULUMI) bin/${PROVIDER}
 	rm -rf sdk/go
-	$(PULUMI) package gen-sdk bin/$(PROVIDER) --language go -o ${TMPDIR}
-	cp go.mod ${TMPDIR}/go/${PACK}/go.mod
-	cd ${TMPDIR}/go/${PACK} && \
-		go mod edit -module=github.com/pulumi/pulumi-${PACK}/${PACKDIR}/go/${PACK} && \
+	PATH=$(PATH) $(PULUMI) package gen-sdk bin/$(PROVIDER) --language go -o ${TMPDIR}
+	cp go.mod ${TMPDIR}/go/dockerbuild/go.mod
+	cd ${TMPDIR}/go/dockerbuild && \
+		go mod edit -module=github.com/pulumi/pulumi-${PACK}/${PACKDIR}/go/dockerbuild && \
 		go mod tidy
-	mv -f ${TMPDIR}/go ${WORKING_DIR}/sdk/.
+	mv -f ${TMPDIR}/go ${WORKING_DIR}/sdk/go
 
 sdk/dotnet: DOTNET_VERSION  := $(shell pulumictl get version --language dotnet)
 sdk/dotnet: TMPDIR := $(shell mktemp -d)
@@ -245,6 +243,6 @@ sdk/java: $(PULUMI) bin/${PROVIDER}
 	cd ${TMPDIR}/java/ && gradle --console=plain build
 	mv -f ${TMPDIR}/java ${WORKING_DIR}/sdk/.
 
-docs: $(shell find docs/yaml -type f)
+docs: $(shell find docs/yaml -type f) $(shell find ./provider/internal/embed -name '*.md') ${SCHEMA_PATH}
 	go generate docs/generate.go
 	@touch docs

README.md

@@ -1,106 +1,23 @@
-# Pulumi Native Provider Boilerplate
+[![Slack](http://www.pulumi.com/images/docs/badges/slack.svg)](https://slack.pulumi.com)
+[![NPM version](https://badge.fury.io/js/%40pulumi%2fdocker-build.svg)](https://www.npmjs.com/package/@pulumi/docker-build)
+[![Python version](https://badge.fury.io/py/pulumi-docker-build.svg)](https://pypi.org/project/pulumi-docker-build)
+[![NuGet version](https://badge.fury.io/nu/pulumi.dockerbuild.svg)](https://badge.fury.io/nu/pulumi.dockerbuild)
+[![PkgGoDev](https://pkg.go.dev/badge/github.com/pulumi/pulumi-docker-build/sdk/go)](https://pkg.go.dev/github.com/pulumi/pulumi-docker-build/sdk/go)
+[![License](https://img.shields.io/npm/l/%40pulumi%2Fpulumi.svg)](https://github.com/pulumi/pulumi-docker-build/blob/main/LICENSE)
 
-This repository is a boilerplate showing how to create and locally test a native Pulumi provider.
+# Docker-Build Resource Provider
 
-## Authoring a Pulumi Native Provider
+A [Pulumi](http://pulumi.com) provider for building modern Docker images with [buildx](https://docs.docker.com/build/architecture/) and [BuildKit](https://docs.docker.com/build/buildkit/).
 
-This boilerplate creates a working Pulumi-owned provider named `xyz`.
-It implements a random number generator that you can [build and test out for yourself](#test-against-the-example) and then replace the Random code with code specific to your provider.
+Not to be confused with the earlier
+[Docker](http://github.com/pulumi/pulumi-docker) provider, which is still
+appropriate for managing resources unrelated to building images.
 
+| Provider               | Use cases                                                                                                                                                |
+| ----------------       | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `@pulumi/docker-build` | Anything related to building images with `docker build`.                                                                                                 |
+| `@pulumi/docker`       | Everything else -- including running containers and creating networks.                                                                                   |
 
-### Prerequisites
+## Reference
 
-Prerequisites for this repository are already satisfied by the [Pulumi Devcontainer](https://github.com/pulumi/devcontainer) if you are using Github Codespaces, or VSCode.
-
-If you are not using VSCode, you will need to ensure the following tools are installed and present in your `$PATH`:
-
-* [`pulumictl`](https://github.com/pulumi/pulumictl#installation)
-* [Go 1.21](https://golang.org/dl/) or 1.latest
-* [NodeJS](https://nodejs.org/en/) 14.x.  We recommend using [nvm](https://github.com/nvm-sh/nvm) to manage NodeJS installations.
-* [Yarn](https://yarnpkg.com/)
-* [TypeScript](https://www.typescriptlang.org/)
-* [Python](https://www.python.org/downloads/) (called as `python3`).  For recent versions of MacOS, the system-installed version is fine.
-* [.NET](https://dotnet.microsoft.com/download)
-
-
-### Build & test the boilerplate XYZ provider
-
-1. Create a new Github CodeSpaces environment using this repository.
-1. Open a terminal in the CodeSpaces environment.
-1. Run `make build install` to build and install the provider.
-1. Run `make gen_examples` to generate the example programs in `examples/` off of the source `examples/yaml` example program.
-1. Run `make up` to run the example program in `examples/yaml`.
-1. Run `make down` to tear down the example program.
-
-### Creating a new provider repository
-
-Pulumi offers this repository as a [GitHub template repository](https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template) for convenience.  From this repository:
-
-1. Click "Use this template".
-1. Set the following options:
-   * Owner: pulumi 
-   * Repository name: pulumi-xyz-native (replace "xyz" with the name of your provider)
-   * Description: Pulumi provider for xyz
-   * Repository type: Public
-1. Clone the generated repository.
-
-From the templated repository:
-
-1. Search-replace `xyz` with the name of your desired provider.
-
-#### Build the provider and install the plugin
-
-   ```bash
-   $ make build install
-   ```
-   
-This will:
-
-1. Create the SDK codegen binary and place it in a `./bin` folder (gitignored)
-2. Create the provider binary and place it in the `./bin` folder (gitignored)
-3. Generate the dotnet, Go, Node, and Python SDKs and place them in the `./sdk` folder
-4. Install the provider on your machine.
-
-#### Test against the example
-   
-```bash
-$ cd examples/simple
-$ yarn link @pulumi/xyz
-$ yarn install
-$ pulumi stack init test
-$ pulumi up
-```
-
-Now that you have completed all of the above steps, you have a working provider that generates a random string for you.
-
-#### A brief repository overview
-
-You now have:
-
-1. A `provider/` folder containing the building and implementation logic
-    1. `cmd/pulumi-resource-xyz/main.go` - holds the provider's sample implementation logic.
-2. `deployment-templates` - a set of files to help you around deployment and publication
-3. `sdk` - holds the generated code libraries created by `pulumi-gen-xyz/main.go`
-4. `examples` a folder of Pulumi programs to try locally and/or use in CI.
-5. A `Makefile` and this `README`.
-
-#### Additional Details
-
-This repository depends on the pulumi-go-provider library. For more details on building providers, please check
-the [Pulumi Go Provider docs](https://github.com/pulumi/pulumi-go-provider).
-
-### Build Examples
-
-Create an example program using the resources defined in your provider, and place it in the `examples/` folder.
-
-You can now repeat the steps for [build, install, and test](#test-against-the-example).
-
-## Configuring CI and releases
-
-1. Follow the instructions laid out in the [deployment templates](./deployment-templates/README-DEPLOYMENT.md).
-
-## References
-
-Other resources/examples for implementing providers:
-* [Pulumi Command provider](https://github.com/pulumi/pulumi-command/blob/master/provider/pkg/provider/provider.go)
-* [Pulumi Go Provider repository](https://github.com/pulumi/pulumi-go-provider)
+For more information, including examples and migration guidance, please see the Docker-Build provider's detailed [API documentation](https://www.pulumi.com/registry/packages/docker-build/).

docs/yaml/image-examples.yaml

@@ -6,7 +6,7 @@ resources:
   ecr-repository:
     type: aws:ecr:Repository
   my-image:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       tags:
         - ${ecr-repository.repositoryUrl}:latest
@@ -36,7 +36,7 @@ runtime: yaml
 description: Multi-platform image
 resources:
   image:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: "app"
@@ -49,7 +49,7 @@ runtime: yaml
 description: Registry export
 resources:
   image:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       tags:
         - "docker.io/pulumi/pulumi:3.107.0"
@@ -68,7 +68,7 @@ runtime: yaml
 description: Caching
 resources:
   image:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: "app"
@@ -85,7 +85,7 @@ runtime: yaml
 description: Docker Build Cloud
 resources:
   image:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: "app"
@@ -98,7 +98,7 @@ runtime: yaml
 description: Build arguments
 resources:
   image:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: "app"
@@ -110,7 +110,7 @@ runtime: yaml
 description: Build target
 resources:
   image:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: "app"
@@ -121,7 +121,7 @@ runtime: yaml
 description: Named contexts
 resources:
   image:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: app
@@ -134,7 +134,7 @@ runtime: yaml
 description: Remote context
 resources:
   image:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: "https://raw.githubusercontent.com/pulumi/pulumi-docker/api-types/provider/testdata/Dockerfile"
@@ -145,7 +145,7 @@ runtime: yaml
 description: Inline Dockerfile
 resources:
   image:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       dockerfile:
         inline: |
@@ -159,7 +159,7 @@ runtime: yaml
 description: Remote context
 resources:
   image:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       dockerfile:
         location: app/Dockerfile
@@ -171,7 +171,7 @@ runtime: yaml
 description: Local export
 resources:
   image:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: "app"

docs/yaml/index-examples.yaml

@@ -3,7 +3,7 @@ description: Multi-platform registry caching
 runtime: yaml
 resources:
   arm64:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: "app"
@@ -20,7 +20,7 @@ resources:
             ref: "docker.io/pulumi/pulumi:cache-arm64"
 
   amd64:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: "app"
@@ -37,7 +37,7 @@ resources:
             ref: "docker.io/pulumi/pulumi:cache-amd64"
 
   index:
-    type: dockerbuild:index:Index
+    type: docker-build:Index
     properties:
       tag: "docker.io/pulumi/pulumi:3.107.0"
       sources:

examples/dotnet/Program.cs

@@ -1,32 +1,32 @@
 using System.Collections.Generic;
 using System.Linq;
 using Pulumi;
-using Dockerbuild = Pulumi.Dockerbuild;
+using DockerBuild = Pulumi.DockerBuild;
 
 return await Deployment.RunAsync(() => 
 {
     var config = new Config();
     var dockerHubPassword = config.Require("dockerHubPassword");
-    var multiPlatform = new Dockerbuild.Image("multiPlatform", new()
+    var multiPlatform = new DockerBuild.Image("multiPlatform", new()
     {
-        Dockerfile = new Dockerbuild.Inputs.DockerfileArgs
+        Dockerfile = new DockerBuild.Inputs.DockerfileArgs
         {
             Location = "./app/Dockerfile.multiPlatform",
         },
-        Context = new Dockerbuild.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "./app",
         },
         Platforms = new[]
         {
-            Dockerbuild.Platform.Plan9_amd64,
-            Dockerbuild.Platform.Plan9_386,
+            DockerBuild.Platform.Plan9_amd64,
+            DockerBuild.Platform.Plan9_386,
         },
     });
 
-    var registryPush = new Dockerbuild.Image("registryPush", new()
+    var registryPush = new DockerBuild.Image("registryPush", new()
     {
-        Context = new Dockerbuild.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "./app",
         },
@@ -36,9 +36,9 @@ return await Deployment.RunAsync(() =>
         },
         Exports = new[]
         {
-            new Dockerbuild.Inputs.ExportArgs
+            new DockerBuild.Inputs.ExportArgs
             {
-                Registry = new Dockerbuild.Inputs.ExportRegistryArgs
+                Registry = new DockerBuild.Inputs.ExportRegistryArgs
                 {
                     OciMediaTypes = true,
                     Push = false,
@@ -47,7 +47,7 @@ return await Deployment.RunAsync(() =>
         },
         Registries = new[]
         {
-            new Dockerbuild.Inputs.RegistryArgs
+            new DockerBuild.Inputs.RegistryArgs
             {
                 Address = "docker.io",
                 Username = "pulumibot",
@@ -56,28 +56,28 @@ return await Deployment.RunAsync(() =>
         },
     });
 
-    var cached = new Dockerbuild.Image("cached", new()
+    var cached = new DockerBuild.Image("cached", new()
     {
-        Context = new Dockerbuild.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "./app",
         },
         CacheTo = new[]
         {
-            new Dockerbuild.Inputs.CacheToArgs
+            new DockerBuild.Inputs.CacheToArgs
             {
-                Local = new Dockerbuild.Inputs.CacheToLocalArgs
+                Local = new DockerBuild.Inputs.CacheToLocalArgs
                 {
                     Dest = "tmp/cache",
-                    Mode = Dockerbuild.CacheMode.Max,
+                    Mode = DockerBuild.CacheMode.Max,
                 },
             },
         },
         CacheFrom = new[]
         {
-            new Dockerbuild.Inputs.CacheFromArgs
+            new DockerBuild.Inputs.CacheFromArgs
             {
-                Local = new Dockerbuild.Inputs.CacheFromLocalArgs
+                Local = new DockerBuild.Inputs.CacheFromLocalArgs
                 {
                     Src = "tmp/cache",
                 },
@@ -85,13 +85,13 @@ return await Deployment.RunAsync(() =>
         },
     });
 
-    var buildArgs = new Dockerbuild.Image("buildArgs", new()
+    var buildArgs = new DockerBuild.Image("buildArgs", new()
     {
-        Dockerfile = new Dockerbuild.Inputs.DockerfileArgs
+        Dockerfile = new DockerBuild.Inputs.DockerfileArgs
         {
             Location = "./app/Dockerfile.buildArgs",
         },
-        Context = new Dockerbuild.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "./app",
         },
@@ -101,13 +101,13 @@ return await Deployment.RunAsync(() =>
         },
     });
 
-    var extraHosts = new Dockerbuild.Image("extraHosts", new()
+    var extraHosts = new DockerBuild.Image("extraHosts", new()
     {
-        Dockerfile = new Dockerbuild.Inputs.DockerfileArgs
+        Dockerfile = new DockerBuild.Inputs.DockerfileArgs
         {
             Location = "./app/Dockerfile.extraHosts",
         },
-        Context = new Dockerbuild.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "./app",
         },
@@ -117,32 +117,32 @@ return await Deployment.RunAsync(() =>
         },
     });
 
-    var sshMount = new Dockerbuild.Image("sshMount", new()
+    var sshMount = new DockerBuild.Image("sshMount", new()
     {
-        Dockerfile = new Dockerbuild.Inputs.DockerfileArgs
+        Dockerfile = new DockerBuild.Inputs.DockerfileArgs
         {
             Location = "./app/Dockerfile.sshMount",
         },
-        Context = new Dockerbuild.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "./app",
         },
         Ssh = new[]
         {
-            new Dockerbuild.Inputs.SSHArgs
+            new DockerBuild.Inputs.SSHArgs
             {
                 Id = "default",
             },
         },
     });
 
-    var secrets = new Dockerbuild.Image("secrets", new()
+    var secrets = new DockerBuild.Image("secrets", new()
     {
-        Dockerfile = new Dockerbuild.Inputs.DockerfileArgs
+        Dockerfile = new DockerBuild.Inputs.DockerfileArgs
         {
             Location = "./app/Dockerfile.secrets",
         },
-        Context = new Dockerbuild.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "./app",
         },
@@ -152,9 +152,9 @@ return await Deployment.RunAsync(() =>
         },
     });
 
-    var labels = new Dockerbuild.Image("labels", new()
+    var labels = new DockerBuild.Image("labels", new()
     {
-        Context = new Dockerbuild.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "./app",
         },
@@ -164,31 +164,31 @@ return await Deployment.RunAsync(() =>
         },
     });
 
-    var target = new Dockerbuild.Image("target", new()
+    var target = new DockerBuild.Image("target", new()
     {
-        Dockerfile = new Dockerbuild.Inputs.DockerfileArgs
+        Dockerfile = new DockerBuild.Inputs.DockerfileArgs
         {
             Location = "./app/Dockerfile.target",
         },
-        Context = new Dockerbuild.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "./app",
         },
         Target = "build-me",
     });
 
-    var namedContexts = new Dockerbuild.Image("namedContexts", new()
+    var namedContexts = new DockerBuild.Image("namedContexts", new()
     {
-        Dockerfile = new Dockerbuild.Inputs.DockerfileArgs
+        Dockerfile = new DockerBuild.Inputs.DockerfileArgs
         {
             Location = "./app/Dockerfile.namedContexts",
         },
-        Context = new Dockerbuild.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "./app",
             Named = 
             {
-                { "golang:latest", new Dockerbuild.Inputs.ContextArgs
+                { "golang:latest", new DockerBuild.Inputs.ContextArgs
                 {
                     Location = "docker-image://golang@sha256:b8e62cf593cdaff36efd90aa3a37de268e6781a2e68c6610940c48f7cdf36984",
                 } },
@@ -196,53 +196,53 @@ return await Deployment.RunAsync(() =>
         },
     });
 
-    var remoteContext = new Dockerbuild.Image("remoteContext", new()
+    var remoteContext = new DockerBuild.Image("remoteContext", new()
     {
-        Context = new Dockerbuild.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "https://raw.githubusercontent.com/pulumi/pulumi-docker/api-types/provider/testdata/Dockerfile",
         },
     });
 
-    var remoteContextWithInline = new Dockerbuild.Image("remoteContextWithInline", new()
+    var remoteContextWithInline = new DockerBuild.Image("remoteContextWithInline", new()
     {
-        Dockerfile = new Dockerbuild.Inputs.DockerfileArgs
+        Dockerfile = new DockerBuild.Inputs.DockerfileArgs
         {
             Inline = @"FROM busybox
 COPY hello.c ./
 ",
         },
-        Context = new Dockerbuild.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "https://github.com/docker-library/hello-world.git",
         },
     });
 
-    var inline = new Dockerbuild.Image("inline", new()
+    var inline = new DockerBuild.Image("inline", new()
     {
-        Dockerfile = new Dockerbuild.Inputs.DockerfileArgs
+        Dockerfile = new DockerBuild.Inputs.DockerfileArgs
         {
             Inline = @"FROM alpine
 RUN echo ""This uses an inline Dockerfile! 👍""
 ",
         },
-        Context = new Dockerbuild.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "./app",
         },
     });
 
-    var dockerLoad = new Dockerbuild.Image("dockerLoad", new()
+    var dockerLoad = new DockerBuild.Image("dockerLoad", new()
     {
-        Context = new Dockerbuild.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "./app",
         },
         Exports = new[]
         {
-            new Dockerbuild.Inputs.ExportArgs
+            new DockerBuild.Inputs.ExportArgs
             {
-                Docker = new Dockerbuild.Inputs.ExportDockerArgs
+                Docker = new DockerBuild.Inputs.ExportDockerArgs
                 {
                     Tar = true,
                 },

examples/dotnet/Pulumi.yaml

@@ -1,4 +1,4 @@
-name: provider-dockerbuild
+name: provider-docker-build
 runtime: dotnet
 config:
   dockerHubPassword:
@@ -6,5 +6,5 @@ config:
     secret: true
 plugins:
   providers:
-    - name: dockerbuild
+    - name: docker-build
       path: ../../bin

examples/dotnet/provider-docker-build.csproj

@@ -8,7 +8,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Pulumi" Version="3.*" />
-		<PackageReference Include="Pulumi.Dockerbuild" Version="*" />
+		<PackageReference Include="Pulumi.DockerBuild" Version="0.0.2-alpha.1712594380+4cd6d49b.dirty" />
 	</ItemGroup>
 
-</Project>
+</Project>

examples/dotnet_test.go

@@ -27,7 +27,7 @@ func TestDotNetExample(t *testing.T) {
 	test := integration.ProgramTestOptions{
 		Dir: path.Join(cwd, "dotnet"),
 		Dependencies: []string{
-			"Pulumi.Dockerbuild",
+			"Pulumi.DockerBuild",
 		},
 		Secrets: map[string]string{
 			"dockerHubPassword": os.Getenv("DOCKER_HUB_PASSWORD"),

examples/go/Pulumi.yaml

@@ -1,4 +1,4 @@
-name: provider-dockerbuild
+name: provider-docker-build
 runtime: go
 config:
   dockerHubPassword:
@@ -6,5 +6,5 @@ config:
     secret: true
 plugins:
   providers:
-    - name: dockerbuild
+    - name: docker-build
       path: ../../bin

examples/go/go.mod

@@ -1,4 +1,4 @@
-module provider-dockerbuild
+module provider-docker-build
 
 go 1.20
 

examples/go/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/pulumi/pulumi-dockerbuild/sdk/go/dockerbuild"
+	"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/config"
 )

examples/go_test.go

@@ -19,7 +19,7 @@ func TestGoExample(t *testing.T) {
 	test := integration.ProgramTestOptions{
 		Dir: path.Join(cwd, "go"),
 		Dependencies: []string{
-			"github.com/pulumi/pulumi-dockerbuild/sdk/go/dockerbuild=../sdk/go/dockerbuild",
+			"github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild=../sdk/go/dockerbuild",
 		},
 		Secrets: map[string]string{
 			"dockerHubPassword": os.Getenv("DOCKER_HUB_PASSWORD"),

examples/java/Pulumi.yaml

@@ -1,4 +1,4 @@
-name: provider-dockerbuild
+name: provider-docker-build
 runtime: java
 config:
   dockerHubPassword:
@@ -6,5 +6,5 @@ config:
     secret: true
 plugins:
   providers:
-    - name: dockerbuild
+    - name: docker-build
       path: ../../bin

examples/java/pom.xml

@@ -5,7 +5,7 @@
 			<modelVersion>4.0.0</modelVersion>
 
 			<groupId>com.pulumi</groupId>
-			<artifactId>provider-dockerbuild</artifactId>
+			<artifactId>provider-docker-build</artifactId>
 			<version>1.0-SNAPSHOT</version>
 
 			<properties>
@@ -25,7 +25,7 @@
 				</dependency>
 				<dependency>
             		<groupId>com.pulumi</groupId>
-            		<artifactId>dockerbuild</artifactId>
+            		<artifactId>docker-build</artifactId>
                     <version>[0.0.0,)</version>
         		</dependency>
 			</dependencies>

examples/main_test.go

@@ -1,8 +1,10 @@
 package examples
 
 import (
-	"crypto/rand"
 	"crypto/rsa"
+	"errors"
+	"io"
+	"math/rand"
 	"net"
 	"os"
 	"path/filepath"
@@ -20,11 +22,12 @@ func TestMain(m *testing.M) {
 
 // sshagent crates an in-memory SSH agent with one identity.
 func sshagent() string {
-	dir := os.TempDir()
-	sock := filepath.Join(dir, "test.sock")
+	dir, err := os.MkdirTemp(os.TempDir(), "docker-test-*")
+	if err != nil {
+		panic(err)
+	}
 
-	// In case it already exists.
-	_ = os.Remove(sock)
+	sock := filepath.Join(dir, "test.sock")
 
 	l, err := net.Listen("unix", sock)
 	if err != nil {
@@ -32,18 +35,26 @@ func sshagent() string {
 	}
 
 	a := agent.NewKeyring()
-	key, err := rsa.GenerateKey(rand.Reader, 2048)
+	//nolint:gosec
+	key, err := rsa.GenerateKey(rand.New(rand.NewSource(42)), 2048)
+	if err != nil {
+		panic(err)
+	}
+	err = a.Add(agent.AddedKey{PrivateKey: key})
 	if err != nil {
 		panic(err)
 	}
-	_ = a.Add(agent.AddedKey{PrivateKey: key})
 
 	go func() {
-		conn, err := l.Accept()
-		if err != nil {
-			panic(err)
+		for {
+			conn, err := l.Accept()
+			if err != nil {
+				panic(err)
+			}
+			if err := agent.ServeAgent(a, conn); err != nil && !errors.Is(err, io.EOF) {
+				panic(err)
+			}
 		}
-		agent.ServeAgent(a, conn)
 	}()
 
 	return sock

examples/nodejs/Pulumi.yaml

@@ -1,4 +1,4 @@
-name: provider-dockerbuild
+name: provider-docker-build
 runtime: nodejs
 config:
   dockerHubPassword:
@@ -6,5 +6,5 @@ config:
     secret: true
 plugins:
   providers:
-    - name: dockerbuild
+    - name: docker-build
       path: ../../bin

examples/nodejs/index.ts

@@ -1,9 +1,9 @@
 import * as pulumi from "@pulumi/pulumi";
-import * as dockerbuild from "@pulumi/dockerbuild";
+import * as docker_build from "@pulumi/docker-build";
 
 const config = new pulumi.Config();
 const dockerHubPassword = config.require("dockerHubPassword");
-const multiPlatform = new dockerbuild.Image("multiPlatform", {
+const multiPlatform = new docker_build.Image("multiPlatform", {
     dockerfile: {
         location: "./app/Dockerfile.multiPlatform",
     },
@@ -11,11 +11,11 @@ const multiPlatform = new dockerbuild.Image("multiPlatform", {
         location: "./app",
     },
     platforms: [
-        dockerbuild.Platform.Plan9_amd64,
-        dockerbuild.Platform.Plan9_386,
+        docker_build.Platform.Plan9_amd64,
+        docker_build.Platform.Plan9_386,
     ],
 });
-const registryPush = new dockerbuild.Image("registryPush", {
+const registryPush = new docker_build.Image("registryPush", {
     context: {
         location: "./app",
     },
@@ -32,14 +32,14 @@ const registryPush = new dockerbuild.Image("registryPush", {
         password: dockerHubPassword,
     }],
 });
-const cached = new dockerbuild.Image("cached", {
+const cached = new docker_build.Image("cached", {
     context: {
         location: "./app",
     },
     cacheTo: [{
         local: {
             dest: "tmp/cache",
-            mode: dockerbuild.CacheMode.Max,
+            mode: docker_build.CacheMode.Max,
         },
     }],
     cacheFrom: [{
@@ -48,7 +48,7 @@ const cached = new dockerbuild.Image("cached", {
         },
     }],
 });
-const buildArgs = new dockerbuild.Image("buildArgs", {
+const buildArgs = new docker_build.Image("buildArgs", {
     dockerfile: {
         location: "./app/Dockerfile.buildArgs",
     },
@@ -59,7 +59,7 @@ const buildArgs = new dockerbuild.Image("buildArgs", {
         SET_ME_TO_TRUE: "true",
     },
 });
-const extraHosts = new dockerbuild.Image("extraHosts", {
+const extraHosts = new docker_build.Image("extraHosts", {
     dockerfile: {
         location: "./app/Dockerfile.extraHosts",
     },
@@ -68,7 +68,7 @@ const extraHosts = new dockerbuild.Image("extraHosts", {
     },
     addHosts: ["metadata.google.internal:169.254.169.254"],
 });
-const sshMount = new dockerbuild.Image("sshMount", {
+const sshMount = new docker_build.Image("sshMount", {
     dockerfile: {
         location: "./app/Dockerfile.sshMount",
     },
@@ -79,7 +79,7 @@ const sshMount = new dockerbuild.Image("sshMount", {
         id: "default",
     }],
 });
-const secrets = new dockerbuild.Image("secrets", {
+const secrets = new docker_build.Image("secrets", {
     dockerfile: {
         location: "./app/Dockerfile.secrets",
     },
@@ -90,7 +90,7 @@ const secrets = new dockerbuild.Image("secrets", {
         password: "hunter2",
     },
 });
-const labels = new dockerbuild.Image("labels", {
+const labels = new docker_build.Image("labels", {
     context: {
         location: "./app",
     },
@@ -98,7 +98,7 @@ const labels = new dockerbuild.Image("labels", {
         description: "This image will get a descriptive label 👍",
     },
 });
-const target = new dockerbuild.Image("target", {
+const target = new docker_build.Image("target", {
     dockerfile: {
         location: "./app/Dockerfile.target",
     },
@@ -107,7 +107,7 @@ const target = new dockerbuild.Image("target", {
     },
     target: "build-me",
 });
-const namedContexts = new dockerbuild.Image("namedContexts", {
+const namedContexts = new docker_build.Image("namedContexts", {
     dockerfile: {
         location: "./app/Dockerfile.namedContexts",
     },
@@ -120,10 +120,10 @@ const namedContexts = new dockerbuild.Image("namedContexts", {
         },
     },
 });
-const remoteContext = new dockerbuild.Image("remoteContext", {context: {
+const remoteContext = new docker_build.Image("remoteContext", {context: {
     location: "https://raw.githubusercontent.com/pulumi/pulumi-docker/api-types/provider/testdata/Dockerfile",
 }});
-const remoteContextWithInline = new dockerbuild.Image("remoteContextWithInline", {
+const remoteContextWithInline = new docker_build.Image("remoteContextWithInline", {
     dockerfile: {
         inline: `FROM busybox
 COPY hello.c ./
@@ -133,7 +133,7 @@ COPY hello.c ./
         location: "https://github.com/docker-library/hello-world.git",
     },
 });
-const inline = new dockerbuild.Image("inline", {
+const inline = new docker_build.Image("inline", {
     dockerfile: {
         inline: `FROM alpine
 RUN echo "This uses an inline Dockerfile! 👍"
@@ -143,7 +143,7 @@ RUN echo "This uses an inline Dockerfile! 👍"
         location: "./app",
     },
 });
-const dockerLoad = new dockerbuild.Image("dockerLoad", {
+const dockerLoad = new docker_build.Image("dockerLoad", {
     context: {
         location: "./app",
     },

examples/nodejs/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "provider-dockerbuild",
+  "name": "provider-docker-build",
   "devDependencies": {
     "@types/node": "^18"
   },
@@ -8,4 +8,3 @@
     "@pulumi/pulumi": "^3.0.0"
   }
 }
-

examples/nodejs_test.go

@@ -18,7 +18,7 @@ func TestNodeExample(t *testing.T) {
 
 	test := integration.ProgramTestOptions{
 		Dir:          path.Join(cwd, "nodejs"),
-		Dependencies: []string{"@pulumi/dockerbuild"},
+		Dependencies: []string{"@pulumi/docker-build"},
 		Secrets: map[string]string{
 			"dockerHubPassword": os.Getenv("DOCKER_HUB_PASSWORD"),
 		},

examples/python/Pulumi.yaml

@@ -1,4 +1,4 @@
-name: provider-dockerbuild
+name: provider-docker-build
 runtime: python
 config:
   dockerHubPassword:
@@ -6,5 +6,5 @@ config:
     secret: true
 plugins:
   providers:
-    - name: dockerbuild
+    - name: docker-build
       path: ../../bin

examples/python/__main__.py

@@ -1,142 +1,142 @@
 import pulumi
-import pulumi_dockerbuild as dockerbuild
+import pulumi_docker_build as docker_build
 
 config = pulumi.Config()
 docker_hub_password = config.require("dockerHubPassword")
-multi_platform = dockerbuild.Image("multiPlatform",
-    dockerfile=dockerbuild.DockerfileArgs(
+multi_platform = docker_build.Image("multiPlatform",
+    dockerfile=docker_build.DockerfileArgs(
         location="./app/Dockerfile.multiPlatform",
     ),
-    context=dockerbuild.BuildContextArgs(
+    context=docker_build.BuildContextArgs(
         location="./app",
     ),
     platforms=[
-        dockerbuild.Platform.PLAN9_AMD64,
-        dockerbuild.Platform.PLAN9_386,
+        docker_build.Platform.PLAN9_AMD64,
+        docker_build.Platform.PLAN9_386,
     ])
-registry_push = dockerbuild.Image("registryPush",
-    context=dockerbuild.BuildContextArgs(
+registry_push = docker_build.Image("registryPush",
+    context=docker_build.BuildContextArgs(
         location="./app",
     ),
     tags=["docker.io/pulumibot/buildkit-e2e:example"],
-    exports=[dockerbuild.ExportArgs(
-        registry=dockerbuild.ExportRegistryArgs(
+    exports=[docker_build.ExportArgs(
+        registry=docker_build.ExportRegistryArgs(
             oci_media_types=True,
             push=False,
         ),
     )],
-    registries=[dockerbuild.RegistryArgs(
+    registries=[docker_build.RegistryArgs(
         address="docker.io",
         username="pulumibot",
         password=docker_hub_password,
     )])
-cached = dockerbuild.Image("cached",
-    context=dockerbuild.BuildContextArgs(
+cached = docker_build.Image("cached",
+    context=docker_build.BuildContextArgs(
         location="./app",
     ),
-    cache_to=[dockerbuild.CacheToArgs(
-        local=dockerbuild.CacheToLocalArgs(
+    cache_to=[docker_build.CacheToArgs(
+        local=docker_build.CacheToLocalArgs(
             dest="tmp/cache",
-            mode=dockerbuild.CacheMode.MAX,
+            mode=docker_build.CacheMode.MAX,
         ),
     )],
-    cache_from=[dockerbuild.CacheFromArgs(
-        local=dockerbuild.CacheFromLocalArgs(
+    cache_from=[docker_build.CacheFromArgs(
+        local=docker_build.CacheFromLocalArgs(
             src="tmp/cache",
         ),
     )])
-build_args = dockerbuild.Image("buildArgs",
-    dockerfile=dockerbuild.DockerfileArgs(
+build_args = docker_build.Image("buildArgs",
+    dockerfile=docker_build.DockerfileArgs(
         location="./app/Dockerfile.buildArgs",
     ),
-    context=dockerbuild.BuildContextArgs(
+    context=docker_build.BuildContextArgs(
         location="./app",
     ),
     build_args={
         "SET_ME_TO_TRUE": "true",
     })
-extra_hosts = dockerbuild.Image("extraHosts",
-    dockerfile=dockerbuild.DockerfileArgs(
+extra_hosts = docker_build.Image("extraHosts",
+    dockerfile=docker_build.DockerfileArgs(
         location="./app/Dockerfile.extraHosts",
     ),
-    context=dockerbuild.BuildContextArgs(
+    context=docker_build.BuildContextArgs(
         location="./app",
     ),
     add_hosts=["metadata.google.internal:169.254.169.254"])
-ssh_mount = dockerbuild.Image("sshMount",
-    dockerfile=dockerbuild.DockerfileArgs(
+ssh_mount = docker_build.Image("sshMount",
+    dockerfile=docker_build.DockerfileArgs(
         location="./app/Dockerfile.sshMount",
     ),
-    context=dockerbuild.BuildContextArgs(
+    context=docker_build.BuildContextArgs(
         location="./app",
     ),
-    ssh=[dockerbuild.SSHArgs(
+    ssh=[docker_build.SSHArgs(
         id="default",
     )])
-secrets = dockerbuild.Image("secrets",
-    dockerfile=dockerbuild.DockerfileArgs(
+secrets = docker_build.Image("secrets",
+    dockerfile=docker_build.DockerfileArgs(
         location="./app/Dockerfile.secrets",
     ),
-    context=dockerbuild.BuildContextArgs(
+    context=docker_build.BuildContextArgs(
         location="./app",
     ),
     secrets={
         "password": "hunter2",
     })
-labels = dockerbuild.Image("labels",
-    context=dockerbuild.BuildContextArgs(
+labels = docker_build.Image("labels",
+    context=docker_build.BuildContextArgs(
         location="./app",
     ),
     labels={
         "description": "This image will get a descriptive label 👍",
     })
-target = dockerbuild.Image("target",
-    dockerfile=dockerbuild.DockerfileArgs(
+target = docker_build.Image("target",
+    dockerfile=docker_build.DockerfileArgs(
         location="./app/Dockerfile.target",
     ),
-    context=dockerbuild.BuildContextArgs(
+    context=docker_build.BuildContextArgs(
         location="./app",
     ),
     target="build-me")
-named_contexts = dockerbuild.Image("namedContexts",
-    dockerfile=dockerbuild.DockerfileArgs(
+named_contexts = docker_build.Image("namedContexts",
+    dockerfile=docker_build.DockerfileArgs(
         location="./app/Dockerfile.namedContexts",
     ),
-    context=dockerbuild.BuildContextArgs(
+    context=docker_build.BuildContextArgs(
         location="./app",
         named={
-            "golang:latest": dockerbuild.ContextArgs(
+            "golang:latest": docker_build.ContextArgs(
                 location="docker-image://golang@sha256:b8e62cf593cdaff36efd90aa3a37de268e6781a2e68c6610940c48f7cdf36984",
             ),
         },
     ))
-remote_context = dockerbuild.Image("remoteContext", context=dockerbuild.BuildContextArgs(
+remote_context = docker_build.Image("remoteContext", context=docker_build.BuildContextArgs(
     location="https://raw.githubusercontent.com/pulumi/pulumi-docker/api-types/provider/testdata/Dockerfile",
 ))
-remote_context_with_inline = dockerbuild.Image("remoteContextWithInline",
-    dockerfile=dockerbuild.DockerfileArgs(
+remote_context_with_inline = docker_build.Image("remoteContextWithInline",
+    dockerfile=docker_build.DockerfileArgs(
         inline="""FROM busybox
 COPY hello.c ./
 """,
     ),
-    context=dockerbuild.BuildContextArgs(
+    context=docker_build.BuildContextArgs(
         location="https://github.com/docker-library/hello-world.git",
     ))
-inline = dockerbuild.Image("inline",
-    dockerfile=dockerbuild.DockerfileArgs(
+inline = docker_build.Image("inline",
+    dockerfile=docker_build.DockerfileArgs(
         inline="""FROM alpine
 RUN echo "This uses an inline Dockerfile! 👍"
 """,
     ),
-    context=dockerbuild.BuildContextArgs(
+    context=docker_build.BuildContextArgs(
         location="./app",
     ))
-docker_load = dockerbuild.Image("dockerLoad",
-    context=dockerbuild.BuildContextArgs(
+docker_load = docker_build.Image("dockerLoad",
+    context=docker_build.BuildContextArgs(
         location="./app",
     ),
-    exports=[dockerbuild.ExportArgs(
-        docker=dockerbuild.ExportDockerArgs(
+    exports=[docker_build.ExportArgs(
+        docker=docker_build.ExportDockerArgs(
             tar=True,
         ),
     )])

examples/tests/dockerhub/.dockerignore

@@ -0,0 +1 @@
+*

examples/tests/dockerhub/Pulumi.yaml

@@ -0,0 +1,34 @@
+name: dockerhub
+description: Push to DockerHub with caching
+runtime: yaml
+plugins:
+  providers:
+    - name: docker-build
+      path: ../../../bin
+outputs:
+  ref: ${my-image.ref}
+resources:
+  my-image:
+    type: docker-build:Image
+    properties:
+      tags:
+        - docker.io/pulumibot/buildkit-e2e
+      push: true
+      context:
+        location: .
+      dockerfile:
+        inline: FROM alpine
+      cacheFrom:
+        - registry:
+            ref: docker.io/pulumibot/buildkit-e2e:cache
+      cacheTo:
+        - registry:
+            ref: docker.io/pulumibot/buildkit-e2e:cache
+      registries:
+        - username: pulumibot
+          address: docker.io
+          password: ${dockerHubPassword}
+config:
+  dockerHubPassword:
+    type: string
+    secret: true

examples/tests/ecr/.dockerignore

@@ -0,0 +1 @@
+*

examples/tests/ecr/Pulumi.yaml

@@ -0,0 +1,40 @@
+name: ecr
+description: Push to AWS ECR with caching
+runtime: yaml
+plugins:
+  providers:
+    - name: docker-build
+      path: ../../../bin
+outputs:
+  ref: ${my-image.ref}
+resources:
+  ecr-repository:
+    type: aws:ecr:Repository
+    properties:
+      forceDelete: true
+  my-image:
+    type: docker-build:Image
+    properties:
+      tags:
+        - ${ecr-repository.repositoryUrl}:latest
+      push: true
+      context:
+        location: .
+      dockerfile:
+        inline: FROM alpine
+      cacheFrom:
+        - registry:
+            ref: ${ecr-repository.repositoryUrl}:cache
+      cacheTo:
+        - registry:
+            ref: ${ecr-repository.repositoryUrl}:cache
+            imageManifest: true
+            ociMediaTypes: true
+      registries:
+        - username: ${auth-token.userName}
+          password: ${auth-token.password}
+          address: ${ecr-repository.repositoryUrl}
+variables:
+  auth-token:
+    fn::aws:ecr:getAuthorizationToken:
+      registryId: ${ecr-repository.registryId}

examples/tests/unauthenticated/.dockerignore

@@ -0,0 +1 @@
+*

examples/tests/unauthenticated/Pulumi.yaml

@@ -0,0 +1,18 @@
+name: dockerhub-unauthenticated
+description: Pull an image from Dockerhub without credentials
+runtime: yaml
+plugins:
+  providers:
+    - name: docker-build
+      path: ../../../bin
+resources:
+  my-image:
+    type: docker-build:Image
+    properties:
+      tags:
+        - alpine-local
+      load: true
+      context:
+        location: .
+      dockerfile:
+        inline: FROM alpine

examples/yaml/Pulumi.yaml

@@ -1,14 +1,14 @@
-name: provider-dockerbuild
+name: provider-docker-build
 runtime: yaml
 plugins:
   providers:
-    - name: dockerbuild
+    - name: docker-build
       path: ../../bin
 
 resources:
   # docker buildx build -f app/Dockerfile.multiPlatform --platform plan9/amd64,plan9/386 app
   multiPlatform:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       dockerfile:
         location: "./app/Dockerfile.multiPlatform"
@@ -20,7 +20,7 @@ resources:
 
   # docker buildx build --output=type=registry app
   registryPush:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: "./app"
@@ -36,7 +36,7 @@ resources:
 
   # docker buildx build --cache-to=type=local,dest=tmp/cache,mode=max --cache-from=type=local,src=tmp/cache app
   cached:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: "./app"
@@ -50,7 +50,7 @@ resources:
 
   # docker buildx build -f app/Dockerfile.buildArgs --build-arg SET_ME_TO_TRUE=true app
   buildArgs:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       dockerfile:
         location: "./app/Dockerfile.buildArgs"
@@ -61,7 +61,7 @@ resources:
 
   # docker buildx build -f app/Dockerfile.extraHosts --add-host metadata.google.internal:169.254.169.254 app
   extraHosts:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       dockerfile:
         location: "./app/Dockerfile.extraHosts"
@@ -72,7 +72,7 @@ resources:
 
   # docker buildx build -f app/Dockerfile.sshMount --ssh default app
   sshMount:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       dockerfile:
         location: "./app/Dockerfile.sshMount"
@@ -83,7 +83,7 @@ resources:
 
   # PASSWORD=hunter2 docker buildx build -f app/Dockerfile.secrets --secret id=password,env=PASSWORD app
   secrets:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       dockerfile:
         location: "./app/Dockerfile.secrets"
@@ -94,7 +94,7 @@ resources:
 
   # docker buildx build --label "description=This image will get a descriptive label 👍" app
   labels:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: "./app"
@@ -103,7 +103,7 @@ resources:
 
   # docker buildx build -f app/Dockerfile.target --target build-me app
   target:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       dockerfile:
         location: "./app/Dockerfile.target"
@@ -114,7 +114,7 @@ resources:
   # docker buildx build -f app/Dockerfile.namedContexts \
   #   --build-context golang:latest=docker-image://golang@sha256:b8e62cf593cdaff36efd90aa3a37de268e6781a2e68c6610940c48f7cdf36984 app
   namedContexts:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       dockerfile:
         location: "./app/Dockerfile.namedContexts"
@@ -126,7 +126,7 @@ resources:
 
   # docker buildx build https://raw.githubusercontent.com/pulumi/pulumi-docker/api-types/provider/testdata/Dockerfile
   remoteContext:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: "https://raw.githubusercontent.com/pulumi/pulumi-docker/api-types/provider/testdata/Dockerfile"
@@ -136,7 +136,7 @@ resources:
   #  COPY hello.c ./
   #  EOF
   remoteContextWithInline:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       dockerfile:
         inline: |
@@ -147,7 +147,7 @@ resources:
 
   # echo "FROM alpine" | docker buildx build -f - .
   inline:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       dockerfile:
         inline: |
@@ -158,7 +158,7 @@ resources:
 
   # docker buildx build --load .
   dockerLoad:
-    type: dockerbuild:index:Image
+    type: docker-build:Image
     properties:
       context:
         location: "./app"
@@ -168,7 +168,7 @@ resources:
 
   # docker buildx build - < app/Dockerfile.emptyContext
   #emptyContext:
-  #  type: dockerbuild:index:Image
+  #  type: docker-build:Image
   #  properties:
   #    file: "app/Dockerfile.emptyContext"
   #    context: "-"

examples/yaml_test.go

@@ -25,3 +25,47 @@ func TestYAMLExample(t *testing.T) {
 
 	integration.ProgramTest(t, &test)
 }
+
+func TestECR(t *testing.T) {
+	if os.Getenv("AWS_SESSION_TOKEN") == "" {
+		t.Skip("Missing AWS credentials")
+	}
+
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
+
+	test := integration.ProgramTestOptions{
+		Dir: path.Join(cwd, "tests/ecr"),
+	}
+
+	integration.ProgramTest(t, &test)
+}
+
+func TestDockerHub(t *testing.T) {
+	if os.Getenv("DOCKER_HUB_PASSWORD") == "" {
+		t.Skip("Missing DockerHub credentials")
+	}
+
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
+
+	test := integration.ProgramTestOptions{
+		Dir: path.Join(cwd, "tests/dockerhub"),
+		Secrets: map[string]string{
+			"dockerHubPassword": os.Getenv("DOCKER_HUB_PASSWORD"),
+		},
+	}
+
+	integration.ProgramTest(t, &test)
+}
+
+func TestDockerHubUnauthenticated(t *testing.T) {
+	cwd, err := os.Getwd()
+	require.NoError(t, err)
+
+	test := integration.ProgramTestOptions{
+		Dir: path.Join(cwd, "tests/unauthenticated"),
+	}
+
+	integration.ProgramTest(t, &test)
+}

go.mod

@@ -1,24 +1,25 @@
-module github.com/pulumi/pulumi-dockerbuild
+module github.com/pulumi/pulumi-docker-build
 
 go 1.21.7
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/distribution/reference v0.5.0
-	github.com/docker/buildx v0.12.0-rc2.0.20240214233841-c9d1c41d206c
-	github.com/docker/cli v25.0.3+incompatible
+	github.com/docker/buildx v0.13.1
+	github.com/docker/cli v26.0.0-rc1+incompatible
 	github.com/docker/distribution v2.8.2+incompatible
-	github.com/docker/docker v25.0.2+incompatible
+	github.com/docker/docker v26.0.0-rc1+incompatible
 	github.com/golangci/golangci-lint v1.57.1
-	github.com/moby/buildkit v0.13.0-beta3.0.20240205165705-d6e142600ee5
+	github.com/moby/buildkit v0.13.0
 	github.com/moby/patternmatcher v0.6.0
 	github.com/muesli/reflow v0.3.0
 	github.com/otiai10/copy v1.14.0
-	github.com/pulumi/pulumi-go-provider v0.14.1-0.20240314105842-9fbffb634faf
+	github.com/pulumi/pulumi-go-provider v0.16.0
 	github.com/pulumi/pulumi-go-provider/integration v0.10.1-0.20240314105842-9fbffb634faf
-	github.com/pulumi/pulumi-java/pkg v0.9.9
-	github.com/pulumi/pulumi/pkg/v3 v3.111.2-0.20240324200353-583e06df0c70
-	github.com/pulumi/pulumi/sdk/v3 v3.111.2-0.20240324200353-583e06df0c70
+	github.com/pulumi/pulumi-java/pkg v0.10.0
+	github.com/pulumi/pulumi/pkg/v3 v3.113.0
+	github.com/pulumi/pulumi/sdk/go/pulumi-language-go/v3 v3.0.0-20240415162817-44c8de53d5d2
+	github.com/pulumi/pulumi/sdk/v3 v3.113.0
 	github.com/regclient/regclient v0.0.0-20240308005156-a7434cff9c6b
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/afero v1.11.0
@@ -26,6 +27,7 @@ require (
 	github.com/theupdateframework/notary v0.7.0
 	github.com/tonistiigi/fsutil v0.0.0-20240301111122-7525a1af2bb5
 	go.uber.org/mock v0.3.0
+	golang.org/x/crypto v0.21.0
 	google.golang.org/protobuf v1.33.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -33,14 +35,14 @@ require (
 require (
 	4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
 	4d63.com/gochecknoglobals v0.2.1 // indirect
-	cloud.google.com/go v0.112.0 // indirect
-	cloud.google.com/go/compute v1.23.3 // indirect
+	cloud.google.com/go v0.112.1 // indirect
+	cloud.google.com/go/compute v1.25.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/iam v1.1.5 // indirect
-	cloud.google.com/go/kms v1.15.5 // indirect
+	cloud.google.com/go/iam v1.1.6 // indirect
+	cloud.google.com/go/kms v1.15.7 // indirect
 	cloud.google.com/go/logging v1.9.0 // indirect
-	cloud.google.com/go/longrunning v0.5.4 // indirect
-	cloud.google.com/go/storage v1.36.0 // indirect
+	cloud.google.com/go/longrunning v0.5.5 // indirect
+	cloud.google.com/go/storage v1.39.1 // indirect
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/4meepo/tagalign v1.3.3 // indirect
 	github.com/Abirdcfly/dupword v0.0.14 // indirect
@@ -49,16 +51,16 @@ require (
 	github.com/Antonboom/errname v0.1.12 // indirect
 	github.com/Antonboom/nilnil v0.1.7 // indirect
 	github.com/Antonboom/testifylint v1.2.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.1 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
 	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
-	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 // indirect
+	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
 	github.com/BurntSushi/toml v1.3.2 // indirect
 	github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
 	github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect
@@ -81,27 +83,27 @@ require (
 	github.com/ashanbrown/forbidigo v1.6.0 // indirect
 	github.com/ashanbrown/makezero v1.1.1 // indirect
 	github.com/atotto/clipboard v0.1.4 // indirect
-	github.com/aws/aws-sdk-go v1.49.0 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.24.1 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.26.6 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.16.16 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/kms v1.27.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.18.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 // indirect
-	github.com/aws/smithy-go v1.19.0 // indirect
+	github.com/aws/aws-sdk-go v1.50.36 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.27.11 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.11 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.15 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/kms v1.30.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 // indirect
+	github.com/aws/smithy-go v1.20.2 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -128,8 +130,8 @@ require (
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/compose-spec/compose-go/v2 v2.0.0-rc.8 // indirect
 	github.com/containerd/console v1.0.4 // indirect
-	github.com/containerd/containerd v1.7.12 // indirect
-	github.com/containerd/continuity v0.4.2 // indirect
+	github.com/containerd/containerd v1.7.13 // indirect
+	github.com/containerd/continuity v0.4.3 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/ttrpc v1.2.2 // indirect
 	github.com/containerd/typeurl/v2 v2.1.1 // indirect
@@ -142,7 +144,7 @@ require (
 	github.com/denis-tingaikin/go-header v0.5.0 // indirect
 	github.com/djherbis/times v1.5.0 // indirect
 	github.com/dlclark/regexp2 v1.4.0 // indirect
-	github.com/docker/cli-docs-tool v0.6.0 // indirect
+	github.com/docker/cli-docs-tool v0.7.0 // indirect
 	github.com/docker/docker-credential-helpers v0.8.0 // indirect
 	github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
@@ -151,7 +153,7 @@ require (
 	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/edsrzf/mmap-go v1.1.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/erikgeiser/promptkit v0.9.0 // indirect
 	github.com/ettle/strcase v0.2.0 // indirect
@@ -168,12 +170,12 @@ require (
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
 	github.com/go-git/go-git/v5 v5.11.0 // indirect
-	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-toolsmith/astcast v1.1.0 // indirect
 	github.com/go-toolsmith/astcopy v1.1.0 // indirect
 	github.com/go-toolsmith/astequal v1.2.0 // indirect
@@ -188,10 +190,10 @@ require (
 	github.com/gofrs/uuid v4.2.0+incompatible // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v5 v5.1.0 // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/golang/glog v1.2.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
 	github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect
@@ -199,7 +201,7 @@ require (
 	github.com/golangci/plugin-module-register v0.1.1 // indirect
 	github.com/golangci/revgrep v0.5.2 // indirect
 	github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
@@ -207,12 +209,13 @@ require (
 	github.com/google/s2a-go v0.1.7 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/google/wire v0.5.0 // indirect
+	github.com/google/wire v0.6.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
-	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.12.2 // indirect
 	github.com/gordonklaus/ineffassign v0.1.0 // indirect
 	github.com/gorilla/css v1.0.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
 	github.com/gostaticanalysis/comment v1.4.2 // indirect
 	github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
@@ -227,7 +230,7 @@ require (
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-plugin v1.6.0 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 // indirect
 	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 // indirect
@@ -242,7 +245,6 @@ require (
 	github.com/hashicorp/vault/sdk v0.6.1 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/hexops/gotextdiff v1.0.3 // indirect
-	github.com/hexops/valast v1.4.4 // indirect
 	github.com/iancoleman/strcase v0.2.0 // indirect
 	github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
@@ -296,6 +298,7 @@ require (
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/moby v25.0.4+incompatible // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
@@ -312,6 +315,7 @@ require (
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/termenv v0.15.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/nakabonne/nestif v0.3.1 // indirect
 	github.com/natefinch/atomic v1.0.1 // indirect
 	github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d // indirect
@@ -333,16 +337,16 @@ require (
 	github.com/pgavlin/text v0.0.0-20230428184845-84c285f11d2f // indirect
 	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
-	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
+	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pkg/term v1.1.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/polyfloyd/go-errorlint v1.4.8 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/prometheus/client_golang v1.16.0 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.42.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/prometheus/client_golang v1.17.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
 	github.com/pulumi/esc v0.6.2 // indirect
 	github.com/pulumi/pulumi-yaml v1.6.0 // indirect
@@ -366,7 +370,7 @@ require (
 	github.com/segmentio/asm v1.1.3 // indirect
 	github.com/segmentio/encoding v0.3.5 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
-	github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 // indirect
+	github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b // indirect
 	github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
 	github.com/shibumi/go-pathspec v1.3.0 // indirect
 	github.com/shirou/gopsutil/v3 v3.24.2 // indirect
@@ -423,35 +427,34 @@ require (
 	go-simpler.org/musttag v0.9.0 // indirect
 	go-simpler.org/sloglint v0.5.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.45.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
-	go.opentelemetry.io/otel v1.21.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
+	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
 	go.opentelemetry.io/otel/exporters/prometheus v0.42.0 // indirect
-	go.opentelemetry.io/otel/metric v1.21.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect
-	go.opentelemetry.io/otel/trace v1.21.0 // indirect
+	go.opentelemetry.io/otel/metric v1.24.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.22.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect
+	go.opentelemetry.io/otel/trace v1.24.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	go.pennock.tech/tabular v1.1.3 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/automaxprocs v1.5.3 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.26.0 // indirect
-	gocloud.dev v0.36.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	gocloud.dev v0.37.0 // indirect
 	gocloud.dev/secrets/hashivault v0.28.0 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
 	golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
 	golang.org/x/mod v0.16.0 // indirect
 	golang.org/x/net v0.22.0 // indirect
-	golang.org/x/oauth2 v0.16.0 // indirect
+	golang.org/x/oauth2 v0.18.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/term v0.18.0 // indirect
@@ -459,29 +462,29 @@ require (
 	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.19.0 // indirect
 	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
-	google.golang.org/api v0.155.0 // indirect
+	google.golang.org/api v0.169.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
-	google.golang.org/grpc v1.62.0 // indirect
+	google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240311173647-c811ad7063a7 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect
+	google.golang.org/grpc v1.62.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	honnef.co/go/tools v0.4.7 // indirect
-	k8s.io/api v0.26.7 // indirect
-	k8s.io/apimachinery v0.26.7 // indirect
-	k8s.io/apiserver v0.26.7 // indirect
-	k8s.io/client-go v0.26.7 // indirect
-	k8s.io/klog/v2 v2.90.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
+	k8s.io/api v0.29.2 // indirect
+	k8s.io/apimachinery v0.29.2 // indirect
+	k8s.io/apiserver v0.29.2 // indirect
+	k8s.io/client-go v0.29.2 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 	lukechampine.com/frand v1.4.2 // indirect
 	mvdan.cc/gofumpt v0.6.0 // indirect
 	mvdan.cc/unparam v0.0.0-20240104100049-c549a3470d14 // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )

go.sum

@@ -41,8 +41,8 @@ cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34h
 cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
 cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I=
-cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM=
-cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4=
+cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM=
+cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4=
 cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
 cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
 cloud.google.com/go/accesscontextmanager v1.3.0/go.mod h1:TgCBehyr5gNMz7ZaH9xubp+CE8dkrszb4oK9CWyvD4o=
@@ -121,8 +121,8 @@ cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOt
 cloud.google.com/go/compute v1.12.0/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU=
 cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU=
 cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARyZtRXDJ8GE=
-cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
-cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
+cloud.google.com/go/compute v1.25.0 h1:H1/4SqSUhjPFE7L5ddzHOfY2bCAvjwNRZPNl6Ni5oYU=
+cloud.google.com/go/compute v1.25.0/go.mod h1:GR7F0ZPZH8EhChlMo9FkLd7eUTwEymjqQagxzilIxIE=
 cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU=
 cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
 cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=
@@ -209,8 +209,8 @@ cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp
 cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc=
 cloud.google.com/go/iam v0.6.0/go.mod h1:+1AH33ueBne5MzYccyMHtEKqLE4/kJOibtffMHDMFMc=
 cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQEYOeg=
-cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI=
-cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8=
+cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc=
+cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI=
 cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc=
 cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A=
 cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM=
@@ -220,8 +220,8 @@ cloud.google.com/go/iot v1.4.0/go.mod h1:dIDxPOn0UvNDUMD8Ger7FIaTuvMkj+aGk94RPP0
 cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg=
 cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0=
 cloud.google.com/go/kms v1.7.0/go.mod h1:k2UdVoNIHLJi/Rnng6dN0vlq7lS3jHSDiZasft+gmYE=
-cloud.google.com/go/kms v1.15.5 h1:pj1sRfut2eRbD9pFRjNnPNg/CzJPuQAzUujMIM1vVeM=
-cloud.google.com/go/kms v1.15.5/go.mod h1:cU2H5jnp6G2TDpUGZyqTCoy1n16fbubHZjmVXSMtwDI=
+cloud.google.com/go/kms v1.15.7 h1:7caV9K3yIxvlQPAcaFffhlT7d1qpxjB1wHBtjWa13SM=
+cloud.google.com/go/kms v1.15.7/go.mod h1:ub54lbsa6tDkUwnu4W7Yt1aAIFLnspgh0kPGToDukeI=
 cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic=
 cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI=
 cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE=
@@ -232,8 +232,8 @@ cloud.google.com/go/logging v1.9.0 h1:iEIOXFO9EmSiTjDmfpbRjOxECO7R8C7b8IXUGOj7xZ
 cloud.google.com/go/logging v1.9.0/go.mod h1:1Io0vnZv4onoUnsVUQY3HZ3Igb1nBchky0A0y7BBBhE=
 cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc=
-cloud.google.com/go/longrunning v0.5.4 h1:w8xEcbZodnA2BbW6sVirkkoC+1gP8wS57EUUgGS0GVg=
-cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI=
+cloud.google.com/go/longrunning v0.5.5 h1:GOE6pZFdSrTb4KAiKnXsJBtlE6mEyaW44oKyMILWnOg=
+cloud.google.com/go/longrunning v0.5.5/go.mod h1:WV2LAxD8/rg5Z1cNW6FJ/ZpX4E4VnDnoTk0yawPBB7s=
 cloud.google.com/go/managedidentities v1.3.0/go.mod h1:UzlW3cBOiPrzucO5qWkNkh0w33KFtBJU281hacNvsdE=
 cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM=
 cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4=
@@ -355,8 +355,8 @@ cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq
 cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc=
 cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s=
 cloud.google.com/go/storage v1.28.0/go.mod h1:qlgZML35PXA3zoEnIkiPLY4/TOkUleufRlu6qmcf7sI=
-cloud.google.com/go/storage v1.36.0 h1:P0mOkAcaJxhCTvAkMhxMfrTKiNcub4YmmPBtlhAyTr8=
-cloud.google.com/go/storage v1.36.0/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8=
+cloud.google.com/go/storage v1.39.1 h1:MvraqHKhogCOTXTlct/9C3K3+Uy2jBmFYb3/Sp6dVtY=
+cloud.google.com/go/storage v1.39.1/go.mod h1:xK6xZmxZmo+fyP7+DEF6FhNc24/JAe95OLyOHCXFH1o=
 cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w=
 cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I=
 cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw=
@@ -404,6 +404,8 @@ contrib.go.opencensus.io/integrations/ocsql v0.1.7/go.mod h1:8DsSdjz3F+APR+0z0Wk
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/4meepo/tagalign v1.3.3 h1:ZsOxcwGD/jP4U/aw7qeWu58i7dwYemfy5Y+IF1ACoNw=
 github.com/4meepo/tagalign v1.3.3/go.mod h1:Q9c1rYMZJc9dPRkbQPpcBNCLEmY2njbAsXhQOZFE2dE=
 github.com/Abirdcfly/dupword v0.0.14 h1:3U4ulkc8EUo+CaT105/GJ1BQwtgyj6+VaBVbAX11Ba8=
@@ -431,18 +433,18 @@ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+Q
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.1/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.4/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.2.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0 h1:fb8kj/Dh4CSwgsOzHeZY4Xh68cFVbzXx+ONXGMY//4w=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0/go.mod h1:uReU2sSxZExRPBAg3qKzmAucSi51+SP1OhohieR821Q=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0 h1:n1DH8TPV4qqPTje2RcUBYwtrTWlabVp4n46+74X2pn4=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0/go.mod h1:HDcZnuGbiyppErN6lB+idp4CKhjbc8gwjto6OPpyggM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.0.0/go.mod h1:+6sju8gk8FRmSajX3Oz4G5Gm7P+mbqE9FVaXXFYTkCM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0/go.mod h1:bhXu1AjYL+wutSL/kpSq6s7733q2Rb0yuot9Zgfqa/0=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0/go.mod h1:NBanQUfSWiWn3QEpWDTCU0IjBECKOYvl2R8xdRtMtiM=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0/go.mod h1:1fXstnBMas5kzG+S3q8UoJcmyU6nUeunJcMDHcRYHhs=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 h1:sO0/P7g68FrryJzljemN+6GTssUXdANk6aJ7T1ZxnsQ=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1/go.mod h1:h8hyGFDsU5HMivxiS2iYFZsgDbU9OnnJ163x5UGVKYo=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.1/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 h1:d81/ng9rET2YqdVkVwkb6EXeRrLJIwyGnJcAlAWKwhs=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 h1:LqbJ/WzJUwBf8UiaSzgX7aMclParm9/5Vgp+TY51uBQ=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2/go.mod h1:yInRyqWXAuaPrgI7p70+lDDgh3mlBohis29jGMISnmc=
 github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.9.0/go.mod h1:EAyXOW1F6BTJPiK2pDvmnvxOHPxoTYWoqBeIlql+QhI=
 github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 h1:m/sWOGCREuSBqg2htVQTBY8nOZpyajYztF0vUvSZTuM=
 github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0/go.mod h1:Pu5Zksi2KrU7LPbZbNINx6fuVrUp/ffvpxdDj+i8LeE=
@@ -450,11 +452,11 @@ github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.0/go.mod h1:9V2j0jn
 github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 h1:FbH3BbSb4bvGluTesZZ+ttN/MDsnMmQP36OSnDuSXqw=
 github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1/go.mod h1:9V2j0jn9jDEkCkv8w/bKTNppX/d0FVA1ud77xCIP4KA=
 github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.1.3/go.mod h1:Eo6WMP/iw9sp06+v8y030eReUwX6sULn5i3fxCDWPag=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.2.0 h1:Ma67P/GGprNwsslzEH6+Kb8nybI8jpDTm4Wmzu2ReK8=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.2.0/go.mod h1:c+Lifp3EDEamAkPVzMooRNOK6CZjNSdEnf1A7jsI9u4=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 h1:AifHbc4mg0x9zW52WOpKbsHaDKuRhlI7TVl47thgQ70=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0/go.mod h1:T5RfihdXtBDxt1Ch2wobif3TvzTdumDy29kahv6AV9A=
 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1/go.mod h1:c6WvOhtmjNUWbLfOG1qxM/q0SPvQNSVJvolm+C52dIU=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0 h1:gggzg0SUMs6SQbEw+3LoSsYf9YMjkupeAnHMX8O9mmY=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0/go.mod h1:+6KLcKIVgxoBDMqMO/Nvy7bZ9a0nbU3I1DtFQK3YvB4=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.1 h1:fXPMAmuh0gDuRDey0atC8cXBuKIlqCzCkL8sm1n9Ov0=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.1/go.mod h1:SUZc9YRRHfx2+FAQKNDGrssXehqLpxmwRv2mC/5ntj4=
 github.com/Azure/go-amqp v0.17.0/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg=
 github.com/Azure/go-amqp v0.17.5/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
@@ -488,8 +490,8 @@ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBp
 github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4=
 github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4=
 github.com/AzureAD/microsoft-authentication-library-for-go v0.7.0/go.mod h1:BDJ5qMFKx9DugEg3+uQSDCdbYPr5s9vBTrL9P8TpqOU=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 h1:hVeq+yCyUi+MsoO/CU95yqCIcdzra5ovzk8Q2BBpV2M=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
@@ -506,8 +508,6 @@ github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
-github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
-github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
@@ -628,75 +628,75 @@ github.com/aws/aws-sdk-go v1.43.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4
 github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/aws/aws-sdk-go v1.44.128/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/aws/aws-sdk-go v1.44.151/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
-github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
-github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
+github.com/aws/aws-sdk-go v1.50.36 h1:PjWXHwZPuTLMR1NIb8nEjLucZBMzmf84TLoLbD8BZqk=
+github.com/aws/aws-sdk-go v1.50.36/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
 github.com/aws/aws-sdk-go-v2 v1.17.1/go.mod h1:JLnGeGONAyi2lWXI1p0PCIOIy333JMVK1U7Hf0aRFLw=
-github.com/aws/aws-sdk-go-v2 v1.24.1 h1:xAojnj+ktS95YZlDf0zxWBkbFtymPeDP+rvUQIH3uAU=
-github.com/aws/aws-sdk-go-v2 v1.24.1/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4=
+github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA=
+github.com/aws/aws-sdk-go-v2 v1.26.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.9/go.mod h1:vCmV1q1VK8eoQJ5+aYE7PkK1K6v41qJ5pJdK3ggCDvg=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 h1:OCs21ST2LrepDfD3lwlQiOqIGp6JiEUqG84GzTDoyJs=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4/go.mod h1:usURWEKSNNAcAZuzRn/9ZYPT8aZQkR7xcCtunK/LkJo=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 h1:x6xsQXGSmW6frevwDA+vi/wqhp1ct18mVXYN08/93to=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2/go.mod h1:lPprDr1e6cJdyYeGXnRaJoP4Md+cDBvi2eOj00BlGmg=
 github.com/aws/aws-sdk-go-v2/config v1.18.3/go.mod h1:BYdrbeCse3ZnOD5+2/VE/nATOK8fEUpBtmPMdKSyhMU=
-github.com/aws/aws-sdk-go-v2/config v1.26.6 h1:Z/7w9bUqlRI0FFQpetVuFYEsjzE3h7fpU6HuGmfPL/o=
-github.com/aws/aws-sdk-go-v2/config v1.26.6/go.mod h1:uKU6cnDmYCvJ+pxO9S4cWDb2yWWIH5hra+32hVh1MI4=
+github.com/aws/aws-sdk-go-v2/config v1.27.11 h1:f47rANd2LQEYHda2ddSCKYId18/8BhSRM4BULGmfgNA=
+github.com/aws/aws-sdk-go-v2/config v1.27.11/go.mod h1:SMsV78RIOYdve1vf36z8LmnszlRWkwMQtomCAI0/mIE=
 github.com/aws/aws-sdk-go-v2/credentials v1.13.3/go.mod h1:/rOMmqYBcFfNbRPU0iN9IgGqD5+V2yp3iWNmIlz0wI4=
-github.com/aws/aws-sdk-go-v2/credentials v1.16.16 h1:8q6Rliyv0aUFAVtzaldUEcS+T5gbadPbWdV1WcAddK8=
-github.com/aws/aws-sdk-go-v2/credentials v1.16.16/go.mod h1:UHVZrdUsv63hPXFo1H7c5fEneoVo9UXiz36QG1GEPi0=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.11 h1:YuIB1dJNf1Re822rriUOTxopaHHvIq0l/pX3fwO+Tzs=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.11/go.mod h1:AQtFPsDH9bI2O+71anW6EKL+NcD7LG3dpKGMV4SShgo=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.19/go.mod h1:VihW95zQpeKQWVPGkwT+2+WJNQV8UXFfMTWdU6VErL8=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 h1:c5I5iH+DZcH3xOIMlz3/tCKJDaHFwYEmxvlh2fAcFo8=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11/go.mod h1:cRrYDYAMUohBJUtUnOhydaMHtiK/1NZ0Otc9lIb6O0Y=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 h1:FVJ0r5XTHSmIHJV6KuDmdYhEpvlHpiSd38RQWhut5J4=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1/go.mod h1:zusuAeqezXzAB24LGuzuekqMAEgWkVYukBec3kr3jUg=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.42/go.mod h1:LHOsygMiW/14CkFxdXxvzKyMh3jbk/QfZVaDtCbLkl8=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15 h1:2MUXyGW6dVaQz6aqycpbdLIH1NMcUI6kW6vQ0RabGYg=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15/go.mod h1:aHbhbR6WEQgHAiRj41EQ2W47yOYwNtIkWTXmcAtYqj8=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.15 h1:7Zwtt/lP3KNRkeZre7soMELMGNoBrutx8nobg1jKWmo=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.15/go.mod h1:436h2adoHb57yd+8W+gYPrrA9U/R/SuAuOO42Ushzhw=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.25/go.mod h1:Zb29PYkf42vVYQY6pvSyJCJcFHlPIiY+YKdPtwnvMkY=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 h1:vF+Zgd9s+H4vOXd5BMaPWykta2a6Ih0AKLq/X6NYKn4=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10/go.mod h1:6BkRjejp/GR4411UGqkX8+wFMbFbqsUIimfK4XjOKR4=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 h1:aw39xVGeRWlWx9EzGVnhOR4yOjQDHPQ6o6NmBlscyQg=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5/go.mod h1:FSaRudD0dXiMPK2UjknVwwTYyZMRsHv3TtkabsZih5I=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.19/go.mod h1:6Q0546uHDp421okhmmGfbxzq2hBqbXFNpi4k+Q1JnQA=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 h1:nYPe006ktcqUji8S2mqXf9c/7NdiKriOwMvWQHgYztw=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10/go.mod h1:6UV4SZkVvmODfXKql4LCbaZUpF7HO2BX38FgBf9ZOLw=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 h1:PG1F3OD1szkuQPzDw3CIQsRIrtTlUC3lP84taWzHlq0=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5/go.mod h1:jU1li6RFryMz+so64PpKtudI+QzbKoIEivqdf6LNpOc=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.3.26/go.mod h1:Y2OJ+P+MC1u1VKnavT+PshiEuGPyh/7DqxoDNij4/bg=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3 h1:n3GDfwqF2tzEkXlv5cuy4iy7LpKDtqDMcNLfZDu9rls=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.16/go.mod h1:XH+3h395e3WVdd6T2Z3mPxuI+x/HVtdqVOREkTiyubs=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10 h1:5oE2WzJE56/mVveuDZPJESKlg/00AaS2pY2QZcnxg4M=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10/go.mod h1:FHbKWQtRBYUz4vO5WBWjzMD2by126ny5y/1EoaWoLfI=
-github.com/aws/aws-sdk-go-v2/service/iam v1.19.0 h1:9vCynoqC+dgxZKrsjvAniyIopsv3RZFsZ6wkQ+yxtj8=
-github.com/aws/aws-sdk-go-v2/service/iam v1.19.0/go.mod h1:OyAuvpFeSVNppcSsp1hFOVQcaTRc1LE24YIR7pMbbAA=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5 h1:81KE7vaZzrl7yHBYHVEzYB8sypz11NMOZ40YlWvPxsU=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5/go.mod h1:LIt2rg7Mcgn09Ygbdh/RdIm0rQ+3BNkbP1gyVMFtRK0=
+github.com/aws/aws-sdk-go-v2/service/iam v1.31.4 h1:eVm30ZIDv//r6Aogat9I88b5YX1xASSLcEDqHYRPVl0=
+github.com/aws/aws-sdk-go-v2/service/iam v1.31.4/go.mod h1:aXWImQV0uTW35LM0A/T4wEg6R1/ReXUu4SM6/lUHYK0=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.10/go.mod h1:9cBNUHI2aW4ho0A5T87O294iPDuuUOSIEDjnd1Lq/z0=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 h1:/b31bi3YVNlkzkBrm9LfpaKoaYZUxIAj4sHfOTmLfqw=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4/go.mod h1:2aGXHFmbInwgP9ZfpmdIfOELL79zhdNYNmReK8qDfdQ=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.20/go.mod h1:Mp4XI/CkWGD79AQxZ5lIFlgvC0A+gl+4BmyG1F+SfNc=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10 h1:L0ai8WICYHozIKK+OtPzVJBugL7culcuM4E4JOpIEm8=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10/go.mod h1:byqfyxJBshFk0fF9YmK0M0ugIO8OWjzH2T3bPG4eGuA=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7 h1:ZMeFZ5yk+Ek+jNr1+uwCd2tG89t6oTS5yVWpa6yy2es=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7/go.mod h1:mxV05U+4JiHqIpGqqYXOHLPKUC6bDXC44bsUhNjOEwY=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.19/go.mod h1:02CP6iuYP+IVnBX5HULVdSAku/85eHB2Y9EsFhrkEwU=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 h1:DBYTXwIGQSGs9w4jKm60F5dmCQ3EEruxdc0MFh+3EY4=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10/go.mod h1:wohMUQiFdzo0NtxbBg0mSRGZ4vL3n0dKjLTINdcIino=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 h1:ogRAwT1/gxJBcSWDMZlgyFUM962F51A5CRhDLbxLdmo=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7/go.mod h1:YCsIZhXfRPLFFCl5xxY+1T9RKzOKjCut+28JSX2DnAk=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.19/go.mod h1:BmQWRVkLTmyNzYPFAZgon53qKLWBNSvonugD1MrSWUs=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 h1:KOxnQeWy5sXyS37fdKEvAsGHOr9fa/qvwxfJurR/BzE=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10/go.mod h1:jMx5INQFYFYB3lQD9W0D8Ohgq6Wnl7NYOJ2TQndbulI=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 h1:f9RyWNtS8oH7cZlbn+/JNPpjUk5+5fLd5lM9M0i49Ys=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5/go.mod h1:h5CoMZV2VF297/VLhRhO1WF+XYWOzXo+4HsObA4HjBQ=
 github.com/aws/aws-sdk-go-v2/service/kms v1.19.0/go.mod h1:kZodDPTQjSH/qM6/OvyTfM5mms5JHB/EKYp5dhn/vI4=
-github.com/aws/aws-sdk-go-v2/service/kms v1.27.5 h1:7lKTr8zJ2nVaVgyII+7hUayTi7xWedMuANiNVXiD2S8=
-github.com/aws/aws-sdk-go-v2/service/kms v1.27.5/go.mod h1:D9FVDkZjkZnnFHymJ3fPVz0zOUlNSd0xcIIVmmrAac8=
+github.com/aws/aws-sdk-go-v2/service/kms v1.30.1 h1:SBn4I0fJXF9FYOVRSVMWuhvEKoAHDikjGpS3wlmw5DE=
+github.com/aws/aws-sdk-go-v2/service/kms v1.30.1/go.mod h1:2snWQJQUKsbN66vAawJuOGX7dr37pfOq9hb0tZDGIqQ=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.29.4/go.mod h1:/NHbqPRiwxSPVOB2Xr+StDEH+GWV/64WwnUjv4KYzV0=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 h1:5XNlsBsEvBZBMO6p82y+sqpWg8j5aBCe+5C2GBFgqBQ=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1/go.mod h1:4qXHrG1Ne3VGIMZPCB8OjH/pLFO94sKABIusjh0KWPU=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 h1:6cnno47Me9bRykw9AEv9zkXE+5or7jz8TsskTTccbgc=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1/go.mod h1:qmdkIIAC+GCLASF7R2whgNrJADz0QZPX+Seiw/i4S3o=
 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.16.8/go.mod h1:k6CPuxyzO247nYEM1baEwHH1kRtosRCvgahAepaaShw=
 github.com/aws/aws-sdk-go-v2/service/sns v1.18.6/go.mod h1:2cPUjR63iE9MPMPJtSyzYmsTFCNrN/Xi9j0v9BL5OU0=
 github.com/aws/aws-sdk-go-v2/service/sqs v1.19.15/go.mod h1:DKX/7/ZiAzHO6p6AhArnGdrV4r+d461weby8KeVtvC4=
 github.com/aws/aws-sdk-go-v2/service/ssm v1.33.1/go.mod h1:rEsqsZrOp9YvSGPOrcL3pR9+i/QJaWRkAYbuxMa7yCU=
 github.com/aws/aws-sdk-go-v2/service/sso v1.11.25/go.mod h1:IARHuzTXmj1C0KS35vboR0FeJ89OkEy1M9mWbK2ifCI=
-github.com/aws/aws-sdk-go-v2/service/sso v1.18.7 h1:eajuO3nykDPdYicLlP3AGgOyVN3MOlFmZv7WGTuJPow=
-github.com/aws/aws-sdk-go-v2/service/sso v1.18.7/go.mod h1:+mJNDdF+qiUlNKNC3fxn74WWNN+sOiGOEImje+3ScPM=
+github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 h1:vN8hEbpRnL7+Hopy9dzmRle1xmDc7o8tmY0klsr175w=
+github.com/aws/aws-sdk-go-v2/service/sso v1.20.5/go.mod h1:qGzynb/msuZIE8I75DVRCUXw3o3ZyBmUvMwQ2t/BrGM=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.8/go.mod h1:er2JHN+kBY6FcMfcBBKNGCT3CarImmdFzishsqBmSRI=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7 h1:QPMJf+Jw8E1l7zqhZmMlFw6w1NmfkfiSK8mS4zOx3BA=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7/go.mod h1:ykf3COxYI0UJmxcfcxcVuz7b6uADi1FkiUz6Eb7AgM8=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 h1:Jux+gDDyi1Lruk+KHF91tK2KCuY61kzoCpvtvJJBtOE=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4/go.mod h1:mUYPBhaF2lGiukDEjJX2BLRRKTmoUSitGDUgM4tRxak=
 github.com/aws/aws-sdk-go-v2/service/sts v1.17.5/go.mod h1:bXcN3koeVYiJcdDU89n3kCYILob7Y34AeLopUbZgLT4=
-github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 h1:NzO4Vrau795RkUdSHKEwiR01FaGzGOH1EETJ+5QHnm0=
-github.com/aws/aws-sdk-go-v2/service/sts v1.26.7/go.mod h1:6h2YuIoxaMSCFf5fi1EgZAwdfkGMgDY+DVfa61uLe4U=
+github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 h1:cwIxeBttqPN3qkaAjcEcsh8NYr8n2HZPkcKgPAi1phU=
+github.com/aws/aws-sdk-go-v2/service/sts v1.28.6/go.mod h1:FZf1/nKNEkHdGGJP/cI2MoIMquumuRK6ol3QQJNDxmw=
 github.com/aws/smithy-go v1.13.4/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
-github.com/aws/smithy-go v1.19.0 h1:KWFKQV80DpP3vJrrA9sVAHQ5gc2z8i4EzrLhLlWXcBM=
-github.com/aws/smithy-go v1.19.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE=
+github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q=
+github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
 github.com/aymanbagabas/go-osc52 v1.0.3/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
@@ -821,8 +821,6 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ=
-github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
@@ -875,8 +873,8 @@ github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTV
 github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c=
 github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s=
 github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE=
-github.com/containerd/containerd v1.7.12 h1:+KQsnv4VnzyxWcfO9mlxxELaoztsDEjOuCMPAuPqgU0=
-github.com/containerd/containerd v1.7.12/go.mod h1:/5OMpE1p0ylxtEUGY8kuCYkDRzJm9NO1TFMWjUpdevk=
+github.com/containerd/containerd v1.7.13 h1:wPYKIeGMN8vaggSKuV1X0wZulpMz4CrgEsZdaCyB6Is=
+github.com/containerd/containerd v1.7.13/go.mod h1:zT3up6yTRfEUa6+GsITYIJNgSVL9NQ4x4h1RPzk0Wu4=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
@@ -885,8 +883,8 @@ github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR
 github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ=
 github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM=
 github.com/containerd/continuity v0.2.2/go.mod h1:pWygW9u7LtS1o4N/Tn0FoCFDIXZ7rxcMX7HX1Dmibvk=
-github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
-github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
+github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8=
+github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
 github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
 github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
 github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=
@@ -914,12 +912,12 @@ github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3
 github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c=
 github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
 github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
-github.com/containerd/nydus-snapshotter v0.13.1 h1:5XNkCZ9ivLXCcyx3Jbbfh/fntkcls69uBg0x9VE8zlk=
-github.com/containerd/nydus-snapshotter v0.13.1/go.mod h1:XWAz9ytsjBuKPVXDKP3xoMlcSKNsGnjXlEup6DuzUIo=
-github.com/containerd/stargz-snapshotter v0.14.3 h1:OTUVZoPSPs8mGgmQUE1dqw3WX/3nrsmsurW7UPLWl1U=
+github.com/containerd/nydus-snapshotter v0.13.7 h1:x7DHvGnzJOu1ZPwPYkeOPk5MjZZYbdddygEjaSDoFTk=
+github.com/containerd/nydus-snapshotter v0.13.7/go.mod h1:VPVKQ3jmHFIcUIV2yiQ1kImZuBFS3GXDohKs9mRABVE=
+github.com/containerd/stargz-snapshotter v0.15.1 h1:fpsP4kf/Z4n2EYnU0WT8ZCE3eiKDwikDhL6VwxIlgeA=
 github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM=
-github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k=
-github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o=
+github.com/containerd/stargz-snapshotter/estargz v0.15.1 h1:eXJjw9RbkLFgioVaTG+G/ZW/0kEe2oEKCdS/ZxIyoCU=
+github.com/containerd/stargz-snapshotter/estargz v0.15.1/go.mod h1:gr2RNwukQ/S9Nv33Lt6UC7xEx58C+LHRdoqbEKjz1Kk=
 github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
 github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
 github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8=
@@ -1019,13 +1017,13 @@ github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyG
 github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/docker/buildx v0.12.0-rc2.0.20240214233841-c9d1c41d206c h1:lnat2Mid6g6TYYeWUeI7mJJRrb9CHTpgifMfPe/v/t4=
-github.com/docker/buildx v0.12.0-rc2.0.20240214233841-c9d1c41d206c/go.mod h1:GFbvBo9B3AWKndc1f43skX/czEg25njn26xnCK05z8A=
+github.com/docker/buildx v0.13.1 h1:uZjBcb477zh02tnHk0rqNV/DZOxbf/OiHw6Mc8OhDYU=
+github.com/docker/buildx v0.13.1/go.mod h1:f2n6vggoX4sNNZ0XoRZ0Wtv6J1/rbDTabgdHtpW9NNM=
 github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/cli v25.0.3+incompatible h1:KLeNs7zws74oFuVhgZQ5ONGZiXUUdgsdy6/EsX/6284=
-github.com/docker/cli v25.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/cli-docs-tool v0.6.0 h1:Z9x10SaZgFaB6jHgz3OWooynhSa40CsWkpe5hEnG/qA=
-github.com/docker/cli-docs-tool v0.6.0/go.mod h1:zMjqTFCU361PRh8apiXzeAZ1Q/xupbIwTusYpzCXS/o=
+github.com/docker/cli v26.0.0-rc1+incompatible h1:PVxv2ySd8iZHoNfoAoKcnWSC/hKP2qMb806PWM34v50=
+github.com/docker/cli v26.0.0-rc1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli-docs-tool v0.7.0 h1:M2Da98Unz2kz3A5d4yeSGbhyOge2mfYSNjAFt01Rw0M=
+github.com/docker/cli-docs-tool v0.7.0/go.mod h1:zMjqTFCU361PRh8apiXzeAZ1Q/xupbIwTusYpzCXS/o=
 github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
@@ -1034,8 +1032,8 @@ github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc
 github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v20.10.14+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v20.10.21+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v25.0.2+incompatible h1:/OaKeauroa10K4Nqavw4zlhcDq/WBcPMc5DbjOGgozY=
-github.com/docker/docker v25.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v26.0.0-rc1+incompatible h1:8Q4f+KSdA4hFc5SXcxthv1vR9HIoRwwjhBnMZL6IpkU=
+github.com/docker/docker v26.0.0-rc1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
 github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8=
 github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40=
@@ -1075,8 +1073,8 @@ github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/El
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
-github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
@@ -1094,8 +1092,6 @@ github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJ
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo=
 github.com/envoyproxy/protoc-gen-validate v0.6.13/go.mod h1:qEySVqXrEugbHKvmhI8ZqtQi75/RHSSRNpffvB4I6Bw=
-github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
-github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
 github.com/erikgeiser/promptkit v0.9.0 h1:3qL1mS/ntCrXdb8sTP/ka82CJ9kEQaGuYXNrYJkWYBc=
 github.com/erikgeiser/promptkit v0.9.0/go.mod h1:pU9dtogSe3Jlc2AY77EP7R4WFP/vgD4v+iImC83KsCo=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
@@ -1190,8 +1186,9 @@ github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV
 github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
 github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
@@ -1204,15 +1201,16 @@ github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpX
 github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
+github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
 github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
 github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
 github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
 github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
-github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
-github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
+github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
+github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
 github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g=
 github.com/go-openapi/runtime v0.23.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk=
 github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
@@ -1227,8 +1225,9 @@ github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-openapi/swag v0.21.1 h1:wm0rhTb5z7qpJRHBdPOMuY4QjVUMbF6/kwoYeRAOrKU=
 github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
+github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
 github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
@@ -1239,8 +1238,8 @@ github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48/go.mod h1:dZGr
 github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
-github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/go-sql-driver/mysql v1.8.0 h1:UtktXaU2Nb64z/pLiGIxY4431SJ4/dR5cjMmlVHgnT4=
+github.com/go-sql-driver/mysql v1.8.0/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
@@ -1336,8 +1335,8 @@ github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzw
 github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang-jwt/jwt/v5 v5.1.0 h1:UGKbA/IPjtS6zLcdB7i5TyACMgSbOTiR8qzXgw8HWQU=
-github.com/golang-jwt/jwt/v5 v5.1.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
+github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -1378,8 +1377,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -1404,8 +1403,9 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ
 github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
 github.com/google/certificate-transparency-go v1.0.10-0.20180222191210-5ab67e519c93 h1:jc2UWq7CbdszqeH6qu1ougXMIUBfSy8Pbh/anURYbGI=
 github.com/google/certificate-transparency-go v1.0.10-0.20180222191210-5ab67e519c93/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
-github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
 github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
+github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
+github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -1471,6 +1471,7 @@ github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
+github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -1478,8 +1479,9 @@ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8=
 github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU=
+github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI=
+github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA=
 github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
 github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
@@ -1495,8 +1497,8 @@ github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK
 github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo=
 github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY=
 github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
-github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
-github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
+github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA=
+github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc=
 github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
 github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
 github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
@@ -1521,6 +1523,7 @@ github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gostaticanalysis/analysisutil v0.7.1 h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk=
 github.com/gostaticanalysis/analysisutil v0.7.1/go.mod h1:v21E3hY37WKMGSnbsw2S/ojApNWb6C1//mXO48CXbVc=
@@ -1604,8 +1607,8 @@ github.com/hashicorp/go-plugin v1.6.0/go.mod h1:lBS5MtSSBZk0SHc66KACcjjlU6WzEVP/
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
-github.com/hashicorp/go-retryablehttp v0.7.2 h1:AcYqCvkpalPnPF2pn0KamgwamS42TqUDDYFRKq/RAd0=
-github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
+github.com/hashicorp/go-retryablehttp v0.7.5 h1:bJj+Pj19UZMIweq/iie+1u5YCdGrnxCT9yvm0e+Nd5M=
+github.com/hashicorp/go-retryablehttp v0.7.5/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
@@ -1985,8 +1988,10 @@ github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQ
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/moby/buildkit v0.13.0-beta3.0.20240205165705-d6e142600ee5 h1:FJknzwgQMF0PviKWgRpJ3GtGbAkPNw5/PQtqqXnqvVM=
-github.com/moby/buildkit v0.13.0-beta3.0.20240205165705-d6e142600ee5/go.mod h1:wWi92eSRd6lwFOiMcq6L2EJTuP7TvPTRl5KF3jmDiYc=
+github.com/moby/buildkit v0.13.0 h1:reVR1Y+rbNIUQ9jf0Q1YZVH5a/nhOixZsl+HJ9qQEGI=
+github.com/moby/buildkit v0.13.0/go.mod h1:aNmNQKLBFYAOFuzQjR3VA27/FijlvtBD1pjNwTSN37k=
+github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
+github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
 github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
 github.com/moby/moby v25.0.4+incompatible h1:vea1J80wDM5x5geaZSaywFkfFxLABJIQ3mmR4ewZGbU=
@@ -2043,6 +2048,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81U=
 github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE=
@@ -2203,8 +2209,9 @@ github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi
 github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
 github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
 github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ=
-github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -2242,8 +2249,8 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
 github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
 github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
-github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
-github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
+github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
+github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
 github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
@@ -2252,8 +2259,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
-github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
-github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
+github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
+github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
 github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
@@ -2269,8 +2276,8 @@ github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+
 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 github.com/prometheus/common v0.34.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE=
 github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
-github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
-github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
+github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
+github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
 github.com/prometheus/common/assets v0.1.0/go.mod h1:D17UVUE12bHbim7HzwUvtqm6gwBEaDQ0F+hIGbFbccI=
 github.com/prometheus/common/assets v0.2.0/go.mod h1:D17UVUE12bHbim7HzwUvtqm6gwBEaDQ0F+hIGbFbccI=
 github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI=
@@ -2290,8 +2297,8 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
-github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
-github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
+github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/prometheus/prometheus v0.35.0/go.mod h1:7HaLx5kEPKJ0GDgbODG0fZgXbQ8K/XjZNJXQmbmgQlY=
 github.com/prometheus/prometheus v0.40.5/go.mod h1:bxgdmtoSNLmmIVPGmeTJ3OiP67VmuY4yalE4ZP6L/j8=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
@@ -2299,18 +2306,20 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435
 github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE=
 github.com/pulumi/esc v0.6.2 h1:+z+l8cuwIauLSwXQS0uoI3rqB+YG4SzsZYtHfNoXBvw=
 github.com/pulumi/esc v0.6.2/go.mod h1:jNnYNjzsOgVTjCp0LL24NsCk8ZJxq4IoLQdCT0X7l8k=
-github.com/pulumi/pulumi-go-provider v0.14.1-0.20240314105842-9fbffb634faf h1:ASPpJovJ/v4QJIokHuLcYmr+NR44Iuiq0O+rW17c7WQ=
-github.com/pulumi/pulumi-go-provider v0.14.1-0.20240314105842-9fbffb634faf/go.mod h1:q3gz5HmArwNALbFihAt1vpg/1xpZlAKjB6A6uMsTgfw=
+github.com/pulumi/pulumi-go-provider v0.16.0 h1:vLAiECprIoLdTPd0UFs9Vv/HgSw7l/SBAurRBm3vpSU=
+github.com/pulumi/pulumi-go-provider v0.16.0/go.mod h1:2yjjeyMSmsb/o/BRJeWk+kcXrJWF5U2EulJKnN7qVLs=
 github.com/pulumi/pulumi-go-provider/integration v0.10.1-0.20240314105842-9fbffb634faf h1:7fDWArOUFH+qQ9EywoC4K2ElXP76Ks/CtVJkEBmv2pk=
 github.com/pulumi/pulumi-go-provider/integration v0.10.1-0.20240314105842-9fbffb634faf/go.mod h1:sf87soow+4JkV361vHI0W04hpJmWiWajzJytFMNonCE=
-github.com/pulumi/pulumi-java/pkg v0.9.9 h1:F3xJUtMFDVrTGCxb7Rh2Q8s6tj7gMfM5pcoUthz7vFY=
-github.com/pulumi/pulumi-java/pkg v0.9.9/go.mod h1:LVF1zeg3UkToHWxb67V+zEIxQc3EdMnlot5NWSt+FpA=
+github.com/pulumi/pulumi-java/pkg v0.10.0 h1:D1i5MiiNrxYr2uJ1szcj1aQwF9DYv7TTsPmajB9dKSw=
+github.com/pulumi/pulumi-java/pkg v0.10.0/go.mod h1:xu6UgYtQm+xXOo1/DZNa2CWVPytu+RMkZVTtI7w7ffY=
 github.com/pulumi/pulumi-yaml v1.6.0 h1:mb/QkebWXTa1fR+P3ZkCCHGXOYC6iTN8X8By9eNz8xM=
 github.com/pulumi/pulumi-yaml v1.6.0/go.mod h1:RyEPo4MhL363sbAiFMVKRsQmXpQPDCY1S8pGv3E6Ij0=
-github.com/pulumi/pulumi/pkg/v3 v3.111.2-0.20240324200353-583e06df0c70 h1:5VKzgiaXUycebEQ3uomBui8vtEekKpR4xQ4JAttOMRE=
-github.com/pulumi/pulumi/pkg/v3 v3.111.2-0.20240324200353-583e06df0c70/go.mod h1:rqY+lgFmvNcgaTFY3ek0iffqZMVG2I13Z1sLlq53z2M=
-github.com/pulumi/pulumi/sdk/v3 v3.111.2-0.20240324200353-583e06df0c70 h1:ghmycvyB0Pp1SUgGr49YyLQIaJQhyWicpBDs6mxuqn8=
-github.com/pulumi/pulumi/sdk/v3 v3.111.2-0.20240324200353-583e06df0c70/go.mod h1:BZqRjE2GtMYyjB8eNUomPWld+8RaqXKAuYXFqE13JMY=
+github.com/pulumi/pulumi/pkg/v3 v3.113.0 h1:fo63QR2nB5ksqq0fxg5uPm/zbXW7eJVRdYpAawIda7I=
+github.com/pulumi/pulumi/pkg/v3 v3.113.0/go.mod h1:i5hGDlTN59giiXHfrigWEo30x51FPUj8GllAlVkUcQA=
+github.com/pulumi/pulumi/sdk/go/pulumi-language-go/v3 v3.0.0-20240415162817-44c8de53d5d2 h1:HVBduxIfM/MFBdkOrxUD3oJjz22MPE+8ZbeGGz8sJsA=
+github.com/pulumi/pulumi/sdk/go/pulumi-language-go/v3 v3.0.0-20240415162817-44c8de53d5d2/go.mod h1:tVLWi2SXi6Cr1u/vzFqWOV+Kzb3MrXJUoSMoqg+pr0g=
+github.com/pulumi/pulumi/sdk/v3 v3.113.0 h1:CIlmxJZdjxpPPoFe/rrP1dWTwh3CB7ahs/dA6SHcbuE=
+github.com/pulumi/pulumi/sdk/v3 v3.113.0/go.mod h1:JWSzKBoHd8rlncC1DhXLf7YdV+Bk/Qf+hSZOOQh0WwQ=
 github.com/quasilyte/go-ruleguard v0.4.2 h1:htXcXDK6/rO12kiTHKfHuqR4kr3Y4M0J0rOL6CH/BYs=
 github.com/quasilyte/go-ruleguard v0.4.2/go.mod h1:GJLgqsLeo4qgavUoL8JeGFNS7qcisx3awV/w9eWTmNI=
 github.com/quasilyte/gogrep v0.5.0 h1:eTKODPXbI8ffJMN+W2aE0+oL0z/nh8/5eNdiO34SOAo=
@@ -2380,8 +2389,8 @@ github.com/segmentio/encoding v0.3.5 h1:UZEiaZ55nlXGDL92scoVuw00RmiRCazIEmvPSbSv
 github.com/segmentio/encoding v0.3.5/go.mod h1:n0JeuIqEQrQoPDGsjo8UNd1iA0U8d8+oHAA4E3G3OxM=
 github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
-github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 h1:ka9QPuQg2u4LGipiZGsgkg3rJCo4iIUCy75FddM0GRQ=
-github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002/go.mod h1:/yeG0My1xr/u+HZrFQ1tOQQQQrOawfyMUH13ai5brBc=
+github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b h1:h+3JX2VoWTFuyQEo87pStk/a99dzIO1mM9KxIyLPGTU=
+github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b/go.mod h1:/yeG0My1xr/u+HZrFQ1tOQQQQrOawfyMUH13ai5brBc=
 github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU=
 github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs=
 github.com/shibumi/go-pathspec v1.3.0 h1:QUyMZhFo0Md5B8zV8x2tesohbb5kfbpTi9rBnKh5dkI=
@@ -2432,8 +2441,8 @@ github.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67/go.mod h1
 github.com/sourcegraph/go-diff v0.7.0 h1:9uLlrd5T46OXs5qpp8L/MTltk0zikUGi0sNNyCpA8G0=
 github.com/sourcegraph/go-diff v0.7.0/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spdx/tools-golang v0.5.1 h1:fJg3SVOGG+eIva9ZUBm/hvyA7PIPVFjRxUKe6fdAgwE=
-github.com/spdx/tools-golang v0.5.1/go.mod h1:/DRDQuBfB37HctM29YtrX1v+bXiVmT2OpQDalRmX9aU=
+github.com/spdx/tools-golang v0.5.3 h1:ialnHeEYUC4+hkm5vJm4qz2x+oEJbS0mAMFrNXdQraY=
+github.com/spdx/tools-golang v0.5.3/go.mod h1:/ETOahiAo96Ob0/RAIBmFZw6XN0yTnyr/uFZm2NTMhI=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
@@ -2670,22 +2679,22 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE=
-go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.45.0 h1:2ea0IkZBsWH+HA2GkD+7+hRw2u97jzdFyRtXuO14a1s=
-go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.45.0/go.mod h1:4m3RnBBb+7dB9d21y510oO1pdB1V4J6smNf14WXcBFQ=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0=
+go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1 h1:gbhw/u49SS3gkPWiYweQNJGm/uJN5GkI/FrosxSHT7A=
+go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1/go.mod h1:GnOaBaFQ2we3b9AGWJpsBa7v1S5RlQzlC3O7dRMxZhM=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0/go.mod h1:PFmBsWbldL1kiWZk9+0LBZz2brhByaGsvp6pRICMlPE=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
 go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo=
 go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs=
 go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ=
 go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwkAtrWQ=
 go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE=
-go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
-go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
+go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
+go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
 go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM=
 go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4=
 go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.1/go.mod h1:NEu79Xo32iVb+0gVNV8PMd7GoWqnyDXRlj04yFjqz40=
@@ -2699,43 +2708,43 @@ go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0/go.mod
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.6.1/go.mod h1:YJ/JbY5ag/tSQFXzH3mtDmHqzF3aFn3DI/aB1n7pt4w=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.1/go.mod h1:19O5I2U5iys38SsmT2uDJja/300woyzE1KPIQxEUBUc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 h1:cl5P5/GIfFh4t6xyruOgJP5QiA1pw4fYYdv6nc6CBWw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0/go.mod h1:zgBdWWAu7oEEMC06MMKc5NLbA/1YDXV1sMpSqEeLQLg=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1:keUU7UfnwWTWpJ+FWnyqmogPa82nuU5VUANFq49hlMY=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.1/go.mod h1:UJJXJj0rltNIemDMwkOJyggsvyMG9QHfJeFH0HS5JjM=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.1/go.mod h1:QrRRQiY3kzAoYPNLP0W/Ikg0gR6V3LMc+ODSxr7yyvg=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 h1:3d+S281UTjM+AbF31XSOYn1qXn3BgIdWl8HNEpx08Jk=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0/go.mod h1:0+KuTDyKL4gjKCF75pHOX4wuzYDUZYfAQdSu43o+Z2I=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqheXEFWAZ7O8A7m+J0aPTmpJN3YQ7qetUAdkkkKpk=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.6.1/go.mod h1:DAKwdo06hFLc0U88O10x4xnb5sc7dDRDqRuiN+io8JE=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.11.1/go.mod h1:X620Jww3RajCJXw/unA+8IRTgxkdS7pi+ZwK9b7KUJk=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 h1:digkEZCJWobwBqMwC0cwCq8/wkkRy/OowZg5OArWZrM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0/go.mod h1:/OpE/y70qVkndM0TrxT4KBoN3RsFZP0QaofcfYrj76I=
 go.opentelemetry.io/otel/exporters/prometheus v0.42.0 h1:jwV9iQdvp38fxXi8ZC+lNpxjK16MRcZlpDYvbuO1FiA=
 go.opentelemetry.io/otel/exporters/prometheus v0.42.0/go.mod h1:f3bYiqNqhoPxkvI2LrXqQVC546K7BuRDL/kKuxkujhA=
 go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU=
 go.opentelemetry.io/otel/metric v0.28.0/go.mod h1:TrzsfQAmQaB1PDcdhBauLMk7nyyg9hm+GoQq/ekE9Iw=
 go.opentelemetry.io/otel/metric v0.33.0/go.mod h1:QlTYc+EnYNq/M2mNk1qDDMRLpqCOj2f/r5c7Fd5FYaI=
-go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
-go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
+go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
+go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
 go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw=
 go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc=
 go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs=
 go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E=
 go.opentelemetry.io/otel/sdk v1.11.1/go.mod h1:/l3FE4SupHJ12TduVjUkZtlfFqDCQJlOlithYrdktys=
-go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
-go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
+go.opentelemetry.io/otel/sdk v1.22.0 h1:6coWHw9xw7EfClIC/+O31R8IY3/+EiRFHevmHafB2Gw=
+go.opentelemetry.io/otel/sdk v1.22.0/go.mod h1:iu7luyVGYovrRpe2fmj3CVKouQNdTOkxtLzPvPz1DOc=
 go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE=
 go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE=
-go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k=
-go.opentelemetry.io/otel/sdk/metric v1.19.0/go.mod h1:XjG0jQyFJrv2PbMvwND7LwCEhsJzCzV5210euduKcKY=
+go.opentelemetry.io/otel/sdk/metric v1.21.0 h1:smhI5oD714d6jHE6Tie36fPx4WDFIg+Y6RfAY4ICcR0=
+go.opentelemetry.io/otel/sdk/metric v1.21.0/go.mod h1:FJ8RAsoPGv/wYMgBdUJXOm+6pzFY3YdljnXtv1SBE8Q=
 go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw=
 go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk=
 go.opentelemetry.io/otel/trace v1.6.0/go.mod h1:qs7BrU5cZ8dXQHBGxHMOxwME/27YH2qEp4/+tZLLwJE=
 go.opentelemetry.io/otel/trace v1.6.1/go.mod h1:RkFRM1m0puWIq10oxImnGEduNBzxiN7TXluRBtE+5j0=
 go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk=
-go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
-go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
+go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
+go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ=
 go.opentelemetry.io/proto/otlp v0.12.1/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
@@ -2760,8 +2769,8 @@ go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
-go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
-go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo=
 go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
@@ -2778,11 +2787,11 @@ go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
 go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
-go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
-go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 gocloud.dev v0.28.0/go.mod h1:nzSs01FpRYyIb/OqXLNNa+NMPZG9CdTUY/pGLgSpIN0=
-gocloud.dev v0.36.0 h1:q5zoXux4xkOZP473e1EZbG8Gq9f0vlg1VNH5Du/ybus=
-gocloud.dev v0.36.0/go.mod h1:bLxah6JQVKBaIxzsr5BQLYB4IYdWHkMZdzCXlo6F0gg=
+gocloud.dev v0.37.0 h1:XF1rN6R0qZI/9DYjN16Uy0durAmSlf58DHOcb28GPro=
+gocloud.dev v0.37.0/go.mod h1:7/O4kqdInCNsc6LqgmuFnS0GRew4XNNYWpA44yQnwco=
 gocloud.dev/secrets/hashivault v0.28.0 h1:Aaeuv1DnwZ2rTSb1h5mkdmPLUMrIcBLpOjVlOPGLmNI=
 gocloud.dev/secrets/hashivault v0.28.0/go.mod h1:HOcM3K+i2KXpfCTg49ctroScJvS1LaZCcpwMmKUZxyw=
 golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -2827,6 +2836,8 @@ golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
 golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -2878,6 +2889,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
 golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
 golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -2969,6 +2982,9 @@ golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
 golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -3000,8 +3016,8 @@ golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri
 golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A=
 golang.org/x/oauth2 v0.2.0/go.mod h1:Cwn6afJ8jrQwYMxQDTpISoXmXW9I6qF6vDeuuoX3Ibs=
-golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ=
-golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o=
+golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=
+golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -3018,6 +3034,7 @@ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -3181,6 +3198,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
@@ -3195,6 +3214,9 @@ golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
 golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
 golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
 golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -3212,6 +3234,8 @@ golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -3326,6 +3350,8 @@ golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
 golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
 golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
 golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
 golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -3395,8 +3421,8 @@ google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91
 google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/api v0.102.0/go.mod h1:3VFl6/fzoA+qNuS1N1/VfXY4LjoXN/wzeIp7TweWwGo=
 google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0=
-google.golang.org/api v0.155.0 h1:vBmGhCYs0djJttDNynWo44zosHlPvHmA0XiN2zP2DtA=
-google.golang.org/api v0.155.0/go.mod h1:GI5qK5f40kCpHfPn6+YzGAByIKWv8ujFnmoWm7Igduk=
+google.golang.org/api v0.169.0 h1:QwWPy71FgMWqJN/l6jVlFHUa29a7dcUy02I8o799nPY=
+google.golang.org/api v0.169.0/go.mod h1:gpNOiMA2tZ4mf5R9Iwf4rK/Dcz0fbdIgWYWVoxmsyLg=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -3532,12 +3558,12 @@ google.golang.org/genproto v0.0.0-20221109142239-94d6d90a7d66/go.mod h1:rZS5c/ZV
 google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
 google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
 google.golang.org/genproto v0.0.0-20221201204527-e3fa12d562f3/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ=
-google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro=
-google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU=
-google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
+google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7 h1:ImUcDPHjTrAqNhlOkSocDLfG9rrNHH7w7uoKWPaWZ8s=
+google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7/go.mod h1:/3XmxOjePkvmKrHuBy4zNFw7IzxJXtAgdpXi8Ll990U=
+google.golang.org/genproto/googleapis/api v0.0.0-20240311173647-c811ad7063a7 h1:oqta3O3AnlWbmIE3bFnWbu4bRxZjfbWCp0cKSuZh01E=
+google.golang.org/genproto/googleapis/api v0.0.0-20240311173647-c811ad7063a7/go.mod h1:VQW3tUculP/D4B+xVCo+VgSq8As6wA9ZjHl//pmk+6s=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 h1:8EeVk1VKMD+GD/neyEHGmz7pFblqPjHoi+PGQIlLx2s=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
 google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.0.5/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
@@ -3586,8 +3612,8 @@ google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD
 google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
 google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
 google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
-google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk=
-google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
+google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
+google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -3681,8 +3707,8 @@ k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8=
 k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs=
 k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8=
 k8s.io/api v0.25.3/go.mod h1:o42gKscFrEVjHdQnyRenACrMtbuJsVdP+WVjqejfzmI=
-k8s.io/api v0.26.7 h1:Lf4iEBEJb5OFNmawtBfSZV/UNi9riSJ0t1qdhyZqI40=
-k8s.io/api v0.26.7/go.mod h1:Vk9bMadzA49UHPmHB//lX7VRCQSXGoVwfLd3Sc1SSXI=
+k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A=
+k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0=
 k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
 k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
 k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc=
@@ -3690,22 +3716,22 @@ k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ
 k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U=
 k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
 k8s.io/apimachinery v0.25.3/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo=
-k8s.io/apimachinery v0.26.7 h1:590jSBwaSHCAFCqltaEogY/zybFlhGsnLteLpuF2wig=
-k8s.io/apimachinery v0.26.7/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0=
+k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8=
+k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
 k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU=
 k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM=
 k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q=
 k8s.io/apiserver v0.22.5/go.mod h1:s2WbtgZAkTKt679sYtSudEQrTGWUSQAPe6MupLnlmaQ=
-k8s.io/apiserver v0.26.7 h1:NX/zBZZn4R+Cq6shwyn8Pn8REd0yJJ16dbtv9WkEVEU=
-k8s.io/apiserver v0.26.7/go.mod h1:r0wDRWHI7VL/KlQLTkJJBVGZ3KeNfv+VetlyRtr86xs=
+k8s.io/apiserver v0.29.2 h1:+Z9S0dSNr+CjnVXQePG8TcBWHr3Q7BmAr7NraHvsMiQ=
+k8s.io/apiserver v0.29.2/go.mod h1:B0LieKVoyU7ykQvPFm7XSdIHaCHSzCzQWPFa5bqbeMQ=
 k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y=
 k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k=
 k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0=
 k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y=
 k8s.io/client-go v0.23.5/go.mod h1:flkeinTO1CirYgzMPRWxUCnV0G4Fbu2vLhYCObnt/r4=
 k8s.io/client-go v0.25.3/go.mod h1:t39LPczAIMwycjcXkVc+CB+PZV69jQuNx4um5ORDjQA=
-k8s.io/client-go v0.26.7 h1:hyU9aKHlwVOykgyxzGYkrDSLCc4+mimZVyUJjPyUn1E=
-k8s.io/client-go v0.26.7/go.mod h1:okYjy0jtq6sdeztALDvCh24tg4opOQS1XNvsJlERDAo=
+k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg=
+k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA=
 k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0=
 k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk=
 k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI=
@@ -3729,16 +3755,16 @@ k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/klog/v2 v2.80.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
-k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
+k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
 k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
 k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU=
-k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
-k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
+k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
+k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
 k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
@@ -3746,8 +3772,8 @@ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
 k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 h1:kmDqav+P+/5e1i9tFfHq1qcF3sOrDp+YEkVDAHu7Jwk=
-k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 lukechampine.com/frand v1.4.2 h1:RzFIpOvkMXuPMBb9maa4ND4wjBn71E1Jpf8BzJHMaVw=
 lukechampine.com/frand v1.4.2/go.mod h1:4S/TM2ZgrKejMcKMbeLjISpJMO+/eZ1zu3vYX9dtj3s=
 mvdan.cc/gofumpt v0.6.0 h1:G3QvahNDmpD+Aek/bNOLrFR2XC6ZAdo62dZu65gmwGo=
@@ -3766,15 +3792,17 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyz
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
-sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
 sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=

provider/cmd/pulumi-resource-docker-build/main.go

@@ -16,9 +16,8 @@
 package main
 
 import (
+	"github.com/pulumi/pulumi-docker-build/provider"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
-
-	"github.com/pulumi/pulumi-dockerbuild/provider"
 )
 
 func main() {

provider/internal/cache.go

@@ -342,22 +342,23 @@ func (c *CacheFromS3) String() string {
 
 // CacheWithMode is a cache that can configure its mode.
 type CacheWithMode struct {
-	Mode CacheMode `pulumi:"mode,optional"`
+	Mode *CacheMode `pulumi:"mode,optional"`
 }
 
 // Annotate sets docstrings and defaults on CacheWithMode.
 func (c *CacheWithMode) Annotate(a infer.Annotator) {
-	a.SetDefault(&c.Mode, Min)
+	m := Min
+	a.SetDefault(&c.Mode, &m)
 	a.Describe(&c.Mode, dedent(`
 		The cache mode to use. Defaults to "min".
 	`))
 }
 
 func (c CacheWithMode) String() string {
-	if c.Mode == "" {
+	if c.Mode == nil {
 		return ""
 	}
-	return fmt.Sprintf("mode=%s", c.Mode)
+	return fmt.Sprintf("mode=%s", *c.Mode)
 }
 
 // CacheWithIgnoreError exposes an option to ignore errors during caching.
@@ -552,14 +553,15 @@ func (c *CacheToRegistry) String() string {
 // CacheWithCompression is a cache with options to configure compression
 // settings.
 type CacheWithCompression struct {
-	Compression      CompressionType `pulumi:"compression,optional"`
-	CompressionLevel int             `pulumi:"compressionLevel,optional"`
-	ForceCompression *bool           `pulumi:"forceCompression,optional"`
+	Compression      *CompressionType `pulumi:"compression,optional"`
+	CompressionLevel int              `pulumi:"compressionLevel,optional"`
+	ForceCompression *bool            `pulumi:"forceCompression,optional"`
 }
 
 // Annotate sets docstrings and defaults on CacheWithCompression.
 func (c *CacheWithCompression) Annotate(a infer.Annotator) {
-	a.SetDefault(&c.Compression, Gzip)
+	gz := Gzip
+	a.SetDefault(&c.Compression, &gz)
 	a.SetDefault(&c.CompressionLevel, 0)
 	a.SetDefault(&c.ForceCompression, false)
 
@@ -575,8 +577,8 @@ func (c CacheWithCompression) String() string {
 		return ""
 	}
 	parts := []string{}
-	if c.Compression != "" {
-		parts = append(parts, fmt.Sprintf("compression=%s", c.Compression))
+	if c.Compression != nil {
+		parts = append(parts, fmt.Sprintf("compression=%s", *c.Compression))
 	}
 	if c.CompressionLevel > 0 {
 		cl := c.CompressionLevel

provider/internal/cache_test.go

@@ -26,6 +26,7 @@ import (
 
 func TestCacheString(t *testing.T) {
 	t.Parallel()
+	gzip := Gzip
 
 	tests := []struct {
 		name  string
@@ -81,12 +82,12 @@ func TestCacheString(t *testing.T) {
 			given: CacheTo{Local: &CacheToLocal{
 				Dest: "/foo",
 				CacheWithCompression: CacheWithCompression{
-					Compression:      "gz2",
+					Compression:      &gzip,
 					CompressionLevel: 100,
 					ForceCompression: pulumi.BoolRef(true),
 				},
 			}},
-			want: "type=local,dest=/foo,compression=gz2,compression-level=22,force-compression=true",
+			want: "type=local,dest=/foo,compression=gzip,compression-level=22,force-compression=true",
 		},
 		{
 			name: "ignore-error",

provider/internal/cli.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:generate go run go.uber.org/mock/mockgen -typed -package internal -source client.go -destination mockcli_test.go --self_package github.com/pulumi/pulumi-dockerbuild/provider/internal
+//go:generate go run go.uber.org/mock/mockgen -typed -package internal -source cli.go -destination mockcli_test.go --self_package github.com/pulumi/pulumi-docker-build/provider/internal
 
 package internal
 
@@ -30,12 +30,14 @@ import (
 	"github.com/docker/buildx/commands"
 	"github.com/docker/cli/cli-plugins/manager"
 	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/config/credentials"
 	cfgtypes "github.com/docker/cli/cli/config/types"
 	"github.com/docker/cli/cli/streams"
 	"github.com/moby/buildkit/client"
 	cp "github.com/otiai10/copy"
 	"github.com/regclient/regclient"
 	"github.com/regclient/regclient/config"
+	"github.com/sirupsen/logrus"
 
 	provider "github.com/pulumi/pulumi-go-provider"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/diag"
@@ -54,10 +56,11 @@ type cli struct {
 	auths map[string]cfgtypes.AuthConfig
 	host  *host
 
-	in   string        // stdin
-	r, w *os.File      // stdout
-	err  bytes.Buffer  // stderr
-	done chan struct{} // signaled when all logs have been forwarded to the engine.
+	in       string        // stdin
+	r, w     *os.File      // stdout
+	err      bytes.Buffer  // stderr
+	dumplogs bool          // if true then tail() will re-log status messages
+	done     chan struct{} // signaled when all logs have been forwarded to the engine.
 }
 
 // Cli wraps the Docker interface for mock generation.
@@ -66,7 +69,8 @@ type Cli interface {
 }
 
 // wrap creates a new cli client with auth configs layered on top of our host's
-// auth.
+// auth. Repeated auth for the same host will take precedence over earlier
+// credentials.
 func wrap(host *host, registries ...Registry) (*cli, error) {
 	// We need to create a new DockerCLI instance because we don't want the
 	// auth changes we make to the ConfigFile to leak to the host.
@@ -77,13 +81,25 @@ func wrap(host *host, registries ...Registry) (*cli, error) {
 
 	auths := map[string]cfgtypes.AuthConfig{}
 	for k, v := range host.auths {
-		auths[k] = v
+		if k != config.DockerRegistryAuth {
+			k = credentials.ConvertToHostname(k)
+		}
+		auths[k] = cfgtypes.AuthConfig{
+			ServerAddress: v.ServerAddress,
+			Username:      v.Username,
+			Password:      v.Password,
+		}
 	}
 
 	for _, r := range registries {
 		// HostNewName takes care of DockerHub's special-casing for us.
-		h := config.HostNewName(r.Address)
-		auths[h.CredHost] = cfgtypes.AuthConfig{
+		h := config.HostNewName(credentials.ConvertToHostname(r.Address))
+		key := h.CredHost
+		if key == "" {
+			key = h.Hostname
+		}
+
+		auths[key] = cfgtypes.AuthConfig{
 			ServerAddress: h.Hostname,
 			Username:      r.Username,
 			Password:      r.Password,
@@ -150,17 +166,30 @@ func (c *cli) tail(ctx provider.Context) {
 		}
 	}()
 
+	b := bytes.Buffer{}
+
 	s := bufio.NewScanner(c.r)
 	for s.Scan() {
-		ctx.LogStatus(diag.Info, s.Text())
+		text := s.Text()
+		ctx.LogStatus(diag.Info, text)
+		_, _ = b.WriteString(text + "\n")
 	}
 	ctx.LogStatus(diag.Info, "") // clear confusing "DONE" statements.
+
+	if c.dumplogs {
+		// Persist the full Docker output on error for easier debugging.
+		if b.Len() > 0 {
+			ctx.Log(diag.Info, b.String())
+		}
+		if c.err.Len() > 0 {
+			ctx.Log(diag.Error, c.err.String())
+		}
+	}
 }
 
 // close flushes any outstanding logs and cleans up resources.
 func (c *cli) Close() error {
-	err := c.w.Close()
-	err = errors.Join(err, c.r.Close())
+	err := errors.Join(c.w.Close(), c.r.Close())
 	if c.done != nil {
 		<-c.done
 	}
@@ -367,7 +396,7 @@ func (c *cli) exec(args, extraEnv []string) error {
 		return err
 	}
 	cmd.Args = append([]string{cmd.Args[0]}, args...)
-	cmd.Stderr = c.Err() // TODO: This is build output...
+	cmd.Stderr = c.Err()
 	cmd.Stdout = c.Out()
 	cmd.Stdin = c.In()
 
@@ -384,3 +413,8 @@ func attrcsv(typ string, m map[string]string) string {
 	}
 	return strings.Join(s, ",")
 }
+
+func init() {
+	// Disable the CLI's tendency to log randomly to stdout.
+	logrus.SetOutput(io.Discard)
+}

provider/internal/cli_test.go

@@ -18,6 +18,8 @@ import (
 	"io"
 	"testing"
 
+	"github.com/docker/cli/cli/config/types"
+	"github.com/regclient/regclient/config"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -37,3 +39,70 @@ func TestExec(t *testing.T) {
 	require.NoError(t, err)
 	assert.Contains(t, string(out), "github.com/docker/buildx")
 }
+
+func TestWrappedAuth(t *testing.T) {
+	t.Parallel()
+	ecr := "https://1234.dkr.ecr.us-west-2.amazonaws.com"
+
+	realhost, err := newHost(nil)
+	require.NoError(t, err)
+
+	h := &host{
+		auths: map[string]types.AuthConfig{
+			ecr: {
+				Username:      "host-aws-user",
+				Password:      "host-aws-password",
+				ServerAddress: ecr,
+			},
+			"https://misc": { // Legacy config includes http/https scheme.
+				Username:      "host-misc-user",
+				Password:      "host-misc-password",
+				ServerAddress: "misc",
+			},
+		},
+	}
+
+	registries := []Registry{
+		{
+			Address:  "1234.dkr.ecr.us-west-2.amazonaws.com",
+			Username: "resource-aws-user",
+			Password: "resource-aws-password",
+		},
+		{
+			Address:  "docker.io",
+			Username: "resource-dockerhub-user",
+			Password: "resource-dockerhub-password",
+		},
+	}
+
+	_, err = wrap(h, registries...)
+	require.NoError(t, err)
+
+	cli, err := wrap(h, registries...)
+	require.NoError(t, err)
+
+	expected := map[string]types.AuthConfig{
+		"1234.dkr.ecr.us-west-2.amazonaws.com": {
+			Username:      "resource-aws-user",
+			Password:      "resource-aws-password",
+			ServerAddress: "1234.dkr.ecr.us-west-2.amazonaws.com",
+		},
+		config.DockerRegistryAuth: {
+			Username:      "resource-dockerhub-user",
+			Password:      "resource-dockerhub-password",
+			ServerAddress: config.DockerRegistryDNS,
+		},
+		"misc": {
+			Username:      "host-misc-user",
+			Password:      "host-misc-password",
+			ServerAddress: "misc",
+		},
+	}
+	assert.Equal(t, expected, cli.auths)
+	assert.Len(t, h.auths, 2) // In-memory host auth is unchanged.
+
+	// Assert that our on-disk host's auth is untouched.
+	realhostRefreshed, err := newHost(nil)
+	require.NoError(t, err)
+	assert.Equal(t, realhost.auths, realhostRefreshed.auths)
+}

provider/internal/client.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:generate go run go.uber.org/mock/mockgen -typed -package internal -source client.go -destination mockclient_test.go --self_package github.com/pulumi/pulumi-dockerbuild/provider/internal
+//go:generate go run go.uber.org/mock/mockgen -typed -package internal -source client.go -destination mockclient_test.go --self_package github.com/pulumi/pulumi-docker-build/provider/internal
 
 package internal
 
@@ -21,7 +21,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io"
 	"os"
 	"path/filepath"
 	"strings"
@@ -35,7 +34,7 @@ import (
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/flags"
-	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/image"
 	"github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/session/auth/authprovider"
@@ -44,7 +43,6 @@ import (
 	"github.com/regclient/regclient/types/errs"
 	"github.com/regclient/regclient/types/manifest"
 	"github.com/regclient/regclient/types/ref"
-	"github.com/sirupsen/logrus"
 
 	provider "github.com/pulumi/pulumi-go-provider"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/diag"
@@ -93,9 +91,6 @@ func newDockerCLI(config *Config) (*command.DockerCli, error) {
 
 	// TODO: Log some version information for debugging.
 
-	// Disable the CLI's tendency to log randomly to stdout.
-	logrus.SetOutput(io.Discard)
-
 	return cli, nil
 }
 
@@ -130,9 +125,24 @@ func (c *cli) Build(
 	if err != nil {
 		return nil, fmt.Errorf("creating printer: %w", err)
 	}
+	defer func() {
+		// Log any warnings when we're done.
+		_ = printer.Wait()
+		for _, w := range printer.Warnings() {
+			b := &bytes.Buffer{}
+			fmt.Fprint(b, w.Short)
+			for _, d := range w.Detail {
+				fmt.Fprintf(b, "\n%s", d)
+			}
+			pctx.Log(diag.Warning, b.String())
+		}
+	}()
 
 	cacheFrom := []client.CacheOptionsEntry{}
 	for _, c := range opts.CacheFrom {
+		if c == nil {
+			continue
+		}
 		cacheFrom = append(cacheFrom, client.CacheOptionsEntry{
 			Type:  c.Type,
 			Attrs: c.Attrs,
@@ -140,6 +150,9 @@ func (c *cli) Build(
 	}
 	cacheTo := []client.CacheOptionsEntry{}
 	for _, c := range opts.CacheTo {
+		if c == nil {
+			continue
+		}
 		cacheTo = append(cacheTo, client.CacheOptionsEntry{
 			Type:  c.Type,
 			Attrs: c.Attrs,
@@ -147,6 +160,9 @@ func (c *cli) Build(
 	}
 	exports := []client.ExportEntry{}
 	for _, e := range opts.Exports {
+		if e == nil {
+			continue
+		}
 		exports = append(exports, client.ExportEntry{
 			Type:      e.Type,
 			Attrs:     e.Attrs,
@@ -219,21 +235,10 @@ func (c *cli) Build(
 		printer,
 	)
 	if err != nil {
+		c.dumplogs = true
 		return nil, err
 	}
 
-	if printErr := printer.Wait(); printErr != nil {
-		return results[target], printErr
-	}
-	for _, w := range printer.Warnings() {
-		b := &bytes.Buffer{}
-		fmt.Fprintf(b, "%s", w.Short)
-		for _, d := range w.Detail {
-			fmt.Fprintf(b, "\n%s", d)
-		}
-		pctx.Log(diag.Warning, b.String())
-	}
-
 	return results[target], err
 }
 
@@ -243,8 +248,6 @@ func (c *cli) BuildKitEnabled() (bool, error) {
 }
 
 func (c *cli) ManifestCreate(ctx provider.Context, push bool, target string, refs ...string) error {
-	// TODO: Create this manifest with regclient or imagetools.
-
 	go c.tail(ctx)
 	defer contract.IgnoreClose(c)
 
@@ -252,6 +255,7 @@ func (c *cli) ManifestCreate(ctx provider.Context, push bool, target string, ref
 		// "buildx",
 		"imagetools",
 		"create",
+		"--progress=plain",
 		"--tag", target,
 	}
 
@@ -264,6 +268,10 @@ func (c *cli) ManifestCreate(ctx provider.Context, push bool, target string, ref
 	cmd := commands.NewRootCmd(os.Args[0], false, c)
 
 	cmd.SetArgs(args)
+	cmd.SetErr(c.Err())
+	cmd.SetOut(c.Out())
+
+	ctx.Log(diag.Debug, fmt.Sprint("creating manifest with args", args))
 	return cmd.ExecuteContext(ctx)
 }
 
@@ -277,7 +285,7 @@ func (c *cli) ManifestInspect(ctx provider.Context, target string) (string, erro
 
 	m, err := rc.ManifestHead(ctx, ref)
 	if err != nil {
-		return "", fmt.Errorf("fetching head: %w", err)
+		return "", fmt.Errorf("fetching %q: %w", ref, err)
 	}
 
 	return string(m.GetDescriptor().Digest), nil
@@ -327,7 +335,7 @@ func (c *cli) Inspect(ctx context.Context, r string) ([]descriptor.Descriptor, e
 // support the DELETE API yet, so this operation is not guaranteed to work.
 func (c *cli) Delete(ctx context.Context, r string) error {
 	// Attempt to delete the ref locally if it exists.
-	_, _ = c.Client().ImageRemove(ctx, r, types.ImageRemoveOptions{
+	_, _ = c.Client().ImageRemove(ctx, r, image.RemoveOptions{
 		Force: true, // Needed in case the image has multiple tags.
 	})
 

provider/internal/client_test.go

@@ -15,6 +15,7 @@
 package internal
 
 import (
+	"bytes"
 	"context"
 	"os"
 	"path/filepath"
@@ -24,6 +25,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
+
+	"github.com/pulumi/pulumi/sdk/v3/go/common/diag"
 )
 
 func TestAuth(t *testing.T) {
@@ -90,8 +93,9 @@ func TestBuild(t *testing.T) {
 	pctx.EXPECT().Deadline().Return(ctx.Deadline()).AnyTimes()
 
 	tmpdir := t.TempDir()
+	max := Max
 
-	exampleContext := BuildContext{Context: Context{Location: "../../examples/app"}}
+	exampleContext := &BuildContext{Context: Context{Location: "../../examples/app"}}
 
 	tests := []struct {
 		name string
@@ -104,7 +108,7 @@ func TestBuild(t *testing.T) {
 			name: "multiPlatform",
 			args: ImageArgs{
 				Context: exampleContext,
-				Dockerfile: Dockerfile{
+				Dockerfile: &Dockerfile{
 					Location: "../../examples/app/Dockerfile.multiPlatform",
 				},
 				Platforms: []Platform{"plan9/amd64", "plan9/arm64"},
@@ -131,7 +135,7 @@ func TestBuild(t *testing.T) {
 				Tags:    []string{"cached"},
 				CacheTo: []CacheTo{{Local: &CacheToLocal{
 					Dest:          filepath.Join(tmpdir, "cache"),
-					CacheWithMode: CacheWithMode{Mode: "max"},
+					CacheWithMode: CacheWithMode{Mode: &max},
 				}}},
 				CacheFrom: []CacheFrom{{Local: &CacheFromLocal{
 					Src: filepath.Join(tmpdir, "cache"),
@@ -142,7 +146,7 @@ func TestBuild(t *testing.T) {
 			name: "buildArgs",
 			args: ImageArgs{
 				Context: exampleContext,
-				Dockerfile: Dockerfile{
+				Dockerfile: &Dockerfile{
 					Location: "../../examples/app/Dockerfile.buildArgs",
 				},
 				BuildArgs: map[string]string{
@@ -154,7 +158,7 @@ func TestBuild(t *testing.T) {
 			name: "extraHosts",
 			args: ImageArgs{
 				Context: exampleContext,
-				Dockerfile: Dockerfile{
+				Dockerfile: &Dockerfile{
 					Location: "../../examples/app/Dockerfile.extraHosts",
 				},
 				AddHosts: []string{
@@ -167,7 +171,7 @@ func TestBuild(t *testing.T) {
 			skip: os.Getenv("SSH_AUTH_SOCK") == "",
 			args: ImageArgs{
 				Context: exampleContext,
-				Dockerfile: Dockerfile{
+				Dockerfile: &Dockerfile{
 					Location: "../../examples/app/Dockerfile.sshMount",
 				},
 				SSH: []SSH{{ID: "default"}},
@@ -177,7 +181,7 @@ func TestBuild(t *testing.T) {
 			name: "secrets",
 			args: ImageArgs{
 				Context: exampleContext,
-				Dockerfile: Dockerfile{
+				Dockerfile: &Dockerfile{
 					Location: "../../examples/app/Dockerfile.secrets",
 				},
 				Secrets: map[string]string{
@@ -199,7 +203,7 @@ func TestBuild(t *testing.T) {
 			name: "target",
 			args: ImageArgs{
 				Context: exampleContext,
-				Dockerfile: Dockerfile{
+				Dockerfile: &Dockerfile{
 					Location: "../../examples/app/Dockerfile.target",
 				},
 				Target: "build-me",
@@ -208,7 +212,7 @@ func TestBuild(t *testing.T) {
 		{
 			name: "namedContext",
 			args: ImageArgs{
-				Context: BuildContext{
+				Context: &BuildContext{
 					Context: Context{
 						Location: "../../examples/app",
 					},
@@ -218,7 +222,7 @@ func TestBuild(t *testing.T) {
 						},
 					},
 				},
-				Dockerfile: Dockerfile{
+				Dockerfile: &Dockerfile{
 					Location: "../../examples/app/Dockerfile.namedContexts",
 				},
 			},
@@ -226,7 +230,7 @@ func TestBuild(t *testing.T) {
 		{
 			name: "remoteContext",
 			args: ImageArgs{
-				Context: BuildContext{
+				Context: &BuildContext{
 					Context: Context{
 						Location: "https://raw.githubusercontent.com/pulumi/pulumi-docker/api-types/provider/testdata/Dockerfile",
 					},
@@ -236,12 +240,12 @@ func TestBuild(t *testing.T) {
 		{
 			name: "remoteContextWithInline",
 			args: ImageArgs{
-				Context: BuildContext{
+				Context: &BuildContext{
 					Context: Context{
 						Location: "https://github.com/docker-library/hello-world.git",
 					},
 				},
-				Dockerfile: Dockerfile{
+				Dockerfile: &Dockerfile{
 					Inline: dedent(`
 					FROM busybox
 					COPY hello.c ./
@@ -253,7 +257,7 @@ func TestBuild(t *testing.T) {
 			name: "inline",
 			args: ImageArgs{
 				Context: exampleContext,
-				Dockerfile: Dockerfile{
+				Dockerfile: &Dockerfile{
 					Inline: dedent(`
 					FROM alpine
 					RUN echo 👍
@@ -319,7 +323,7 @@ func TestInspect(t *testing.T) {
 	t.Parallel()
 	cli := testcli(t, false)
 	descriptors, err := cli.Inspect(context.Background(), "pulumibot/myapp:buildx")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(
 		t,
 		"application/vnd.docker.distribution.manifest.v2+json",
@@ -327,7 +331,7 @@ func TestInspect(t *testing.T) {
 	)
 }
 
-func TestNormalizatReference(t *testing.T) {
+func TestNormalizeReference(t *testing.T) {
 	t.Parallel()
 	tests := []struct {
 		ref     string
@@ -362,6 +366,101 @@ func TestNormalizatReference(t *testing.T) {
 	}
 }
 
+func TestBuildError(t *testing.T) {
+	t.Parallel()
+
+	if os.Getenv("CI") != "" {
+		t.Skip("flaky on CI for some reason")
+	}
+
+	ctrl, ctx := gomock.WithContext(context.Background(), t)
+
+	exampleContext := &BuildContext{Context: Context{Location: "../../examples/app"}}
+
+	args := ImageArgs{
+		Context: exampleContext,
+		Dockerfile: &Dockerfile{
+			Inline: "FROM alpine\nRUN echo hello\nRUN badcmd",
+		},
+	}
+	logged := bytes.Buffer{}
+
+	pctx := NewMockProviderContext(ctrl)
+	pctx.EXPECT().Done().Return(ctx.Done()).AnyTimes()
+	pctx.EXPECT().
+		Value(gomock.Any()).
+		DoAndReturn(func(key any) any { return ctx.Value(key) }).
+		AnyTimes()
+	pctx.EXPECT().Err().Return(ctx.Err()).AnyTimes()
+	pctx.EXPECT().Deadline().Return(ctx.Deadline()).AnyTimes()
+
+	pctx.EXPECT().LogStatus(gomock.Any(), gomock.Any()).AnyTimes()
+	pctx.EXPECT().Log(gomock.Any(), gomock.Any()).DoAndReturn(func(_ diag.Severity, msg string) {
+		logged.WriteString(msg)
+	}).AnyTimes()
+
+	cli := testcli(t, true)
+
+	build, err := args.toBuild(pctx, false)
+	require.NoError(t, err)
+
+	_, err = cli.Build(pctx, build)
+	assert.Error(t, err)
+
+	want := []string{
+		`RUN echo hello`,
+		`/bin/sh: badcmd: not found`,
+	}
+
+	for _, want := range want {
+		assert.Contains(t, logged.String(), want)
+	}
+	assert.ErrorContains(t, err,
+		`process "/bin/sh -c badcmd" did not complete successfully: exit code: 127`,
+	)
+}
+
+func TestBuildExecError(t *testing.T) {
+	t.Parallel()
+	ctrl, _ := gomock.WithContext(context.Background(), t)
+
+	exampleContext := &BuildContext{Context: Context{Location: "../../examples/app"}}
+
+	args := ImageArgs{
+		Context: exampleContext,
+		Dockerfile: &Dockerfile{
+			Inline: "FROM alpine\nRUN echo hello\nRUN badcmd",
+		},
+		Exec: true,
+	}
+
+	pctx := NewMockProviderContext(ctrl)
+	pctx.EXPECT().Log(
+		diag.Warning,
+		"No exports were specified so the build will only remain in the local build cache. "+
+			"Use `push` to upload the image to a registry, or silence this warning with a `cacheonly` export.",
+	)
+	pctx.EXPECT().LogStatus(gomock.Any(), gomock.Any()).AnyTimes()
+
+	cli := testcli(t, true)
+
+	build, err := args.toBuild(pctx, false)
+	require.NoError(t, err)
+
+	_, err = cli.Build(pctx, build)
+	assert.Error(t, err)
+
+	want := []string{
+		`RUN echo hello`,
+		`/bin/sh: badcmd: not found`,
+		`process "/bin/sh -c badcmd" did not complete successfully: exit code: 127`,
+	}
+
+	for _, want := range want {
+		assert.Contains(t, cli.err.String(), want)
+	}
+}
+
 // testcli returns a new standalone CLI instance. Set ping to true if a live
 // daemon is required -- the test will be skipped if the daemon is not available.
 func testcli(t *testing.T, ping bool, auths ...Registry) *cli {

provider/internal/context.go

@@ -54,6 +54,13 @@ type BuildContext struct {
 	Named NamedContexts `pulumi:"named,optional"`
 }
 
+func (bc *BuildContext) namedMap() map[string]string {
+	if bc == nil {
+		return nil
+	}
+	return bc.Named.Map()
+}
+
 // NamedContexts correspond to Docker's `--build-context name=path` options.
 // The path can be local or a remote URL.
 type NamedContexts map[string]Context
@@ -84,23 +91,31 @@ func (c *Context) Annotate(a infer.Annotator) {
 // validate returns a non-nil CheckError if the Context is invalid. The
 // returned Dockerfile may have defaults set to match Docker's default
 // handling. The returned Dockerfile should be validated separately.
-func (c *Context) validate(preview bool, d Dockerfile) (Dockerfile, error) {
+func (bc *BuildContext) validate(preview bool, d *Dockerfile) (*Dockerfile, *Context, error) {
+	if d == nil {
+		d = &Dockerfile{}
+	}
+	c := &Context{}
+	if bc != nil {
+		c = &bc.Context
+	}
+
 	if c.Location == "" && preview {
 		// The field is required so we normally wouldn't need to check if it
 		// exists, but during previews it can still be empty if the value is
 		// unknown. This isn't an error, but it does prevent us from performing
 		// a build later.
-		return d, nil
+		return d, c, nil
 	}
 
 	if buildx.IsRemoteURL(c.Location) {
 		// We assume remote URLs are always valid.
-		return d, nil
+		return d, c, nil
 	}
 
 	abs, err := filepath.Abs(c.Location)
 	if err != nil {
-		return d, newCheckFailure(err, "context.location")
+		return d, c, newCheckFailure(err, "context.location")
 	}
 
 	if d.Location == "" && d.Inline == "" {
@@ -111,17 +126,17 @@ func (c *Context) validate(preview bool, d Dockerfile) (Dockerfile, error) {
 
 	if isLocalDir(afero.NewOsFs(), abs) {
 		// Our context exists -- nothing else to check.
-		return d, nil
+		return d, c, nil
 	}
 
 	if c.Location != "-" {
-		return d, newCheckFailure(
+		return d, c, newCheckFailure(
 			fmt.Errorf("%q: not a valid directory or URL", c.Location),
 			"context.location",
 		)
 	}
 
-	return d, nil
+	return d, c, nil
 }
 
 // Annotate sets docstrings on BuildContext.

provider/internal/context_test.go

@@ -96,7 +96,8 @@ func TestValidateContext(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
-			d, err := tt.c.validate(tt.preview, tt.givenD)
+			bc := &BuildContext{Context: tt.c}
+			d, _, err := bc.validate(tt.preview, &tt.givenD)
 
 			if tt.wantErr == "" {
 				assert.NoError(t, err)

provider/internal/doc.go

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:generate go run ../pkg/docs-gen/examples examples doc
-
 // Package internal contains our clients, validation, and provider
 // implementation for interacting with Docker's buildx APIs.
 //

provider/internal/dockerfile.go

@@ -54,7 +54,7 @@ func (d *Dockerfile) Annotate(a infer.Annotator) {
     `))
 }
 
-func (d *Dockerfile) validate(preview bool, c Context) error {
+func (d *Dockerfile) validate(preview bool, c *Context) error {
 	if d.Location != "" && d.Inline != "" {
 		return newCheckFailure(
 			errors.New(`only specify "file" or "inline", not both`),
@@ -88,7 +88,7 @@ func (d *Dockerfile) validate(preview bool, c Context) error {
 		return nil
 	}
 
-	if !preview && !buildx.IsRemoteURL(c.Location) {
+	if !preview && c != nil && !buildx.IsRemoteURL(c.Location) {
 		return newCheckFailure(errors.New("missing 'location' or 'inline'"), "dockerfile")
 	}
 

provider/internal/dockerfile_test.go

@@ -90,7 +90,7 @@ func TestValidateDockerfile(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
-			err := tt.d.validate(tt.preview, tt.givenC)
+			err := tt.d.validate(tt.preview, &tt.givenC)
 
 			if tt.wantErr == "" {
 				assert.NoError(t, err)

provider/internal/embed/image-migration.md

@@ -1,11 +1,11 @@
-## Migrating v3 and v4 Image resources
+## Migrating Pulumi Docker v3 and v4 Image resources
 
-The `buildx.Image` resource provides a superset of functionality over the `Image` resources available in versions 3 and 4 of the Pulumi Docker provider.
-Existing `Image` resources can be converted to `build.Image` resources with minor modifications.
+This provider's `Image` resource provides a superset of functionality over the `Image` resources available in versions 3 and 4 of the Pulumi Docker provider.
+Existing `Image` resources can be converted to the docker-build `Image` resources with minor modifications.
 
 ### Behavioral differences
 
-There are several key behavioral differences to keep in mind when transitioning images to the new `buildx.Image` resource.
+There are several key behavioral differences to keep in mind when transitioning images to the new `Image` resource.
 
 #### Previews
 
@@ -14,19 +14,17 @@ This is helpful as a safeguard to prevent "broken" images from merging, but user
 
 Version `4.x` changed build-on-preview behavior to be opt-in.
 By default, `v4.x` `Image` resources do _not_ build during previews, but this behavior can be toggled with the `buildOnPreview` option.
-Some users felt this made previews in CI less helpful because they no longer detected bad images by default.
+Several users reported outages due to the default behavior allowing bad images to accidentally sneak through CI.
 
-The default behavior of the `buildx.Image` resource has been changed to strike a better balance between CI use cases and manual updates.
-By default, Pulumi will now only build `buildx.Image` resources during previews when it detects a CI environment like GitHub Actions.
-Previews run in non-CI environments will not build images.
-This behavior is still configurable with `buildOnPreview`.
+The default behavior of this provider's `Image` resource is similar to `3.x` and will build images during previews.
+This behavior can be changed by specifying `buildOnPreview`.
 
 #### Push behavior
 
 Versions `3.x` and `4.x` of the Pulumi Docker provider attempt to push images to remote registries by default.
 They expose a `skipPush: true` option to disable pushing.
 
-The `buildx.Image` resource matches the Docker CLI's behavior and does not push images anywhere by default.
+This provider's `Image` resource matches the Docker CLI's behavior and does not push images anywhere by default.
 
 To push images to a registry you can include `push: true` (equivalent to Docker's `--push` flag) or configure an `export` of type `registry` (equivalent to Docker's `--output type=registry`).
 Like Docker, if an image is configured without exports you will see a warning with instructions for how to enable pushing, but the build will still proceed normally.
@@ -37,7 +35,7 @@ Version `3.x` of the Pulumi Docker provider supports secrets by way of the `extr
 
 Version `4.x` of the Pulumi Docker provider does not support secrets.
 
-The `buildx.Image` resource supports secrets but does not require those secrets to exist on-disk or in environment variables.
+The `Image` resource supports secrets but does not require those secrets to exist on-disk or in environment variables.
 Instead, they should be passed directly as values.
 (Please be sure to familiarize yourself with Pulumi's [native secret handling](https://www.pulumi.com/docs/concepts/secrets/).)
 Pulumi also provides [ESC](https://www.pulumi.com/product/esc/) to make it easier to share secrets across stacks and environments.
@@ -52,7 +50,7 @@ Version `4.x` exposes a similar parameter `cacheFrom: { images: [...] }` which p
 Both versions 3 and 4 require specific environment variables to be set and deviate from Docker's native caching behavior.
 This can result in inefficient builds due to unnecessary image pulls, repeated file transfers, etc.
 
-The `buildx.Image` resource delegates all caching behavior to Docker.
+The `Image` resource delegates all caching behavior to Docker.
 `cacheFrom` and `cacheTo` options (equivalent to Docker's `--cache-to` and `--cache-from`) are exposed and provide additional cache targets, such as local disk, S3 storage, etc.
 
 #### Outputs
@@ -60,7 +58,7 @@ The `buildx.Image` resource delegates all caching behavior to Docker.
 Versions `3.x` and `4.x` of the provider exposed a `repoDigest` output which was a fully qualified tag with digest.
 In `4.x` this could also be a single sha256 hash if the image wasn't pushed.
 
-Unlike earlier providers the `buildx.Image` resource can push multiple tags.
+Unlike earlier providers the `Image` resource can push multiple tags.
 As a convenience, it exposes a `ref` output consisting of a tag with digest as long as the image was pushed.
 If multiple tags were pushed this uses one at random.
 
@@ -73,7 +71,7 @@ Versions 3 and 4 of Pulumi Docker provider do not delete tags when the `Image` r
 The `buidx.Image` will query your registries during `refresh` to ensure the expected tags exist.
 If any are missing a subsequent `update` will push them.
 
-When a `buildx.Image` is deleted, it will _attempt_ to also delete any pushed tags.
+When a `Image` is deleted, it will _attempt_ to also delete any pushed tags.
 Deletion of remote tags is not guaranteed because not all registries support the manifest `DELETE` API (`docker.io` in particular).
 Manifests are _not_ deleted in the same way during updates -- to do so safely would require a full build to determine whether a Pulumi operation should be an update or update-replace.
 
@@ -81,11 +79,11 @@ Use the [`retainOnDelete: true`](https://www.pulumi.com/docs/concepts/options/re
 
 ### Example migration
 
-Examples of "fully-featured" `v3` and `v4` `Image` resources are shown below, along with an example `buildx.Image` resource showing how they would look after migration.
+Examples of "fully-featured" `v3` and `v4` `Image` resources are shown below, along with an example `Image` resource showing how they would look after migration.
 
 The `v3` resource leverages `buildx` via a `DOCKER_BUILDKIT` environment variable and CLI flags passed in with `extraOption`.
-After migration, the environment variable is no longer needed and CLI flags are now properties on the `buildx.Image`.
-In almost all cases, properties of `buildx.Image` are named after the Docker CLI flag they correspond to.
+After migration, the environment variable is no longer needed and CLI flags are now properties on the `Image`.
+In almost all cases, properties of `Image` are named after the Docker CLI flag they correspond to.
 
 The `v4` resource is less functional than its `v3` counterpart because it lacks the flexibility of `extraOptions`.
 It it is shown with parameters similar to the `v3` example for completeness.
@@ -136,8 +134,8 @@ const v3 = new docker.Image("v3-image", {
   },
 });
 
-// v3 Image after migrating to buildx.Image
-const v3Migrated = new docker.buildx.Image("v3-to-buildx", {
+// v3 Image after migrating to docker-build.Image
+const v3Migrated = new dockerbuild.Image("v3-to-buildx", {
     tags: ["myregistry.com/user/repo:latest", "local-tag"],
     push: true,
     dockerfile: {
@@ -146,7 +144,7 @@ const v3Migrated = new docker.buildx.Image("v3-to-buildx", {
     context: {
         location: "../app",
     },
-    targets: ["mytarget"],
+    target: "mytarget",
     buildArgs: {
         MY_BUILD_ARG: "foo",
     },
@@ -195,8 +193,8 @@ const v4 = new docker.Image("v4-image", {
     },
 });
 
-// v4 Image after migrating to buildx.Image
-const v4Migrated = new docker.buildx.Image("v4-to-buildx", {
+// v4 Image after migrating to docker-build.Image
+const v4Migrated = new dockerbuild.Image("v4-to-buildx", {
     tags: ["myregistry.com/user/repo:latest"],
     push: true,
     dockerfile: {
@@ -205,7 +203,7 @@ const v4Migrated = new docker.buildx.Image("v4-to-buildx", {
     context: {
         location: "../app",
     },
-    targets: ["mytarget"],
+    target: "mytarget",
     buildArgs: {
         MY_BUILD_ARG: "foo",
     },

provider/internal/embed/index-examples.md

@@ -5,9 +5,9 @@
 
 ```typescript
 import * as pulumi from "@pulumi/pulumi";
-import * as docker from "@pulumi/docker";
+import * as docker_build from "@pulumi/docker-build";
 
-const amd64 = new docker.buildx.Image("amd64", {
+const amd64 = new docker_build.Image("amd64", {
     cacheFrom: [{
         registry: {
             ref: "docker.io/pulumi/pulumi:cache-amd64",
@@ -15,17 +15,17 @@ const amd64 = new docker.buildx.Image("amd64", {
     }],
     cacheTo: [{
         registry: {
-            mode: docker.buildx.image.CacheMode.Max,
+            mode: docker_build.CacheMode.Max,
             ref: "docker.io/pulumi/pulumi:cache-amd64",
         },
     }],
     context: {
         location: "app",
     },
-    platforms: [docker.buildx.image.Platform.Linux_amd64],
+    platforms: [docker_build.Platform.Linux_amd64],
     tags: ["docker.io/pulumi/pulumi:3.107.0-amd64"],
 });
-const arm64 = new docker.buildx.Image("arm64", {
+const arm64 = new docker_build.Image("arm64", {
     cacheFrom: [{
         registry: {
             ref: "docker.io/pulumi/pulumi:cache-arm64",
@@ -33,17 +33,17 @@ const arm64 = new docker.buildx.Image("arm64", {
     }],
     cacheTo: [{
         registry: {
-            mode: docker.buildx.image.CacheMode.Max,
+            mode: docker_build.CacheMode.Max,
             ref: "docker.io/pulumi/pulumi:cache-arm64",
         },
     }],
     context: {
         location: "app",
     },
-    platforms: [docker.buildx.image.Platform.Linux_arm64],
+    platforms: [docker_build.Platform.Linux_arm64],
     tags: ["docker.io/pulumi/pulumi:3.107.0-arm64"],
 });
-const index = new docker.buildx.Index("index", {
+const index = new docker_build.Index("index", {
     sources: [
         amd64.ref,
         arm64.ref,
@@ -54,43 +54,43 @@ export const ref = index.ref;
 ```
 ```python
 import pulumi
-import pulumi_docker as docker
+import pulumi_docker_build as docker_build
 
-amd64 = docker.buildx.Image("amd64",
-    cache_from=[docker.buildx.CacheFromArgs(
-        registry=docker.buildx.CacheFromRegistryArgs(
+amd64 = docker_build.Image("amd64",
+    cache_from=[docker_build.CacheFromArgs(
+        registry=docker_build.CacheFromRegistryArgs(
             ref="docker.io/pulumi/pulumi:cache-amd64",
         ),
     )],
-    cache_to=[docker.buildx.CacheToArgs(
-        registry=docker.buildx.CacheToRegistryArgs(
-            mode=docker.buildx.image.CacheMode.MAX,
+    cache_to=[docker_build.CacheToArgs(
+        registry=docker_build.CacheToRegistryArgs(
+            mode=docker_build.CacheMode.MAX,
             ref="docker.io/pulumi/pulumi:cache-amd64",
         ),
     )],
-    context=docker.buildx.BuildContextArgs(
+    context=docker_build.BuildContextArgs(
         location="app",
     ),
-    platforms=[docker.buildx.image.Platform.LINUX_AMD64],
+    platforms=[docker_build.Platform.LINUX_AMD64],
     tags=["docker.io/pulumi/pulumi:3.107.0-amd64"])
-arm64 = docker.buildx.Image("arm64",
-    cache_from=[docker.buildx.CacheFromArgs(
-        registry=docker.buildx.CacheFromRegistryArgs(
+arm64 = docker_build.Image("arm64",
+    cache_from=[docker_build.CacheFromArgs(
+        registry=docker_build.CacheFromRegistryArgs(
             ref="docker.io/pulumi/pulumi:cache-arm64",
         ),
     )],
-    cache_to=[docker.buildx.CacheToArgs(
-        registry=docker.buildx.CacheToRegistryArgs(
-            mode=docker.buildx.image.CacheMode.MAX,
+    cache_to=[docker_build.CacheToArgs(
+        registry=docker_build.CacheToRegistryArgs(
+            mode=docker_build.CacheMode.MAX,
             ref="docker.io/pulumi/pulumi:cache-arm64",
         ),
     )],
-    context=docker.buildx.BuildContextArgs(
+    context=docker_build.BuildContextArgs(
         location="app",
     ),
-    platforms=[docker.buildx.image.Platform.LINUX_ARM64],
+    platforms=[docker_build.Platform.LINUX_ARM64],
     tags=["docker.io/pulumi/pulumi:3.107.0-arm64"])
-index = docker.buildx.Index("index",
+index = docker_build.Index("index",
     sources=[
         amd64.ref,
         arm64.ref,
@@ -102,17 +102,17 @@ pulumi.export("ref", index.ref)
 using System.Collections.Generic;
 using System.Linq;
 using Pulumi;
-using Docker = Pulumi.Docker;
+using DockerBuild = Pulumi.DockerBuild;
 
 return await Deployment.RunAsync(() => 
 {
-    var amd64 = new Docker.Buildx.Image("amd64", new()
+    var amd64 = new DockerBuild.Image("amd64", new()
     {
         CacheFrom = new[]
         {
-            new Docker.Buildx.Inputs.CacheFromArgs
+            new DockerBuild.Inputs.CacheFromArgs
             {
-                Registry = new Docker.Buildx.Inputs.CacheFromRegistryArgs
+                Registry = new DockerBuild.Inputs.CacheFromRegistryArgs
                 {
                     Ref = "docker.io/pulumi/pulumi:cache-amd64",
                 },
@@ -120,22 +120,22 @@ return await Deployment.RunAsync(() =>
         },
         CacheTo = new[]
         {
-            new Docker.Buildx.Inputs.CacheToArgs
+            new DockerBuild.Inputs.CacheToArgs
             {
-                Registry = new Docker.Buildx.Inputs.CacheToRegistryArgs
+                Registry = new DockerBuild.Inputs.CacheToRegistryArgs
                 {
-                    Mode = Docker.Buildx.Image.CacheMode.Max,
+                    Mode = DockerBuild.CacheMode.Max,
                     Ref = "docker.io/pulumi/pulumi:cache-amd64",
                 },
             },
         },
-        Context = new Docker.Buildx.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "app",
         },
         Platforms = new[]
         {
-            Docker.Buildx.Image.Platform.Linux_amd64,
+            DockerBuild.Platform.Linux_amd64,
         },
         Tags = new[]
         {
@@ -143,13 +143,13 @@ return await Deployment.RunAsync(() =>
         },
     });
 
-    var arm64 = new Docker.Buildx.Image("arm64", new()
+    var arm64 = new DockerBuild.Image("arm64", new()
     {
         CacheFrom = new[]
         {
-            new Docker.Buildx.Inputs.CacheFromArgs
+            new DockerBuild.Inputs.CacheFromArgs
             {
-                Registry = new Docker.Buildx.Inputs.CacheFromRegistryArgs
+                Registry = new DockerBuild.Inputs.CacheFromRegistryArgs
                 {
                     Ref = "docker.io/pulumi/pulumi:cache-arm64",
                 },
@@ -157,22 +157,22 @@ return await Deployment.RunAsync(() =>
         },
         CacheTo = new[]
         {
-            new Docker.Buildx.Inputs.CacheToArgs
+            new DockerBuild.Inputs.CacheToArgs
             {
-                Registry = new Docker.Buildx.Inputs.CacheToRegistryArgs
+                Registry = new DockerBuild.Inputs.CacheToRegistryArgs
                 {
-                    Mode = Docker.Buildx.Image.CacheMode.Max,
+                    Mode = DockerBuild.CacheMode.Max,
                     Ref = "docker.io/pulumi/pulumi:cache-arm64",
                 },
             },
         },
-        Context = new Docker.Buildx.Inputs.BuildContextArgs
+        Context = new DockerBuild.Inputs.BuildContextArgs
         {
             Location = "app",
         },
         Platforms = new[]
         {
-            Docker.Buildx.Image.Platform.Linux_arm64,
+            DockerBuild.Platform.Linux_arm64,
         },
         Tags = new[]
         {
@@ -180,7 +180,7 @@ return await Deployment.RunAsync(() =>
         },
     });
 
-    var index = new Docker.Buildx.Index("index", new()
+    var index = new DockerBuild.Index("index", new()
     {
         Sources = new[]
         {
@@ -201,33 +201,33 @@ return await Deployment.RunAsync(() =>
 package main
 
 import (
-	"github.com/pulumi/pulumi-docker/sdk/v4/go/docker/buildx"
+	"github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild"
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
 	pulumi.Run(func(ctx *pulumi.Context) error {
-		amd64, err := buildx.NewImage(ctx, "amd64", &buildx.ImageArgs{
-			CacheFrom: buildx.CacheFromArray{
-				&buildx.CacheFromArgs{
-					Registry: &buildx.CacheFromRegistryArgs{
+		amd64, err := dockerbuild.NewImage(ctx, "amd64", &dockerbuild.ImageArgs{
+			CacheFrom: dockerbuild.CacheFromArray{
+				&dockerbuild.CacheFromArgs{
+					Registry: &dockerbuild.CacheFromRegistryArgs{
 						Ref: pulumi.String("docker.io/pulumi/pulumi:cache-amd64"),
 					},
 				},
 			},
-			CacheTo: buildx.CacheToArray{
-				&buildx.CacheToArgs{
-					Registry: &buildx.CacheToRegistryArgs{
-						Mode: buildx.CacheModeMax,
+			CacheTo: dockerbuild.CacheToArray{
+				&dockerbuild.CacheToArgs{
+					Registry: &dockerbuild.CacheToRegistryArgs{
+						Mode: dockerbuild.CacheModeMax,
 						Ref:  pulumi.String("docker.io/pulumi/pulumi:cache-amd64"),
 					},
 				},
 			},
-			Context: &buildx.BuildContextArgs{
+			Context: &dockerbuild.BuildContextArgs{
 				Location: pulumi.String("app"),
 			},
-			Platforms: buildx.PlatformArray{
-				buildx.Platform_Linux_amd64,
+			Platforms: docker - build.PlatformArray{
+				dockerbuild.Platform_Linux_amd64,
 			},
 			Tags: pulumi.StringArray{
 				pulumi.String("docker.io/pulumi/pulumi:3.107.0-amd64"),
@@ -236,27 +236,27 @@ func main() {
 		if err != nil {
 			return err
 		}
-		arm64, err := buildx.NewImage(ctx, "arm64", &buildx.ImageArgs{
-			CacheFrom: buildx.CacheFromArray{
-				&buildx.CacheFromArgs{
-					Registry: &buildx.CacheFromRegistryArgs{
+		arm64, err := dockerbuild.NewImage(ctx, "arm64", &dockerbuild.ImageArgs{
+			CacheFrom: dockerbuild.CacheFromArray{
+				&dockerbuild.CacheFromArgs{
+					Registry: &dockerbuild.CacheFromRegistryArgs{
 						Ref: pulumi.String("docker.io/pulumi/pulumi:cache-arm64"),
 					},
 				},
 			},
-			CacheTo: buildx.CacheToArray{
-				&buildx.CacheToArgs{
-					Registry: &buildx.CacheToRegistryArgs{
-						Mode: buildx.CacheModeMax,
+			CacheTo: dockerbuild.CacheToArray{
+				&dockerbuild.CacheToArgs{
+					Registry: &dockerbuild.CacheToRegistryArgs{
+						Mode: dockerbuild.CacheModeMax,
 						Ref:  pulumi.String("docker.io/pulumi/pulumi:cache-arm64"),
 					},
 				},
 			},
-			Context: &buildx.BuildContextArgs{
+			Context: &dockerbuild.BuildContextArgs{
 				Location: pulumi.String("app"),
 			},
-			Platforms: buildx.PlatformArray{
-				buildx.Platform_Linux_arm64,
+			Platforms: docker - build.PlatformArray{
+				dockerbuild.Platform_Linux_arm64,
 			},
 			Tags: pulumi.StringArray{
 				pulumi.String("docker.io/pulumi/pulumi:3.107.0-arm64"),
@@ -265,7 +265,7 @@ func main() {
 		if err != nil {
 			return err
 		}
-		index, err := buildx.NewIndex(ctx, "index", &buildx.IndexArgs{
+		index, err := dockerbuild.NewIndex(ctx, "index", &dockerbuild.IndexArgs{
 			Sources: pulumi.StringArray{
 				amd64.Ref,
 				arm64.Ref,
@@ -301,7 +301,7 @@ resources:
                 - linux/amd64
             tags:
                 - docker.io/pulumi/pulumi:3.107.0-amd64
-        type: docker:buildx/image:Image
+        type: docker-build:Image
     arm64:
         properties:
             cacheFrom:
@@ -317,14 +317,14 @@ resources:
                 - linux/arm64
             tags:
                 - docker.io/pulumi/pulumi:3.107.0-arm64
-        type: docker:buildx/image:Image
+        type: docker-build:Image
     index:
         properties:
             sources:
                 - ${amd64.ref}
                 - ${arm64.ref}
             tag: docker.io/pulumi/pulumi:3.107.0
-        type: docker:buildx/image:Index
+        type: docker-build:Index
 runtime: yaml
 ```
 ```java
@@ -333,15 +333,15 @@ package generated_program;
 import com.pulumi.Context;
 import com.pulumi.Pulumi;
 import com.pulumi.core.Output;
-import com.pulumi.docker.buildx.Image;
-import com.pulumi.docker.buildx.ImageArgs;
-import com.pulumi.docker.buildx.inputs.CacheFromArgs;
-import com.pulumi.docker.buildx.inputs.CacheFromRegistryArgs;
-import com.pulumi.docker.buildx.inputs.CacheToArgs;
-import com.pulumi.docker.buildx.inputs.CacheToRegistryArgs;
-import com.pulumi.docker.buildx.inputs.BuildContextArgs;
-import com.pulumi.docker.buildx.Index;
-import com.pulumi.docker.buildx.IndexArgs;
+import com.pulumi.dockerbuild.Image;
+import com.pulumi.dockerbuild.ImageArgs;
+import com.pulumi.dockerbuild.inputs.CacheFromArgs;
+import com.pulumi.dockerbuild.inputs.CacheFromRegistryArgs;
+import com.pulumi.dockerbuild.inputs.CacheToArgs;
+import com.pulumi.dockerbuild.inputs.CacheToRegistryArgs;
+import com.pulumi.dockerbuild.inputs.BuildContextArgs;
+import com.pulumi.dockerbuild.Index;
+import com.pulumi.dockerbuild.IndexArgs;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;

provider/internal/export.go

@@ -386,14 +386,15 @@ func (c ExportWithOCI) String() string {
 // ExportWithCompression is an export with options to configure compression
 // settings.
 type ExportWithCompression struct {
-	Compression      CompressionType `pulumi:"compression,optional"`
-	CompressionLevel int             `pulumi:"compressionLevel,optional"`
-	ForceCompression *bool           `pulumi:"forceCompression,optional"`
+	Compression      *CompressionType `pulumi:"compression,optional"`
+	CompressionLevel int              `pulumi:"compressionLevel,optional"`
+	ForceCompression *bool            `pulumi:"forceCompression,optional"`
 }
 
 // Annotate sets docstrings and defaults on ExportWithCompression.
 func (e *ExportWithCompression) Annotate(a infer.Annotator) {
-	a.SetDefault(&e.Compression, Gzip)
+	gzip := Gzip
+	a.SetDefault(&e.Compression, &gzip)
 	a.SetDefault(&e.CompressionLevel, 0)
 	a.SetDefault(&e.ForceCompression, false)
 
@@ -407,8 +408,8 @@ func (e ExportWithCompression) String() string {
 		return ""
 	}
 	parts := []string{}
-	if e.Compression != "" {
-		parts = append(parts, fmt.Sprintf("compression=%s", e.Compression))
+	if e.Compression != nil {
+		parts = append(parts, fmt.Sprintf("compression=%s", *e.Compression))
 	}
 	if e.CompressionLevel > 0 {
 		cl := e.CompressionLevel

provider/internal/export_test.go

@@ -93,6 +93,7 @@ func TestValidateExport(t *testing.T) {
 
 func TestExportString(t *testing.T) {
 	t.Parallel()
+	gzip := Gzip
 	tests := []struct {
 		name  string
 		given Export
@@ -113,13 +114,13 @@ func TestExportString(t *testing.T) {
 			given: Export{Registry: &ExportRegistry{
 				ExportImage: ExportImage{
 					ExportWithCompression: ExportWithCompression{
-						Compression:      "gz2",
+						Compression:      &gzip,
 						CompressionLevel: 100,
 						ForceCompression: pulumi.BoolRef(true),
 					},
 				},
 			}},
-			want: "type=registry,compression=gz2,compression-level=22,force-compression=true",
+			want: "type=registry,compression=gzip,compression-level=22,force-compression=true",
 		},
 		{
 			name: "registry-without-push",

provider/internal/image.go

@@ -40,7 +40,7 @@ import (
 	"github.com/pulumi/pulumi-go-provider/infer"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/diag"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/v3/go/common/util/ciutil"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 var (
@@ -72,16 +72,10 @@ func (i *Image) Annotate(a infer.Annotator) {
 
 		## Stability
 
-		**This resource is experimental and subject to change.**
+		**This resource is pre-1.0 and in public preview.**
 
-		API types are unstable. Subsequent releases _may_ require manual edits
-		to your state file(s) in order to adopt API changes.
-
-		"retainOnDelete: true" is recommended with this resource until it is
-		stable. This enables future API changes to be adopted more easily by renaming
-		resources.
-
-		Only use this resource if you understand and accept the risks.
+		We will strive to keep APIs and behavior as stable as possible, but we
+		cannot guarantee stability until version 1.0.
 	`)+
 		"\n\n"+_migration+
 		"\n\n"+_imageExamples,
@@ -93,15 +87,15 @@ type ImageArgs struct {
 	AddHosts       []string          `pulumi:"addHosts,optional"`
 	BuildArgs      map[string]string `pulumi:"buildArgs,optional"`
 	BuildOnPreview *bool             `pulumi:"buildOnPreview,optional"`
-	Builder        BuilderConfig     `pulumi:"builder,optional"`
+	Builder        *BuilderConfig    `pulumi:"builder,optional"`
 	CacheFrom      []CacheFrom       `pulumi:"cacheFrom,optional"`
 	CacheTo        []CacheTo         `pulumi:"cacheTo,optional"`
-	Context        BuildContext      `pulumi:"context,optional"`
-	Dockerfile     Dockerfile        `pulumi:"dockerfile,optional"`
+	Context        *BuildContext     `pulumi:"context,optional"`
+	Dockerfile     *Dockerfile       `pulumi:"dockerfile,optional"`
 	Exports        []Export          `pulumi:"exports,optional"`
 	Labels         map[string]string `pulumi:"labels,optional"`
 	Load           bool              `pulumi:"load,optional"`
-	Network        NetworkMode       `pulumi:"network,optional"`
+	Network        *NetworkMode      `pulumi:"network,optional"`
 	NoCache        bool              `pulumi:"noCache,optional"`
 	Platforms      []Platform        `pulumi:"platforms,optional"`
 	Pull           bool              `pulumi:"pull,optional"`
@@ -133,21 +127,19 @@ func (ia *ImageArgs) Annotate(a infer.Annotator) {
 		Equivalent to Docker's "--build-arg" flag.
 	`))
 	a.Describe(&ia.BuildOnPreview, dedent(`
-		By default, preview behavior depends on the execution environment. If
-		Pulumi detects the operation is running on a CI system (GitHub Actions,
-		Travis CI, Azure Pipelines, etc.) then it will build images during
-		previews as a safeguard. Otherwise, if not running on CI, previews will
-		not build images.
-
-		Setting this to "false" forces previews to never perform builds, and
-		setting it to "true" will always build the image during previews.
+		Setting this to "false" will always skip image builds during previews,
+		and setting it to "true" will always build images during previews.
 
 		Images built during previews are never exported to registries, however
 		cache manifests are still exported.
 
 		On-disk Dockerfiles are always validated for syntactic correctness
 		regardless of this setting.
+
+		Defaults to "true" as a safeguard against broken images merging as part
+		of CI pipelines.
 	`))
+	a.SetDefault(&ia.BuildOnPreview, pulumi.Bool(true))
 	a.Describe(&ia.Builder, dedent(`
 		Builder configuration.
 	`))
@@ -287,7 +279,8 @@ func (ia *ImageArgs) Annotate(a infer.Annotator) {
 		"docker-buildx" binary.
 	`))
 
-	a.SetDefault(&ia.Network, Default)
+	d := Default
+	a.SetDefault(&ia.Network, &d)
 }
 
 // ImageState is serialized to the program's state file.
@@ -338,16 +331,20 @@ func (is *ImageState) Annotate(a infer.Annotator) {
 
 // client produces a CLI client with scoped to this resource and layered on top
 // of any host-level credentials.
-func (i *Image) client(ctx provider.Context, state ImageState, args ImageArgs) (Client, error) {
-	cfg := infer.GetConfig[Config](ctx)
+func (i *Image) client(pctx provider.Context, state ImageState, args ImageArgs) (Client, error) {
+	ctx := context.Context(pctx)
+
+	cfg := infer.GetConfig[Config](pctx)
 
 	if cli, ok := ctx.Value(_mockClientKey).(Client); ok {
 		return cli, nil
 	}
 
-	// Layer auth from args, state, and the provider in that order.
-	auths := cfg.Registries
-	auths = append(auths, state.Registries...)
+	// We prefer auth from args, the provider, and state in that order. We
+	// build a slice in reverse order because wrap() will overwrite earlier
+	// entries with later ones.
+	auths := []Registry{}
+	auths = append(auths, cfg.Registries...)
 	auths = append(auths, args.Registries...)
 
 	return wrap(cfg.host, auths...)
@@ -458,13 +455,12 @@ func (ia *ImageArgs) isExported() bool {
 }
 
 // shouldBuildOnPreview returns true if we should build this image during
-// previews. In CI environments we default to building during previews, but we
-// always respect buildOnPreview if it was specified.
+// previews.
 func (ia *ImageArgs) shouldBuildOnPreview() bool {
 	if ia.BuildOnPreview != nil {
 		return *ia.BuildOnPreview
 	}
-	return ciutil.IsCI()
+	return true
 }
 
 type build struct {
@@ -551,13 +547,13 @@ func (ia *ImageArgs) validate(preview bool) (controllerapi.BuildOptions, error)
 		)
 	}
 
-	dockerfile, err := ia.Context.validate(preview, ia.Dockerfile)
+	dockerfile, context, err := ia.Context.validate(preview, ia.Dockerfile)
 	if err != nil {
 		multierr = errors.Join(multierr, err)
 	}
 	ia.Dockerfile = dockerfile
 
-	if err := ia.Dockerfile.validate(preview, ia.Context.Context); err != nil {
+	if err := ia.Dockerfile.validate(preview, context); err != nil {
 		multierr = errors.Join(multierr, err)
 	}
 
@@ -640,19 +636,24 @@ func (ia *ImageArgs) validate(preview bool) (controllerapi.BuildOptions, error)
 		})
 	}
 
+	builder := BuilderConfig{}
+	if normalized.Builder != nil {
+		builder = *normalized.Builder
+	}
+
 	opts := controllerapi.BuildOptions{
 		BuildArgs:      normalized.BuildArgs,
-		Builder:        normalized.Builder.Name,
+		Builder:        builder.Name,
 		CacheFrom:      cacheFrom,
 		CacheTo:        cacheTo,
-		ContextPath:    normalized.Context.Location,
+		ContextPath:    context.Location,
 		DockerfileName: dockerfile.Location,
 		Exports:        exports,
 		ExtraHosts:     normalized.AddHosts,
 		Labels:         normalized.Labels,
-		NetworkMode:    string(normalized.Network),
+		NetworkMode:    normalized.Network.String(),
 		NoCache:        normalized.NoCache,
-		NamedContexts:  normalized.Context.Named.Map(),
+		NamedContexts:  normalized.Context.namedMap(),
 		Platforms:      platforms,
 		Pull:           normalized.Pull,
 		Secrets:        secrets,
@@ -888,7 +889,7 @@ func (*Image) Diff(
 	if !reflect.DeepEqual(olds.BuildArgs, news.BuildArgs) {
 		diff["buildArgs"] = update
 	}
-	if olds.BuildOnPreview != news.BuildOnPreview {
+	if !reflect.DeepEqual(olds.BuildOnPreview, news.BuildOnPreview) {
 		diff["buildOnPreview"] = update
 	}
 	if !reflect.DeepEqual(olds.Builder, news.Builder) {
@@ -922,7 +923,7 @@ func (*Image) Diff(
 	if olds.Load != news.Load {
 		diff["load"] = update
 	}
-	if olds.Network != news.Network {
+	if !reflect.DeepEqual(olds.Network, news.Network) {
 		diff["network"] = update
 	}
 	if !reflect.DeepEqual(olds.NoCache, news.NoCache) {

provider/internal/image_test.go

@@ -39,7 +39,7 @@ import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
-var _fakeURN = resource.NewURN("test", "provider", "a", "dockerbuild:index:Image", "test")
+var _fakeURN = resource.NewURN("test", "provider", "a", "docker-build:index:Image", "test")
 
 func TestImageLifecycle(t *testing.T) {
 	t.Parallel()
@@ -273,7 +273,7 @@ func TestImageLifecycle(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			lc := integration.LifeCycleTest{
-				Resource: "dockerbuild:index:Image",
+				Resource: "docker-build:index:Image",
 				Create:   tt.op(t),
 			}
 			s := newServer(tt.client(t))
@@ -365,12 +365,13 @@ func TestRead(t *testing.T) {
 func TestImageDiff(t *testing.T) {
 	t.Parallel()
 	emptyDir := t.TempDir()
+	host := Host
 
 	hash, err := hashBuildContext(emptyDir, "", nil)
 	require.NoError(t, err)
 	baseArgs := ImageArgs{
-		Context:    BuildContext{Context: Context{Location: emptyDir}},
-		Dockerfile: Dockerfile{Location: "testdata/noop"},
+		Context:    &BuildContext{Context: Context{Location: emptyDir}},
+		Dockerfile: &Dockerfile{Location: "testdata/noop"},
 		Tags:       []string{},
 	}
 	baseState := ImageState{
@@ -517,7 +518,7 @@ func TestImageDiff(t *testing.T) {
 			wantChanges: true,
 		},
 		{
-			name: "diff if buildOnPreview changes",
+			name: "diff if buildOnPreview doesn't change",
 			olds: func(*testing.T, ImageState) ImageState { return baseState },
 			news: func(t *testing.T, ia ImageArgs) ImageArgs {
 				val := true
@@ -526,6 +527,16 @@ func TestImageDiff(t *testing.T) {
 			},
 			wantChanges: true,
 		},
+		{
+			name: "diff if buildOnPreview changes",
+			olds: func(*testing.T, ImageState) ImageState { return baseState },
+			news: func(t *testing.T, ia ImageArgs) ImageArgs {
+				val := false
+				ia.BuildOnPreview = &val
+				return ia
+			},
+			wantChanges: true,
+		},
 		{
 			name: "diff if ssh changes",
 			olds: func(*testing.T, ImageState) ImageState { return baseState },
@@ -566,7 +577,7 @@ func TestImageDiff(t *testing.T) {
 			name: "diff if context changes",
 			olds: func(*testing.T, ImageState) ImageState { return baseState },
 			news: func(_ *testing.T, a ImageArgs) ImageArgs {
-				a.Context.Location = "testdata/ignores"
+				a.Context = &BuildContext{Context: Context{Location: "testdata/ignores"}}
 				return a
 			},
 			wantChanges: true,
@@ -575,7 +586,7 @@ func TestImageDiff(t *testing.T) {
 			name: "diff if named context changes",
 			olds: func(*testing.T, ImageState) ImageState { return baseState },
 			news: func(_ *testing.T, a ImageArgs) ImageArgs {
-				a.Context.Named = NamedContexts{"foo": Context{Location: "bar"}}
+				a.Context = &BuildContext{Named: NamedContexts{"foo": Context{Location: "bar"}}}
 				return a
 			},
 			wantChanges: true,
@@ -584,7 +595,7 @@ func TestImageDiff(t *testing.T) {
 			name: "diff if network changes",
 			olds: func(*testing.T, ImageState) ImageState { return baseState },
 			news: func(_ *testing.T, a ImageArgs) ImageArgs {
-				a.Network = Host
+				a.Network = &host
 				return a
 			},
 			wantChanges: true,
@@ -593,7 +604,7 @@ func TestImageDiff(t *testing.T) {
 			name: "diff if dockerfile location changes",
 			olds: func(*testing.T, ImageState) ImageState { return baseState },
 			news: func(_ *testing.T, a ImageArgs) ImageArgs {
-				a.Dockerfile.Location = "testdata/ignores/basedir/Dockerfile"
+				a.Dockerfile = &Dockerfile{Location: "testdata/ignores/basedir/Dockerfile"}
 				return a
 			},
 			wantChanges: true,
@@ -602,7 +613,7 @@ func TestImageDiff(t *testing.T) {
 			name: "diff if dockerfile inline changes",
 			olds: func(*testing.T, ImageState) ImageState { return baseState },
 			news: func(_ *testing.T, a ImageArgs) ImageArgs {
-				a.Dockerfile.Inline = "FROM scratch"
+				a.Dockerfile = &Dockerfile{Inline: "FROM scratch"}
 				return a
 			},
 			wantChanges: true,
@@ -629,7 +640,7 @@ func TestImageDiff(t *testing.T) {
 			name: "diff if builder changes",
 			olds: func(*testing.T, ImageState) ImageState { return baseState },
 			news: func(_ *testing.T, a ImageArgs) ImageArgs {
-				a.Builder.Name = "foo"
+				a.Builder = &BuilderConfig{Name: "foo"}
 				return a
 			},
 			wantChanges: true,
@@ -709,6 +720,8 @@ func TestImageDiff(t *testing.T) {
 
 	for _, tt := range tests {
 		tt := tt
+		baseState := baseState
+		baseArgs := baseArgs
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			resp, err := s.Diff(provider.DiffRequest{
@@ -729,7 +742,7 @@ func TestValidateImageArgs(t *testing.T) {
 		args := ImageArgs{
 			Tags:      []string{"a/bad:tag:format"},
 			Exports:   []Export{{Raw: "badexport,-"}},
-			Context:   BuildContext{Context: Context{Location: "./testdata"}},
+			Context:   &BuildContext{Context: Context{Location: "./testdata"}},
 			Platforms: []Platform{","},
 			CacheFrom: []CacheFrom{{Raw: "=badcachefrom"}},
 			CacheTo:   []CacheTo{{Raw: "=badcacheto"}},
@@ -747,7 +760,7 @@ func TestValidateImageArgs(t *testing.T) {
 	t.Run("buildOnPreview", func(t *testing.T) {
 		t.Parallel()
 		args := ImageArgs{
-			Context: BuildContext{Context: Context{Location: "testdata/noop"}},
+			Context: &BuildContext{Context: Context{Location: "testdata/noop"}},
 			Tags:    []string{"my-tag"},
 			Exports: []Export{{Registry: &ExportRegistry{ExportImage{Push: pulumi.BoolRef(true)}}}},
 		}
@@ -775,12 +788,12 @@ func TestValidateImageArgs(t *testing.T) {
 				"known": "value",
 				"":      "",
 			},
-			Builder:    BuilderConfig{},
+			Builder:    nil,
 			CacheFrom:  []CacheFrom{{GHA: &CacheFromGitHubActions{}}, {Raw: ""}},
 			CacheTo:    []CacheTo{{GHA: &CacheToGitHubActions{}}, {Raw: ""}},
-			Context:    BuildContext{},
+			Context:    nil,
 			Exports:    []Export{{Raw: ""}},
-			Dockerfile: Dockerfile{},
+			Dockerfile: nil,
 			Platforms:  []Platform{"linux/amd64", ""},
 			Registries: []Registry{
 				{
@@ -803,7 +816,7 @@ func TestValidateImageArgs(t *testing.T) {
 	t.Run("disabled caches", func(t *testing.T) {
 		t.Parallel()
 		args := ImageArgs{
-			Context:   BuildContext{Context: Context{Location: "testdata/noop"}},
+			Context:   &BuildContext{Context: Context{Location: "testdata/noop"}},
 			CacheFrom: []CacheFrom{{Raw: "type=registry", Disabled: true}},
 			CacheTo:   []CacheTo{{Raw: "type=registry", Disabled: true}},
 			Exports:   []Export{{Raw: "type=registry", Disabled: true}},
@@ -853,7 +866,8 @@ func TestValidateImageArgs(t *testing.T) {
 		for _, d := range []Dockerfile{
 			{Location: path}, {Inline: string(data)},
 		} {
-			args := ImageArgs{Dockerfile: d}
+			d := d
+			args := ImageArgs{Dockerfile: &d}
 			_, err := args.validate(false)
 			assert.ErrorContains(t, err, "unknown instruction: RUNN (did you mean RUN?)")
 		}
@@ -943,13 +957,14 @@ func TestToBuild(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	pctx := NewMockProviderContext(ctrl)
 	pctx.EXPECT().Log(gomock.Any(), gomock.Any()).AnyTimes()
+	max := Max
 
 	ia := ImageArgs{
 		Tags:      []string{"foo", "bar"},
 		Platforms: []Platform{"linux/amd64"},
-		Context:   BuildContext{Context: Context{Location: "testdata/noop"}},
+		Context:   &BuildContext{Context: Context{Location: "testdata/noop"}},
 		CacheTo: []CacheTo{
-			{GHA: &CacheToGitHubActions{CacheWithMode: CacheWithMode{Max}}},
+			{GHA: &CacheToGitHubActions{CacheWithMode: CacheWithMode{&max}}},
 			{
 				Registry: &CacheToRegistry{
 					CacheFromRegistry: CacheFromRegistry{Ref: "docker.io/foo/bar"},

provider/internal/index.go

@@ -24,6 +24,7 @@ import (
 
 	provider "github.com/pulumi/pulumi-go-provider"
 	"github.com/pulumi/pulumi-go-provider/infer"
+	"github.com/pulumi/pulumi/sdk/v3/go/common/diag"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
 )
 
@@ -47,10 +48,10 @@ type Index struct{}
 
 // IndexArgs instantiate an Index.
 type IndexArgs struct {
-	Tag      string   `pulumi:"tag"`
-	Sources  []string `pulumi:"sources"`
-	Push     bool     `pulumi:"push,optional"`
-	Registry Registry `pulumi:"registry,optional"`
+	Tag      string    `pulumi:"tag"`
+	Sources  []string  `pulumi:"sources"`
+	Push     bool      `pulumi:"push,optional"`
+	Registry *Registry `pulumi:"registry,optional"`
 }
 
 // IndexState captures the state of an Index.
@@ -63,13 +64,25 @@ type IndexState struct {
 // Annotate sets docstrings and defaults on Index.
 func (i *Index) Annotate(a infer.Annotator) {
 	a.Describe(&i, dedent(`
-		An index (or manifest list) referencing one or more existing images.
+		A wrapper around "docker buildx imagetools create" to create an index
+		(or manifest list) referencing one or more existing images.
 
-		Useful for crafting a multi-platform image from several
-		platform-specific images.
+		In most cases you do not need an "Index" to build a multi-platform
+		image -- specifying multiple platforms on the "Image" will handle this
+		for you automatically.
 
-		This creates an OCI image index or a Docker manifest list depending on
-		the media types of the source images.
+		However, as of April 2024, building multi-platform images _with
+		caching_ will only export a cache for one platform at a time (see [this
+		discussion](https://github.com/docker/buildx/discussions/1382) for more
+		details).
+
+		Therefore this resource can be helpful if you are building
+		multi-platform images with caching: each platform can be built and
+		cached separately, and an "Index" can join them all together. An
+		example of this is shown below.
+
+		This resource creates an OCI image index or a Docker manifest list
+		depending on the media types of the source images.
 	`)+
 		"\n\n"+_indexExamples,
 	)
@@ -138,6 +151,8 @@ func (i *Index) Update(
 		return state, nil
 	}
 
+	ctx.Log(diag.Debug, fmt.Sprintf("creating index with tag %s and sources %s", input.Tag, input.Sources))
+
 	err = cli.ManifestCreate(ctx, input.Push, input.Tag, input.Sources...)
 	if err != nil {
 		return state, fmt.Errorf("creating: %w", err)
@@ -160,6 +175,7 @@ func (i *Index) Read(
 	state.Ref = input.Tag
 
 	if !input.Push {
+		ctx.Log(diag.Debug, "skipping read because index was not pushed")
 		return name, input, state, nil // Nothing to read.
 	}
 
@@ -168,6 +184,8 @@ func (i *Index) Read(
 		return name, input, state, err
 	}
 
+	ctx.Log(diag.Debug, "reading index with tag "+input.Tag)
+
 	digest, err := cli.ManifestInspect(ctx, input.Tag)
 	if err != nil && strings.Contains(err.Error(), "No such manifest:") && input.Push {
 		// A remote tag was expected but isn't there -- delete the resource.
@@ -175,7 +193,7 @@ func (i *Index) Read(
 	}
 	if err != nil && strings.Contains(err.Error(), "No such manifest:") && !input.Push {
 		// Nothing was pushed, so just use the tag without digest..
-		return name, input, state, err
+		return name, input, state, nil
 	}
 	if err != nil {
 		return name, input, state, err
@@ -268,14 +286,20 @@ func (i *Index) Diff(
 	if !reflect.DeepEqual(olds.Sources, news.Sources) {
 		diff["sources"] = update
 	}
-	if olds.Registry.Address != news.Registry.Address {
-		diff["registry.address"] = update
-		if olds.Registry.Address != "" {
-			diff["registry.address"] = replace
+	if olds.Registry != nil && news.Registry != nil {
+		if olds.Registry.Address != news.Registry.Address {
+			diff["registry.address"] = update
+			if olds.Registry.Address != "" {
+				diff["registry.address"] = replace
+			}
+		}
+		if olds.Registry.Username != news.Registry.Username {
+			diff["registry.username"] = update
 		}
 	}
-	if olds.Registry.Username != news.Registry.Username {
-		diff["registry.username"] = update
+	if (olds.Registry == nil && news.Registry != nil) ||
+		(olds.Registry != nil && news.Registry == nil) {
+		diff["registry"] = update
 	}
 	// Intentionally ignore changes to registry.password
 
@@ -289,7 +313,7 @@ func (i *Index) Diff(
 // of any host-level credentials.
 func (i *Index) client(
 	ctx provider.Context,
-	state IndexState,
+	_ IndexState,
 	args IndexArgs,
 ) (Client, error) {
 	cfg := infer.GetConfig[Config](ctx)
@@ -298,8 +322,14 @@ func (i *Index) client(
 		return cli, nil
 	}
 
-	auths := cfg.Registries
-	auths = append(auths, state.Registry, args.Registry)
+	// We prefer auth from args, the provider, and state in that order. We
+	// build a slice in reverse order because wrap() will overwrite earlier
+	// entries with later ones.
+	auths := []Registry{}
+	auths = append(auths, cfg.Registries...)
+	if args.Registry != nil {
+		auths = append(auths, *args.Registry)
+	}
 
 	return wrap(cfg.host, auths...)
 }

provider/internal/index_test.go

@@ -94,7 +94,7 @@ func TestIndexLifecycle(t *testing.T) {
 				t.Skip("missing environment variables")
 			}
 			lc := integration.LifeCycleTest{
-				Resource: "dockerbuild:index:Index",
+				Resource: "docker-build:index:Index",
 				Create:   tt.op(t),
 			}
 			s := newServer(tt.client(t))
@@ -109,7 +109,7 @@ func TestIndexLifecycle(t *testing.T) {
 
 func TestIndexDiff(t *testing.T) {
 	t.Parallel()
-	urn := resource.NewURN("test", "provider", "a", "dockerbuild:index:Index", "test")
+	urn := resource.NewURN("test", "provider", "a", "docker-build:index:Index", "test")
 	baseArgs := IndexArgs{Sources: []string{"docker.io/nginx:latest"}}
 	baseState := IndexState{IndexArgs: baseArgs}
 
@@ -138,7 +138,7 @@ func TestIndexDiff(t *testing.T) {
 		{
 			name: "no diff if registry password changes",
 			olds: func(_ *testing.T, s IndexState) IndexState {
-				s.Registry = Registry{
+				s.Registry = &Registry{
 					Address:  "foo",
 					Username: "foo",
 					Password: "foo",
@@ -146,7 +146,7 @@ func TestIndexDiff(t *testing.T) {
 				return s
 			},
 			news: func(_ *testing.T, a IndexArgs) IndexArgs {
-				a.Registry = Registry{
+				a.Registry = &Registry{
 					Address:  "foo",
 					Username: "foo",
 					Password: "DIFFERENT PASSWORD",
@@ -159,7 +159,7 @@ func TestIndexDiff(t *testing.T) {
 			name: "diff if registry added",
 			olds: func(*testing.T, IndexState) IndexState { return baseState },
 			news: func(_ *testing.T, a IndexArgs) IndexArgs {
-				a.Registry = Registry{Address: "foo.com", Username: "foo", Password: "foo"}
+				a.Registry = &Registry{Address: "foo.com", Username: "foo", Password: "foo"}
 				return a
 			},
 			wantChanges: true,
@@ -167,7 +167,7 @@ func TestIndexDiff(t *testing.T) {
 		{
 			name: "diff if registry user changes",
 			olds: func(_ *testing.T, s IndexState) IndexState {
-				s.Registry = Registry{
+				s.Registry = &Registry{
 					Address:  "foo",
 					Username: "foo",
 					Password: "foo",
@@ -175,7 +175,7 @@ func TestIndexDiff(t *testing.T) {
 				return s
 			},
 			news: func(_ *testing.T, a IndexArgs) IndexArgs {
-				a.Registry = Registry{
+				a.Registry = &Registry{
 					Address:  "DIFFERENT USER",
 					Username: "foo",
 					Password: "foo",

provider/internal/mockcli_test.go

@@ -0,0 +1,737 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: cli.go
+//
+// Generated by this command:
+//
+//	mockgen -typed -package internal -source cli.go -destination mockcli_test.go --self_package github.com/pulumi/pulumi-docker-build/provider/internal
+//
+// Package internal is a generated GoMock package.
+package internal
+
+import (
+	io "io"
+	reflect "reflect"
+
+	command "github.com/docker/cli/cli/command"
+	configfile "github.com/docker/cli/cli/config/configfile"
+	docker "github.com/docker/cli/cli/context/docker"
+	store "github.com/docker/cli/cli/context/store"
+	store0 "github.com/docker/cli/cli/manifest/store"
+	client "github.com/docker/cli/cli/registry/client"
+	streams "github.com/docker/cli/cli/streams"
+	trust "github.com/docker/cli/cli/trust"
+	client0 "github.com/docker/docker/client"
+	client1 "github.com/theupdateframework/notary/client"
+	gomock "go.uber.org/mock/gomock"
+)
+
+// MockCli is a mock of Cli interface.
+type MockCli struct {
+	ctrl     *gomock.Controller
+	recorder *MockCliMockRecorder
+}
+
+// MockCliMockRecorder is the mock recorder for MockCli.
+type MockCliMockRecorder struct {
+	mock *MockCli
+}
+
+// NewMockCli creates a new mock instance.
+func NewMockCli(ctrl *gomock.Controller) *MockCli {
+	mock := &MockCli{ctrl: ctrl}
+	mock.recorder = &MockCliMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockCli) EXPECT() *MockCliMockRecorder {
+	return m.recorder
+}
+
+// Apply mocks base method.
+func (m *MockCli) Apply(ops ...command.CLIOption) error {
+	m.ctrl.T.Helper()
+	varargs := []any{}
+	for _, a := range ops {
+		varargs = append(varargs, a)
+	}
+	ret := m.ctrl.Call(m, "Apply", varargs...)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// Apply indicates an expected call of Apply.
+func (mr *MockCliMockRecorder) Apply(ops ...any) *CliApplyCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Apply", reflect.TypeOf((*MockCli)(nil).Apply), ops...)
+	return &CliApplyCall{Call: call}
+}
+
+// CliApplyCall wrap *gomock.Call
+type CliApplyCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliApplyCall) Return(arg0 error) *CliApplyCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliApplyCall) Do(f func(...command.CLIOption) error) *CliApplyCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliApplyCall) DoAndReturn(f func(...command.CLIOption) error) *CliApplyCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// BuildKitEnabled mocks base method.
+func (m *MockCli) BuildKitEnabled() (bool, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "BuildKitEnabled")
+	ret0, _ := ret[0].(bool)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// BuildKitEnabled indicates an expected call of BuildKitEnabled.
+func (mr *MockCliMockRecorder) BuildKitEnabled() *CliBuildKitEnabledCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BuildKitEnabled", reflect.TypeOf((*MockCli)(nil).BuildKitEnabled))
+	return &CliBuildKitEnabledCall{Call: call}
+}
+
+// CliBuildKitEnabledCall wrap *gomock.Call
+type CliBuildKitEnabledCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliBuildKitEnabledCall) Return(arg0 bool, arg1 error) *CliBuildKitEnabledCall {
+	c.Call = c.Call.Return(arg0, arg1)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliBuildKitEnabledCall) Do(f func() (bool, error)) *CliBuildKitEnabledCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliBuildKitEnabledCall) DoAndReturn(f func() (bool, error)) *CliBuildKitEnabledCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// Client mocks base method.
+func (m *MockCli) Client() client0.APIClient {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Client")
+	ret0, _ := ret[0].(client0.APIClient)
+	return ret0
+}
+
+// Client indicates an expected call of Client.
+func (mr *MockCliMockRecorder) Client() *CliClientCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Client", reflect.TypeOf((*MockCli)(nil).Client))
+	return &CliClientCall{Call: call}
+}
+
+// CliClientCall wrap *gomock.Call
+type CliClientCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliClientCall) Return(arg0 client0.APIClient) *CliClientCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliClientCall) Do(f func() client0.APIClient) *CliClientCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliClientCall) DoAndReturn(f func() client0.APIClient) *CliClientCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// ConfigFile mocks base method.
+func (m *MockCli) ConfigFile() *configfile.ConfigFile {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ConfigFile")
+	ret0, _ := ret[0].(*configfile.ConfigFile)
+	return ret0
+}
+
+// ConfigFile indicates an expected call of ConfigFile.
+func (mr *MockCliMockRecorder) ConfigFile() *CliConfigFileCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ConfigFile", reflect.TypeOf((*MockCli)(nil).ConfigFile))
+	return &CliConfigFileCall{Call: call}
+}
+
+// CliConfigFileCall wrap *gomock.Call
+type CliConfigFileCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliConfigFileCall) Return(arg0 *configfile.ConfigFile) *CliConfigFileCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliConfigFileCall) Do(f func() *configfile.ConfigFile) *CliConfigFileCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliConfigFileCall) DoAndReturn(f func() *configfile.ConfigFile) *CliConfigFileCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// ContentTrustEnabled mocks base method.
+func (m *MockCli) ContentTrustEnabled() bool {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ContentTrustEnabled")
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// ContentTrustEnabled indicates an expected call of ContentTrustEnabled.
+func (mr *MockCliMockRecorder) ContentTrustEnabled() *CliContentTrustEnabledCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ContentTrustEnabled", reflect.TypeOf((*MockCli)(nil).ContentTrustEnabled))
+	return &CliContentTrustEnabledCall{Call: call}
+}
+
+// CliContentTrustEnabledCall wrap *gomock.Call
+type CliContentTrustEnabledCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliContentTrustEnabledCall) Return(arg0 bool) *CliContentTrustEnabledCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliContentTrustEnabledCall) Do(f func() bool) *CliContentTrustEnabledCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliContentTrustEnabledCall) DoAndReturn(f func() bool) *CliContentTrustEnabledCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// ContextStore mocks base method.
+func (m *MockCli) ContextStore() store.Store {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ContextStore")
+	ret0, _ := ret[0].(store.Store)
+	return ret0
+}
+
+// ContextStore indicates an expected call of ContextStore.
+func (mr *MockCliMockRecorder) ContextStore() *CliContextStoreCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ContextStore", reflect.TypeOf((*MockCli)(nil).ContextStore))
+	return &CliContextStoreCall{Call: call}
+}
+
+// CliContextStoreCall wrap *gomock.Call
+type CliContextStoreCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliContextStoreCall) Return(arg0 store.Store) *CliContextStoreCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliContextStoreCall) Do(f func() store.Store) *CliContextStoreCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliContextStoreCall) DoAndReturn(f func() store.Store) *CliContextStoreCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// CurrentContext mocks base method.
+func (m *MockCli) CurrentContext() string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "CurrentContext")
+	ret0, _ := ret[0].(string)
+	return ret0
+}
+
+// CurrentContext indicates an expected call of CurrentContext.
+func (mr *MockCliMockRecorder) CurrentContext() *CliCurrentContextCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CurrentContext", reflect.TypeOf((*MockCli)(nil).CurrentContext))
+	return &CliCurrentContextCall{Call: call}
+}
+
+// CliCurrentContextCall wrap *gomock.Call
+type CliCurrentContextCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliCurrentContextCall) Return(arg0 string) *CliCurrentContextCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliCurrentContextCall) Do(f func() string) *CliCurrentContextCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliCurrentContextCall) DoAndReturn(f func() string) *CliCurrentContextCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// CurrentVersion mocks base method.
+func (m *MockCli) CurrentVersion() string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "CurrentVersion")
+	ret0, _ := ret[0].(string)
+	return ret0
+}
+
+// CurrentVersion indicates an expected call of CurrentVersion.
+func (mr *MockCliMockRecorder) CurrentVersion() *CliCurrentVersionCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CurrentVersion", reflect.TypeOf((*MockCli)(nil).CurrentVersion))
+	return &CliCurrentVersionCall{Call: call}
+}
+
+// CliCurrentVersionCall wrap *gomock.Call
+type CliCurrentVersionCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliCurrentVersionCall) Return(arg0 string) *CliCurrentVersionCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliCurrentVersionCall) Do(f func() string) *CliCurrentVersionCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliCurrentVersionCall) DoAndReturn(f func() string) *CliCurrentVersionCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// DefaultVersion mocks base method.
+func (m *MockCli) DefaultVersion() string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "DefaultVersion")
+	ret0, _ := ret[0].(string)
+	return ret0
+}
+
+// DefaultVersion indicates an expected call of DefaultVersion.
+func (mr *MockCliMockRecorder) DefaultVersion() *CliDefaultVersionCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DefaultVersion", reflect.TypeOf((*MockCli)(nil).DefaultVersion))
+	return &CliDefaultVersionCall{Call: call}
+}
+
+// CliDefaultVersionCall wrap *gomock.Call
+type CliDefaultVersionCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliDefaultVersionCall) Return(arg0 string) *CliDefaultVersionCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliDefaultVersionCall) Do(f func() string) *CliDefaultVersionCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliDefaultVersionCall) DoAndReturn(f func() string) *CliDefaultVersionCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// DockerEndpoint mocks base method.
+func (m *MockCli) DockerEndpoint() docker.Endpoint {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "DockerEndpoint")
+	ret0, _ := ret[0].(docker.Endpoint)
+	return ret0
+}
+
+// DockerEndpoint indicates an expected call of DockerEndpoint.
+func (mr *MockCliMockRecorder) DockerEndpoint() *CliDockerEndpointCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DockerEndpoint", reflect.TypeOf((*MockCli)(nil).DockerEndpoint))
+	return &CliDockerEndpointCall{Call: call}
+}
+
+// CliDockerEndpointCall wrap *gomock.Call
+type CliDockerEndpointCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliDockerEndpointCall) Return(arg0 docker.Endpoint) *CliDockerEndpointCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliDockerEndpointCall) Do(f func() docker.Endpoint) *CliDockerEndpointCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliDockerEndpointCall) DoAndReturn(f func() docker.Endpoint) *CliDockerEndpointCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// Err mocks base method.
+func (m *MockCli) Err() io.Writer {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Err")
+	ret0, _ := ret[0].(io.Writer)
+	return ret0
+}
+
+// Err indicates an expected call of Err.
+func (mr *MockCliMockRecorder) Err() *CliErrCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Err", reflect.TypeOf((*MockCli)(nil).Err))
+	return &CliErrCall{Call: call}
+}
+
+// CliErrCall wrap *gomock.Call
+type CliErrCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliErrCall) Return(arg0 io.Writer) *CliErrCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliErrCall) Do(f func() io.Writer) *CliErrCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliErrCall) DoAndReturn(f func() io.Writer) *CliErrCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// In mocks base method.
+func (m *MockCli) In() *streams.In {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "In")
+	ret0, _ := ret[0].(*streams.In)
+	return ret0
+}
+
+// In indicates an expected call of In.
+func (mr *MockCliMockRecorder) In() *CliInCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "In", reflect.TypeOf((*MockCli)(nil).In))
+	return &CliInCall{Call: call}
+}
+
+// CliInCall wrap *gomock.Call
+type CliInCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliInCall) Return(arg0 *streams.In) *CliInCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliInCall) Do(f func() *streams.In) *CliInCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliInCall) DoAndReturn(f func() *streams.In) *CliInCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// ManifestStore mocks base method.
+func (m *MockCli) ManifestStore() store0.Store {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ManifestStore")
+	ret0, _ := ret[0].(store0.Store)
+	return ret0
+}
+
+// ManifestStore indicates an expected call of ManifestStore.
+func (mr *MockCliMockRecorder) ManifestStore() *CliManifestStoreCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ManifestStore", reflect.TypeOf((*MockCli)(nil).ManifestStore))
+	return &CliManifestStoreCall{Call: call}
+}
+
+// CliManifestStoreCall wrap *gomock.Call
+type CliManifestStoreCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliManifestStoreCall) Return(arg0 store0.Store) *CliManifestStoreCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliManifestStoreCall) Do(f func() store0.Store) *CliManifestStoreCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliManifestStoreCall) DoAndReturn(f func() store0.Store) *CliManifestStoreCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// NotaryClient mocks base method.
+func (m *MockCli) NotaryClient(imgRefAndAuth trust.ImageRefAndAuth, actions []string) (client1.Repository, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "NotaryClient", imgRefAndAuth, actions)
+	ret0, _ := ret[0].(client1.Repository)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// NotaryClient indicates an expected call of NotaryClient.
+func (mr *MockCliMockRecorder) NotaryClient(imgRefAndAuth, actions any) *CliNotaryClientCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NotaryClient", reflect.TypeOf((*MockCli)(nil).NotaryClient), imgRefAndAuth, actions)
+	return &CliNotaryClientCall{Call: call}
+}
+
+// CliNotaryClientCall wrap *gomock.Call
+type CliNotaryClientCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliNotaryClientCall) Return(arg0 client1.Repository, arg1 error) *CliNotaryClientCall {
+	c.Call = c.Call.Return(arg0, arg1)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliNotaryClientCall) Do(f func(trust.ImageRefAndAuth, []string) (client1.Repository, error)) *CliNotaryClientCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliNotaryClientCall) DoAndReturn(f func(trust.ImageRefAndAuth, []string) (client1.Repository, error)) *CliNotaryClientCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// Out mocks base method.
+func (m *MockCli) Out() *streams.Out {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Out")
+	ret0, _ := ret[0].(*streams.Out)
+	return ret0
+}
+
+// Out indicates an expected call of Out.
+func (mr *MockCliMockRecorder) Out() *CliOutCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Out", reflect.TypeOf((*MockCli)(nil).Out))
+	return &CliOutCall{Call: call}
+}
+
+// CliOutCall wrap *gomock.Call
+type CliOutCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliOutCall) Return(arg0 *streams.Out) *CliOutCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliOutCall) Do(f func() *streams.Out) *CliOutCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliOutCall) DoAndReturn(f func() *streams.Out) *CliOutCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// RegistryClient mocks base method.
+func (m *MockCli) RegistryClient(arg0 bool) client.RegistryClient {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "RegistryClient", arg0)
+	ret0, _ := ret[0].(client.RegistryClient)
+	return ret0
+}
+
+// RegistryClient indicates an expected call of RegistryClient.
+func (mr *MockCliMockRecorder) RegistryClient(arg0 any) *CliRegistryClientCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegistryClient", reflect.TypeOf((*MockCli)(nil).RegistryClient), arg0)
+	return &CliRegistryClientCall{Call: call}
+}
+
+// CliRegistryClientCall wrap *gomock.Call
+type CliRegistryClientCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliRegistryClientCall) Return(arg0 client.RegistryClient) *CliRegistryClientCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliRegistryClientCall) Do(f func(bool) client.RegistryClient) *CliRegistryClientCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliRegistryClientCall) DoAndReturn(f func(bool) client.RegistryClient) *CliRegistryClientCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// ServerInfo mocks base method.
+func (m *MockCli) ServerInfo() command.ServerInfo {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ServerInfo")
+	ret0, _ := ret[0].(command.ServerInfo)
+	return ret0
+}
+
+// ServerInfo indicates an expected call of ServerInfo.
+func (mr *MockCliMockRecorder) ServerInfo() *CliServerInfoCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ServerInfo", reflect.TypeOf((*MockCli)(nil).ServerInfo))
+	return &CliServerInfoCall{Call: call}
+}
+
+// CliServerInfoCall wrap *gomock.Call
+type CliServerInfoCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliServerInfoCall) Return(arg0 command.ServerInfo) *CliServerInfoCall {
+	c.Call = c.Call.Return(arg0)
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliServerInfoCall) Do(f func() command.ServerInfo) *CliServerInfoCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliServerInfoCall) DoAndReturn(f func() command.ServerInfo) *CliServerInfoCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}
+
+// SetIn mocks base method.
+func (m *MockCli) SetIn(in *streams.In) {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "SetIn", in)
+}
+
+// SetIn indicates an expected call of SetIn.
+func (mr *MockCliMockRecorder) SetIn(in any) *CliSetInCall {
+	mr.mock.ctrl.T.Helper()
+	call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetIn", reflect.TypeOf((*MockCli)(nil).SetIn), in)
+	return &CliSetInCall{Call: call}
+}
+
+// CliSetInCall wrap *gomock.Call
+type CliSetInCall struct {
+	*gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *CliSetInCall) Return() *CliSetInCall {
+	c.Call = c.Call.Return()
+	return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *CliSetInCall) Do(f func(*streams.In)) *CliSetInCall {
+	c.Call = c.Call.Do(f)
+	return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *CliSetInCall) DoAndReturn(f func(*streams.In)) *CliSetInCall {
+	c.Call = c.Call.DoAndReturn(f)
+	return c
+}

provider/internal/mockclient_test.go

@@ -3,7 +3,7 @@
 //
 // Generated by this command:
 //
-//	mockgen -typed -package internal -source client.go -destination mockclient_test.go --self_package github.com/pulumi/pulumi-dockerbuild/provider/internal
+//	mockgen -typed -package internal -source client.go -destination mockclient_test.go --self_package github.com/pulumi/pulumi-docker-build/provider/internal
 //
 // Package internal is a generated GoMock package.
 package internal

provider/internal/network.go

@@ -44,3 +44,10 @@ func (NetworkMode) Values() []infer.EnumValue[NetworkMode] {
 		},
 	}
 }
+
+func (n *NetworkMode) String() string {
+	if n == nil {
+		return string(Default)
+	}
+	return string(*n)
+}

provider/internal/preview.go

@@ -96,8 +96,8 @@ func (k mapKeeper) keep(m map[string]string) map[string]string {
 
 type contextKeeper struct{ preview bool }
 
-func (k contextKeeper) keep(bc BuildContext) BuildContext {
-	if !k.preview || len(bc.Named) == 0 {
+func (k contextKeeper) keep(bc *BuildContext) *BuildContext {
+	if !k.preview || bc == nil || len(bc.Named) == 0 {
 		return bc
 	}
 
@@ -110,7 +110,7 @@ func (k contextKeeper) keep(bc BuildContext) BuildContext {
 		named[k] = v
 	}
 
-	return BuildContext{
+	return &BuildContext{
 		Context: Context{bc.Location},
 		Named:   named,
 	}

provider/internal/provider.go

@@ -69,22 +69,21 @@ func NewBuildxProvider() provider.Provider {
 	return infer.Provider(
 		infer.Options{
 			Metadata: pschema.Metadata{
-				DisplayName:       "dockerbuild",
-				Keywords:          []string{"docker", "buildkit", "buildx"},
-				Description:       "A Pulumi provider for Docker buildx",
-				Homepage:          "https://pulumi.io",
-				Publisher:         "pulumi",
-				License:           "Apache-2.0",
-				Repository:        "https://github.com/pulumi/pulumi-dockerbuild",
-				PluginDownloadURL: "github.com/pulumi/pulumi-dockerbuild",
+				DisplayName: "docker-build",
+				Keywords:    []string{"docker", "buildkit", "buildx", "kind/native"},
+				Description: "A Pulumi provider for building modern Docker images with buildx and BuildKit.",
+				Homepage:    "https://pulumi.com",
+				Publisher:   "pulumi",
+				License:     "Apache-2.0",
+				Repository:  "https://github.com/pulumi/pulumi-docker-build",
 				LanguageMap: map[string]any{
 					"go": gogen.GoPackageInfo{
 						// GenerateResourceContainerTypes: true,
 						Generics: gogen.GenericsSettingSideBySide,
 						PackageImportAliases: map[string]string{
-							"github.com/pulumi/pulumi-dockerbuild/sdk/go/dockerbuild": "dockerbuild",
+							"github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild": "dockerbuild",
 						},
-						ImportBasePath: "github.com/pulumi/pulumi-dockerbuild/sdk/go/dockerbuild",
+						ImportBasePath: "github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild",
 					},
 					"csharp": csgen.CSharpPackageInfo{
 						PackageReferences: map[string]string{
@@ -130,7 +129,7 @@ func NewBuildxProvider() provider.Provider {
 // Schema returns our package specification.
 func Schema(ctx context.Context, version string) schema.PackageSpec {
 	p := NewBuildxProvider()
-	spec, err := provider.GetSchema(ctx, "dockerbuild", version, p)
+	spec, err := provider.GetSchema(ctx, "docker-build", version, p)
 	contract.AssertNoErrorf(err, "missing schema")
 	return spec
 }

provider/provider.go

@@ -18,20 +18,19 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/pulumi/pulumi-docker-build/provider/internal"
+	"github.com/pulumi/pulumi-docker-build/provider/internal/deprecated"
 	gp "github.com/pulumi/pulumi-go-provider"
 	"github.com/pulumi/pulumi/pkg/v3/resource/provider"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
 	rpc "github.com/pulumi/pulumi/sdk/v3/proto/go"
-
-	"github.com/pulumi/pulumi-dockerbuild/provider/internal"
-	"github.com/pulumi/pulumi-dockerbuild/provider/internal/deprecated"
 )
 
 // Version is initialized by the Go linker to contain the semver of this build.
-var Version string
+var Version = "0.0.1"
 
 // Name needs to match $PACK in Makefile.
-const Name string = "dockerbuild"
+const Name string = "docker-build"
 
 // Serve launches the gRPC server for the resource provider.
 func Serve() error {
@@ -63,7 +62,7 @@ func (p configurableProvider) Configure(
 	ctx context.Context,
 	request *rpc.ConfigureRequest,
 ) (*rpc.ConfigureResponse, error) {
-	schema := internal.Schema(ctx, "")
+	schema := internal.Schema(ctx, Version)
 	ce := deprecated.New(schema.Config)
 	buildxReq := request
 	if props, err := ce.UnmarshalProperties(request.Args); err == nil {

provider/provider_test.go

@@ -18,8 +18,10 @@ import (
 	"context"
 	"testing"
 
+	"github.com/blang/semver"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/structpb"
 
 	pulumirpc "github.com/pulumi/pulumi/sdk/v3/proto/go"
@@ -48,3 +50,19 @@ func TestConfigure(t *testing.T) {
 
 	assert.NoError(t, err)
 }
+
+func TestVersion(t *testing.T) {
+	t.Parallel()
+
+	_, err := semver.Parse(Version)
+	assert.NoError(t, err)
+
+	p, err := New(nil)
+	require.NoError(t, err)
+
+	info, err := p.GetPluginInfo(context.Background(), &emptypb.Empty{})
+	assert.NoError(t, err)
+
+	require.NotEqual(t, "", Version)
+	assert.Equal(t, Version, info.Version)
+}

sdk/dotnet/Config/Config.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Immutable;
 
-namespace Pulumi.Dockerbuild
+namespace Pulumi.DockerBuild
 {
     public static class Config
     {
@@ -30,7 +30,7 @@ namespace Pulumi.Dockerbuild
             }
         }
 
-        private static readonly global::Pulumi.Config __config = new global::Pulumi.Config("dockerbuild");
+        private static readonly global::Pulumi.Config __config = new global::Pulumi.Config("docker-build");
 
         private static readonly __Value<string?> _host = new __Value<string?>(() => __config.Get("host") ?? Utilities.GetEnv("DOCKER_HOST") ?? "");
         /// <summary>

sdk/dotnet/Config/README.md

@@ -1 +1 @@
-A Pulumi provider for Docker buildx
+A Pulumi provider for building modern Docker images with buildx and BuildKit.

sdk/dotnet/Enums.cs

@@ -5,7 +5,7 @@ using System;
 using System.ComponentModel;
 using Pulumi;
 
-namespace Pulumi.Dockerbuild
+namespace Pulumi.DockerBuild
 {
     [EnumType]
     public readonly struct CacheMode : IEquatable<CacheMode>

sdk/dotnet/Image.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild
+namespace Pulumi.DockerBuild
 {
     /// <summary>
     /// A Docker image built using buildx -- Docker's interface to the improved
@@ -15,25 +15,19 @@ namespace Pulumi.Dockerbuild
     /// 
     /// ## Stability
     /// 
-    /// **This resource is experimental and subject to change.**
+    /// **This resource is pre-1.0 and in public preview.**
     /// 
-    /// API types are unstable. Subsequent releases _may_ require manual edits
-    /// to your state file(s) in order to adopt API changes.
+    /// We will strive to keep APIs and behavior as stable as possible, but we
+    /// cannot guarantee stability until version 1.0.
     /// 
-    /// `retainOnDelete: true` is recommended with this resource until it is
-    /// stable. This enables future API changes to be adopted more easily by renaming
-    /// resources.
+    /// ## Migrating Pulumi Docker v3 and v4 Image resources
     /// 
-    /// Only use this resource if you understand and accept the risks.
-    /// 
-    /// ## Migrating v3 and v4 Image resources
-    /// 
-    /// The `buildx.Image` resource provides a superset of functionality over the `Image` resources available in versions 3 and 4 of the Pulumi Docker provider.
-    /// Existing `Image` resources can be converted to `build.Image` resources with minor modifications.
+    /// This provider's `Image` resource provides a superset of functionality over the `Image` resources available in versions 3 and 4 of the Pulumi Docker provider.
+    /// Existing `Image` resources can be converted to the docker-build `Image` resources with minor modifications.
     /// 
     /// ### Behavioral differences
     /// 
-    /// There are several key behavioral differences to keep in mind when transitioning images to the new `buildx.Image` resource.
+    /// There are several key behavioral differences to keep in mind when transitioning images to the new `Image` resource.
     /// 
     /// #### Previews
     /// 
@@ -42,19 +36,17 @@ namespace Pulumi.Dockerbuild
     /// 
     /// Version `4.x` changed build-on-preview behavior to be opt-in.
     /// By default, `v4.x` `Image` resources do _not_ build during previews, but this behavior can be toggled with the `buildOnPreview` option.
-    /// Some users felt this made previews in CI less helpful because they no longer detected bad images by default.
+    /// Several users reported outages due to the default behavior allowing bad images to accidentally sneak through CI.
     /// 
-    /// The default behavior of the `buildx.Image` resource has been changed to strike a better balance between CI use cases and manual updates.
-    /// By default, Pulumi will now only build `buildx.Image` resources during previews when it detects a CI environment like GitHub Actions.
-    /// Previews run in non-CI environments will not build images.
-    /// This behavior is still configurable with `buildOnPreview`.
+    /// The default behavior of this provider's `Image` resource is similar to `3.x` and will build images during previews.
+    /// This behavior can be changed by specifying `buildOnPreview`.
     /// 
     /// #### Push behavior
     /// 
     /// Versions `3.x` and `4.x` of the Pulumi Docker provider attempt to push images to remote registries by default.
     /// They expose a `skipPush: true` option to disable pushing.
     /// 
-    /// The `buildx.Image` resource matches the Docker CLI's behavior and does not push images anywhere by default.
+    /// This provider's `Image` resource matches the Docker CLI's behavior and does not push images anywhere by default.
     /// 
     /// To push images to a registry you can include `push: true` (equivalent to Docker's `--push` flag) or configure an `export` of type `registry` (equivalent to Docker's `--output type=registry`).
     /// Like Docker, if an image is configured without exports you will see a warning with instructions for how to enable pushing, but the build will still proceed normally.
@@ -65,7 +57,7 @@ namespace Pulumi.Dockerbuild
     /// 
     /// Version `4.x` of the Pulumi Docker provider does not support secrets.
     /// 
-    /// The `buildx.Image` resource supports secrets but does not require those secrets to exist on-disk or in environment variables.
+    /// The `Image` resource supports secrets but does not require those secrets to exist on-disk or in environment variables.
     /// Instead, they should be passed directly as values.
     /// (Please be sure to familiarize yourself with Pulumi's [native secret handling](https://www.pulumi.com/docs/concepts/secrets/).)
     /// Pulumi also provides [ESC](https://www.pulumi.com/product/esc/) to make it easier to share secrets across stacks and environments.
@@ -80,7 +72,7 @@ namespace Pulumi.Dockerbuild
     /// Both versions 3 and 4 require specific environment variables to be set and deviate from Docker's native caching behavior.
     /// This can result in inefficient builds due to unnecessary image pulls, repeated file transfers, etc.
     /// 
-    /// The `buildx.Image` resource delegates all caching behavior to Docker.
+    /// The `Image` resource delegates all caching behavior to Docker.
     /// `cacheFrom` and `cacheTo` options (equivalent to Docker's `--cache-to` and `--cache-from`) are exposed and provide additional cache targets, such as local disk, S3 storage, etc.
     /// 
     /// #### Outputs
@@ -88,7 +80,7 @@ namespace Pulumi.Dockerbuild
     /// Versions `3.x` and `4.x` of the provider exposed a `repoDigest` output which was a fully qualified tag with digest.
     /// In `4.x` this could also be a single sha256 hash if the image wasn't pushed.
     /// 
-    /// Unlike earlier providers the `buildx.Image` resource can push multiple tags.
+    /// Unlike earlier providers the `Image` resource can push multiple tags.
     /// As a convenience, it exposes a `ref` output consisting of a tag with digest as long as the image was pushed.
     /// If multiple tags were pushed this uses one at random.
     /// 
@@ -101,7 +93,7 @@ namespace Pulumi.Dockerbuild
     /// The `buidx.Image` will query your registries during `refresh` to ensure the expected tags exist.
     /// If any are missing a subsequent `update` will push them.
     /// 
-    /// When a `buildx.Image` is deleted, it will _attempt_ to also delete any pushed tags.
+    /// When a `Image` is deleted, it will _attempt_ to also delete any pushed tags.
     /// Deletion of remote tags is not guaranteed because not all registries support the manifest `DELETE` API (`docker.io` in particular).
     /// Manifests are _not_ deleted in the same way during updates -- to do so safely would require a full build to determine whether a Pulumi operation should be an update or update-replace.
     /// 
@@ -109,11 +101,11 @@ namespace Pulumi.Dockerbuild
     /// 
     /// ### Example migration
     /// 
-    /// Examples of "fully-featured" `v3` and `v4` `Image` resources are shown below, along with an example `buildx.Image` resource showing how they would look after migration.
+    /// Examples of "fully-featured" `v3` and `v4` `Image` resources are shown below, along with an example `Image` resource showing how they would look after migration.
     /// 
     /// The `v3` resource leverages `buildx` via a `DOCKER_BUILDKIT` environment variable and CLI flags passed in with `extraOption`.
-    /// After migration, the environment variable is no longer needed and CLI flags are now properties on the `buildx.Image`.
-    /// In almost all cases, properties of `buildx.Image` are named after the Docker CLI flag they correspond to.
+    /// After migration, the environment variable is no longer needed and CLI flags are now properties on the `Image`.
+    /// In almost all cases, properties of `Image` are named after the Docker CLI flag they correspond to.
     /// 
     /// The `v4` resource is less functional than its `v3` counterpart because it lacks the flexibility of `extraOptions`.
     /// It it is shown with parameters similar to the `v3` example for completeness.
@@ -127,7 +119,7 @@ namespace Pulumi.Dockerbuild
     /// using System.Linq;
     /// using Pulumi;
     /// using Aws = Pulumi.Aws;
-    /// using Docker = Pulumi.Docker;
+    /// using DockerBuild = Pulumi.DockerBuild;
     /// 
     /// return await Deployment.RunAsync(() =&gt; 
     /// {
@@ -138,13 +130,13 @@ namespace Pulumi.Dockerbuild
     ///         RegistryId = ecrRepository.RegistryId,
     ///     });
     /// 
-    ///     var myImage = new Docker.Buildx.Image("my-image", new()
+    ///     var myImage = new DockerBuild.Image("my-image", new()
     ///     {
     ///         CacheFrom = new[]
     ///         {
-    ///             new Docker.Buildx.Inputs.CacheFromArgs
+    ///             new DockerBuild.Inputs.CacheFromArgs
     ///             {
-    ///                 Registry = new Docker.Buildx.Inputs.CacheFromRegistryArgs
+    ///                 Registry = new DockerBuild.Inputs.CacheFromRegistryArgs
     ///                 {
     ///                     Ref = ecrRepository.RepositoryUrl.Apply(repositoryUrl =&gt; $"{repositoryUrl}:cache"),
     ///                 },
@@ -152,9 +144,9 @@ namespace Pulumi.Dockerbuild
     ///         },
     ///         CacheTo = new[]
     ///         {
-    ///             new Docker.Buildx.Inputs.CacheToArgs
+    ///             new DockerBuild.Inputs.CacheToArgs
     ///             {
-    ///                 Registry = new Docker.Buildx.Inputs.CacheToRegistryArgs
+    ///                 Registry = new DockerBuild.Inputs.CacheToRegistryArgs
     ///                 {
     ///                     ImageManifest = true,
     ///                     OciMediaTypes = true,
@@ -162,14 +154,14 @@ namespace Pulumi.Dockerbuild
     ///                 },
     ///             },
     ///         },
-    ///         Context = new Docker.Buildx.Inputs.BuildContextArgs
+    ///         Context = new DockerBuild.Inputs.BuildContextArgs
     ///         {
     ///             Location = "./app",
     ///         },
     ///         Push = true,
     ///         Registries = new[]
     ///         {
-    ///             new Docker.Buildx.Inputs.RegistryAuthArgs
+    ///             new DockerBuild.Inputs.RegistryArgs
     ///             {
     ///                 Address = ecrRepository.RepositoryUrl,
     ///                 Password = authToken.Apply(getAuthorizationTokenResult =&gt; getAuthorizationTokenResult.Password),
@@ -194,20 +186,20 @@ namespace Pulumi.Dockerbuild
     /// using System.Collections.Generic;
     /// using System.Linq;
     /// using Pulumi;
-    /// using Docker = Pulumi.Docker;
+    /// using DockerBuild = Pulumi.DockerBuild;
     /// 
     /// return await Deployment.RunAsync(() =&gt; 
     /// {
-    ///     var image = new Docker.Buildx.Image("image", new()
+    ///     var image = new DockerBuild.Image("image", new()
     ///     {
-    ///         Context = new Docker.Buildx.Inputs.BuildContextArgs
+    ///         Context = new DockerBuild.Inputs.BuildContextArgs
     ///         {
     ///             Location = "app",
     ///         },
     ///         Platforms = new[]
     ///         {
-    ///             Docker.Buildx.Image.Platform.Plan9_amd64,
-    ///             Docker.Buildx.Image.Platform.Plan9_386,
+    ///             DockerBuild.Platform.Plan9_amd64,
+    ///             DockerBuild.Platform.Plan9_386,
     ///         },
     ///     });
     /// 
@@ -219,20 +211,20 @@ namespace Pulumi.Dockerbuild
     /// using System.Collections.Generic;
     /// using System.Linq;
     /// using Pulumi;
-    /// using Docker = Pulumi.Docker;
+    /// using DockerBuild = Pulumi.DockerBuild;
     /// 
     /// return await Deployment.RunAsync(() =&gt; 
     /// {
-    ///     var image = new Docker.Buildx.Image("image", new()
+    ///     var image = new DockerBuild.Image("image", new()
     ///     {
-    ///         Context = new Docker.Buildx.Inputs.BuildContextArgs
+    ///         Context = new DockerBuild.Inputs.BuildContextArgs
     ///         {
     ///             Location = "app",
     ///         },
     ///         Push = true,
     ///         Registries = new[]
     ///         {
-    ///             new Docker.Buildx.Inputs.RegistryAuthArgs
+    ///             new DockerBuild.Inputs.RegistryArgs
     ///             {
     ///                 Address = "docker.io",
     ///                 Password = dockerHubPassword,
@@ -257,17 +249,17 @@ namespace Pulumi.Dockerbuild
     /// using System.Collections.Generic;
     /// using System.Linq;
     /// using Pulumi;
-    /// using Docker = Pulumi.Docker;
+    /// using DockerBuild = Pulumi.DockerBuild;
     /// 
     /// return await Deployment.RunAsync(() =&gt; 
     /// {
-    ///     var image = new Docker.Buildx.Image("image", new()
+    ///     var image = new DockerBuild.Image("image", new()
     ///     {
     ///         CacheFrom = new[]
     ///         {
-    ///             new Docker.Buildx.Inputs.CacheFromArgs
+    ///             new DockerBuild.Inputs.CacheFromArgs
     ///             {
-    ///                 Local = new Docker.Buildx.Inputs.CacheFromLocalArgs
+    ///                 Local = new DockerBuild.Inputs.CacheFromLocalArgs
     ///                 {
     ///                     Src = "tmp/cache",
     ///                 },
@@ -275,16 +267,16 @@ namespace Pulumi.Dockerbuild
     ///         },
     ///         CacheTo = new[]
     ///         {
-    ///             new Docker.Buildx.Inputs.CacheToArgs
+    ///             new DockerBuild.Inputs.CacheToArgs
     ///             {
-    ///                 Local = new Docker.Buildx.Inputs.CacheToLocalArgs
+    ///                 Local = new DockerBuild.Inputs.CacheToLocalArgs
     ///                 {
     ///                     Dest = "tmp/cache",
-    ///                     Mode = Docker.Buildx.Image.CacheMode.Max,
+    ///                     Mode = DockerBuild.CacheMode.Max,
     ///                 },
     ///             },
     ///         },
-    ///         Context = new Docker.Buildx.Inputs.BuildContextArgs
+    ///         Context = new DockerBuild.Inputs.BuildContextArgs
     ///         {
     ///             Location = "app",
     ///         },
@@ -298,17 +290,17 @@ namespace Pulumi.Dockerbuild
     /// using System.Collections.Generic;
     /// using System.Linq;
     /// using Pulumi;
-    /// using Docker = Pulumi.Docker;
+    /// using DockerBuild = Pulumi.DockerBuild;
     /// 
     /// return await Deployment.RunAsync(() =&gt; 
     /// {
-    ///     var image = new Docker.Buildx.Image("image", new()
+    ///     var image = new DockerBuild.Image("image", new()
     ///     {
-    ///         Builder = new Docker.Buildx.Inputs.BuilderConfigArgs
+    ///         Builder = new DockerBuild.Inputs.BuilderConfigArgs
     ///         {
     ///             Name = "cloud-builder-name",
     ///         },
-    ///         Context = new Docker.Buildx.Inputs.BuildContextArgs
+    ///         Context = new DockerBuild.Inputs.BuildContextArgs
     ///         {
     ///             Location = "app",
     ///         },
@@ -323,17 +315,17 @@ namespace Pulumi.Dockerbuild
     /// using System.Collections.Generic;
     /// using System.Linq;
     /// using Pulumi;
-    /// using Docker = Pulumi.Docker;
+    /// using DockerBuild = Pulumi.DockerBuild;
     /// 
     /// return await Deployment.RunAsync(() =&gt; 
     /// {
-    ///     var image = new Docker.Buildx.Image("image", new()
+    ///     var image = new DockerBuild.Image("image", new()
     ///     {
     ///         BuildArgs = 
     ///         {
     ///             { "SET_ME_TO_TRUE", "true" },
     ///         },
-    ///         Context = new Docker.Buildx.Inputs.BuildContextArgs
+    ///         Context = new DockerBuild.Inputs.BuildContextArgs
     ///         {
     ///             Location = "app",
     ///         },
@@ -347,13 +339,13 @@ namespace Pulumi.Dockerbuild
     /// using System.Collections.Generic;
     /// using System.Linq;
     /// using Pulumi;
-    /// using Docker = Pulumi.Docker;
+    /// using DockerBuild = Pulumi.DockerBuild;
     /// 
     /// return await Deployment.RunAsync(() =&gt; 
     /// {
-    ///     var image = new Docker.Buildx.Image("image", new()
+    ///     var image = new DockerBuild.Image("image", new()
     ///     {
-    ///         Context = new Docker.Buildx.Inputs.BuildContextArgs
+    ///         Context = new DockerBuild.Inputs.BuildContextArgs
     ///         {
     ///             Location = "app",
     ///         },
@@ -368,18 +360,18 @@ namespace Pulumi.Dockerbuild
     /// using System.Collections.Generic;
     /// using System.Linq;
     /// using Pulumi;
-    /// using Docker = Pulumi.Docker;
+    /// using DockerBuild = Pulumi.DockerBuild;
     /// 
     /// return await Deployment.RunAsync(() =&gt; 
     /// {
-    ///     var image = new Docker.Buildx.Image("image", new()
+    ///     var image = new DockerBuild.Image("image", new()
     ///     {
-    ///         Context = new Docker.Buildx.Inputs.BuildContextArgs
+    ///         Context = new DockerBuild.Inputs.BuildContextArgs
     ///         {
     ///             Location = "app",
     ///             Named = 
     ///             {
-    ///                 { "golang:latest", new Docker.Buildx.Inputs.ContextArgs
+    ///                 { "golang:latest", new DockerBuild.Inputs.ContextArgs
     ///                 {
     ///                     Location = "docker-image://golang@sha256:b8e62cf593cdaff36efd90aa3a37de268e6781a2e68c6610940c48f7cdf36984",
     ///                 } },
@@ -395,13 +387,13 @@ namespace Pulumi.Dockerbuild
     /// using System.Collections.Generic;
     /// using System.Linq;
     /// using Pulumi;
-    /// using Docker = Pulumi.Docker;
+    /// using DockerBuild = Pulumi.DockerBuild;
     /// 
     /// return await Deployment.RunAsync(() =&gt; 
     /// {
-    ///     var image = new Docker.Buildx.Image("image", new()
+    ///     var image = new DockerBuild.Image("image", new()
     ///     {
-    ///         Context = new Docker.Buildx.Inputs.BuildContextArgs
+    ///         Context = new DockerBuild.Inputs.BuildContextArgs
     ///         {
     ///             Location = "https://raw.githubusercontent.com/pulumi/pulumi-docker/api-types/provider/testdata/Dockerfile",
     ///         },
@@ -415,17 +407,17 @@ namespace Pulumi.Dockerbuild
     /// using System.Collections.Generic;
     /// using System.Linq;
     /// using Pulumi;
-    /// using Docker = Pulumi.Docker;
+    /// using DockerBuild = Pulumi.DockerBuild;
     /// 
     /// return await Deployment.RunAsync(() =&gt; 
     /// {
-    ///     var image = new Docker.Buildx.Image("image", new()
+    ///     var image = new DockerBuild.Image("image", new()
     ///     {
-    ///         Context = new Docker.Buildx.Inputs.BuildContextArgs
+    ///         Context = new DockerBuild.Inputs.BuildContextArgs
     ///         {
     ///             Location = "app",
     ///         },
-    ///         Dockerfile = new Docker.Buildx.Inputs.DockerfileArgs
+    ///         Dockerfile = new DockerBuild.Inputs.DockerfileArgs
     ///         {
     ///             Inline = @"FROM busybox
     /// COPY hello.c ./
@@ -441,17 +433,17 @@ namespace Pulumi.Dockerbuild
     /// using System.Collections.Generic;
     /// using System.Linq;
     /// using Pulumi;
-    /// using Docker = Pulumi.Docker;
+    /// using DockerBuild = Pulumi.DockerBuild;
     /// 
     /// return await Deployment.RunAsync(() =&gt; 
     /// {
-    ///     var image = new Docker.Buildx.Image("image", new()
+    ///     var image = new DockerBuild.Image("image", new()
     ///     {
-    ///         Context = new Docker.Buildx.Inputs.BuildContextArgs
+    ///         Context = new DockerBuild.Inputs.BuildContextArgs
     ///         {
     ///             Location = "https://github.com/docker-library/hello-world.git",
     ///         },
-    ///         Dockerfile = new Docker.Buildx.Inputs.DockerfileArgs
+    ///         Dockerfile = new DockerBuild.Inputs.DockerfileArgs
     ///         {
     ///             Location = "app/Dockerfile",
     ///         },
@@ -465,21 +457,21 @@ namespace Pulumi.Dockerbuild
     /// using System.Collections.Generic;
     /// using System.Linq;
     /// using Pulumi;
-    /// using Docker = Pulumi.Docker;
+    /// using DockerBuild = Pulumi.DockerBuild;
     /// 
     /// return await Deployment.RunAsync(() =&gt; 
     /// {
-    ///     var image = new Docker.Buildx.Image("image", new()
+    ///     var image = new DockerBuild.Image("image", new()
     ///     {
-    ///         Context = new Docker.Buildx.Inputs.BuildContextArgs
+    ///         Context = new DockerBuild.Inputs.BuildContextArgs
     ///         {
     ///             Location = "app",
     ///         },
     ///         Exports = new[]
     ///         {
-    ///             new Docker.Buildx.Inputs.ExportArgs
+    ///             new DockerBuild.Inputs.ExportArgs
     ///             {
-    ///                 Docker = new Docker.Buildx.Inputs.ExportDockerArgs
+    ///                 Docker = new DockerBuild.Inputs.ExportDockerArgs
     ///                 {
     ///                     Tar = true,
     ///                 },
@@ -491,7 +483,7 @@ namespace Pulumi.Dockerbuild
     /// 
     /// ```
     /// </summary>
-    [DockerbuildResourceType("dockerbuild:index:Image")]
+    [DockerBuildResourceType("docker-build:index:Image")]
     public partial class Image : global::Pulumi.CustomResource
     {
         /// <summary>
@@ -517,20 +509,17 @@ namespace Pulumi.Dockerbuild
         public Output<ImmutableDictionary<string, string>?> BuildArgs { get; private set; } = null!;
 
         /// <summary>
-        /// By default, preview behavior depends on the execution environment. If
-        /// Pulumi detects the operation is running on a CI system (GitHub Actions,
-        /// Travis CI, Azure Pipelines, etc.) then it will build images during
-        /// previews as a safeguard. Otherwise, if not running on CI, previews will
-        /// not build images.
-        /// 
-        /// Setting this to `false` forces previews to never perform builds, and
-        /// setting it to `true` will always build the image during previews.
+        /// Setting this to `false` will always skip image builds during previews,
+        /// and setting it to `true` will always build images during previews.
         /// 
         /// Images built during previews are never exported to registries, however
         /// cache manifests are still exported.
         /// 
         /// On-disk Dockerfiles are always validated for syntactic correctness
         /// regardless of this setting.
+        /// 
+        /// Defaults to `true` as a safeguard against broken images merging as part
+        /// of CI pipelines.
         /// </summary>
         [Output("buildOnPreview")]
         public Output<bool?> BuildOnPreview { get; private set; } = null!;
@@ -658,7 +647,7 @@ namespace Pulumi.Dockerbuild
         /// Equivalent to Docker's `--network` flag.
         /// </summary>
         [Output("network")]
-        public Output<Pulumi.Dockerbuild.NetworkMode?> Network { get; private set; } = null!;
+        public Output<Pulumi.DockerBuild.NetworkMode?> Network { get; private set; } = null!;
 
         /// <summary>
         /// Do not import cache manifests when building the image.
@@ -674,7 +663,7 @@ namespace Pulumi.Dockerbuild
         /// Equivalent to Docker's `--platform` flag.
         /// </summary>
         [Output("platforms")]
-        public Output<ImmutableArray<Pulumi.Dockerbuild.Platform>> Platforms { get; private set; } = null!;
+        public Output<ImmutableArray<Pulumi.DockerBuild.Platform>> Platforms { get; private set; } = null!;
 
         /// <summary>
         /// Always pull referenced images.
@@ -777,12 +766,12 @@ namespace Pulumi.Dockerbuild
         /// <param name="args">The arguments used to populate this resource's properties</param>
         /// <param name="options">A bag of options that control this resource's behavior</param>
         public Image(string name, ImageArgs? args = null, CustomResourceOptions? options = null)
-            : base("dockerbuild:index:Image", name, args ?? new ImageArgs(), MakeResourceOptions(options, ""))
+            : base("docker-build:index:Image", name, args ?? new ImageArgs(), MakeResourceOptions(options, ""))
         {
         }
 
         private Image(string name, Input<string> id, CustomResourceOptions? options = null)
-            : base("dockerbuild:index:Image", name, null, MakeResourceOptions(options, id))
+            : base("docker-build:index:Image", name, null, MakeResourceOptions(options, id))
         {
         }
 
@@ -791,7 +780,6 @@ namespace Pulumi.Dockerbuild
             var defaultOptions = new CustomResourceOptions
             {
                 Version = Utilities.Version,
-                PluginDownloadURL = "github.com/pulumi/pulumi-dockerbuild",
             };
             var merged = CustomResourceOptions.Merge(defaultOptions, options);
             // Override the ID if one was specified for consistency with other language SDKs.
@@ -849,20 +837,17 @@ namespace Pulumi.Dockerbuild
         }
 
         /// <summary>
-        /// By default, preview behavior depends on the execution environment. If
-        /// Pulumi detects the operation is running on a CI system (GitHub Actions,
-        /// Travis CI, Azure Pipelines, etc.) then it will build images during
-        /// previews as a safeguard. Otherwise, if not running on CI, previews will
-        /// not build images.
-        /// 
-        /// Setting this to `false` forces previews to never perform builds, and
-        /// setting it to `true` will always build the image during previews.
+        /// Setting this to `false` will always skip image builds during previews,
+        /// and setting it to `true` will always build images during previews.
         /// 
         /// Images built during previews are never exported to registries, however
         /// cache manifests are still exported.
         /// 
         /// On-disk Dockerfiles are always validated for syntactic correctness
         /// regardless of this setting.
+        /// 
+        /// Defaults to `true` as a safeguard against broken images merging as part
+        /// of CI pipelines.
         /// </summary>
         [Input("buildOnPreview")]
         public Input<bool>? BuildOnPreview { get; set; }
@@ -994,7 +979,7 @@ namespace Pulumi.Dockerbuild
         /// Equivalent to Docker's `--network` flag.
         /// </summary>
         [Input("network")]
-        public Input<Pulumi.Dockerbuild.NetworkMode>? Network { get; set; }
+        public Input<Pulumi.DockerBuild.NetworkMode>? Network { get; set; }
 
         /// <summary>
         /// Do not import cache manifests when building the image.
@@ -1005,16 +990,16 @@ namespace Pulumi.Dockerbuild
         public Input<bool>? NoCache { get; set; }
 
         [Input("platforms")]
-        private InputList<Pulumi.Dockerbuild.Platform>? _platforms;
+        private InputList<Pulumi.DockerBuild.Platform>? _platforms;
 
         /// <summary>
         /// Set target platform(s) for the build. Defaults to the host's platform.
         /// 
         /// Equivalent to Docker's `--platform` flag.
         /// </summary>
-        public InputList<Pulumi.Dockerbuild.Platform> Platforms
+        public InputList<Pulumi.DockerBuild.Platform> Platforms
         {
-            get => _platforms ?? (_platforms = new InputList<Pulumi.Dockerbuild.Platform>());
+            get => _platforms ?? (_platforms = new InputList<Pulumi.DockerBuild.Platform>());
             set => _platforms = value;
         }
 
@@ -1117,7 +1102,8 @@ namespace Pulumi.Dockerbuild
 
         public ImageArgs()
         {
-            Network = Pulumi.Dockerbuild.NetworkMode.@Default;
+            BuildOnPreview = true;
+            Network = Pulumi.DockerBuild.NetworkMode.@Default;
         }
         public static new ImageArgs Empty => new ImageArgs();
     }

sdk/dotnet/Index.cs

@@ -7,16 +7,28 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild
+namespace Pulumi.DockerBuild
 {
     /// <summary>
-    /// An index (or manifest list) referencing one or more existing images.
+    /// A wrapper around `docker buildx imagetools create` to create an index
+    /// (or manifest list) referencing one or more existing images.
     /// 
-    /// Useful for crafting a multi-platform image from several
-    /// platform-specific images.
+    /// In most cases you do not need an `Index` to build a multi-platform
+    /// image -- specifying multiple platforms on the `Image` will handle this
+    /// for you automatically.
     /// 
-    /// This creates an OCI image index or a Docker manifest list depending on
-    /// the media types of the source images.
+    /// However, as of April 2024, building multi-platform images _with
+    /// caching_ will only export a cache for one platform at a time (see [this
+    /// discussion](https://github.com/docker/buildx/discussions/1382) for more
+    /// details).
+    /// 
+    /// Therefore this resource can be helpful if you are building
+    /// multi-platform images with caching: each platform can be built and
+    /// cached separately, and an `Index` can join them all together. An
+    /// example of this is shown below.
+    /// 
+    /// This resource creates an OCI image index or a Docker manifest list
+    /// depending on the media types of the source images.
     /// 
     /// ## Example Usage
     /// ### Multi-platform registry caching
@@ -24,17 +36,17 @@ namespace Pulumi.Dockerbuild
     /// using System.Collections.Generic;
     /// using System.Linq;
     /// using Pulumi;
-    /// using Docker = Pulumi.Docker;
+    /// using DockerBuild = Pulumi.DockerBuild;
     /// 
     /// return await Deployment.RunAsync(() =&gt; 
     /// {
-    ///     var amd64 = new Docker.Buildx.Image("amd64", new()
+    ///     var amd64 = new DockerBuild.Image("amd64", new()
     ///     {
     ///         CacheFrom = new[]
     ///         {
-    ///             new Docker.Buildx.Inputs.CacheFromArgs
+    ///             new DockerBuild.Inputs.CacheFromArgs
     ///             {
-    ///                 Registry = new Docker.Buildx.Inputs.CacheFromRegistryArgs
+    ///                 Registry = new DockerBuild.Inputs.CacheFromRegistryArgs
     ///                 {
     ///                     Ref = "docker.io/pulumi/pulumi:cache-amd64",
     ///                 },
@@ -42,22 +54,22 @@ namespace Pulumi.Dockerbuild
     ///         },
     ///         CacheTo = new[]
     ///         {
-    ///             new Docker.Buildx.Inputs.CacheToArgs
+    ///             new DockerBuild.Inputs.CacheToArgs
     ///             {
-    ///                 Registry = new Docker.Buildx.Inputs.CacheToRegistryArgs
+    ///                 Registry = new DockerBuild.Inputs.CacheToRegistryArgs
     ///                 {
-    ///                     Mode = Docker.Buildx.Image.CacheMode.Max,
+    ///                     Mode = DockerBuild.CacheMode.Max,
     ///                     Ref = "docker.io/pulumi/pulumi:cache-amd64",
     ///                 },
     ///             },
     ///         },
-    ///         Context = new Docker.Buildx.Inputs.BuildContextArgs
+    ///         Context = new DockerBuild.Inputs.BuildContextArgs
     ///         {
     ///             Location = "app",
     ///         },
     ///         Platforms = new[]
     ///         {
-    ///             Docker.Buildx.Image.Platform.Linux_amd64,
+    ///             DockerBuild.Platform.Linux_amd64,
     ///         },
     ///         Tags = new[]
     ///         {
@@ -65,13 +77,13 @@ namespace Pulumi.Dockerbuild
     ///         },
     ///     });
     /// 
-    ///     var arm64 = new Docker.Buildx.Image("arm64", new()
+    ///     var arm64 = new DockerBuild.Image("arm64", new()
     ///     {
     ///         CacheFrom = new[]
     ///         {
-    ///             new Docker.Buildx.Inputs.CacheFromArgs
+    ///             new DockerBuild.Inputs.CacheFromArgs
     ///             {
-    ///                 Registry = new Docker.Buildx.Inputs.CacheFromRegistryArgs
+    ///                 Registry = new DockerBuild.Inputs.CacheFromRegistryArgs
     ///                 {
     ///                     Ref = "docker.io/pulumi/pulumi:cache-arm64",
     ///                 },
@@ -79,22 +91,22 @@ namespace Pulumi.Dockerbuild
     ///         },
     ///         CacheTo = new[]
     ///         {
-    ///             new Docker.Buildx.Inputs.CacheToArgs
+    ///             new DockerBuild.Inputs.CacheToArgs
     ///             {
-    ///                 Registry = new Docker.Buildx.Inputs.CacheToRegistryArgs
+    ///                 Registry = new DockerBuild.Inputs.CacheToRegistryArgs
     ///                 {
-    ///                     Mode = Docker.Buildx.Image.CacheMode.Max,
+    ///                     Mode = DockerBuild.CacheMode.Max,
     ///                     Ref = "docker.io/pulumi/pulumi:cache-arm64",
     ///                 },
     ///             },
     ///         },
-    ///         Context = new Docker.Buildx.Inputs.BuildContextArgs
+    ///         Context = new DockerBuild.Inputs.BuildContextArgs
     ///         {
     ///             Location = "app",
     ///         },
     ///         Platforms = new[]
     ///         {
-    ///             Docker.Buildx.Image.Platform.Linux_arm64,
+    ///             DockerBuild.Platform.Linux_arm64,
     ///         },
     ///         Tags = new[]
     ///         {
@@ -102,7 +114,7 @@ namespace Pulumi.Dockerbuild
     ///         },
     ///     });
     /// 
-    ///     var index = new Docker.Buildx.Index("index", new()
+    ///     var index = new DockerBuild.Index("index", new()
     ///     {
     ///         Sources = new[]
     ///         {
@@ -120,7 +132,7 @@ namespace Pulumi.Dockerbuild
     /// 
     /// ```
     /// </summary>
-    [DockerbuildResourceType("dockerbuild:index:Index")]
+    [DockerBuildResourceType("docker-build:index:Index")]
     public partial class Index : global::Pulumi.CustomResource
     {
         /// <summary>
@@ -168,12 +180,12 @@ namespace Pulumi.Dockerbuild
         /// <param name="args">The arguments used to populate this resource's properties</param>
         /// <param name="options">A bag of options that control this resource's behavior</param>
         public Index(string name, IndexArgs args, CustomResourceOptions? options = null)
-            : base("dockerbuild:index:Index", name, args ?? new IndexArgs(), MakeResourceOptions(options, ""))
+            : base("docker-build:index:Index", name, args ?? new IndexArgs(), MakeResourceOptions(options, ""))
         {
         }
 
         private Index(string name, Input<string> id, CustomResourceOptions? options = null)
-            : base("dockerbuild:index:Index", name, null, MakeResourceOptions(options, id))
+            : base("docker-build:index:Index", name, null, MakeResourceOptions(options, id))
         {
         }
 
@@ -182,7 +194,6 @@ namespace Pulumi.Dockerbuild
             var defaultOptions = new CustomResourceOptions
             {
                 Version = Utilities.Version,
-                PluginDownloadURL = "github.com/pulumi/pulumi-dockerbuild",
             };
             var merged = CustomResourceOptions.Merge(defaultOptions, options);
             // Override the ID if one was specified for consistency with other language SDKs.

sdk/dotnet/Inputs/BuildContextArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class BuildContextArgs : global::Pulumi.ResourceArgs

sdk/dotnet/Inputs/BuilderConfigArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class BuilderConfigArgs : global::Pulumi.ResourceArgs

sdk/dotnet/Inputs/CacheFromArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class CacheFromArgs : global::Pulumi.ResourceArgs

sdk/dotnet/Inputs/CacheFromAzureBlobArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class CacheFromAzureBlobArgs : global::Pulumi.ResourceArgs

sdk/dotnet/Inputs/CacheFromGitHubActionsArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class CacheFromGitHubActionsArgs : global::Pulumi.ResourceArgs

sdk/dotnet/Inputs/CacheFromLocalArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class CacheFromLocalArgs : global::Pulumi.ResourceArgs

sdk/dotnet/Inputs/CacheFromRegistryArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class CacheFromRegistryArgs : global::Pulumi.ResourceArgs

sdk/dotnet/Inputs/CacheFromS3Args.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class CacheFromS3Args : global::Pulumi.ResourceArgs

sdk/dotnet/Inputs/CacheToArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class CacheToArgs : global::Pulumi.ResourceArgs

sdk/dotnet/Inputs/CacheToAzureBlobArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class CacheToAzureBlobArgs : global::Pulumi.ResourceArgs
@@ -28,7 +28,7 @@ namespace Pulumi.Dockerbuild.Inputs
         /// The cache mode to use. Defaults to `min`.
         /// </summary>
         [Input("mode")]
-        public Input<Pulumi.Dockerbuild.CacheMode>? Mode { get; set; }
+        public Input<Pulumi.DockerBuild.CacheMode>? Mode { get; set; }
 
         /// <summary>
         /// The name of the cache image.
@@ -55,7 +55,7 @@ namespace Pulumi.Dockerbuild.Inputs
         public CacheToAzureBlobArgs()
         {
             IgnoreError = false;
-            Mode = Pulumi.Dockerbuild.CacheMode.Min;
+            Mode = Pulumi.DockerBuild.CacheMode.Min;
         }
         public static new CacheToAzureBlobArgs Empty => new CacheToAzureBlobArgs();
     }

sdk/dotnet/Inputs/CacheToGitHubActionsArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class CacheToGitHubActionsArgs : global::Pulumi.ResourceArgs
@@ -22,7 +22,7 @@ namespace Pulumi.Dockerbuild.Inputs
         /// The cache mode to use. Defaults to `min`.
         /// </summary>
         [Input("mode")]
-        public Input<Pulumi.Dockerbuild.CacheMode>? Mode { get; set; }
+        public Input<Pulumi.DockerBuild.CacheMode>? Mode { get; set; }
 
         /// <summary>
         /// The scope to use for cache keys. Defaults to `buildkit`.
@@ -67,7 +67,7 @@ namespace Pulumi.Dockerbuild.Inputs
         public CacheToGitHubActionsArgs()
         {
             IgnoreError = false;
-            Mode = Pulumi.Dockerbuild.CacheMode.Min;
+            Mode = Pulumi.DockerBuild.CacheMode.Min;
             Scope = Utilities.GetEnv("buildkit") ?? "";
             Token = Utilities.GetEnv("ACTIONS_RUNTIME_TOKEN") ?? "";
             Url = Utilities.GetEnv("ACTIONS_RUNTIME_URL") ?? "";

sdk/dotnet/Inputs/CacheToInlineArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     /// <summary>

sdk/dotnet/Inputs/CacheToLocalArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class CacheToLocalArgs : global::Pulumi.ResourceArgs
@@ -16,7 +16,7 @@ namespace Pulumi.Dockerbuild.Inputs
         /// The compression type to use.
         /// </summary>
         [Input("compression")]
-        public Input<Pulumi.Dockerbuild.CompressionType>? Compression { get; set; }
+        public Input<Pulumi.DockerBuild.CompressionType>? Compression { get; set; }
 
         /// <summary>
         /// Compression level from 0 to 22.
@@ -46,15 +46,15 @@ namespace Pulumi.Dockerbuild.Inputs
         /// The cache mode to use. Defaults to `min`.
         /// </summary>
         [Input("mode")]
-        public Input<Pulumi.Dockerbuild.CacheMode>? Mode { get; set; }
+        public Input<Pulumi.DockerBuild.CacheMode>? Mode { get; set; }
 
         public CacheToLocalArgs()
         {
-            Compression = Pulumi.Dockerbuild.CompressionType.Gzip;
+            Compression = Pulumi.DockerBuild.CompressionType.Gzip;
             CompressionLevel = 0;
             ForceCompression = false;
             IgnoreError = false;
-            Mode = Pulumi.Dockerbuild.CacheMode.Min;
+            Mode = Pulumi.DockerBuild.CacheMode.Min;
         }
         public static new CacheToLocalArgs Empty => new CacheToLocalArgs();
     }

sdk/dotnet/Inputs/CacheToRegistryArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class CacheToRegistryArgs : global::Pulumi.ResourceArgs
@@ -16,7 +16,7 @@ namespace Pulumi.Dockerbuild.Inputs
         /// The compression type to use.
         /// </summary>
         [Input("compression")]
-        public Input<Pulumi.Dockerbuild.CompressionType>? Compression { get; set; }
+        public Input<Pulumi.DockerBuild.CompressionType>? Compression { get; set; }
 
         /// <summary>
         /// Compression level from 0 to 22.
@@ -52,7 +52,7 @@ namespace Pulumi.Dockerbuild.Inputs
         /// The cache mode to use. Defaults to `min`.
         /// </summary>
         [Input("mode")]
-        public Input<Pulumi.Dockerbuild.CacheMode>? Mode { get; set; }
+        public Input<Pulumi.DockerBuild.CacheMode>? Mode { get; set; }
 
         /// <summary>
         /// Whether to use OCI media types in exported manifests. Defaults to
@@ -69,12 +69,12 @@ namespace Pulumi.Dockerbuild.Inputs
 
         public CacheToRegistryArgs()
         {
-            Compression = Pulumi.Dockerbuild.CompressionType.Gzip;
+            Compression = Pulumi.DockerBuild.CompressionType.Gzip;
             CompressionLevel = 0;
             ForceCompression = false;
             IgnoreError = false;
             ImageManifest = false;
-            Mode = Pulumi.Dockerbuild.CacheMode.Min;
+            Mode = Pulumi.DockerBuild.CacheMode.Min;
             OciMediaTypes = true;
         }
         public static new CacheToRegistryArgs Empty => new CacheToRegistryArgs();

sdk/dotnet/Inputs/CacheToS3Args.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class CacheToS3Args : global::Pulumi.ResourceArgs
@@ -52,7 +52,7 @@ namespace Pulumi.Dockerbuild.Inputs
         /// The cache mode to use. Defaults to `min`.
         /// </summary>
         [Input("mode")]
-        public Input<Pulumi.Dockerbuild.CacheMode>? Mode { get; set; }
+        public Input<Pulumi.DockerBuild.CacheMode>? Mode { get; set; }
 
         /// <summary>
         /// Name of the cache image.
@@ -108,7 +108,7 @@ namespace Pulumi.Dockerbuild.Inputs
         {
             AccessKeyId = Utilities.GetEnv("AWS_ACCESS_KEY_ID") ?? "";
             IgnoreError = false;
-            Mode = Pulumi.Dockerbuild.CacheMode.Min;
+            Mode = Pulumi.DockerBuild.CacheMode.Min;
             Region = Utilities.GetEnv("AWS_REGION") ?? "";
             SecretAccessKey = Utilities.GetEnv("AWS_SECRET_ACCESS_KEY") ?? "";
             SessionToken = Utilities.GetEnv("AWS_SESSION_TOKEN") ?? "";

sdk/dotnet/Inputs/ContextArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class ContextArgs : global::Pulumi.ResourceArgs

sdk/dotnet/Inputs/DockerfileArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class DockerfileArgs : global::Pulumi.ResourceArgs

sdk/dotnet/Inputs/ExportArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class ExportArgs : global::Pulumi.ResourceArgs

sdk/dotnet/Inputs/ExportCacheOnlyArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class ExportCacheOnlyArgs : global::Pulumi.ResourceArgs

sdk/dotnet/Inputs/ExportDockerArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class ExportDockerArgs : global::Pulumi.ResourceArgs
@@ -28,7 +28,7 @@ namespace Pulumi.Dockerbuild.Inputs
         /// The compression type to use.
         /// </summary>
         [Input("compression")]
-        public Input<Pulumi.Dockerbuild.CompressionType>? Compression { get; set; }
+        public Input<Pulumi.DockerBuild.CompressionType>? Compression { get; set; }
 
         /// <summary>
         /// Compression level from 0 to 22.
@@ -74,7 +74,7 @@ namespace Pulumi.Dockerbuild.Inputs
 
         public ExportDockerArgs()
         {
-            Compression = Pulumi.Dockerbuild.CompressionType.Gzip;
+            Compression = Pulumi.DockerBuild.CompressionType.Gzip;
             CompressionLevel = 0;
             ForceCompression = false;
             OciMediaTypes = false;

sdk/dotnet/Inputs/ExportImageArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class ExportImageArgs : global::Pulumi.ResourceArgs
@@ -28,7 +28,7 @@ namespace Pulumi.Dockerbuild.Inputs
         /// The compression type to use.
         /// </summary>
         [Input("compression")]
-        public Input<Pulumi.Dockerbuild.CompressionType>? Compression { get; set; }
+        public Input<Pulumi.DockerBuild.CompressionType>? Compression { get; set; }
 
         /// <summary>
         /// Compression level from 0 to 22.
@@ -111,7 +111,7 @@ namespace Pulumi.Dockerbuild.Inputs
 
         public ExportImageArgs()
         {
-            Compression = Pulumi.Dockerbuild.CompressionType.Gzip;
+            Compression = Pulumi.DockerBuild.CompressionType.Gzip;
             CompressionLevel = 0;
             ForceCompression = false;
             OciMediaTypes = false;

sdk/dotnet/Inputs/ExportLocalArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class ExportLocalArgs : global::Pulumi.ResourceArgs

sdk/dotnet/Inputs/ExportOCIArgs.cs

@@ -7,7 +7,7 @@ using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Pulumi.Serialization;
 
-namespace Pulumi.Dockerbuild.Inputs
+namespace Pulumi.DockerBuild.Inputs
 {
 
     public sealed class ExportOCIArgs : global::Pulumi.ResourceArgs
@@ -28,7 +28,7 @@ namespace Pulumi.Dockerbuild.Inputs
         /// The compression type to use.
         /// </summary>
         [Input("compression")]
-        public Input<Pulumi.Dockerbuild.CompressionType>? Compression { get; set; }
+        public Input<Pulumi.DockerBuild.CompressionType>? Compression { get; set; }
 
         /// <summary>
         /// Compression level from 0 to 22.
@@ -74,7 +74,7 @@ namespace Pulumi.Dockerbuild.Inputs
 
         public ExportOCIArgs()
         {
-            Compression = Pulumi.Dockerbuild.CompressionType.Gzip;
+            Compression = Pulumi.DockerBuild.CompressionType.Gzip;
             CompressionLevel = 0;
             ForceCompression = false;
             OciMediaTypes = true;