[Microsoft.Migrate] [2024-03-03-preview] Making swagger and typespec consistent.

specification/migrate/AssessmentProjects.Management/AKSAssessments.Management/ArmModels/Assessed/AssessedWebApplication.tsp

@@ -1,7 +1,7 @@
-import "../../../Common/StandardizedContracts/CommonEnums.tsp";
-import "../../../Common/StandardizedContracts/Scope.tsp";
-import "../../../Common/StandardizedContracts/CommonModels.tsp";
-import "../../../Common/StandardizedContracts/AssessedWorkloadProperties.tsp";
+import "../../Common/StandardizedContracts/CommonEnums.tsp";
+import "../../Common/StandardizedContracts/Scope.tsp";
+import "../../Common/StandardizedContracts/CommonModels.tsp";
+import "../../Common/StandardizedContracts/AssessedWorkloadProperties.tsp";
 import "../../DataModels/Recommendation/RecommendationResult.tsp";
 
 using TypeSpec.Http;

specification/migrate/AssessmentProjects.Management/AKSAssessments.Management/ArmModels/Assessment/AKSAssessment.tsp

@@ -1,9 +1,9 @@
-import "../../../Common/StandardizedContracts/CommonEnums.tsp";
-import "../../../Common/StandardizedContracts/Scope.tsp";
-import "../../../Common/StandardizedContracts/CommonModels.tsp";
-import "../../../Common/StandardizedContracts/AssessmentProperties.tsp";
+import "../../Common/StandardizedContracts/CommonEnums.tsp";
+import "../../Common/StandardizedContracts/Scope.tsp";
+import "../../Common/StandardizedContracts/CommonModels.tsp";
+import "../../Common/StandardizedContracts/AssessmentProperties.tsp";
 import "../../DataModels/Assessment/AKSAssessmentSettings.tsp";
-import "../../../Common/ArmModels/AssessmentProjectV2.tsp";
+import "../../Common/ArmModels/AssessmentProjectV2.tsp";
 
 using TypeSpec.Http;
 using TypeSpec.Rest;

specification/migrate/AssessmentProjects.Management/AKSAssessments.Management/ArmModels/Options/AKSAssessmentOptions.tsp

@@ -1,5 +1,5 @@
-import "../../../Common/StandardizedContracts/CommonAssessmentPropertiesEnums.tsp";
-import "../../../Common/Enums/Enums.tsp";
+import "../../Common/StandardizedContracts/CommonAssessmentPropertiesEnums.tsp";
+import "../../Common/Enums/Enums.tsp";
 
 using TypeSpec.Http;
 using TypeSpec.Rest;

specification/migrate/AssessmentProjects.Management/AKSAssessments.Management/ArmModels/Summary/AKSSummary.tsp

@@ -1,4 +1,4 @@
-import "../../../Common/StandardizedContracts/SummaryProperties.tsp";
+import "../../Common/StandardizedContracts/SummaryProperties.tsp";
 
 using TypeSpec.Http;
 using TypeSpec.Rest;

specification/migrate/AssessmentProjects.Management/AKSAssessments.Management/DataModels/Assessment/AKSAssessmentSettings.tsp

@@ -1,5 +1,5 @@
 import "../../Enums/Enums.tsp";
-import "../../../Common/StandardizedContracts/AssessmentProperties.tsp";
+import "../../Common/StandardizedContracts/AssessmentProperties.tsp";
 
 namespace Microsoft.Migrate;
 

specification/migrate/AssessmentProjects.Management/AKSAssessments.Management/aksroutes.tsp

@@ -6,7 +6,7 @@ import "./ArmModels/Cluster/AKSCluster.tsp";
 import "./ArmModels/CostDetails/AKSCostDetails.tsp";
 import "./ArmModels/Options/AKSAssessmentOptions.tsp";
 import "./ArmModels/Summary/AKSSummary.tsp";
-import "../Common/DataModels/DownloadUrl.tsp";
+import "./Common/DataModels/DownloadUrl.tsp";
 
 import "./AKSApiVersions.tsp";
 

specification/migrate/AssessmentProjects.Management/AKSAssessments.Management/main.tsp

@@ -16,10 +16,9 @@ using Azure.Core;
 using Azure.ResourceManager;
 using OpenAPI;
 
