Skip to content

Commit 4b3d44a

Browse files
rename azure emulator image to localstack/localstack-azure
1 parent ca6f7bc commit 4b3d44a

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

internal/config/containers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ var knownImages = []struct {
8080
{EmulatorAWS, "localstack-pro", true},
8181
{EmulatorAWS, "localstack", false},
8282
{EmulatorSnowflake, "snowflake", true},
83-
{EmulatorAzure, "localstack-azure-alpha", true},
83+
{EmulatorAzure, "localstack-azure", true},
8484
}
8585

8686
func EmulatorTypeForImage(image string) EmulatorType {

internal/config/containers_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ func TestAzureEmulatorResolvesStartMetadata(t *testing.T) {
121121

122122
image, err := c.Image()
123123
require.NoError(t, err)
124-
assert.Equal(t, "localstack/localstack-azure-alpha:latest", image)
124+
assert.Equal(t, "localstack/localstack-azure:latest", image)
125125

126126
productName, err := c.ProductName()
127127
require.NoError(t, err)
128-
assert.Equal(t, "localstack-azure-alpha", productName)
128+
assert.Equal(t, "localstack-azure", productName)
129129

130130
healthPath, err := c.HealthPath()
131131
require.NoError(t, err)
@@ -137,7 +137,7 @@ func TestAzureEmulatorResolvesStartMetadata(t *testing.T) {
137137
}
138138

139139
func TestEmulatorTypeForImage_Azure(t *testing.T) {
140-
assert.Equal(t, EmulatorAzure, EmulatorTypeForImage("localstack/localstack-azure-alpha:latest"))
140+
assert.Equal(t, EmulatorAzure, EmulatorTypeForImage("localstack/localstack-azure:latest"))
141141
}
142142

143143
func TestSelfValidatesLicense(t *testing.T) {

internal/container/start_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func TestSelectContainersToStart_AttachesWhenExternalContainerOnConfiguredPort(t
157157
}
158158

159159
mockRT.EXPECT().IsRunning(gomock.Any(), c.Name).Return(false, nil)
160-
mockRT.EXPECT().FindRunningByImage(gomock.Any(), []string{"localstack/localstack-pro", "localstack/localstack", "localstack/snowflake", "localstack/localstack-azure-alpha"}, "4566/tcp").
160+
mockRT.EXPECT().FindRunningByImage(gomock.Any(), []string{"localstack/localstack-pro", "localstack/localstack", "localstack/snowflake", "localstack/localstack-azure"}, "4566/tcp").
161161
Return(&runtime.RunningContainer{Name: "external-container", Image: "localstack/localstack-pro:3.5.0", BoundPort: "4566"}, nil)
162162
mockRT.EXPECT().ContainerEnv(gomock.Any(), "external-container").Return(nil, nil)
163163

@@ -186,7 +186,7 @@ func TestSelectContainersToStart_AttachesWhenExternalContainerVersionDiffers(t *
186186
}
187187

188188
mockRT.EXPECT().IsRunning(gomock.Any(), c.Name).Return(false, nil)
189-
mockRT.EXPECT().FindRunningByImage(gomock.Any(), []string{"localstack/localstack-pro", "localstack/localstack", "localstack/snowflake", "localstack/localstack-azure-alpha"}, "4566/tcp").
189+
mockRT.EXPECT().FindRunningByImage(gomock.Any(), []string{"localstack/localstack-pro", "localstack/localstack", "localstack/snowflake", "localstack/localstack-azure"}, "4566/tcp").
190190
Return(&runtime.RunningContainer{Name: "external-container", Image: "localstack/localstack-pro:3.5.0", BoundPort: "4566"}, nil)
191191
mockRT.EXPECT().ContainerEnv(gomock.Any(), "external-container").Return(nil, nil)
192192

@@ -220,7 +220,7 @@ func TestSelectContainersToStart_QueuesContainerWhenNoneRunningOnPort(t *testing
220220
}
221221

222222
mockRT.EXPECT().IsRunning(gomock.Any(), c.Name).Return(false, nil)
223-
mockRT.EXPECT().FindRunningByImage(gomock.Any(), []string{"localstack/localstack-pro", "localstack/localstack", "localstack/snowflake", "localstack/localstack-azure-alpha"}, "4566/tcp").
223+
mockRT.EXPECT().FindRunningByImage(gomock.Any(), []string{"localstack/localstack-pro", "localstack/localstack", "localstack/snowflake", "localstack/localstack-azure"}, "4566/tcp").
224224
Return(nil, nil)
225225

226226
sink := output.NewPlainSink(io.Discard)
@@ -246,7 +246,7 @@ func TestSelectContainersToStart_ErrorsOnEmulatorTypeMismatch(t *testing.T) {
246246
}
247247

248248
mockRT.EXPECT().IsRunning(gomock.Any(), c.Name).Return(false, nil)
249-
mockRT.EXPECT().FindRunningByImage(gomock.Any(), []string{"localstack/localstack-pro", "localstack/localstack", "localstack/snowflake", "localstack/localstack-azure-alpha"}, "4566/tcp").
249+
mockRT.EXPECT().FindRunningByImage(gomock.Any(), []string{"localstack/localstack-pro", "localstack/localstack", "localstack/snowflake", "localstack/localstack-azure"}, "4566/tcp").
250250
Return(&runtime.RunningContainer{Name: "localstack-aws", Image: "localstack/localstack-pro:latest", BoundPort: "4566"}, nil)
251251

252252
var out bytes.Buffer
@@ -363,7 +363,7 @@ func TestStartContainers_AzureLicenseError(t *testing.T) {
363363
mockRT := runtime.NewMockRuntime(ctrl)
364364

365365
c := runtime.ContainerConfig{
366-
Image: "localstack/localstack-azure-alpha:latest",
366+
Image: "localstack/localstack-azure:latest",
367367
Name: "localstack-azure",
368368
EmulatorType: config.EmulatorAzure,
369369
Tag: "latest",

test/integration/start_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -713,8 +713,8 @@ func TestStartCommandSucceedsForAzure(t *testing.T) {
713713
inspect, err := dockerClient.ContainerInspect(ctx, azureContainerName, client.ContainerInspectOptions{})
714714
require.NoError(t, err, "failed to inspect azure container")
715715
require.True(t, inspect.Container.State.Running, "azure container should be running")
716-
assert.Contains(t, inspect.Container.Config.Image, "localstack/localstack-azure-alpha",
717-
"expected localstack/localstack-azure-alpha image, got %s", inspect.Container.Config.Image)
716+
assert.Contains(t, inspect.Container.Config.Image, "localstack/localstack-azure",
717+
"expected localstack/localstack-azure image, got %s", inspect.Container.Config.Image)
718718

719719
resp, err := http.Get(fmt.Sprintf("http://localhost:%s/_localstack/health", hostPort))
720720
require.NoError(t, err)

0 commit comments

Comments
 (0)