This commit is contained in:
Michael Quigley
2025-09-16 11:31:39 -04:00
parent 33e5952747
commit e84bfc9f6f
454 changed files with 631 additions and 634 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ import "fmt"
var Version string
var Hash string
const Series = "v1.1"
const Series = "v2.0"
func String() string {
if Version != "" {
+1 -1
View File
@@ -44,7 +44,7 @@ func (cmd *orgAdminOverviewCommand) run(_ *cobra.Command, args []string) {
client := &http.Client{}
apiEndpoint, _ := root.ApiEndpoint()
req, err := http.NewRequest("GET", fmt.Sprintf("%v/api/v1/overview/%v/%v", apiEndpoint, args[0], args[1]), nil)
req, err := http.NewRequest("GET", fmt.Sprintf("%v/api/v2/overview/%v/%v", apiEndpoint, args[0], args[1]), nil)
if err != nil {
if !panicInstead {
tui.Error("error creating request", err)
+1 -2
View File
@@ -98,8 +98,7 @@ func DefaultConfig() *Config {
cfg := &Config{
Compatibility: &CompatibilityConfig{
VersionPatterns: []string{
`^(refs/(heads|tags)/)?v1\.1`,
`^v1\.0`,
`^(refs/(heads|tags)/)?v2\.0`,
},
},
Limits: limits.DefaultConfig(),
+1 -1
View File
@@ -42,7 +42,7 @@ fi
)
# Get version information
VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo "v1.0.x")
VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo "v2.0.x")
STEPS=$(git rev-list --count ${VERSION}..HEAD 2>/dev/null || echo "0")
if [ "$STEPS" -gt "0" ]; then
VERSION="${VERSION}-${STEPS}"
+2 -2
View File
@@ -98,7 +98,7 @@ When we left off you had downloaded, extracted, and configured your `zrok` softw
Log into the API console at:
[https://api-v1.zrok.io/](https://api-v1.zrok.io/)
[https://api-v2.zrok.io/](https://api-v2.zrok.io/)
When you first log into your account on the API console, your interface will look like this:
@@ -132,7 +132,7 @@ $ zrok status
Config:
CONFIG VALUE SOURCE
apiEndpoint https://api-v1.zrok.io env
apiEndpoint https://api-v2.zrok.io env
defaultFrontend public binary
headless false binary
+2 -2
View File
@@ -45,7 +45,7 @@ unhealthy; failed to execute request: Get "http://127.1.1.1:9090/": dial tcp 127
When your Agent is remoted and accessible through the zrok API, you can use the `/agent/share/http-healthcheck` endpoint to remotely check your Agent's connectivity to the backend target:
```
$ curl -H "X-TOKEN: 5hLXj48Bmn11" -XPOST -H "Content-Type: application/zrok.v1+json" -d '{"envZId": "MxMbUXSANU", "shareToken": "8rvjpmeeyvwc", "httpVerb": "GET", "endpoint": "/", "expectedHttpResponse": 200}' http://localhost:18080/api/v1/agent/share/http-healthcheck
$ curl -H "X-TOKEN: 5hLXj48Bmn11" -XPOST -H "Content-Type: application/zrok.v1+json" -d '{"envZId": "MxMbUXSANU", "shareToken": "8rvjpmeeyvwc", "httpVerb": "GET", "endpoint": "/", "expectedHttpResponse": 200}' http://localhost:18080/api/v2/agent/share/http-healthcheck
{
"healthy": true
}
@@ -53,7 +53,7 @@ $ curl -H "X-TOKEN: 5hLXj48Bmn11" -XPOST -H "Content-Type: application/zrok.v1+j
A non-existent health check URL will return a non-`200` response:
```
$ curl -H "X-TOKEN: 5hLXj48Bmn11" -XPOST -H "Content-Type: application/zrok.v1+json" -d '{"envZId": "MxMbUXSANU", "shareToken": "8rvjpmeeyvwc", "httpVerb": "GET", "endpoint": "/non-existent", "expectedHttpResponse": 200}' http://localhost:18080/api/v1/agent/share/http-healthcheck
$ curl -H "X-TOKEN: 5hLXj48Bmn11" -XPOST -H "Content-Type: application/zrok.v1+json" -d '{"envZId": "MxMbUXSANU", "shareToken": "8rvjpmeeyvwc", "httpVerb": "GET", "endpoint": "/non-existent", "expectedHttpResponse": 200}' http://localhost:18080/api/v2/agent/share/http-healthcheck
{
"error": "unexpected status code; got '202', want '200'"
}
+6 -6
View File
@@ -39,7 +39,7 @@ warning! proceeding will allow remote control of your zrok agent!
your agent will accept remote commands from:
https://api-v1.zrok.io
https://api-v2.zrok.io
you should only proceed if you understand the implications of this action!
@@ -72,7 +72,7 @@ The `apiEndpoint` `http://localhost:18080` is a zrok controller in a local devel
You can call the `/agent/share` endpoint to create a share on a remote Agent through the API:
```
$ curl -H "X-TOKEN: ojF2fna5GKlt" -XPOST -H "Content-Type: application/zrok.v1+json" -d '{"envZId": "qDWmgIxne4", "shareMode": "public", "backendMode": "web", "target": "/home/michael/Repos/nf/zrok"}' http://localhost:18080/api/v1/agent/share | jq
$ curl -H "X-TOKEN: ojF2fna5GKlt" -XPOST -H "Content-Type: application/zrok.v1+json" -d '{"envZId": "qDWmgIxne4", "shareMode": "public", "backendMode": "web", "target": "/home/michael/Repos/nf/zrok"}' http://localhost:18080/api/v2/agent/share | jq
{
"frontendEndpoints": [
"http://51bnatug7ua3.zrok.quigley.com:8080"
@@ -84,7 +84,7 @@ $ curl -H "X-TOKEN: ojF2fna5GKlt" -XPOST -H "Content-Type: application/zrok.v1+j
### Query the Status of the Remote Agent
```
$ curl -H "X-TOKEN: ojF2fna5GKlt" -XPOST -H "Content-Type: application/zrok.v1+json" -d '{"envZId": "qDWmgIxne4"}' http://localhost:18080/api/v1/agent/status | jq
$ curl -H "X-TOKEN: ojF2fna5GKlt" -XPOST -H "Content-Type: application/zrok.v1+json" -d '{"envZId": "qDWmgIxne4"}' http://localhost:18080/api/v2/agent/status | jq
{
"accesses": null,
"shares": [
@@ -104,9 +104,9 @@ $ curl -H "X-TOKEN: ojF2fna5GKlt" -XPOST -H "Content-Type: application/zrok.v1+j
### Remove the Remote Share
```
$ curl -H "X-TOKEN: ojF2fna5GKlt" -XPOST -H "Content-Type: application/zrok.v1+json" -d '{"envZId": "qDWmgIxne4", "token": "51bnatug7ua3"}' http://localhost:18080/api/v1/agent/unshare
$ curl -H "X-TOKEN: ojF2fna5GKlt" -XPOST -H "Content-Type: application/zrok.v1+json" -d '{"envZId": "qDWmgIxne4", "token": "51bnatug7ua3"}' http://localhost:18080/api/v2/agent/unshare
$ curl -H "X-TOKEN: ojF2fna5GKlt" -XPOST -H "Content-Type: application/zrok.v1+json" -d '{"envZId": "qDWmgIxne4"}' http://localhost:18080/api/v1/agent/status | jq
$ curl -H "X-TOKEN: ojF2fna5GKlt" -XPOST -H "Content-Type: application/zrok.v1+json" -d '{"envZId": "qDWmgIxne4"}' http://localhost:18080/api/v2/agent/status | jq
{
"accesses": null,
"shares": null
@@ -123,7 +123,7 @@ The `zrok agent unenroll` command will remove all remote control access from an
```
$ zrok agent unenroll
SUCCESS: unenrolled agent from 'https://api-v1.zrok.io'
SUCCESS: unenrolled agent from 'https://api-v2.zrok.io'
SUCCESS: removed agent-enrollment.json
```
@@ -9,7 +9,7 @@ This guide is relevant if you are self-hosting or using a friend's `zrok` instan
The `zrok` *command* on your computer uses a `zrok` *instance* over the network.
The default instance API endpoint for the `zrok` command is `api-v1.zrok.io`. Set the API endpoint to another instance's API endpoint:
The default instance API endpoint for the `zrok` command is `api-v2.zrok.io`. Set the API endpoint to another instance's API endpoint:
```text
zrok config set apiEndpoint https://zrok.example.com
+1 -1
View File
@@ -117,7 +117,7 @@ See the separate guides on [configuring metrics](/guides/self-hosting/metrics-an
## Environment Variables
The `zrok` binaries are configured to work with the global `zrok.io` service, and default to using `api-v1.zrok.io` as the endpoint for communicating with the service.
The `zrok` binaries are configured to work with the global `zrok.io` service, and default to using `api-v2.zrok.io` as the endpoint for communicating with the service.
To work with a self-hosted `zrok` deployment, you'll need to set the `ZROK_API_ENDPOINT` environment variable to point to the address where your `zrok` controller will be listening, according to `endpoint` in the configuration file above.
+3 -4
View File
@@ -1,7 +1,6 @@
package env_v0_3
import (
"fmt"
"net/url"
"os"
"path/filepath"
@@ -46,14 +45,14 @@ func (r *Root) Client() (*rest_client_zrok.Zrok, error) {
if err != nil {
return nil, errors.Wrapf(err, "error parsing api endpoint '%v'", r)
}
transport := httptransport.New(apiUrl.Host, "/api/v1", []string{apiUrl.Scheme})
transport := httptransport.New(apiUrl.Host, "/api/v2", []string{apiUrl.Scheme})
transport.Producers["application/zrok.v1+json"] = runtime.JSONProducer()
transport.Consumers["application/zrok.v1+json"] = runtime.JSONConsumer()
zrok := rest_client_zrok.New(transport, strfmt.Default)
_, err = zrok.Metadata.ClientVersionCheck(&metadata2.ClientVersionCheckParams{
Body: metadata2.ClientVersionCheckBody{
ClientVersion: fmt.Sprintf("v1.0-%s", build.String()), // TODO: go back to build.String()
ClientVersion: build.String(),
},
})
if err != nil {
@@ -64,7 +63,7 @@ func (r *Root) Client() (*rest_client_zrok.Zrok, error) {
}
func (r *Root) ApiEndpoint() (string, string) {
apiEndpoint := "https://api-v1.zrok.io"
apiEndpoint := "https://api-v2.zrok.io"
from := "binary"
if r.Config() != nil && r.Config().ApiEndpoint != "" {
+3 -4
View File
@@ -1,7 +1,6 @@
package env_v0_4
import (
"fmt"
"net/url"
"os"
"path/filepath"
@@ -46,14 +45,14 @@ func (r *Root) Client() (*rest_client_zrok.Zrok, error) {
if err != nil {
return nil, errors.Wrapf(err, "error parsing api endpoint '%v'", r)
}
transport := httptransport.New(apiUrl.Host, "/api/v1", []string{apiUrl.Scheme})
transport := httptransport.New(apiUrl.Host, "/api/v2", []string{apiUrl.Scheme})
transport.Producers["application/zrok.v1+json"] = runtime.JSONProducer()
transport.Consumers["application/zrok.v1+json"] = runtime.JSONConsumer()
zrok := rest_client_zrok.New(transport, strfmt.Default)
_, err = zrok.Metadata.ClientVersionCheck(&metadata2.ClientVersionCheckParams{
Body: metadata2.ClientVersionCheckBody{
ClientVersion: fmt.Sprintf("v1.0-%s", build.String()), // TODO: go back to build.String()
ClientVersion: build.String(),
},
})
if err != nil {
@@ -63,7 +62,7 @@ func (r *Root) Client() (*rest_client_zrok.Zrok, error) {
}
func (r *Root) ApiEndpoint() (string, string) {
apiEndpoint := "https://api-v1.zrok.io"
apiEndpoint := "https://api-v2.zrok.io"
from := "binary"
if r.Config() != nil && r.Config().ApiEndpoint != "" {
+2 -2
View File
@@ -292,11 +292,11 @@ func loadEnvironment() (*env_core.Environment, error) {
ApiEndpoint: env.ApiEndpoint,
}
if strings.HasPrefix(env.ApiEndpoint, "https://api.zrok.io") {
out.ApiEndpoint = "https://api-v1.zrok.io"
out.ApiEndpoint = "https://api-v2.zrok.io"
if err := saveEnvironment(out); err != nil {
return nil, errors.Wrap(err, "error auto-rebasing apiEndpoint")
}
logrus.Info("auto-rebased 'apiEndpoint' for v1.0.x")
logrus.Info("auto-rebased 'apiEndpoint' for v2.0.x")
}
return out, nil
}
+1 -1
View File
@@ -51,7 +51,7 @@ if [[ -z "${ZROK_ENABLE_TOKEN}" ]]; then
echo "ERROR: ZROK_ENABLE_TOKEN is not defined" >&2
exit 1
else
zrok config set apiEndpoint "${ZROK_API_ENDPOINT:-https://api-v1.zrok.io}"
zrok config set apiEndpoint "${ZROK_API_ENDPOINT:-https://api-v2.zrok.io}"
echo "INFO: running: zrok enable ..."
exec zrok enable --headless --description "${ZROK_ENVIRONMENT_NAME:-${DEFAULT_ZROK_ENVIRONMENT_NAME}}" "${ZROK_ENABLE_TOKEN}"
fi
+2 -2
View File
@@ -20,7 +20,7 @@ ZROK_ENABLE_TOKEN=""
ZROK_ENVIRONMENT_NAME=""
# You MUST set this if not using the default API endpoint
#ZROK_API_ENDPOINT="https://api-v1.zrok.io"
#ZROK_API_ENDPOINT="https://api-v2.zrok.io"
#
## ZROK BACKEND MODE AND TARGET
@@ -88,7 +88,7 @@ ZROK_TARGET="" # e.g., http://127.0.0.1:3000
# WARNING: changes take effect the next time the frontend URL is reserved
#ZROK_UNIQUE_NAME=""
# you MAY set one OAuth2/OIDC provider; "google" and "github" are valid for the default instance api-v1.zrok.io
# you MAY set one OAuth2/OIDC provider; "google" and "github" are valid for the default instance api-v2.zrok.io
# WARNING: changes take effect the next time the frontend URL is reserved
# NOTE: basic auth and oauth are mutually exclusive
#ZROK_OAUTH_PROVIDER="google"
+1 -1
View File
@@ -27,7 +27,7 @@ const (
DefaultHost string = "localhost"
// DefaultBasePath is the default BasePath
// found in Meta (info) section of spec file
DefaultBasePath string = "/api/v1"
DefaultBasePath string = "/api/v2"
)
// DefaultSchemes are the default schemes found in Meta (info) section of spec file
+2 -2
View File
@@ -6,8 +6,8 @@
// Schemes:
// http
// Host: localhost
// BasePath: /api/v1
// Version: 1.0.0
// BasePath: /api/v2
// Version: 2.0.0
//
// Consumes:
// - application/zrok.v1+json
+4 -4
View File
@@ -31,9 +31,9 @@ func init() {
"info": {
"description": "zrok client access",
"title": "zrok",
"version": "1.0.0"
"version": "2.0.0"
},
"basePath": "/api/v1",
"basePath": "/api/v2",
"paths": {
"/access": {
"post": {
@@ -3794,9 +3794,9 @@ func init() {
"info": {
"description": "zrok client access",
"title": "zrok",
"version": "1.0.0"
"version": "2.0.0"
},
"basePath": "/api/v1",
"basePath": "/api/v2",
"paths": {
"/access": {
"post": {
@@ -39,7 +39,7 @@ func (o *ChangePasswordURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *InviteURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *LoginURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *RegenerateAccountTokenURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *RegisterURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *ResetPasswordRequestURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *ResetPasswordURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *VerifyURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *AddFrontendGrantURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *AddNamespaceFrontendMappingURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *AddNamespaceGrantURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *AddOrganizationMemberURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *CreateAccountURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *CreateFrontendURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *CreateIdentityURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *CreateNamespaceURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *CreateOrganizationURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *DeleteAccountURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *DeleteFrontendGrantURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *DeleteFrontendURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *DeleteIdentityURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *DeleteNamespaceURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *DeleteOrganizationURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *GrantsURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *InviteTokenGenerateURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -51,7 +51,7 @@ func (o *ListFrontendNamespaceMappingsURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *ListFrontendsURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -51,7 +51,7 @@ func (o *ListNamespaceFrontendMappingsURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *ListNamespacesURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *ListOrganizationMembersURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *ListOrganizationsURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *RemoveNamespaceFrontendMappingURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *RemoveNamespaceGrantURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *RemoveOrganizationMemberURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *UpdateFrontendURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *UpdateNamespaceURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *EnrollURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *PingURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *RemoteAccessURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *RemoteShareURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *RemoteStatusURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *RemoteUnaccessURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *RemoteUnshareURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *ShareHTTPHealthcheckURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *UnenrollURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *DisableURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *EnableURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *ClientVersionCheckURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *ConfigurationURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *GetAccountDetailURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -43,7 +43,7 @@ func (o *GetAccountMetricsURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -51,7 +51,7 @@ func (o *GetEnvironmentDetailURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -53,7 +53,7 @@ func (o *GetEnvironmentMetricsURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -53,7 +53,7 @@ func (o *GetFrontendDetailURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -51,7 +51,7 @@ func (o *GetShareDetailURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -53,7 +53,7 @@ func (o *GetShareMetricsURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *GetSparklinesURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *ListMembershipsURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -51,7 +51,7 @@ func (o *ListOrgMembersURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *ListPublicFrontendsForAccountURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -59,7 +59,7 @@ func (o *OrgAccountOverviewURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *OverviewURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *VersionInventoryURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *VersionURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *AccessURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *CreateShareNameURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *DeleteShareNameURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *ListAllNamesURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -51,7 +51,7 @@ func (o *ListNamesForNamespaceURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *Share12URL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *UnaccessURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *Unshare12URL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *UpdateAccessURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
@@ -39,7 +39,7 @@ func (o *UpdateShareURL) Build() (*url.URL, error) {
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
_basePath = "/api/v2"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
+1 -1
View File
@@ -15,7 +15,7 @@ func Overview(root env_core.Root) (string, error) {
client := &http.Client{}
apiEndpoint, _ := root.ApiEndpoint()
req, err := http.NewRequest("GET", fmt.Sprintf("%v/api/v1/overview", apiEndpoint), nil)
req, err := http.NewRequest("GET", fmt.Sprintf("%v/api/v2/overview", apiEndpoint), nil)
if err != nil {
return "", err
}
+1 -1
View File
@@ -4,7 +4,7 @@
* zrok
* zrok client access
*
* The version of the OpenAPI document: 1.0.0
* The version of the OpenAPI document: 2.0.0
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+1 -1
View File
@@ -4,7 +4,7 @@
* zrok
* zrok client access
*
* The version of the OpenAPI document: 1.0.0
* The version of the OpenAPI document: 2.0.0
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+1 -1
View File
@@ -4,7 +4,7 @@
* zrok
* zrok client access
*
* The version of the OpenAPI document: 1.0.0
* The version of the OpenAPI document: 2.0.0
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -4,7 +4,7 @@
* zrok
* zrok client access
*
* The version of the OpenAPI document: 1.0.0
* The version of the OpenAPI document: 2.0.0
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+1 -1
View File
@@ -4,7 +4,7 @@
* zrok
* zrok client access
*
* The version of the OpenAPI document: 1.0.0
* The version of the OpenAPI document: 2.0.0
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+1 -1
View File
@@ -4,7 +4,7 @@
* zrok
* zrok client access
*
* The version of the OpenAPI document: 1.0.0
* The version of the OpenAPI document: 2.0.0
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -4,7 +4,7 @@
* zrok
* zrok client access
*
* The version of the OpenAPI document: 1.0.0
* The version of the OpenAPI document: 2.0.0
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -4,7 +4,7 @@
* zrok
* zrok client access
*
* The version of the OpenAPI document: 1.0.0
* The version of the OpenAPI document: 2.0.0
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

Some files were not shown because too many files have changed in this diff Show More