+#suppress "@azure-tools/typespec-azure-resource-manager/missing-operations-endpoint" "Operations interface is intentionally excluded"
 @armProviderNamespace
 @service(#{ title: "Azure Migrate Assessment Service" })
 @versioned(AKSApiVersions)
 @doc("Azure Migrate Resource Provider management API.")
 namespace Microsoft.Migrate;
-
-interface Operations extends Azure.ResourceManager.Operations {}

specification/migrate/AssessmentProjects.Management/AKSAssessments.Management/tspconfig.yaml

@@ -10,7 +10,7 @@ linter:
 options:
   "@azure-tools/typespec-autorest":
     emitter-output-dir: "{output-dir}"
-    output-file: "{azure-resource-provider-folder}/{service-name}/AssessmentProjects/{version-status}/{version}/aksAssessments.json"
+    output-file: "{azure-resource-provider-folder}/{service-name}/AKSAssessments/{version-status}/{version}/aksAssessments.json"
     azure-resource-provider-folder: ./resource-manager
     use-read-only-status-schema: true
     arm-types-dir: "{project-root}/../../../common-types/resource-management"
@@ -40,4 +40,4 @@ options:
       name: "@azure/arm-migrate"
   "@azure-tools/typespec-client-generator-cli":
     "additionalDirectories":
-      - "specification/migrate/AssessmentProjects.Management/Common"
+      - "specification/migrate/AssessmentProjects.Management/AKSAssessments.Management"

specification/migrate/AssessmentProjects.Management/AssessmentProjects.Management/AssessmentProjectSummary.tsp

@@ -1,4 +1,4 @@
-import "../Common/ArmModels/AzureResourceProperties.tsp";
+import "./Common/ArmModels/AzureResourceProperties.tsp";
 import "@azure-tools/typespec-autorest";
 
 using Autorest;

specification/migrate/AssessmentProjects.Management/AssessmentProjects.Management/Common/ArmModels/AssessmentProjectV2.tsp

@@ -0,0 +1,79 @@
+import "./AzureResourceProperties.tsp";
+import "./PrivateEndpointConnection.tsp";
+
+using TypeSpec.Http;
+using TypeSpec.Rest;
+using TypeSpec.Versioning;
+using Azure.ResourceManager;
+
+namespace Microsoft.Migrate;
+
+@doc("An Assessment project site resource.")
+model AssessmentProject is TrackedResource<ProjectProperties> {
+  @doc("Assessment Project Name")
+  @segment("assessmentProjects")
+  @key("projectName")
+  @path
+  // "^[^<>&:\\?\/#\x00-\x1F\x7F]{1,260}$"
+  @pattern("^[^<>&:\\?/#]{1,260}$")
+  name: string;
+}
+
+@doc("Properties of a project.")
+model ProjectProperties is AzureResourceProperties {
+  @doc("Time when this project was created. Date-Time represented in ISO-8601 format.")
+  @visibility(Lifecycle.Read)
+  createdTimestamp?: utcDateTime;
+
+  @doc("""
+    Time when this project was last updated. Date-Time represented in ISO-8601
+    format.
+    """)
+  @visibility(Lifecycle.Read)
+  updatedTimestamp?: utcDateTime;
+
+  @doc("Endpoint at which the collector agent can call agent REST API.")
+  @visibility(Lifecycle.Read)
+  serviceEndpoint?: string;
+
+  @doc("Assessment solution ARM id tracked by Microsoft.Migrate/migrateProjects.")
+  assessmentSolutionId?: string;
+
+  @doc("Assessment project status.")
+  projectStatus?: ProjectStatus;
+
+  @doc("The ARM id of service map workspace created by customer.")
+  customerWorkspaceId?: string;
+
+  @doc("Location of service map workspace created by customer.")
+  customerWorkspaceLocation?: string;
+
+  @doc("""
+    This value can be set to 'enabled' to avoid breaking changes on existing
+    customer resources and templates. If set to 'disabled', traffic over public
+    interface is not allowed, and private endpoint connections would be the
+    exclusive access method.
+    """)
+  publicNetworkAccess?: string;
+
+  @doc("The list of private endpoint connections to the project.")
+  @visibility(Lifecycle.Read)
+  privateEndpointConnections?: PrivateEndpointConnection[];
+
+  @doc("""
+    The ARM id of the storage account used for interactions when public access is
+    disabled.
+    """)
+  customerStorageAccountArmId?: string;
+}
+
+@doc("Project Status.")
+union ProjectStatus {
+  @doc("Active Status.")
+  Active: "Active",
+
+  @doc("Inactive Status.")
+  Inactive: "Inactive",
+
+  string,
+}

specification/migrate/AssessmentProjects.Management/AssessmentProjects.Management/Common/ArmModels/AzureResourceProperties.tsp

@@ -0,0 +1,10 @@
+import "../Enums/Enums.tsp";
+
+namespace Microsoft.Migrate;
+
+@doc("Common properties for all azure tracked and proxy resources.")
+model AzureResourceProperties {
+  @doc("The status of the last operation.")
+  @visibility(Lifecycle.Read)
+  provisioningState?: ProvisioningState;
+}

specification/migrate/AssessmentProjects.Management/AssessmentProjects.Management/Common/ArmModels/PrivateEndpointConnection.tsp

@@ -0,0 +1,18 @@
+using TypeSpec.Http;
+using TypeSpec.Rest;
+using Azure.ResourceManager;
+
+namespace Microsoft.Migrate;
+
+@doc("Private endpoint connection resource.")
+@parentResource(AssessmentProject)
+model PrivateEndpointConnection
+  is ProxyResource<Azure.ResourceManager.PrivateEndpointConnectionProperties> {
+  @doc("Private endpoint connection ARM name")
+  @segment("privateEndpointConnections")
+  @key("privateEndpointConnectionName")
+  @path
+  // "^[^<>&:\\?\/#\x00-\x1F\x7F]{1,260}$"
+  @pattern("^[^<>&:\\?/#]{1,260}$")
+  name: string;
+}

specification/migrate/AssessmentProjects.Management/AssessmentProjects.Management/Common/DataModels/DownloadUrl.tsp

@@ -0,0 +1,12 @@
+namespace Microsoft.Migrate;
+
+@doc("Data model of Download URL for assessment report.")
+model DownloadUrl {
+  @doc("Hyperlink to download report.")
+  @visibility(Lifecycle.Read)
+  assessmentReportUrl: string;
+
+  @doc("Expiry date of download url.")
+  @visibility(Lifecycle.Read)
+  expirationTime: utcDateTime;
+}