Skip to content

Commit

Permalink
Merge branch 'main' into fix-packer-template
Browse files Browse the repository at this point in the history
  • Loading branch information
cjlapao authored Nov 8, 2023
2 parents 0b60fae + e283260 commit 18d717a
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 35 deletions.
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: "0.1.42"
appVersion: "0.1.42"
version: "0.1.43"
appVersion: "0.1.43"
20 changes: 10 additions & 10 deletions src/controllers/api_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ import (
"github.com/gorilla/mux"
)

// @Summary Gets all the api keys
// @Description This endpoint returns all the api keys
// @Tags Api Keys
// @Produce json
// @Success 200 {object} []models.ApiKeyResponse
// @Failure 400 {object} models.ApiErrorResponse
// @Failure 401 {object} models.OAuthErrorResponse
// @Security ApiKeyAuth
// @Security BearerAuth
// @Router /v1/auth/api_keys [get]
// @Summary Gets all the api keys
// @Description This endpoint returns all the api keys
// @Tags Api Keys
// @Produce json
// @Success 200 {object} []models.ApiKeyResponse
// @Failure 400 {object} models.ApiErrorResponse
// @Failure 401 {object} models.OAuthErrorResponse
// @Security ApiKeyAuth
// @Security BearerAuth
// @Router /v1/auth/api_keys [get]
func GetApiKeysController() restapi.Controller {
return func(w http.ResponseWriter, r *http.Request) {
ctx := GetBaseContext(r)
Expand Down
44 changes: 22 additions & 22 deletions src/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,30 @@ import (
"github.com/cjlapao/common-go/version"
)

var ver = "0.1.42"
var ver = "0.1.43"
var versionSvc = version.Get()

// @title Parallels Desktop API
// @version 1.0
// @description Parallels Desktop API Service
// @termsOfService http://swagger.io/terms/

// @contact.name Parallels Desktop API Support
// @contact.url https://forum.parallels.com/
// @contact.email [email protected]

// @license.name Apache 2.0
// @license.url http://www.apache.org/licenses/LICENSE-2.0.html
// @BasePath /api
// @securityDefinitions.apikey ApiKeyAuth
// @description Type the api key in the input below.
// @in header
// @name X-Api-Key

// @securityDefinitions.apikey BearerAuth
// @description Type "Bearer" followed by a space and JWT token.
// @in header
// @name Authorization
// @title Parallels Desktop API
// @version 1.0
// @description Parallels Desktop API Service
// @termsOfService http://swagger.io/terms/

// @contact.name Parallels Desktop API Support
// @contact.url https://forum.parallels.com/
// @contact.email [email protected]

// @license.name Apache 2.0
// @license.url http://www.apache.org/licenses/LICENSE-2.0.html
// @BasePath /api
// @securityDefinitions.apikey ApiKeyAuth
// @description Type the api key in the input below.
// @in header
// @name X-Api-Key

// @securityDefinitions.apikey BearerAuth
// @description Type "Bearer" followed by a space and JWT token.
// @in header
// @name Authorization
func main() {
versionSvc.Author = "Carlos Lapao"
versionSvc.Name = "Parallels Desktop API Service"
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "0.1.42"
"version": "0.1.43"
}

0 comments on commit 18d717a

Please sign in to comment.