Merge branch 'main' into andrueastman/enumParsin

CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed `RequestConfiguration` Classes dropped in RequestBuilder methods in python [#4535](https://github.com/microsoft/kiota/issues/4535)
 - Fixed incorrect optional types in method parameters in Python [#4507](https://github.com/microsoft/kiota/issues/4507)
 - Changed enum parsing methods to return nil in the default case in Go [#4621](https://github.com/microsoft/kiota/issues/4621)
+- Changes the cached description file name to `openapi.yml|json` from `description.yml|json` [#4641](https://github.com/microsoft/kiota/issues/4641)
 
 ## [1.14.0] - 2024-05-02
 

it/typescript/package.json

@@ -22,7 +22,7 @@
     "@types/node": "^20.12.11",
     "@typescript-eslint/eslint-plugin": "^7.7.1",
     "@typescript-eslint/parser": "^7.8.0",
-    "esbuild": "^0.21.1",
+    "esbuild": "^0.21.2",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "minimist": "^1.2.8",

specs/cli/client-add.md

@@ -6,7 +6,7 @@
 
 When executing, a new API entry will be added and will use the `--client-name` parameter as the key for the map. When loading the OpenAPI description, it will store the location of the description in the `descriptionLocation` property. If `--include-path` or `--exclude-path` are provided, they will be stored in the `includePatterns` and `excludePatterns` properties respectively.
 
-Every time an API client is added, a copy of the OpenAPI description file will be stored in the `./.kiota/documents/{client-name}/{client-name}.yaml|json` folder. The files will be named using the API client name. This will allow the CLI to detect changes in the description and avoid downloading the description again if it hasn't changed. 
+Every time an API client is added, a copy of the OpenAPI description file will be stored in the `./.kiota/documents/{client-name}/openapi.yaml|json` folder. The files will be named using the API client name. This will allow the CLI to detect changes in the description and avoid downloading the description again if it hasn't changed. 
 
 At the same time, an [API Manifest](https://www.ietf.org/archive/id/draft-miller-api-manifest-01.html) file will be generated (if non existing) or edited (if already existing) in the `.kiota` folder next to `workspace.json`. API Manifest represents a snapshot of API dependencies and permissions required to access those APIs. This file will represent a concatenated surface of all APIs used across plugins and clients. Both files, `apimanifest.json` and `workspace.json` will be used to generate the code files. A new hash composed of the Kiota version, the OpenAPI description location and the properties of the client will be generated and would trigger an update to the [API Manifest][https://www.ietf.org/archive/id/draft-miller-api-manifest-01.html].
 

specs/cli/client-edit.md

@@ -105,7 +105,7 @@ _The resulting `apimanifest.json` file will look like this:_
     └─workspace.json 
     └─documents
        └─GraphClient
-         └─GraphClient.yaml
+         └─openapi.yaml
  └─generated
     └─graph
        └─csharp

specs/cli/plugin-add.md

@@ -172,7 +172,7 @@ _The resulting API Manifest named `apimanifest.json` in the `./kiota` folder (co
     └─apimanifest.json # Single artifact with all APIs dependencies info across clients and plugins
     └─documents
       └─github    
-        └─GitHub.json # OpenAPI document
+        └─openapi.json # OpenAPI document
         └─overlay.json # Overlay to be applied on top of OpenAPI document
  └─generated
     └─plugins

specs/cli/plugin-edit.md

@@ -136,7 +136,7 @@ _The resulting API Manifest named `apimanifest.json` in the `./kiota` folder (co
     └─apimanifest.json
     └─documents
       └─github    
-        └─GitHub.json # OpenAPI document
+        └─openapi.json # OpenAPI document
         └─overlay.json # Overlay to be applied on top of OpenAPI document
  └─generated
     └─plugins

src/Kiota.Builder/WorkspaceManagement/DescriptionStorageService.cs

@@ -21,7 +21,7 @@ public DescriptionStorageService(string targetDirectory)
         o.PoolSize = 20;
         o.PoolInitialFill = 1;
     });
-    private string GetDescriptionFilePath(string clientName, string extension) => Path.Combine(TargetDirectory, DescriptionsSubDirectoryRelativePath, clientName, $"description.{extension}");
+    private string GetDescriptionFilePath(string clientName, string extension) => Path.Combine(TargetDirectory, DescriptionsSubDirectoryRelativePath, clientName, $"openapi.{extension}");
     public async Task UpdateDescriptionAsync(string clientName, Stream description, string extension = "yml", CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(clientName);

tests/Kiota.Builder.Tests/WorkspaceManagement/WorkspaceManagementServiceTests.cs

@@ -219,7 +219,7 @@ await classicService.UpdateStateFromConfigurationAsync(
         Assert.False(File.Exists(Path.Combine(tempPath, LockManagementService.LockFileName)));
         Assert.True(File.Exists(Path.Combine(tempPath, WorkspaceConfigurationStorageService.KiotaDirectorySegment, WorkspaceConfigurationStorageService.ConfigurationFileName)));
         Assert.True(File.Exists(Path.Combine(tempPath, WorkspaceConfigurationStorageService.KiotaDirectorySegment, WorkspaceConfigurationStorageService.ManifestFileName)));
-        Assert.True(File.Exists(Path.Combine(tempPath, DescriptionStorageService.DescriptionsSubDirectoryRelativePath, "clientName", "description.yml")));
+        Assert.True(File.Exists(Path.Combine(tempPath, DescriptionStorageService.DescriptionsSubDirectoryRelativePath, "clientName", "openapi.yml")));
     }
     [InlineData(true, true)]
     [InlineData(true, false)]
@@ -231,7 +231,7 @@ public async Task GetsADescription(bool usesConfig, bool cleanOutput)
         var mockLogger = Mock.Of<ILogger>();
         Directory.CreateDirectory(tempPath);
         var service = new WorkspaceManagementService(mockLogger, httpClient, usesConfig, tempPath);
-        var descriptionPath = Path.Combine(tempPath, $"{DescriptionStorageService.DescriptionsSubDirectoryRelativePath}/clientName/description.yml");
+        var descriptionPath = Path.Combine(tempPath, $"{DescriptionStorageService.DescriptionsSubDirectoryRelativePath}/clientName/openapi.yml");
         var outputPath = Path.Combine(tempPath, "client");
         Directory.CreateDirectory(outputPath);
         Directory.CreateDirectory(Path.GetDirectoryName(descriptionPath));

vscode/microsoft-kiota/package.json

@@ -431,7 +431,7 @@
     "@typescript-eslint/parser": "^7.5.0",
     "@vscode/test-electron": "^2.3.9",
     "eslint": "^8.57.0",
-    "glob": "^10.3.14",
+    "glob": "^10.3.15",
     "mocha": "^10.4.0",
     "ts-loader": "^9.5.1",
     "typescript": "^5.4.5",