Skip to content

Commit

Permalink
Add version to vs-server (#3322)
Browse files Browse the repository at this point in the history
To simplify consumption for diagnostics purposes, we also include version information in `azd vs-server` invocation, i.e.           
`{"port":40899,"pid":74476,"azd":{"version":"1.2.3-dev.0","commit":"8a49ae5ae9ab13beeade35f91ad4b4611c2f5574"}}`.

Fixes #3314
  • Loading branch information
weikanglim committed Feb 9, 2024
1 parent d105fca commit 1cd55ed
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 8 deletions.
23 changes: 15 additions & 8 deletions cli/azd/cmd/vs_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/azure/azure-dev/cli/azd/cmd/actions"
"github.com/azure/azure-dev/cli/azd/internal"
"github.com/azure/azure-dev/cli/azd/internal/vsrpc"
"github.com/azure/azure-dev/cli/azd/pkg/contracts"
"github.com/azure/azure-dev/cli/azd/pkg/ioc"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
Expand Down Expand Up @@ -63,18 +64,24 @@ func (s *vsServerAction) Run(ctx context.Context) (*actions.ActionResult, error)
panic(err)
}

res, err := json.Marshal(struct {
Port int `json:"port"`
Pid int `json:"pid"`
}{
Port: listener.Addr().(*net.TCPAddr).Port,
Pid: os.Getpid(),
})
var versionRes contracts.VersionResult
versionSpec := internal.VersionInfo()

versionRes.Azd.Commit = versionSpec.Commit
versionRes.Azd.Version = versionSpec.Version.String()

res := contracts.VsServerResult{
Port: listener.Addr().(*net.TCPAddr).Port,
Pid: os.Getpid(),
VersionResult: versionRes,
}

resString, err := json.Marshal(res)
if err != nil {
return nil, err
}

fmt.Printf("%s\n", string(res))
fmt.Printf("%s\n", string(resString))

return nil, vsrpc.NewServer(s.rootContainer).Serve(listener)
}
7 changes: 7 additions & 0 deletions cli/azd/pkg/contracts/vs_server.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package contracts

type VsServerResult struct {
Port int `json:"port"`
Pid int `json:"pid"`
VersionResult
}

0 comments on commit 1cd55ed

Please sign in to comment.