changes for rc1

This commit is contained in:
Bryce Lampe
2025-05-09 09:39:13 -07:00
parent f37fe4d2d7
commit 53d91af128
16 changed files with 102 additions and 95 deletions

View File

@@ -717,7 +717,7 @@ func (i *Image) Create(
}, errors.New("buildkit is not supported on this host")
}
build, err := input.toBuild(ctx, cli.SupportsMultipleExports(), req.Preview)
build, err := input.toBuild(ctx, cli.SupportsMultipleExports(), req.DryRun)
if err != nil {
return infer.CreateResponse[ImageState]{
ID: id,
@@ -738,10 +738,10 @@ func (i *Image) Create(
}
state.ContextHash = hash
if req.Preview && !input.shouldBuildOnPreview() {
if req.DryRun && !input.shouldBuildOnPreview() {
return infer.CreateResponse[ImageState]{ID: id, Output: state}, nil
}
if req.Preview && !input.buildable() {
if req.DryRun && !input.buildable() {
provider.GetLogger(ctx).Warning("Skipping preview build because some inputs are unknown.")
return infer.CreateResponse[ImageState]{ID: id, Output: state}, nil
}
@@ -784,7 +784,7 @@ func (i *Image) Update(
req infer.UpdateRequest[ImageArgs, ImageState],
) (infer.UpdateResponse[ImageState], error) {
resp, err := i.Create(ctx,
infer.CreateRequest[ImageArgs]{Name: req.ID, Inputs: req.Inputs, Preview: req.Preview},
infer.CreateRequest[ImageArgs]{Name: req.ID, Inputs: req.Inputs, DryRun: req.DryRun},
)
return infer.UpdateResponse[ImageState]{Output: resp.Output}, err
}

View File

@@ -327,7 +327,7 @@ func TestImageLifecycle(t *testing.T) {
Resource: "docker-build:index:Image",
Create: tt.op(t),
}
s := newServer(tt.client(t))
s := newServer(t.Context(), t, tt.client(t))
err := s.Configure(provider.ConfigureRequest{})
require.NoError(t, err)
@@ -352,7 +352,7 @@ func TestDelete(t *testing.T) {
Delete(gomock.Any(), "docker.io/pulumi/test@sha256:foo").
Return(errNotFound{})
s := newServer(client)
s := newServer(t.Context(), t, client)
err := s.Configure(provider.ConfigureRequest{})
require.NoError(t, err)
@@ -390,7 +390,7 @@ func TestRead(t *testing.T) {
},
}, nil)
s := newServer(client)
s := newServer(t.Context(), t, client)
err := s.Configure(provider.ConfigureRequest{})
require.NoError(t, err)
@@ -793,7 +793,7 @@ func TestImageDiff(t *testing.T) {
},
}
s := newServer(nil)
s := newServer(t.Context(), t, nil)
encode := func(t *testing.T, x any) property.Map {
raw, err := mapper.New(&mapper.Opts{IgnoreMissing: true}).Encode(x)

View File

@@ -135,10 +135,10 @@ func (i *Index) Create(
) (infer.CreateResponse[IndexState], error) {
resp, err := i.Update(ctx,
infer.UpdateRequest[IndexArgs, IndexState]{
ID: req.Name,
State: IndexState{},
Inputs: req.Inputs,
Preview: req.Preview,
ID: req.Name,
State: IndexState{},
Inputs: req.Inputs,
DryRun: req.DryRun,
},
)
return infer.CreateResponse[IndexState]{ID: req.Name, Output: resp.Output}, err
@@ -160,7 +160,7 @@ func (i *Index) Update(
return infer.UpdateResponse[IndexState]{Output: state}, err
}
if req.Preview {
if req.DryRun {
return infer.UpdateResponse[IndexState]{Output: state}, nil
}

View File

@@ -125,7 +125,7 @@ func TestIndexLifecycle(t *testing.T) {
Resource: "docker-build:index:Index",
Create: tt.op(t),
}
s := newServer(tt.client(t))
s := newServer(t.Context(), t, tt.client(t))
err := s.Configure(provider.ConfigureRequest{})
require.NoError(t, err)
@@ -214,7 +214,7 @@ func TestIndexDiff(t *testing.T) {
},
}
s := newServer(nil)
s := newServer(t.Context(), t, nil)
encode := func(t *testing.T, x any) property.Map {
raw, err := mapper.New(&mapper.Opts{IgnoreMissing: true}).Encode(x)

View File

@@ -20,6 +20,7 @@ import (
"github.com/blang/semver"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
provider "github.com/pulumi/pulumi-go-provider"
"github.com/pulumi/pulumi-go-provider/infer"
@@ -31,7 +32,7 @@ import (
func TestConfigure(t *testing.T) {
t.Parallel()
s := newServer(nil)
s := newServer(t.Context(), t, nil)
err := s.Configure(
provider.ConfigureRequest{},
@@ -60,7 +61,7 @@ func TestAnnotate(t *testing.T) {
func TestSchema(t *testing.T) {
t.Parallel()
s := newServer(nil)
s := newServer(t.Context(), t, nil)
_, err := s.GetSchema(provider.GetSchemaRequest{Version: 0})
assert.NoError(t, err)
@@ -75,7 +76,9 @@ func (annotator) SetToken(tokens.ModuleName, tokens.TypeName) {}
func (annotator) AddAlias(tokens.ModuleName, tokens.TypeName) {}
func (annotator) SetResourceDeprecationMessage(_ string) {}
func newServer(client Client) integration.Server {
func newServer(ctx context.Context, t *testing.T, client Client) integration.Server {
t.Helper()
p := NewBuildxProvider()
// Inject a mock client if provided.
@@ -85,5 +88,11 @@ func newServer(client Client) integration.Server {
})
}
return integration.NewServer("docker-build", semver.Version{Major: 0}, p)
s, err := integration.NewServer(
ctx,
"docker-build", semver.Version{Major: 0},
integration.WithProvider(p),
)
require.NoError(t, err)
return s
}