Skip to content

Commit 6c034c2

Browse files
fix lingering reference to PulumiProject
these should have been fixed in fab0ce7
1 parent 13a6eb1 commit 6c034c2

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/pkg/cli/client/byoc/aws/byoc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ func (b *ByocAws) Delete(ctx context.Context, req *defangv1.DeleteRequest) (*def
357357

358358
// stackDir returns a stack-qualified path, like the Pulumi TS function `stackDir`
359359
func (b *ByocAws) stackDir(name string) string {
360-
ensure(b.ProjectName != "", "pulumiProject not set")
360+
ensure(b.ProjectName != "", "ProjectName not set")
361361
return fmt.Sprintf("/%s/%s/%s/%s", byoc.DefangPrefix, b.ProjectName, b.PulumiStack, name) // same as shared/common.ts
362362
}
363363

@@ -472,7 +472,7 @@ func (b *ByocAws) Follow(ctx context.Context, req *defangv1.TailRequest) (client
472472
term.Debug("Tailing task", etag)
473473
etag = "" // no need to filter by etag
474474
} else {
475-
// Tail CD, kaniko, and all services (this requires PulumiProject to be set)
475+
// Tail CD, kaniko, and all services (this requires ProjectName to be set)
476476
kanikoTail := ecs.LogGroupInput{LogGroupARN: b.driver.MakeARN("logs", "log-group:"+b.stackDir("builds"))} // must match logic in ecs/common.ts
477477
term.Debug("Tailing kaniko logs", kanikoTail.LogGroupARN)
478478
servicesTail := ecs.LogGroupInput{LogGroupARN: b.driver.MakeARN("logs", "log-group:"+b.stackDir("logs"))} // must match logic in ecs/common.ts

src/pkg/cli/client/byoc/aws/byoc_integration_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var ctx = context.Background()
1616

1717
func TestDeploy(t *testing.T) {
1818
b := NewByoc(ctx, client.GrpcClient{}, "ten ant") // no domain
19-
b.PulumiProject = "byoc_integration_test"
19+
b.ProjectName = "byoc_integration_test"
2020

2121
t.Run("multiple ingress without domain", func(t *testing.T) {
2222
t.Skip("skipping test: delegation enabled")
@@ -42,7 +42,7 @@ func TestDeploy(t *testing.T) {
4242

4343
func TestTail(t *testing.T) {
4444
b := NewByoc(ctx, client.GrpcClient{}, "TestTail")
45-
b.PulumiProject = "byoc_integration_test"
45+
b.ProjectName = "byoc_integration_test"
4646
b.ProjectDomain = "example.com" // avoid rpc call
4747

4848
ss, err := b.Follow(context.Background(), &defangv1.TailRequest{})
@@ -70,7 +70,7 @@ func TestTail(t *testing.T) {
7070

7171
func TestGetServices(t *testing.T) {
7272
b := NewByoc(ctx, client.GrpcClient{}, "TestGetServices")
73-
b.PulumiProject = "byoc_integration_test"
73+
b.ProjectName = "byoc_integration_test"
7474

7575
services, err := b.GetServices(context.Background())
7676
if err != nil {
@@ -90,7 +90,7 @@ func TestPutSecret(t *testing.T) {
9090
const secretName = "hello"
9191

9292
b := NewByoc(ctx, client.GrpcClient{}, "TestPutSecret")
93-
b.PulumiProject = "byoc_integration_test"
93+
b.ProjectName = "byoc_integration_test"
9494

9595
t.Run("delete non-existent", func(t *testing.T) {
9696
err := b.DeleteConfig(context.Background(), &defangv1.Secrets{Names: []string{secretName}})
@@ -125,7 +125,7 @@ func TestPutSecret(t *testing.T) {
125125
b.DeleteConfig(context.Background(), &defangv1.Secrets{Names: []string{secretName}})
126126
})
127127
// Check that the secret is in the list
128-
prefix := "/Defang/" + b.PulumiProject + "/beta/"
128+
prefix := "/Defang/" + b.ProjectName + "/beta/"
129129
secrets, err := b.driver.ListSecretsByPrefix(context.Background(), prefix)
130130
if err != nil {
131131
t.Fatalf("unexpected error: %v", err)
@@ -142,7 +142,7 @@ func TestPutSecret(t *testing.T) {
142142

143143
func TestListSecrets(t *testing.T) {
144144
b := NewByoc(ctx, client.GrpcClient{}, "TestListSecrets")
145-
b.PulumiProject = "byoc_integration_test2" // ensure we don't accidentally see the secrets from the other test
145+
b.ProjectName = "byoc_integration_test2" // ensure we don't accidentally see the secrets from the other test
146146

147147
t.Run("list", func(t *testing.T) {
148148
secrets, err := b.ListConfig(context.Background())

0 commit comments

Comments
 (0)