Merge branch 'main' into main

hvuhsg · May 13, 2024 · 8f1800b · 8f1800b
2 parents de26446 + 72e70ba
commit 8f1800b
Show file tree

Hide file tree

Showing 16 changed files with 179 additions and 147 deletions.
diff --git a/.github/ISSUE_TEMPLATE/01-kiota-bug.yml b/.github/ISSUE_TEMPLATE/01-kiota-bug.yml
@@ -32,11 +32,11 @@ body:
   - type: dropdown
     id: language
     attributes:
-      label: Client Library/SDK Language
+      label: Client library/SDK language
       description: If  Client SDK, what's the language in use?
       multiple: false
       options:
-        - C#
+        - Csharp
         - CLI
         - Go
         - Java
@@ -45,6 +45,7 @@ body:
         - Python
         - Ruby
         - TypeScript
+        - Swift
     validations:
       required: false
   - type: textarea

diff --git a/.github/ISSUE_TEMPLATE/02-kiota-feature-request.yml b/.github/ISSUE_TEMPLATE/02-kiota-feature-request.yml
@@ -21,7 +21,7 @@ body:
       description: Is feature request related to any client library/SDK language?
       multiple: false
       options:
-        - C#
+        - Csharp
         - CLI
         - Go
         - Java
@@ -30,6 +30,7 @@ body:
         - Python
         - Ruby
         - TypeScript
+        - Swift
     validations:
       required: false
   - type: textarea

diff --git a/.github/workflows/graphprojects.yml → .github/workflows/project-auto-add.yml b/.github/workflows/graphprojects.yml → .github/workflows/project-auto-add.yml
@@ -1,12 +1,19 @@
-# This workflow is used to add new issues to GitHub Projects (Beta)
+# This workflow is used to add new issues to GitHub Kiota Project
 
-name: Add PR to project
+name: Add Issue or PR to project
 on:
   issues:
     types:
       - opened
+  pull_request:
+    types:
+      - opened
+    branches:
+      - "main"
+
 jobs:
   track_issue:
+    if: github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
     steps:
       - name: Generate token
@@ -16,11 +23,26 @@ jobs:
           app_id: ${{ secrets.GRAPHBOT_APP_ID }}
           private_key: ${{ secrets.GRAPHBOT_APP_PEM }}
 
+      - name: Check if issue has language specified
+        env:
+          ISSUE_BODY: ${{github.event.issue.body}}
+        run: |
+          language=$(awk '/SDK language/{flag=1;next} /Describe/{flag=0} flag' <<< "$ISSUE_BODY" | tr -d '[:space:]')
+          allowedList="PHP Python Go TypeScript Csharp Java PowerShell CLI Ruby Swift"
+          if [[ $allowedList =~ (^|[[:space:]])$language($|[[:space:]]) ]]; then
+            echo "$language is in allowed list";
+            echo 'LANGUAGE='$language >> $GITHUB_ENV;
+            echo 'SELECTED_LANGUAGE='$language >> $GITHUB_ENV;
+          else
+            echo "$language is not allowed";
+            echo 'SELECTED_LANGUAGE=Multiple Languages' >> $GITHUB_ENV;
+          fi
+
       - name: Get project data
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
-          ORGANIZATION: microsoftgraph
-          PROJECT_NUMBER: 28
+          ORGANIZATION: microsoft
+          PROJECT_NUMBER: 220
         run: |
           gh api graphql -f query='
             query($org: String!, $number: Int!) {
@@ -44,13 +66,14 @@ jobs:
             }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
 
           echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
-          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
-          echo 'TRIAGE_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .options[] | select(.name=="Needs Triage 🔍") |.id' project_data.json) >> $GITHUB_ENV
+          echo 'LANGUAGE_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Language") | .id' project_data.json) >> $GITHUB_ENV
+          LANGUAGE_OPTION_ID=$(jq --arg lang "$SELECTED_LANGUAGE" '.data.organization.projectV2.fields.nodes[] | select(.name== "Language") | .options[] | select(.name==$lang) | .id' project_data.json)
+          echo "LANGUAGE_OPTION_ID=$LANGUAGE_OPTION_ID" >> $GITHUB_ENV
 
-      - name: Add Issue to project
+      - name: Add Issue or PR to project
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
-          ISSUE_ID: ${{ github.event.issue.node_id }}
+          ISSUE_ID: ${{ github.event_name == 'issues' && github.event.issue.node_id || github.event.pull_request.node_id }}
         run: |
           item_id="$( gh api graphql -f query='
             mutation($project:ID!, $issue:ID!) {
@@ -60,28 +83,28 @@ jobs:
                 }
               }
             }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')"
-          
+
           echo 'ITEM_ID='$item_id >> $GITHUB_ENV
 
