s/resource_name/id/g

jordanstephens · jordanstephens · commit 6fcd1825601c · 2025-04-16T14:02:36.000-07:00
diff --git a/examples/dotnet/Program.cs b/examples/dotnet/Program.cs
@@ -23,7 +23,7 @@
             {
                 { "service1", 
                 {
-                    { "resource_name", myProject.Services.Apply(services => services.Service1.Resource_name) },
+                    { "id", myProject.Services.Apply(services => services.Service1.Id) },
                     { "task_role", myProject.Services.Apply(services => services.Service1.Task_role) },
                 } },
             } },
diff --git a/examples/dotnet/provider-defang.csproj b/examples/dotnet/provider-defang.csproj
@@ -7,7 +7,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Pulumi" Version="3.*" />
-		<PackageReference Include="DefangLabs.Defang" Version="1.2.0-alpha.1744826391" />
+		<PackageReference Include="DefangLabs.Defang" Version="1.2.0-alpha.1744837289" />
 	</ItemGroup>
 
 </Project>
diff --git a/examples/go/go.mod b/examples/go/go.mod
@@ -4,5 +4,5 @@ go 1.20
 
 require (
 	github.com/pulumi/pulumi/sdk/v3 v3.30.0
-	github.com/DefangLabs/pulumi-defang/sdk v1.2.0-alpha.1744826391
+	github.com/DefangLabs/pulumi-defang/sdk v1.2.0-alpha.1744837289
 )
