Merge pull request #619 from DefangLabs/jordan/586-cleanup

fix lingering reference to PulumiProject

Author: lionello

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

@@ -357,7 +357,7 @@ func (b *ByocAws) Delete(ctx context.Context, req *defangv1.DeleteRequest) (*def
 
 // stackDir returns a stack-qualified path, like the Pulumi TS function `stackDir`
 func (b *ByocAws) stackDir(name string) string {
-	ensure(b.ProjectName != "", "pulumiProject not set")
+	ensure(b.ProjectName != "", "ProjectName not set")
 	return fmt.Sprintf("/%s/%s/%s/%s", byoc.DefangPrefix, b.ProjectName, b.PulumiStack, name) // same as shared/common.ts
 }
 
@@ -472,7 +472,7 @@ func (b *ByocAws) Follow(ctx context.Context, req *defangv1.TailRequest) (client
 		term.Debug("Tailing task", etag)
 		etag = "" // no need to filter by etag
 	} else {
-		// Tail CD, kaniko, and all services (this requires PulumiProject to be set)
+		// Tail CD, kaniko, and all services (this requires ProjectName to be set)
 		kanikoTail := ecs.LogGroupInput{LogGroupARN: b.driver.MakeARN("logs", "log-group:"+b.stackDir("builds"))} // must match logic in ecs/common.ts
 		term.Debug("Tailing kaniko logs", kanikoTail.LogGroupARN)
 		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

@@ -16,7 +16,7 @@ var ctx = context.Background()
 
 func TestDeploy(t *testing.T) {
 	b := NewByoc(ctx, client.GrpcClient{}, "ten ant") // no domain
-	b.PulumiProject = "byoc_integration_test"
+	b.ProjectName = "byoc_integration_test"
 
 	t.Run("multiple ingress without domain", func(t *testing.T) {
 		t.Skip("skipping test: delegation enabled")
@@ -42,7 +42,7 @@ func TestDeploy(t *testing.T) {
 
 func TestTail(t *testing.T) {
 	b := NewByoc(ctx, client.GrpcClient{}, "TestTail")
-	b.PulumiProject = "byoc_integration_test"
+	b.ProjectName = "byoc_integration_test"
 	b.ProjectDomain = "example.com" // avoid rpc call
 
 	ss, err := b.Follow(context.Background(), &defangv1.TailRequest{})
@@ -70,7 +70,7 @@ func TestTail(t *testing.T) {
 
 func TestGetServices(t *testing.T) {
 	b := NewByoc(ctx, client.GrpcClient{}, "TestGetServices")
-	b.PulumiProject = "byoc_integration_test"
+	b.ProjectName = "byoc_integration_test"
 
 	services, err := b.GetServices(context.Background())
 	if err != nil {
@@ -90,7 +90,7 @@ func TestPutSecret(t *testing.T) {
 	const secretName = "hello"
 
 	b := NewByoc(ctx, client.GrpcClient{}, "TestPutSecret")
-	b.PulumiProject = "byoc_integration_test"
+	b.ProjectName = "byoc_integration_test"
 
 	t.Run("delete non-existent", func(t *testing.T) {
 		err := b.DeleteConfig(context.Background(), &defangv1.Secrets{Names: []string{secretName}})
@@ -125,7 +125,7 @@ func TestPutSecret(t *testing.T) {
 			b.DeleteConfig(context.Background(), &defangv1.Secrets{Names: []string{secretName}})
 		})
 		// Check that the secret is in the list
-		prefix := "/Defang/" + b.PulumiProject + "/beta/"
+		prefix := "/Defang/" + b.ProjectName + "/beta/"
 		secrets, err := b.driver.ListSecretsByPrefix(context.Background(), prefix)
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
@@ -142,7 +142,7 @@ func TestPutSecret(t *testing.T) {
 
 func TestListSecrets(t *testing.T) {
 	b := NewByoc(ctx, client.GrpcClient{}, "TestListSecrets")
-	b.PulumiProject = "byoc_integration_test2" // ensure we don't accidentally see the secrets from the other test
+	b.ProjectName = "byoc_integration_test2" // ensure we don't accidentally see the secrets from the other test
 
 	t.Run("list", func(t *testing.T) {
 		secrets, err := b.ListConfig(context.Background())