Relocate Hidi to OpenAPI.NET.OData

.azure-pipelines/ci-build.yml

@@ -12,6 +12,7 @@ trigger:
   tags:
     include:
       - 'v*'
+      - 'hidi-v*'
 pr:
   branches:
     include:
@@ -54,6 +55,10 @@ extends:
               displayName: 'Publish Artifact: Nugets'
               artifactName: Nugets
               targetPath: '$(Build.ArtifactStagingDirectory)'
+            - output: pipelineArtifact
+              displayName: 'Publish Artifact: Hidi Docker Context'
+              artifactName: HidiDockerContext
+              targetPath: '$(Build.ArtifactStagingDirectory)\HidiDockerContext'
           steps:
 
           - task: UseDotNet@2
@@ -66,6 +71,11 @@ extends:
             inputs:
               version: 8.x
 
+          - task: UseDotNet@2
+            displayName: 'Use .NET 10'
+            inputs:
+              version: 10.x
+
           # Install the nuget tool.
           - task: NuGetToolInstaller@1
             displayName: 'Use NuGet >=6.11.0'
@@ -96,12 +106,16 @@ extends:
 
           # Run the Unit test
           - task: DotNetCoreCLI@2
-            displayName: 'test'
+            displayName: 'test OData'
             inputs:
               command: test
-              projects: '$(Build.SourcesDirectory)\Microsoft.OpenApi.OData.sln'
+              projects: '$(Build.SourcesDirectory)\test\Microsoft.OpenAPI.OData.Reader.Tests\Microsoft.OpenAPI.OData.Reader.Tests.csproj'
               arguments: '--configuration $(BuildConfiguration) --no-build'
 
+          - pwsh: dotnet test --configuration $(BuildConfiguration) --no-build
+            workingDirectory: '$(Build.SourcesDirectory)\test\Microsoft.OpenApi.Hidi.Tests'
+            displayName: 'test Hidi'
+
           - task: EsrpCodeSigning@6
             displayName: 'ESRP CodeSigning'
             inputs:
@@ -156,14 +170,21 @@ extends:
               MaxRetryAttempts: '5'
               PendingAnalysisWaitTimeoutMinutes: '5'
 
-          # Pack
+          # Pack OData
           - task: DotNetCoreCLI@2
-            displayName: 'pack'
+            displayName: 'pack OData'
             inputs:
               command: pack
               projects: src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
               arguments: '-o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg'
 
+          - task: DotNetCoreCLI@2
+            displayName: 'pack Hidi'
+            inputs:
+              command: pack
+              projects: src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
+              arguments: '-o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg'
+
           - task: EsrpCodeSigning@6
             displayName: 'ESRP CodeSigning Nuget Packages'
             inputs:
@@ -198,11 +219,93 @@ extends:
               MaxRetryAttempts: '5'
               PendingAnalysisWaitTimeoutMinutes: '5'
 