-      - name: Set Triage
+      - name: Set Language
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
         run: |
           gh api graphql -f query='
             mutation (
               $project: ID!
               $item: ID!
-              $status_field: ID!
-              $status_value: String!              
+              $language_field: ID!
+              $language_value: String!
             ) {
               set_status: updateProjectV2ItemFieldValue(input: {
                 projectId: $project
                 itemId: $item
-                fieldId: $status_field
-                value: {singleSelectOptionId: $status_value} 
+                fieldId: $language_field
+                value: {singleSelectOptionId: $language_value}
               }) {
                 projectV2Item {
                   id
                   }
               }
-            }' -f project=$PROJECT_ID -f item=$ITEM_ID -f status_field=$STATUS_FIELD_ID -f status_value=${{ env.TRIAGE_OPTION_ID }} --silent
+            }' -f project=$PROJECT_ID -f item=$ITEM_ID -f language_field=$LANGUAGE_FIELD_ID -f language_value=${{ env.LANGUAGE_OPTION_ID }} --silent
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Aligns naming of sliced OpenAPI description generated by `plugin add` should be named `<plugin-name>-openapi.json|yml` [#4595](https://github.com/microsoft/kiota/issues/4595)
 - Fixed RPC server to respect the `KIOTA_CONFIG_PREVIEW` flag.
+- Added missing nullable directives for CLI generation.
 - Fixed handling of nested arrays to be handled as `UntypedNode` instances [#4549](https://github.com/microsoft/kiota/issues/4549)
 - Fixed `InvalidOperationException` thrown when serializing IBacked models with no changes present in the additional data in dotnet [microsoftgraph/msgraph-sdk-dotnet#2471](https://github.com/microsoftgraph/msgraph-sdk-dotnet/issues/2471).
 - Fixed `RequestConfiguration` Classes dropped in RequestBuilder methods in python [#4535](https://github.com/microsoft/kiota/issues/4535)

diff --git a/it/csharp/dotnet.csproj b/it/csharp/dotnet.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.11.2" />
+    <PackageReference Include="Azure.Identity" Version="1.11.3" />
     <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.8.3" />
     <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.1.5" />
     <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.3.8" />

diff --git a/it/go/go.mod b/it/go/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2
 	github.com/microsoft/kiota-abstractions-go v1.6.0
 	github.com/microsoft/kiota-authentication-azure-go v1.0.2
-	github.com/microsoft/kiota-http-go v1.3.3
+	github.com/microsoft/kiota-http-go v1.4.1
 	github.com/microsoft/kiota-serialization-form-go v1.0.0
 	github.com/microsoft/kiota-serialization-json-go v1.0.7
 	github.com/microsoft/kiota-serialization-multipart-go v1.0.0

diff --git a/it/go/go.sum b/it/go/go.sum
@@ -29,8 +29,8 @@ github.com/microsoft/kiota-abstractions-go v1.6.0 h1:qbGBNMU0/o5myKbikCBXJFohVCF
 github.com/microsoft/kiota-abstractions-go v1.6.0/go.mod h1:7YH20ZbRWXGfHSSvdHkdztzgCB9mRdtFx13+hrYIEpo=
 github.com/microsoft/kiota-authentication-azure-go v1.0.2 h1:tClGeyFZJ+4Bakf8u0euPM4wqy4ethycdOgx3jyH3pI=
 github.com/microsoft/kiota-authentication-azure-go v1.0.2/go.mod h1:aTcti0bUJEcq7kBfQG4Sr4ElvRNuaalXcFEu4iEyQ6M=
-github.com/microsoft/kiota-http-go v1.3.3 h1:FKjK5BLFONu5eIBxtrkirkixFQmcPwitZ8iwZHKbESo=
-github.com/microsoft/kiota-http-go v1.3.3/go.mod h1:IWw/PwtBs/GYz+Pa75gPW7MFNFv0aKPFsLw5WqzL1SE=
+github.com/microsoft/kiota-http-go v1.4.1 h1:zR54JahUOcu8h9C5z00fcQChzX8d01+BwhkTS8H16Ro=
+github.com/microsoft/kiota-http-go v1.4.1/go.mod h1:Kup5nMDD3a9sjdgRKHCqZWqtrv3FbprjcPaGjLR6FzM=
 github.com/microsoft/kiota-serialization-form-go v1.0.0 h1:UNdrkMnLFqUCccQZerKjblsyVgifS11b3WCx+eFEsAI=
 github.com/microsoft/kiota-serialization-form-go v1.0.0/go.mod h1:h4mQOO6KVTNciMF6azi1J9QB19ujSw3ULKcSNyXXOMA=
 github.com/microsoft/kiota-serialization-json-go v1.0.7 h1:yMbckSTPrjZdM4EMXgzLZSA3CtDaUBI350u0VoYRz7Y=

diff --git a/it/java/pom.xml b/it/java/pom.xml
@@ -15,7 +15,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <kiota-java.version>1.1.9</kiota-java.version>
+        <kiota-java.version>1.1.11</kiota-java.version>
     </properties>
 
     <dependencies>

diff --git a/it/python/requirements-dev.txt b/it/python/requirements-dev.txt
@@ -54,7 +54,7 @@ tomli==2.0.1 ; python_version < '3.11'
 
 tomli-w==1.0.0 ; python_version >= '3.7'
 
-tomlkit==0.12.4 ; python_version >= '3.7'
+tomlkit==0.12.5 ; python_version >= '3.7'
 
 typing-extensions==4.11.0 ; python_version >= '3.7'