diff --git a/examples/go/main.go b/examples/go/main.go
@@ -20,8 +20,8 @@ func main() {
 			"etag":   myProject.Etag,
 			"services": pulumi.StringMapMap{
 				"service1": pulumi.StringMap{
-					"resource_name": myProject.Services.ApplyT(func(services map[string]defang.ServiceState) (*string, error) {
-						return &services.Service1.Resource_name, nil
+					"id": myProject.Services.ApplyT(func(services map[string]defang.ServiceState) (*string, error) {
+						return &services.Service1.Id, nil
 					}).(pulumi.StringPtrOutput),
 					"task_role": myProject.Services.ApplyT(func(services map[string]defang.ServiceState) (*string, error) {
 						return &services.Service1.Task_role, nil
diff --git a/examples/nodejs/index.ts b/examples/nodejs/index.ts
@@ -7,7 +7,7 @@ export const output = {
     etag: myProject.etag,
     services: {
         service1: {
-            resource_name: myProject.services.apply(services => services.service1.resource_name),
+            id: myProject.services.apply(services => services.service1.id),
             task_role: myProject.services.apply(services => services.service1.task_role),
         },
     },
diff --git a/examples/nodejs/package.json b/examples/nodejs/package.json
@@ -6,6 +6,6 @@
 	"dependencies": {
 		"typescript": "^4.0.0",
 		"@pulumi/pulumi": "^3.0.0",
-		"@defang-io/pulumi-defang": "1.2.0-alpha.1744826391"
+		"@defang-io/pulumi-defang": "1.2.0-alpha.1744837289"
 	}
 }
diff --git a/examples/python/__main__.py b/examples/python/__main__.py
@@ -7,7 +7,7 @@
     "etag": my_project.etag,
     "services": {
         "service1": {
-            "resource_name": my_project.services["service1"],
+            "id": my_project.services["service1"],
             "task_role": my_project.services["service1"],
         },
     },
diff --git a/examples/python/requirements.txt b/examples/python/requirements.txt
@@ -1,2 +1,2 @@
-pulumi-defang==1.2.0-alpha.1744826391
+pulumi-defang==1.2.0-alpha.1744837289
 pulumi>=3.0.0,<4.0.0
diff --git a/examples/yaml/Pulumi.yaml b/examples/yaml/Pulumi.yaml
@@ -18,5 +18,5 @@ outputs:
     etag: ${myProject.etag}
     services:
       service1:
-        resource_name: ${myProject.services.service1.resource_name}
+        id: ${myProject.services.service1.id}
         task_role: ${myProject.services.service1.task_role}
diff --git a/provider/cmd/pulumi-resource-defang/schema.json b/provider/cmd/pulumi-resource-defang/schema.json
@@ -1,6 +1,6 @@
 {
   "name": "defang",
-  "version": "1.1.0-beta.10",
+  "version": "1.1.0-beta.11",
   "description": "Take your app from Docker Compose to a secure and scalable cloud deployment with Pulumi.",
   "keywords": [
     "category/cloud",
@@ -93,7 +93,7 @@
     },
     "defang:index:ServiceState": {
       "properties": {
-        "resource_name": {
+        "id": {
           "type": "string"
         },
         "task_role": {
@@ -102,7 +102,7 @@
       },
       "type": "object",
       "required": [
-        "resource_name",
+        "id",
         "task_role"
       ]
     },
diff --git a/provider/project.go b/provider/project.go
@@ -61,8 +61,8 @@ type ProjectArgs struct {
 }
 
 type ServiceState struct {
-	ResourceName string  `pulumi:"resource_name,omitempty"`
-	TaskRole     *string `pulumi:"task_role"`
+	ID       string  `pulumi:"id,omitempty"`
+	TaskRole *string `pulumi:"task_role"`
 }
 
 // Each resource has a state, describing the fields that exist on the created resource.
@@ -292,10 +292,10 @@ func getProjectState(etag string, projectUpdate *defangv1.ProjectUpdate) (Projec
 	}
 
 	services := make(map[string]*ServiceState, len(projectUpdate.GetServices()))
-	for _, serviceState := range v1DefangProjectOutputs.Services {
-		services[serviceState.ID] = &ServiceState{
-			ResourceName: serviceState.ID,
-			TaskRole:     serviceState.TaskRole,
+	for _, serviceOutputs := range v1DefangProjectOutputs.Services {
+		services[serviceOutputs.ID] = &ServiceState{
+			ID:       serviceOutputs.ID,
+			TaskRole: serviceOutputs.TaskRole,
 		}
 	}
 	state.Services = services
diff --git a/tests/project_test.go b/tests/project_test.go
@@ -40,7 +40,7 @@ func TestProject(t *testing.T) {
 				services := output["services"].ObjectValue()
 				serviceValue := services["service1-id"]
 				serviceConfig := serviceValue.ObjectValue()
-				assert.Equal(t, "service1-id", serviceConfig["resource_name"].StringValue())
+				assert.Equal(t, "service1-id", serviceConfig["id"].StringValue())
 				assert.Equal(t, "service1-role", serviceConfig["task_role"].StringValue())
 			},
 		},
@@ -54,7 +54,7 @@ func TestProject(t *testing.T) {
 					services := output["services"].ObjectValue()
 					serviceValue := services["service1-id"]
 					serviceConfig := serviceValue.ObjectValue()
-					assert.Equal(t, "service1-id", serviceConfig["resource_name"].StringValue())
+					assert.Equal(t, "service1-id", serviceConfig["id"].StringValue())
 					assert.Equal(t, "service1-role", serviceConfig["task_role"].StringValue())
 				},
 			},
diff --git a/tests/provider_test.go b/tests/provider_test.go
@@ -47,7 +47,7 @@ func TestProjectCreate(t *testing.T) {
 	serviceValue := services["service1-id"]
 	assert.NotNil(t, serviceValue)
 	serviceConfig := serviceValue.ObjectValue()
-	assert.Equal(t, "service1-id", serviceConfig["resource_name"].StringValue())
+	assert.Equal(t, "service1-id", serviceConfig["id"].StringValue())
 	assert.Equal(t, "service1-role", serviceConfig["task_role"].StringValue())
 }
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`{`
`24`	`24`	`{ "service1",`
`25`	`25`	`{`
`26`		`- { "resource_name", myProject.Services.Apply(services => services.Service1.Resource_name) },`
	`26`	`+ { "id", myProject.Services.Apply(services => services.Service1.Id) },`
`27`	`27`	`{ "task_role", myProject.Services.Apply(services => services.Service1.Task_role) },`
`28`	`28`	`} },`
`29`	`29`	`} },`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ go 1.20`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/pulumi/pulumi/sdk/v3 v3.30.0`
`7`		`- github.com/DefangLabs/pulumi-defang/sdk v1.2.0-alpha.1744826391`
	`7`	`+ github.com/DefangLabs/pulumi-defang/sdk v1.2.0-alpha.1744837289`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`"dependencies": {`
`7`	`7`	`"typescript": "^4.0.0",`
`8`	`8`	`"@pulumi/pulumi": "^3.0.0",`
`9`		`- "@defang-io/pulumi-defang": "1.2.0-alpha.1744826391"`
	`9`	`+ "@defang-io/pulumi-defang": "1.2.0-alpha.1744837289"`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-pulumi-defang==1.2.0-alpha.1744826391`
	`1`	`+pulumi-defang==1.2.0-alpha.1744837289`
`2`	`2`	`pulumi>=3.0.0,<4.0.0`