Add workspace resources

Author: Guy Fankam

src/aspire/aspire.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="13.0.0" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireHost>true</IsAspireHost>
-    <UserSecretsId>6ce9dc18-ea0d-4d82-8f1a-e63877f35b88</UserSecretsId>
+    <UserSecretsId>005123cc-339c-4ba3-a189-a918d08c6467</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.5.1" />
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="13.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/common/Api.cs

@@ -1,8 +1,6 @@
 using Azure.Core.Pipeline;
-using Flurl;
 using System;
 using System.Collections.Immutable;
-using System.IO;
 using System.Linq;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
@@ -260,35 +258,6 @@ public record WsdlSelectorContract
     }
 }
 
-public static class ApiRevisionModule
-{
-    private const string separator = ";rev=";
-
-    public static bool IsRootName(ResourceName name) =>
-        Parse(name).IsNone;
-
-    public static ResourceName GetRootName(ResourceName name) =>
-        Parse(name).Map(x => x.RootName)
-                   .IfNone(() => name);
-
-    public static Option<(ResourceName RootName, int Revision)> Parse(ResourceName name) =>
-        name.ToString().Split(separator).ToArray() switch
-        {
-            [var first, var second] => from rootName in ResourceName.From(first).ToOption()
-                                       from revision in int.TryParse(second, out var revision)
-                                                        ? Option.Some(revision)
-                                                        : Option.None
-                                       select (rootName, revision),
-            _ => Option.None
-        };
-
-    public static ResourceName Combine(ResourceName rootName, int revision) =>
-        revision < 1
-            ? throw new InvalidOperationException($"Revision must be positive.")
-            : ResourceName.From($"{rootName}{separator}{revision}")
-                          .IfErrorThrow();
-}
-
 public static partial class ResourceModule
 {
     private static async ValueTask PutApiInApim(ResourceName name, JsonObject dto, GetResourceDtoFromApim getApimDto, HttpPipeline pipeline, ServiceUri serviceUri, CancellationToken cancellationToken)
@@ -298,11 +267,12 @@ private static async ValueTask PutApiInApim(ResourceName name, JsonObject dto, G
 
         var uri = resource.GetUri(name, parentChain, serviceUri);
         var formattedDto = await formatDto();
-        var result = await pipeline.PutJson(uri, formattedDto, cancellationToken);
+
+        var result = await pipeline.PutJson(uri, formattedDto, cancellationToken);        
         result.IfErrorThrow();
 
         // Non-current revisions are not allowed to update certain properties.
-        // Replace them with the existing revision properties if necessary.
+        // Replace them with the current revision's properties if necessary.
         async ValueTask<JsonObject> formatDto()
         {
             // If this is the current revision, return the DTO as-is.
@@ -312,9 +282,10 @@ async ValueTask<JsonObject> formatDto()
                 return dto;
             }
 
-            // Otherwise, update the DTO with the appropriate current revision properties.
+            // Otherwise, get the current revision's DTO from APIM...
             var existingDto = await getApimDto(resource, rootName, parentChain, cancellationToken);
 
+            // ...and use its properties to format the new revision's DTO.
             var result = from existingDtoObject in JsonNodeModule.To<ApiDto>(existingDto, resource.SerializerOptions)
                          from newDtoObject in JsonNodeModule.To<ApiDto>(dto, resource.SerializerOptions)
                          let formattedDtoObject = newDtoObject with
@@ -354,20 +325,4 @@ private static JsonObject FormatInformationFileDto(this ApiResource resource, Js
         return JsonObjectModule.From(dto, serializerOptions)
                                .IfErrorThrow();
     }
-
-    private static Option<(ResourceName Name, ParentChain Ancestors)> ParseSpecificationFile(this ApiResource resource, FileInfo? file, ServiceDirectory serviceDirectory)
-    {
-        if (file is null)
-        {
-            return Option.None;
-        }
-
-        var specificationFileNames = specifications.Select(GetSpecificationFileName);
-        if (specificationFileNames.Contains(file.Name) is false)
-        {
-            return Option.None;
-        }
-
-        return resource.ParseDirectory(file.Directory, serviceDirectory);
-    }
 }

src/common/ApiOperation.cs

@@ -0,0 +1,18 @@
+namespace common;
+
+public sealed record ApiOperationResource : IResourceWithDirectory, IChildResource
+{
+    private ApiOperationResource() { }
+
+    public string CollectionDirectoryName { get; } = "operations";
+
+    public string SingularName { get; } = "operation";
+
+    public string PluralName { get; } = "operations";
+
+    public string CollectionUriPath { get; } = "operations";
+
+    public IResource Parent { get; } = ApiResource.Instance;
+
+    public static ApiOperationResource Instance { get; } = new();
+}

src/common/ApiOperationPolicy.cs

@@ -0,0 +1,10 @@
+namespace common;
+
+public sealed record ApiOperationPolicyResource : IPolicyResource, IChildResource
+{
+    private ApiOperationPolicyResource() { }
+
+    public IResource Parent { get; } = ApiOperationResource.Instance;
+
+    public static ApiOperationPolicyResource Instance { get; } = new();
+}

src/common/ApiRelease.cs

@@ -70,9 +70,11 @@ private static async ValueTask PutApiReleaseInApim(ResourceName name,
 
         var uri = resource.GetUri(name, ancestors, serviceUri);
         var formattedDto = formatDto(dto);
+        
         var result = await pipeline.PutJson(uri, formattedDto, cancellationToken);
         result.IfErrorThrow();
 
+        // Set the API ID if it's missing from the DTO
         JsonObject formatDto(JsonObject dtoJson)
         {
             var serializerOptions = ((IResourceWithDto)resource).SerializerOptions;

src/common/ApiRevision.cs

@@ -0,0 +1,40 @@
+using Azure.Core.Pipeline;
+using System;
+using System.Collections.Immutable;
+using System.IO;
+using System.Linq;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace common;
+
+public static class ApiRevisionModule
+{
+    private const string separator = ";rev=";
+
+    public static bool IsRootName(ResourceName name) =>
+        Parse(name).IsNone;
+
+    public static ResourceName GetRootName(ResourceName name) =>
+        Parse(name).Map(x => x.RootName)
+                   .IfNone(() => name);
+
+    public static Option<(ResourceName RootName, int Revision)> Parse(ResourceName name) =>
+        name.ToString().Split(separator).ToArray() switch
+        {
+            [var first, var second] => from rootName in ResourceName.From(first).ToOption()
+                                       from revision in int.TryParse(second, out var revision)
+                                                        ? Option.Some(revision)
+                                                        : Option.None
+                                       select (rootName, revision),
+            _ => Option.None
+        };
+
+    public static ResourceName Combine(ResourceName rootName, int revision) =>
+        revision < 1
+            ? throw new InvalidOperationException($"Revision must be positive.")
+            : ResourceName.From($"{rootName}{separator}{revision}")
+                          .IfErrorThrow();
+}