Update Pulumi RPC type names

pulumi · Apr 12, 2024 · 598c58c · 598c58c
1 parent 0ea2d69
commit 598c58c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/pulumi b/pulumi
diff --git a/sdk/java/pulumi/src/main/java/com/pulumi/deployment/internal/DeploymentImpl.java b/sdk/java/pulumi/src/main/java/com/pulumi/deployment/internal/DeploymentImpl.java
@@ -53,7 +53,7 @@
 import pulumirpc.EngineOuterClass;
 import pulumirpc.EngineOuterClass.LogRequest;
 import pulumirpc.EngineOuterClass.LogSeverity;
-import pulumirpc.Provider.CallRequest;
+import pulumirpc.Resource.ResourceCallRequest;
 import pulumirpc.Resource.ReadResourceRequest;
 import pulumirpc.Resource.RegisterResourceOutputsRequest;
 import pulumirpc.Resource.RegisterResourceRequest;
@@ -740,14 +740,14 @@ private CompletableFuture<CallRawAsyncResult> callRawAsync(
                         var providerReference = providerFuture.join();
 
                         // Add arg dependencies to the request.
-                        CompletableFuture<Map<String, CallRequest.ArgumentDependencies>> argDependencies = CompletableFutures.allOf(
+                        CompletableFuture<Map<String, ResourceCallRequest.ArgumentDependencies>> argDependencies = CompletableFutures.allOf(
                                 serialized.propertyToDependentResources.entrySet().stream().collect(Collectors.toMap(
                                         Map.Entry::getKey,
                                         e -> {
                                             var directDependencies = ImmutableSet.copyOf(e.getValue());
                                             return prepare.getAllTransitivelyReferencedResourceUrnsAsync(directDependencies)
                                                     .thenApply(
-                                                            urns -> CallRequest.ArgumentDependencies.newBuilder()
+                                                            urns -> ResourceCallRequest.ArgumentDependencies.newBuilder()
                                                                     .addAllUrns(urns)
                                                                     .build()
                                                     );
@@ -762,7 +762,7 @@ private CompletableFuture<CallRawAsyncResult> callRawAsync(
 
                         // Kick off the call.
                         return argDependencies.thenCompose(deps ->
-                                this.monitor.callAsync(CallRequest.newBuilder()
+                                this.monitor.callAsync(ResourceCallRequest.newBuilder()
                                         .setTok(token)
                                         .setProvider(providerReference.orElse(""))
                                         .setVersion(version.orElse(""))

diff --git a/sdk/java/pulumi/src/main/java/com/pulumi/deployment/internal/GrpcMonitor.java b/sdk/java/pulumi/src/main/java/com/pulumi/deployment/internal/GrpcMonitor.java
@@ -2,7 +2,7 @@
 
 import io.grpc.ManagedChannelBuilder;
 import com.pulumi.resources.Resource;
-import pulumirpc.Provider.CallRequest;
+import pulumirpc.Resource.ResourceCallRequest;
 import pulumirpc.Provider.CallResponse;
 import pulumirpc.Provider.InvokeRequest;
 import pulumirpc.Provider.InvokeResponse;
@@ -40,7 +40,7 @@ public CompletableFuture<InvokeResponse> invokeAsync(ResourceInvokeRequest reque
     }
 
     @Override
-    public CompletableFuture<CallResponse> callAsync(CallRequest request) {
+    public CompletableFuture<CallResponse> callAsync(ResourceCallRequest request) {
         return toCompletableFuture(this.monitor.call(request));
     }
 

diff --git a/sdk/java/pulumi/src/main/java/com/pulumi/deployment/internal/Monitor.java b/sdk/java/pulumi/src/main/java/com/pulumi/deployment/internal/Monitor.java
@@ -1,7 +1,7 @@
 package com.pulumi.deployment.internal;
 
 import com.pulumi.resources.Resource;
-import pulumirpc.Provider.CallRequest;
+import pulumirpc.Resource.ResourceCallRequest;
 import pulumirpc.Provider.CallResponse;
 import pulumirpc.Provider.InvokeRequest;
 import pulumirpc.Provider.InvokeResponse;
@@ -14,7 +14,7 @@ public interface Monitor {
 
     CompletableFuture<InvokeResponse> invokeAsync(ResourceInvokeRequest request);
 
-    CompletableFuture<CallResponse> callAsync(CallRequest request);
+    CompletableFuture<CallResponse> callAsync(ResourceCallRequest request);
 
     CompletableFuture<ReadResourceResponse> readResourceAsync(Resource resource, ReadResourceRequest request);
 

diff --git a/sdk/java/pulumi/src/main/java/com/pulumi/test/internal/MockMonitor.java b/sdk/java/pulumi/src/main/java/com/pulumi/test/internal/MockMonitor.java
@@ -13,7 +13,7 @@
 import com.pulumi.serialization.internal.Deserializer;
 import com.pulumi.serialization.internal.Serializer;
 import com.pulumi.test.Mocks;
-import pulumirpc.Provider.CallRequest;
+import pulumirpc.Resource.ResourceCallRequest;
 import pulumirpc.Provider.CallResponse;
 import pulumirpc.Provider.InvokeResponse;
 import pulumirpc.Resource.ReadResourceRequest;
@@ -83,7 +83,7 @@ public CompletableFuture<InvokeResponse> invokeAsync(pulumirpc.Resource.Resource
     }
 
     @Override
-    public CompletableFuture<CallResponse> callAsync(CallRequest request) {
+    public CompletableFuture<CallResponse> callAsync(ResourceCallRequest request) {
         // For now, we'll route both Invoke and Call through IMocks.CallAsync.
         var args = deserializeToMap(request.getArgs());