Add ID properties to invoke results (#387)

* Generation code

* Schema

* Node.js

* Python

* .NET

* Go

provider/pkg/gen/schema.go

@@ -391,6 +391,10 @@ func (g *packageGenerator) genResources(prov, typeName string, resource *openapi
 
 	gen.escapeCSharpNames(typeName, resourceResponse)
 
+	// Id is a property of the base Custom Resource, we don't want to introduce it on derived resources.
+	delete(resourceResponse.specs, "id")
+	resourceResponse.requiredSpecs.Delete("id")
+
 	// Add an alias for each API version that has the same path in it.
 	var aliases []pschema.AliasSpec
 	for _, version := range resource.CompatibleVersions {
@@ -753,10 +757,6 @@ func (m *moduleGenerator) genResponse(statusCodeResponses map[int]spec.Response,
 			continue
 		}
 
-		// Id is a property of the base Custom Resource, we don't want to introduce it on derived resources.
-		delete(result.specs, "id")
-		result.requiredSpecs.Delete("id")
-
 		// Special case the 'properties' output property as required.
 		// This should be gone when we apply flattening.
 		if _, ok := result.specs["properties"]; ok {

sdk/dotnet/AVS/Latest/GetAuthorization.cs

@@ -54,6 +54,10 @@ public sealed class GetAuthorizationResult
         /// </summary>
         public readonly string ExpressRouteAuthorizationKey;
         /// <summary>
+        /// Resource ID.
+        /// </summary>
+        public readonly string Id;
+        /// <summary>
         /// Resource name.
         /// </summary>
         public readonly string Name;
@@ -72,6 +76,8 @@ private GetAuthorizationResult(
 
             string expressRouteAuthorizationKey,
 
+            string id,
+
             string name,
 
             string provisioningState,
@@ -80,6 +86,7 @@ private GetAuthorizationResult(
         {
             ExpressRouteAuthorizationId = expressRouteAuthorizationId;
             ExpressRouteAuthorizationKey = expressRouteAuthorizationKey;
+            Id = id;
             Name = name;
             ProvisioningState = provisioningState;
             Type = type;

sdk/dotnet/AVS/Latest/GetCluster.cs

@@ -58,6 +58,10 @@ public sealed class GetClusterResult
         /// </summary>
         public readonly ImmutableArray<string> Hosts;
         /// <summary>
+        /// Resource ID.
+        /// </summary>
+        public readonly string Id;
+        /// <summary>
         /// Resource name.
         /// </summary>
         public readonly string Name;
@@ -82,6 +86,8 @@ private GetClusterResult(
 
             ImmutableArray<string> hosts,
 
+            string id,
+
             string name,
 
             string provisioningState,
@@ -93,6 +99,7 @@ private GetClusterResult(
             ClusterId = clusterId;
             ClusterSize = clusterSize;
             Hosts = hosts;
+            Id = id;
             Name = name;
             ProvisioningState = provisioningState;
             Sku = sku;

sdk/dotnet/AVS/Latest/GetHcxEnterpriseSite.cs

@@ -50,6 +50,10 @@ public sealed class GetHcxEnterpriseSiteResult
         /// </summary>
         public readonly string ActivationKey;
         /// <summary>
+        /// Resource ID.
+        /// </summary>
+        public readonly string Id;
+        /// <summary>
         /// Resource name.
         /// </summary>
         public readonly string Name;
@@ -66,13 +70,16 @@ public sealed class GetHcxEnterpriseSiteResult
         private GetHcxEnterpriseSiteResult(
             string activationKey,
 
+            string id,
+
             string name,
 
             string status,
 
             string type)
         {
             ActivationKey = activationKey;
+            Id = id;
             Name = name;
             Status = status;
             Type = type;

sdk/dotnet/AVS/Latest/GetPrivateCloud.cs

@@ -48,6 +48,10 @@ public sealed class GetPrivateCloudResult
         /// </summary>
         public readonly Outputs.EndpointsResponse Endpoints;
         /// <summary>
+        /// Resource ID.
+        /// </summary>
+        public readonly string Id;
+        /// <summary>
         /// vCenter Single Sign On Identity Sources
         /// </summary>
         public readonly ImmutableArray<Outputs.IdentitySourceResponse> IdentitySources;
@@ -122,6 +126,8 @@ private GetPrivateCloudResult(
 
             Outputs.EndpointsResponse endpoints,
 
+            string id,
+
             ImmutableArray<Outputs.IdentitySourceResponse> identitySources,
 
             string? internet,
@@ -158,6 +164,7 @@ private GetPrivateCloudResult(
         {
             Circuit = circuit;
             Endpoints = endpoints;
+            Id = id;
             IdentitySources = identitySources;
             Internet = internet;
             Location = location;

sdk/dotnet/AVS/V20190809Preview/GetCluster.cs

@@ -45,6 +45,10 @@ public GetClusterArgs()
     [OutputType]
     public sealed class GetClusterResult
     {
+        /// <summary>
+        /// Resource ID.
+        /// </summary>
+        public readonly string Id;
         /// <summary>
         /// Resource name.
         /// </summary>
@@ -60,12 +64,15 @@ public sealed class GetClusterResult
 
         [OutputConstructor]
         private GetClusterResult(
+            string id,
+
             string name,
 
             Outputs.ClusterPropertiesResponse properties,
 
             string type)
         {
+            Id = id;
             Name = name;
             Properties = properties;
             Type = type;

sdk/dotnet/AVS/V20190809Preview/GetPrivateCloud.cs

@@ -39,6 +39,10 @@ public GetPrivateCloudArgs()
     [OutputType]
     public sealed class GetPrivateCloudResult
     {
+        /// <summary>
+        /// Resource ID.
+        /// </summary>
+        public readonly string Id;
         /// <summary>
         /// Resource location
         /// </summary>
@@ -66,6 +70,8 @@ public sealed class GetPrivateCloudResult
 
         [OutputConstructor]
         private GetPrivateCloudResult(
+            string id,
+
             string? location,
 
             string name,
@@ -78,6 +84,7 @@ private GetPrivateCloudResult(
 
             string type)
         {
+            Id = id;
             Location = location;
             Name = name;
             Properties = properties;

sdk/dotnet/AVS/V20200320/GetAuthorization.cs

@@ -54,6 +54,10 @@ public sealed class GetAuthorizationResult
         /// </summary>
         public readonly string ExpressRouteAuthorizationKey;
         /// <summary>
+        /// Resource ID.
+        /// </summary>
+        public readonly string Id;
+        /// <summary>
         /// Resource name.
         /// </summary>
         public readonly string Name;
@@ -72,6 +76,8 @@ private GetAuthorizationResult(
 
             string expressRouteAuthorizationKey,
 
+            string id,
+
             string name,
 
             string provisioningState,
@@ -80,6 +86,7 @@ private GetAuthorizationResult(
         {
             ExpressRouteAuthorizationId = expressRouteAuthorizationId;
             ExpressRouteAuthorizationKey = expressRouteAuthorizationKey;
+            Id = id;
             Name = name;
             ProvisioningState = provisioningState;
             Type = type;

sdk/dotnet/AVS/V20200320/GetCluster.cs

@@ -58,6 +58,10 @@ public sealed class GetClusterResult
         /// </summary>
         public readonly ImmutableArray<string> Hosts;
         /// <summary>
+        /// Resource ID.
+        /// </summary>
+        public readonly string Id;
+        /// <summary>
         /// Resource name.
         /// </summary>
         public readonly string Name;
@@ -82,6 +86,8 @@ private GetClusterResult(
 
             ImmutableArray<string> hosts,
 
+            string id,
+
             string name,
 
             string provisioningState,
@@ -93,6 +99,7 @@ private GetClusterResult(
             ClusterId = clusterId;
             ClusterSize = clusterSize;
             Hosts = hosts;
+            Id = id;
             Name = name;
             ProvisioningState = provisioningState;
             Sku = sku;

sdk/dotnet/AVS/V20200320/GetHcxEnterpriseSite.cs

@@ -50,6 +50,10 @@ public sealed class GetHcxEnterpriseSiteResult
         /// </summary>
         public readonly string ActivationKey;
         /// <summary>
+        /// Resource ID.
+        /// </summary>
+        public readonly string Id;
+        /// <summary>
         /// Resource name.
         /// </summary>
         public readonly string Name;
@@ -66,13 +70,16 @@ public sealed class GetHcxEnterpriseSiteResult
         private GetHcxEnterpriseSiteResult(
             string activationKey,
 
+            string id,
+
             string name,
 
             string status,
 
             string type)
         {
             ActivationKey = activationKey;
+            Id = id;
             Name = name;
             Status = status;
             Type = type;

sdk/dotnet/AVS/V20200320/GetPrivateCloud.cs

@@ -48,6 +48,10 @@ public sealed class GetPrivateCloudResult
         /// </summary>
         public readonly Outputs.EndpointsResponse Endpoints;
         /// <summary>
+        /// Resource ID.
+        /// </summary>
+        public readonly string Id;
+        /// <summary>
         /// vCenter Single Sign On Identity Sources
         /// </summary>
         public readonly ImmutableArray<Outputs.IdentitySourceResponse> IdentitySources;
@@ -122,6 +126,8 @@ private GetPrivateCloudResult(
 
             Outputs.EndpointsResponse endpoints,
 
+            string id,
+
             ImmutableArray<Outputs.IdentitySourceResponse> identitySources,
 
             string? internet,
@@ -158,6 +164,7 @@ private GetPrivateCloudResult(
         {
             Circuit = circuit;
             Endpoints = endpoints;
+            Id = id;
             IdentitySources = identitySources;
             Internet = internet;
             Location = location;

sdk/dotnet/AVS/V20200717Preview/GetAuthorization.cs

@@ -54,6 +54,10 @@ public sealed class GetAuthorizationResult
         /// </summary>
         public readonly string ExpressRouteAuthorizationKey;
         /// <summary>
+        /// Resource ID.
+        /// </summary>
+        public readonly string Id;
+        /// <summary>
         /// Resource name.
         /// </summary>
         public readonly string Name;
@@ -72,6 +76,8 @@ private GetAuthorizationResult(
 
             string expressRouteAuthorizationKey,
 
+            string id,
+
             string name,
 
             string provisioningState,
@@ -80,6 +86,7 @@ private GetAuthorizationResult(
         {
             ExpressRouteAuthorizationId = expressRouteAuthorizationId;
             ExpressRouteAuthorizationKey = expressRouteAuthorizationKey;
+            Id = id;
             Name = name;
             ProvisioningState = provisioningState;
             Type = type;

sdk/dotnet/AVS/V20200717Preview/GetCluster.cs

@@ -58,6 +58,10 @@ public sealed class GetClusterResult
         /// </summary>
         public readonly ImmutableArray<string> Hosts;
         /// <summary>
+        /// Resource ID.
+        /// </summary>
+        public readonly string Id;
+        /// <summary>
         /// Resource name.
         /// </summary>
         public readonly string Name;
@@ -82,6 +86,8 @@ private GetClusterResult(
 
             ImmutableArray<string> hosts,
 
+            string id,
+
             string name,
 
             string provisioningState,
@@ -93,6 +99,7 @@ private GetClusterResult(
             ClusterId = clusterId;
             ClusterSize = clusterSize;
             Hosts = hosts;
+            Id = id;
             Name = name;
             ProvisioningState = provisioningState;
             Sku = sku;

sdk/dotnet/AVS/V20200717Preview/GetGlobalReachConnection.cs

@@ -58,6 +58,10 @@ public sealed class GetGlobalReachConnectionResult
         /// </summary>
         public readonly string CircuitConnectionStatus;
         /// <summary>
+        /// Resource ID.
+        /// </summary>
+        public readonly string Id;
+        /// <summary>
         /// Resource name.
         /// </summary>
         public readonly string Name;
@@ -82,6 +86,8 @@ private GetGlobalReachConnectionResult(
 
             string circuitConnectionStatus,
 
+            string id,
+
             string name,
 
             string? peerExpressRouteCircuit,
@@ -93,6 +99,7 @@ private GetGlobalReachConnectionResult(
             AddressPrefix = addressPrefix;
             AuthorizationKey = authorizationKey;
             CircuitConnectionStatus = circuitConnectionStatus;
+            Id = id;
             Name = name;
             PeerExpressRouteCircuit = peerExpressRouteCircuit;
             ProvisioningState = provisioningState;