+          - task: DotNetCoreCLI@2
+            displayName: 'publish Hidi as executable'
+            inputs:
+              command: publish
+              projects: src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
+              arguments: '-c $(BuildConfiguration) --runtime win-x64 -p:RestoreConfigFile=$(Build.SourcesDirectory)\nuget.config /p:PublishSingleFile=true /p:PackAsTool=false --self-contained --output $(Build.ArtifactStagingDirectory)\Microsoft.OpenApi.Hidi'
+              publishWebProjects: false
+              zipAfterPublish: false
+
+          - task: EsrpCodeSigning@6
+            displayName: 'ESRP CodeSigning Hidi executable'
+            inputs:
+              ConnectedServiceName: 'Federated DevX ESRP Managed Identity Connection'
+              FolderPath: '$(Build.ArtifactStagingDirectory)\Microsoft.OpenApi.Hidi'
+              AppRegistrationClientId: '65035b7f-7357-4f29-bf25-c5ee5c3949f8'
+              AppRegistrationTenantId: 'cdc5aeea-15c5-4db6-b079-fcadd2505dc2'
+              AuthAKVName: 'akv-prod-eastus'
+              AuthCertName: 'ReferenceLibraryPrivateCert'
+              AuthSignCertName: 'ReferencePackagePublisherCertificate'
+              signConfigType: inlineSignParams
+              inlineOperation: |
+                [
+                    {
+                        "keyCode": "CP-230012",
+                        "operationSetCode": "SigntoolSign",
+                        "parameters": [
+                        {
+                            "parameterName": "OpusName",
+                            "parameterValue": "Microsoft"
+                        },
+                        {
+                            "parameterName": "OpusInfo",
+                            "parameterValue": "http://www.microsoft.com"
+                        },
+                        {
+                            "parameterName": "FileDigest",
+                            "parameterValue": "/fd \"SHA256\""
+                        },
+                        {
+                            "parameterName": "PageHash",
+                            "parameterValue": "/NPH"
+                        },
+                        {
+                            "parameterName": "TimeStamp",
+                            "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                        }
+                        ],
+                        "toolName": "sign",
+                        "toolVersion": "1.0"
+                    },
+                    {
+                        "keyCode": "CP-230012",
+                        "operationSetCode": "SigntoolVerify",
+                        "parameters": [ ],
+                        "toolName": "sign",
+                        "toolVersion": "1.0"
+                    }
+                ]
+              SessionTimeout: '20'
+              MaxConcurrency: '50'
+              MaxRetryAttempts: '5'
+              PendingAnalysisWaitTimeoutMinutes: '5'
+
+          - task: CopyFiles@2
+            displayName: 'Prepare Hidi Docker context'
+            inputs:
+              SourceFolder: '$(Build.SourcesDirectory)'
+              Contents: |
+                Dockerfile
+                Directory.Build.props
+                Build.props
+                README.md
+                src/Build.props
+                src/Microsoft.OpenApi.Hidi/**
+                src/Microsoft.OpenApi.OData.Reader/**
+                tool/Microsoft.OpenApi.Hidi.snk
+                tool/Microsoft.OpenApi.OData.snk
+                !**/bin/**
+                !**/obj/**
+              TargetFolder: '$(Build.ArtifactStagingDirectory)\HidiDockerContext'
+
     - stage: deploy
-      condition: and(contains(variables['build.sourceBranch'], 'refs/tags/v'), succeeded())
+      condition: and(or(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), startsWith(variables['Build.SourceBranch'], 'refs/tags/hidi-v'), eq(variables['Build.SourceBranch'], 'refs/heads/main')), succeeded())
       dependsOn: build
       jobs:
         - deployment: deploy
+          condition: and(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), succeeded())
           templateContext:
             type: releaseJob
             isProduction: true
@@ -225,7 +328,32 @@ extends:
                     publishFeedCredentials: 'OpenAPI Nuget Connection'
                     packageParentPath: '$(Pipeline.Workspace)'
 
+        - deployment: deploy_hidi
+          condition: and(startsWith(variables['Build.SourceBranch'], 'refs/tags/hidi-v'), succeeded())
+          templateContext:
+            type: releaseJob
+            isProduction: true
+            inputs:
+            - input: pipelineArtifact
+              artifactName: Nugets
+              targetPath: '$(Pipeline.Workspace)'
+          environment: nuget-org
+          strategy:
+            runOnce:
+              deploy:
+                pool:
+                  vmImage: ubuntu-latest
+                steps:
+                - task: 1ES.PublishNuget@1
+                  displayName: 'NuGet push Hidi'
+                  inputs:
+                    packagesToPush: '$(Pipeline.Workspace)/Microsoft.OpenApi.Hidi.*.nupkg'
+                    nuGetFeedType: external
+                    publishFeedCredentials: 'OpenAPI Nuget Connection'
+                    packageParentPath: '$(Pipeline.Workspace)'
+
         - deployment: create_github_release
+          condition: and(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), succeeded())
           templateContext:
             type: releaseJob
             isProduction: true
@@ -242,7 +370,7 @@ extends:
                   vmImage: ubuntu-latest
                 steps:
                 - pwsh: |
-                    $artifactName = Get-ChildItem -Path $(Pipeline.Workspace) -Filter Microsoft.OpenApi.*.nupkg -recurse | select -First 1
+                    $artifactName = Get-ChildItem -Path $(Pipeline.Workspace) -Filter Microsoft.OpenApi.OData.*.nupkg -recurse | select -First 1
                     $artifactVersion= $artifactName.Name -replace "Microsoft.OpenApi.OData.", "" -replace ".nupkg", ""
                     #Set Variable $artifactName and $artifactVersion
                     Write-Host "##vso[task.setvariable variable=artifactVersion; isSecret=false;]$artifactVersion"
@@ -258,5 +386,93 @@ extends:
                     tag: 'v$(artifactVersion)'
                     title: 'v$(artifactVersion)'
                     releaseNotesSource: inline
-                    assets: '$(Pipeline.Workspace)\**\*.nupkg'   
+                    assets: '$(Pipeline.Workspace)/**/Microsoft.OpenApi.OData.*.nupkg'
                     addChangeLog: false   
+
+        - deployment: create_hidi_github_release
+          condition: and(startsWith(variables['Build.SourceBranch'], 'refs/tags/hidi-v'), succeeded())
+          templateContext:
+            type: releaseJob
+            isProduction: true
+            inputs:
+            - input: pipelineArtifact
+              artifactName: Nugets
+              targetPath: '$(Pipeline.Workspace)'
+          dependsOn: []
+          environment: kiota-github-releases
+          strategy:
+            runOnce:
+              deploy:
+                pool:
+                  vmImage: ubuntu-latest
+                steps:
+                - pwsh: |
+                    $version = "$(Build.SourceBranch)" -replace "^refs/tags/hidi-v", ""
+                    Write-Host "##vso[task.setvariable variable=hidiVersion;isSecret=false]$version"
+                  displayName: 'Read Hidi version from tag'
+                - task: GitHubRelease@1
+                  displayName: 'GitHub release Hidi'
+                  inputs:
+                    gitHubConnection: 'Github-MaggieKimani1'
+                    action: edit
+                    tagSource: userSpecifiedTag
+                    tag: 'hidi-v$(hidiVersion)'
+                    title: 'Hidi v$(hidiVersion)'
+                    releaseNotesSource: inline
+                    assets: |
+                      $(Pipeline.Workspace)/**/Microsoft.OpenApi.Hidi.*.nupkg
+                      $(Pipeline.Workspace)/**/Microsoft.OpenApi.Hidi/**
+                    addChangeLog: false
+
+        - deployment: deploy_hidi_docker
+          condition: and(or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/tags/hidi-v')), succeeded())
+          templateContext:
+            type: releaseJob
+            isProduction: true
+            inputs:
+            - input: pipelineArtifact
+              artifactName: HidiDockerContext
+              targetPath: '$(Pipeline.Workspace)/HidiDockerContext'
+          environment: docker-images-deploy
+          strategy:
+            runOnce:
+              deploy:
+                pool:
+                  vmImage: ubuntu-latest
+                steps:
+                - task: AzureCLI@2
+                  displayName: 'Login to Azure Container Registry'
+                  inputs:
+                    azureSubscription: 'ACR Images Push Service Connection'
+                    scriptType: bash
+                    scriptLocation: inlineScript
+                    inlineScript: az acr login --name msgraphprodregistry.azurecr.io
+                - bash: |
+                    docker run --privileged --rm msgraphprodregistry.azurecr.io/tonistiigi/binfmt --install all
+                    docker buildx create --use --name hidi-builder
+                    docker buildx inspect --bootstrap
+                  displayName: 'Configure multi-platform build'
+                - bash: |
+                    version=$(sed -n 's:.*<Version>\(.*\)</Version>.*:\1:p' src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj | head -1)
+                    runnumber=$(echo "$(Build.BuildNumber)" | grep -o '[0-9]\+$')
+                    docker buildx build \
+                      --platform linux/amd64,linux/arm64/v8 \
+                      --push \
+                      -t "msgraphprodregistry.azurecr.io/public/openapi/hidi:nightly" \
+                      -t "msgraphprodregistry.azurecr.io/public/openapi/hidi:${version}.$(date +'%Y%m%d')${runnumber}" \
+                      .
+                  workingDirectory: '$(Pipeline.Workspace)/HidiDockerContext'
+                  displayName: 'Build and push Hidi nightly image'
+                  condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
+                - bash: |
+                    version="$(Build.SourceBranch)"
+                    version="${version#refs/tags/hidi-v}"
+                    docker buildx build \
+                      --platform linux/amd64,linux/arm64/v8 \
+                      --push \
+                      -t "msgraphprodregistry.azurecr.io/public/openapi/hidi:latest" \
+                      -t "msgraphprodregistry.azurecr.io/public/openapi/hidi:${version}" \
+                      .
+                  workingDirectory: '$(Pipeline.Workspace)/HidiDockerContext'
+                  displayName: 'Build and push Hidi release image'
+                  condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/hidi-v')

.github/workflows/ci-cd.yml

@@ -21,6 +21,11 @@ jobs:
         with:
           dotnet-version: 8.0.x
 
+      - name: Setup .NET 10
+        uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
+        with:
+          dotnet-version: 10.0.x
+
       - name: Data gatherer
         id: data_gatherer
         shell: pwsh
@@ -53,7 +58,7 @@ jobs:
         name: Bump GH tag
         id: tag_generator
         uses: mathieudutour/github-tag-action@a22cf08638b34d5badda920f9daf6e72c477b07b # v6.2
-        with: 
+        with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           default_bump: false
           release_branches: ${{ steps.data_gatherer.outputs.default_branch }}
@@ -63,17 +68,18 @@ jobs:
         shell: pwsh
         run: |
           $projectsArray = @(
-            '.\src\Microsoft.OpenApi.OData.Reader\Microsoft.OpenAPI.OData.Reader.csproj'
+            './src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj',
+            './src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj'
           )
           $gitNewVersion = if ("${{ steps.tag_generator.outputs.new_version }}") {"${{ steps.tag_generator.outputs.new_version }}"} else {$null}
-          $projectCurrentVersion = ([xml](Get-Content .\src\Microsoft.OpenApi.OData.Reader\Microsoft.OpenAPI.OData.Reader.csproj)).Project.PropertyGroup.Version
+          $projectCurrentVersion = ([xml](Get-Content ./src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj)).Project.PropertyGroup.Version
           $projectNewVersion = $gitNewVersion ?? $projectCurrentVersion
 
           $projectsArray | ForEach-Object {
             dotnet build $PSItem `
             -c Release # `
             # -o $env:ARTIFACTS_FOLDER `
-            # /p:Version=$projectNewVersion 
+            # /p:Version=$projectNewVersion
           }
 
           # Move NuGet packages to separate folder for pipeline convenience
@@ -85,14 +91,34 @@ jobs:
         shell: pwsh
         run: |
           $testProjectsArray = @(
-            '.\test\Microsoft.OpenAPI.OData.Reader.Tests\Microsoft.OpenAPI.OData.Reader.Tests.csproj'
+            './test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj'
           )
 
           $testProjectsArray | ForEach-Object {
             dotnet test $PSItem `
             -c Release
           }
 
+      - name: Run Hidi unit tests
+        id: run_hidi_unit_tests
+        working-directory: test/Microsoft.OpenApi.Hidi.Tests
+        shell: pwsh
+        run: |
+          dotnet test -c Release
+
+      - name: Smoke test Hidi package
+        shell: pwsh
+        run: |
+          $hidiVersion = ([xml](Get-Content ./src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj)).Project.PropertyGroup.Version
+          $inputDocument = './test/Microsoft.OpenApi.Hidi.Tests/UtilityFiles/SampleOpenApi.yml'
+          dotnet pack ./src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj -c Release --no-build -o ./Artifacts
+          dotnet tool install --tool-path ./.hidi-smoke --source ./Artifacts --version $hidiVersion Microsoft.OpenApi.Hidi
+          ./.hidi-smoke/hidi --help
+          ./.hidi-smoke/hidi validate --openapi $inputDocument
+          ./.hidi-smoke/hidi transform --openapi $inputDocument --output ./Artifacts/transformed.json --format json --version 3.0 --clean-output
+          ./.hidi-smoke/hidi show --openapi $inputDocument --output ./Artifacts/paths.txt --clean-output
+          ./.hidi-smoke/hidi plugin --help
+
       # - if: steps.tag_generator.outputs.new_version != ''
       #   name: Upload NuGet packages as artifacts
       #   id: ul_packages_artifact