diff --git a/client.yml b/client.yml index 4fc0f0b..a48f399 100644 --- a/client.yml +++ b/client.yml @@ -15,7 +15,7 @@ info: license: name: Apache 2.0 url: https://www.apache.org/licenses/LICENSE-2.0.html - version: 0.26.38 + version: 0.26.39 host: demo.ziti.dev basePath: /edge/client/v1 paths: @@ -4235,6 +4235,8 @@ definitions: type: array items: type: string + targetToken: + $ref: '#/definitions/targetToken' clientExternalJwtSignerList: description: An array of External JWT Signers resources type: array @@ -5596,6 +5598,13 @@ definitions: allOf: - $ref: '#/definitions/subTags' x-nullable: true + targetToken: + description: Defines the target token type + type: string + enum: + - ACCESS + - ID + x-nullable: true terminatorClientDetail: type: object allOf: diff --git a/management.yml b/management.yml index 9644565..6026783 100644 --- a/management.yml +++ b/management.yml @@ -15,7 +15,7 @@ info: license: name: Apache 2.0 url: https://www.apache.org/licenses/LICENSE-2.0.html - version: 0.26.38 + version: 0.26.39 host: demo.ziti.dev basePath: /edge/management/v1 paths: @@ -18916,6 +18916,8 @@ definitions: x-nullable: true tags: $ref: '#/definitions/tags' + targetToken: + $ref: '#/definitions/targetToken' useExternalId: type: boolean x-nullable: true @@ -18942,6 +18944,7 @@ definitions: - audience - clientId - scopes + - targetToken properties: audience: type: string @@ -18982,6 +18985,8 @@ definitions: type: array items: type: string + targetToken: + $ref: '#/definitions/targetToken' useExternalId: type: boolean externalJwtSignerList: @@ -19031,6 +19036,8 @@ definitions: type: string tags: $ref: '#/definitions/tags' + targetToken: + $ref: '#/definitions/targetToken' useExternalId: type: boolean x-nullable: true @@ -19079,6 +19086,8 @@ definitions: x-nullable: true tags: $ref: '#/definitions/tags' + targetToken: + $ref: '#/definitions/targetToken' useExternalId: type: boolean x-nullable: true @@ -21282,6 +21291,13 @@ definitions: allOf: - $ref: '#/definitions/subTags' x-nullable: true + targetToken: + description: Defines the target token type + type: string + enum: + - ACCESS + - ID + x-nullable: true terminatorCost: type: integer maximum: 65535 diff --git a/rest_client_api_server/doc.go b/rest_client_api_server/doc.go index 7421dac..94295d6 100644 --- a/rest_client_api_server/doc.go +++ b/rest_client_api_server/doc.go @@ -30,7 +30,7 @@ // https // Host: demo.ziti.dev // BasePath: /edge/client/v1 -// Version: 0.26.38 +// Version: 0.26.39 // License: Apache 2.0 https://www.apache.org/licenses/LICENSE-2.0.html // Contact: OpenZiti https://openziti.discourse.group // diff --git a/rest_client_api_server/embedded_spec.go b/rest_client_api_server/embedded_spec.go index 290ca8a..3acbc08 100644 --- a/rest_client_api_server/embedded_spec.go +++ b/rest_client_api_server/embedded_spec.go @@ -64,7 +64,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.38" + "version": "0.26.39" }, "host": "demo.ziti.dev", "basePath": "/edge/client/v1", @@ -5805,6 +5805,9 @@ func init() { "items": { "type": "string" } + }, + "targetToken": { + "$ref": "#/definitions/targetToken" } } } @@ -7852,6 +7855,15 @@ func init() { ], "x-nullable": true }, + "targetToken": { + "description": "Defines the target token type", + "type": "string", + "enum": [ + "ACCESS", + "ID" + ], + "x-nullable": true + }, "terminatorClientDetail": { "type": "object", "allOf": [ @@ -8002,7 +8014,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.38" + "version": "0.26.39" }, "host": "demo.ziti.dev", "basePath": "/edge/client/v1", @@ -13825,6 +13837,9 @@ func init() { "items": { "type": "string" } + }, + "targetToken": { + "$ref": "#/definitions/targetToken" } } } @@ -15873,6 +15888,15 @@ func init() { ], "x-nullable": true }, + "targetToken": { + "description": "Defines the target token type", + "type": "string", + "enum": [ + "ACCESS", + "ID" + ], + "x-nullable": true + }, "terminatorClientDetail": { "type": "object", "allOf": [ diff --git a/rest_management_api_server/doc.go b/rest_management_api_server/doc.go index 5909ea2..5cf317f 100644 --- a/rest_management_api_server/doc.go +++ b/rest_management_api_server/doc.go @@ -30,7 +30,7 @@ // https // Host: demo.ziti.dev // BasePath: /edge/management/v1 -// Version: 0.26.38 +// Version: 0.26.39 // License: Apache 2.0 https://www.apache.org/licenses/LICENSE-2.0.html // Contact: OpenZiti https://openziti.discourse.group // diff --git a/rest_management_api_server/embedded_spec.go b/rest_management_api_server/embedded_spec.go index ee651d6..7372a2f 100644 --- a/rest_management_api_server/embedded_spec.go +++ b/rest_management_api_server/embedded_spec.go @@ -64,7 +64,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.38" + "version": "0.26.39" }, "host": "demo.ziti.dev", "basePath": "/edge/management/v1", @@ -26075,6 +26075,9 @@ func init() { "tags": { "$ref": "#/definitions/tags" }, + "targetToken": { + "$ref": "#/definitions/targetToken" + }, "useExternalId": { "type": "boolean", "x-nullable": true @@ -26106,7 +26109,8 @@ func init() { "issuer", "audience", "clientId", - "scopes" + "scopes", + "targetToken" ], "properties": { "audience": { @@ -26164,6 +26168,9 @@ func init() { "type": "string" } }, + "targetToken": { + "$ref": "#/definitions/targetToken" + }, "useExternalId": { "type": "boolean" } @@ -26233,6 +26240,9 @@ func init() { "tags": { "$ref": "#/definitions/tags" }, + "targetToken": { + "$ref": "#/definitions/targetToken" + }, "useExternalId": { "type": "boolean", "x-nullable": true @@ -26298,6 +26308,9 @@ func init() { "tags": { "$ref": "#/definitions/tags" }, + "targetToken": { + "$ref": "#/definitions/targetToken" + }, "useExternalId": { "type": "boolean", "x-nullable": true @@ -29677,6 +29690,15 @@ func init() { ], "x-nullable": true }, + "targetToken": { + "description": "Defines the target token type", + "type": "string", + "enum": [ + "ACCESS", + "ID" + ], + "x-nullable": true + }, "terminatorCost": { "type": "integer", "maximum": 65535 @@ -30025,7 +30047,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.38" + "version": "0.26.39" }, "host": "demo.ziti.dev", "basePath": "/edge/management/v1", @@ -56136,6 +56158,9 @@ func init() { "tags": { "$ref": "#/definitions/tags" }, + "targetToken": { + "$ref": "#/definitions/targetToken" + }, "useExternalId": { "type": "boolean", "x-nullable": true @@ -56167,7 +56192,8 @@ func init() { "issuer", "audience", "clientId", - "scopes" + "scopes", + "targetToken" ], "properties": { "audience": { @@ -56225,6 +56251,9 @@ func init() { "type": "string" } }, + "targetToken": { + "$ref": "#/definitions/targetToken" + }, "useExternalId": { "type": "boolean" } @@ -56294,6 +56323,9 @@ func init() { "tags": { "$ref": "#/definitions/tags" }, + "targetToken": { + "$ref": "#/definitions/targetToken" + }, "useExternalId": { "type": "boolean", "x-nullable": true @@ -56359,6 +56391,9 @@ func init() { "tags": { "$ref": "#/definitions/tags" }, + "targetToken": { + "$ref": "#/definitions/targetToken" + }, "useExternalId": { "type": "boolean", "x-nullable": true @@ -59742,6 +59777,15 @@ func init() { ], "x-nullable": true }, + "targetToken": { + "description": "Defines the target token type", + "type": "string", + "enum": [ + "ACCESS", + "ID" + ], + "x-nullable": true + }, "terminatorCost": { "type": "integer", "maximum": 65535, diff --git a/rest_model/client_external_jwt_signer_detail.go b/rest_model/client_external_jwt_signer_detail.go index 89cab96..e2da6c0 100644 --- a/rest_model/client_external_jwt_signer_detail.go +++ b/rest_model/client_external_jwt_signer_detail.go @@ -61,6 +61,9 @@ type ClientExternalJWTSignerDetail struct { // scopes Scopes []string `json:"scopes"` + + // target token + TargetToken *TargetToken `json:"targetToken,omitempty"` } // UnmarshalJSON unmarshals this object from a JSON structure @@ -83,6 +86,8 @@ func (m *ClientExternalJWTSignerDetail) UnmarshalJSON(raw []byte) error { Name *string `json:"name"` Scopes []string `json:"scopes"` + + TargetToken *TargetToken `json:"targetToken,omitempty"` } if err := swag.ReadJSON(raw, &dataAO1); err != nil { return err @@ -98,6 +103,8 @@ func (m *ClientExternalJWTSignerDetail) UnmarshalJSON(raw []byte) error { m.Scopes = dataAO1.Scopes + m.TargetToken = dataAO1.TargetToken + return nil } @@ -120,6 +127,8 @@ func (m ClientExternalJWTSignerDetail) MarshalJSON() ([]byte, error) { Name *string `json:"name"` Scopes []string `json:"scopes"` + + TargetToken *TargetToken `json:"targetToken,omitempty"` } dataAO1.Audience = m.Audience @@ -132,6 +141,8 @@ func (m ClientExternalJWTSignerDetail) MarshalJSON() ([]byte, error) { dataAO1.Scopes = m.Scopes + dataAO1.TargetToken = m.TargetToken + jsonDataAO1, errAO1 := swag.WriteJSON(dataAO1) if errAO1 != nil { return nil, errAO1 @@ -157,6 +168,10 @@ func (m *ClientExternalJWTSignerDetail) Validate(formats strfmt.Registry) error res = append(res, err) } + if err := m.validateTargetToken(formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { return errors.CompositeValidationError(res...) } @@ -181,6 +196,26 @@ func (m *ClientExternalJWTSignerDetail) validateName(formats strfmt.Registry) er return nil } +func (m *ClientExternalJWTSignerDetail) validateTargetToken(formats strfmt.Registry) error { + + if swag.IsZero(m.TargetToken) { // not required + return nil + } + + if m.TargetToken != nil { + if err := m.TargetToken.Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("targetToken") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("targetToken") + } + return err + } + } + + return nil +} + // ContextValidate validate this client external Jwt signer detail based on the context it is used func (m *ClientExternalJWTSignerDetail) ContextValidate(ctx context.Context, formats strfmt.Registry) error { var res []error @@ -190,12 +225,32 @@ func (m *ClientExternalJWTSignerDetail) ContextValidate(ctx context.Context, for res = append(res, err) } + if err := m.contextValidateTargetToken(ctx, formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { return errors.CompositeValidationError(res...) } return nil } +func (m *ClientExternalJWTSignerDetail) contextValidateTargetToken(ctx context.Context, formats strfmt.Registry) error { + + if m.TargetToken != nil { + if err := m.TargetToken.ContextValidate(ctx, formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("targetToken") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("targetToken") + } + return err + } + } + + return nil +} + // MarshalBinary interface implementation func (m *ClientExternalJWTSignerDetail) MarshalBinary() ([]byte, error) { if m == nil { diff --git a/rest_model/external_jwt_signer_create.go b/rest_model/external_jwt_signer_create.go index e19653d..4b69ed0 100644 --- a/rest_model/external_jwt_signer_create.go +++ b/rest_model/external_jwt_signer_create.go @@ -85,6 +85,9 @@ type ExternalJWTSignerCreate struct { // tags Tags *Tags `json:"tags,omitempty"` + // target token + TargetToken *TargetToken `json:"targetToken,omitempty"` + // use external Id UseExternalID *bool `json:"useExternalId,omitempty"` } @@ -117,6 +120,10 @@ func (m *ExternalJWTSignerCreate) Validate(formats strfmt.Registry) error { res = append(res, err) } + if err := m.validateTargetToken(formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { return errors.CompositeValidationError(res...) } @@ -190,6 +197,25 @@ func (m *ExternalJWTSignerCreate) validateTags(formats strfmt.Registry) error { return nil } +func (m *ExternalJWTSignerCreate) validateTargetToken(formats strfmt.Registry) error { + if swag.IsZero(m.TargetToken) { // not required + return nil + } + + if m.TargetToken != nil { + if err := m.TargetToken.Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("targetToken") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("targetToken") + } + return err + } + } + + return nil +} + // ContextValidate validate this external Jwt signer create based on the context it is used func (m *ExternalJWTSignerCreate) ContextValidate(ctx context.Context, formats strfmt.Registry) error { var res []error @@ -198,6 +224,10 @@ func (m *ExternalJWTSignerCreate) ContextValidate(ctx context.Context, formats s res = append(res, err) } + if err := m.contextValidateTargetToken(ctx, formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { return errors.CompositeValidationError(res...) } @@ -220,6 +250,22 @@ func (m *ExternalJWTSignerCreate) contextValidateTags(ctx context.Context, forma return nil } +func (m *ExternalJWTSignerCreate) contextValidateTargetToken(ctx context.Context, formats strfmt.Registry) error { + + if m.TargetToken != nil { + if err := m.TargetToken.ContextValidate(ctx, formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("targetToken") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("targetToken") + } + return err + } + } + + return nil +} + // MarshalBinary interface implementation func (m *ExternalJWTSignerCreate) MarshalBinary() ([]byte, error) { if m == nil { diff --git a/rest_model/external_jwt_signer_detail.go b/rest_model/external_jwt_signer_detail.go index 0d32d2b..8c5673e 100644 --- a/rest_model/external_jwt_signer_detail.go +++ b/rest_model/external_jwt_signer_detail.go @@ -108,6 +108,10 @@ type ExternalJWTSignerDetail struct { // Required: true Scopes []string `json:"scopes"` + // target token + // Required: true + TargetToken *TargetToken `json:"targetToken"` + // use external Id // Required: true UseExternalID *bool `json:"useExternalId"` @@ -154,6 +158,8 @@ func (m *ExternalJWTSignerDetail) UnmarshalJSON(raw []byte) error { Scopes []string `json:"scopes"` + TargetToken *TargetToken `json:"targetToken"` + UseExternalID *bool `json:"useExternalId"` } if err := swag.ReadJSON(raw, &dataAO1); err != nil { @@ -190,6 +196,8 @@ func (m *ExternalJWTSignerDetail) UnmarshalJSON(raw []byte) error { m.Scopes = dataAO1.Scopes + m.TargetToken = dataAO1.TargetToken + m.UseExternalID = dataAO1.UseExternalID return nil @@ -235,6 +243,8 @@ func (m ExternalJWTSignerDetail) MarshalJSON() ([]byte, error) { Scopes []string `json:"scopes"` + TargetToken *TargetToken `json:"targetToken"` + UseExternalID *bool `json:"useExternalId"` } @@ -268,6 +278,8 @@ func (m ExternalJWTSignerDetail) MarshalJSON() ([]byte, error) { dataAO1.Scopes = m.Scopes + dataAO1.TargetToken = m.TargetToken + dataAO1.UseExternalID = m.UseExternalID jsonDataAO1, errAO1 := swag.WriteJSON(dataAO1) @@ -347,6 +359,10 @@ func (m *ExternalJWTSignerDetail) Validate(formats strfmt.Registry) error { res = append(res, err) } + if err := m.validateTargetToken(formats); err != nil { + res = append(res, err) + } + if err := m.validateUseExternalID(formats); err != nil { res = append(res, err) } @@ -504,6 +520,30 @@ func (m *ExternalJWTSignerDetail) validateScopes(formats strfmt.Registry) error return nil } +func (m *ExternalJWTSignerDetail) validateTargetToken(formats strfmt.Registry) error { + + if err := validate.Required("targetToken", "body", m.TargetToken); err != nil { + return err + } + + if err := validate.Required("targetToken", "body", m.TargetToken); err != nil { + return err + } + + if m.TargetToken != nil { + if err := m.TargetToken.Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("targetToken") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("targetToken") + } + return err + } + } + + return nil +} + func (m *ExternalJWTSignerDetail) validateUseExternalID(formats strfmt.Registry) error { if err := validate.Required("useExternalId", "body", m.UseExternalID); err != nil { @@ -522,12 +562,32 @@ func (m *ExternalJWTSignerDetail) ContextValidate(ctx context.Context, formats s res = append(res, err) } + if err := m.contextValidateTargetToken(ctx, formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { return errors.CompositeValidationError(res...) } return nil } +func (m *ExternalJWTSignerDetail) contextValidateTargetToken(ctx context.Context, formats strfmt.Registry) error { + + if m.TargetToken != nil { + if err := m.TargetToken.ContextValidate(ctx, formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("targetToken") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("targetToken") + } + return err + } + } + + return nil +} + // MarshalBinary interface implementation func (m *ExternalJWTSignerDetail) MarshalBinary() ([]byte, error) { if m == nil { diff --git a/rest_model/external_jwt_signer_patch.go b/rest_model/external_jwt_signer_patch.go index acf08ba..18e89e5 100644 --- a/rest_model/external_jwt_signer_patch.go +++ b/rest_model/external_jwt_signer_patch.go @@ -81,6 +81,9 @@ type ExternalJWTSignerPatch struct { // tags Tags *Tags `json:"tags,omitempty"` + // target token + TargetToken *TargetToken `json:"targetToken,omitempty"` + // use external Id UseExternalID *bool `json:"useExternalId,omitempty"` } @@ -97,6 +100,10 @@ func (m *ExternalJWTSignerPatch) Validate(formats strfmt.Registry) error { res = append(res, err) } + if err := m.validateTargetToken(formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { return errors.CompositeValidationError(res...) } @@ -134,6 +141,25 @@ func (m *ExternalJWTSignerPatch) validateTags(formats strfmt.Registry) error { return nil } +func (m *ExternalJWTSignerPatch) validateTargetToken(formats strfmt.Registry) error { + if swag.IsZero(m.TargetToken) { // not required + return nil + } + + if m.TargetToken != nil { + if err := m.TargetToken.Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("targetToken") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("targetToken") + } + return err + } + } + + return nil +} + // ContextValidate validate this external Jwt signer patch based on the context it is used func (m *ExternalJWTSignerPatch) ContextValidate(ctx context.Context, formats strfmt.Registry) error { var res []error @@ -142,6 +168,10 @@ func (m *ExternalJWTSignerPatch) ContextValidate(ctx context.Context, formats st res = append(res, err) } + if err := m.contextValidateTargetToken(ctx, formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { return errors.CompositeValidationError(res...) } @@ -164,6 +194,22 @@ func (m *ExternalJWTSignerPatch) contextValidateTags(ctx context.Context, format return nil } +func (m *ExternalJWTSignerPatch) contextValidateTargetToken(ctx context.Context, formats strfmt.Registry) error { + + if m.TargetToken != nil { + if err := m.TargetToken.ContextValidate(ctx, formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("targetToken") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("targetToken") + } + return err + } + } + + return nil +} + // MarshalBinary interface implementation func (m *ExternalJWTSignerPatch) MarshalBinary() ([]byte, error) { if m == nil { diff --git a/rest_model/external_jwt_signer_update.go b/rest_model/external_jwt_signer_update.go index 7a733f4..6fd9480 100644 --- a/rest_model/external_jwt_signer_update.go +++ b/rest_model/external_jwt_signer_update.go @@ -85,6 +85,9 @@ type ExternalJWTSignerUpdate struct { // tags Tags *Tags `json:"tags,omitempty"` + // target token + TargetToken *TargetToken `json:"targetToken,omitempty"` + // use external Id UseExternalID *bool `json:"useExternalId,omitempty"` } @@ -117,6 +120,10 @@ func (m *ExternalJWTSignerUpdate) Validate(formats strfmt.Registry) error { res = append(res, err) } + if err := m.validateTargetToken(formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { return errors.CompositeValidationError(res...) } @@ -190,6 +197,25 @@ func (m *ExternalJWTSignerUpdate) validateTags(formats strfmt.Registry) error { return nil } +func (m *ExternalJWTSignerUpdate) validateTargetToken(formats strfmt.Registry) error { + if swag.IsZero(m.TargetToken) { // not required + return nil + } + + if m.TargetToken != nil { + if err := m.TargetToken.Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("targetToken") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("targetToken") + } + return err + } + } + + return nil +} + // ContextValidate validate this external Jwt signer update based on the context it is used func (m *ExternalJWTSignerUpdate) ContextValidate(ctx context.Context, formats strfmt.Registry) error { var res []error @@ -198,6 +224,10 @@ func (m *ExternalJWTSignerUpdate) ContextValidate(ctx context.Context, formats s res = append(res, err) } + if err := m.contextValidateTargetToken(ctx, formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { return errors.CompositeValidationError(res...) } @@ -220,6 +250,22 @@ func (m *ExternalJWTSignerUpdate) contextValidateTags(ctx context.Context, forma return nil } +func (m *ExternalJWTSignerUpdate) contextValidateTargetToken(ctx context.Context, formats strfmt.Registry) error { + + if m.TargetToken != nil { + if err := m.TargetToken.ContextValidate(ctx, formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("targetToken") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("targetToken") + } + return err + } + } + + return nil +} + // MarshalBinary interface implementation func (m *ExternalJWTSignerUpdate) MarshalBinary() ([]byte, error) { if m == nil { diff --git a/rest_model/target_token.go b/rest_model/target_token.go new file mode 100644 index 0000000..c76a171 --- /dev/null +++ b/rest_model/target_token.go @@ -0,0 +1,102 @@ +// Code generated by go-swagger; DO NOT EDIT. + +// +// Copyright NetFoundry Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// __ __ _ +// \ \ / / (_) +// \ \ /\ / /_ _ _ __ _ __ _ _ __ __ _ +// \ \/ \/ / _` | '__| '_ \| | '_ \ / _` | +// \ /\ / (_| | | | | | | | | | | (_| | : This file is generated, do not edit it. +// \/ \/ \__,_|_| |_| |_|_|_| |_|\__, | +// __/ | +// |___/ + +package rest_model + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the swagger generate command + +import ( + "context" + "encoding/json" + + "github.com/go-openapi/errors" + "github.com/go-openapi/strfmt" + "github.com/go-openapi/validate" +) + +// TargetToken Defines the target token type +// +// swagger:model targetToken +type TargetToken string + +func NewTargetToken(value TargetToken) *TargetToken { + return &value +} + +// Pointer returns a pointer to a freshly-allocated TargetToken. +func (m TargetToken) Pointer() *TargetToken { + return &m +} + +const ( + + // TargetTokenACCESS captures enum value "ACCESS" + TargetTokenACCESS TargetToken = "ACCESS" + + // TargetTokenID captures enum value "ID" + TargetTokenID TargetToken = "ID" +) + +// for schema +var targetTokenEnum []interface{} + +func init() { + var res []TargetToken + if err := json.Unmarshal([]byte(`["ACCESS","ID"]`), &res); err != nil { + panic(err) + } + for _, v := range res { + targetTokenEnum = append(targetTokenEnum, v) + } +} + +func (m TargetToken) validateTargetTokenEnum(path, location string, value TargetToken) error { + if err := validate.EnumCase(path, location, value, targetTokenEnum, true); err != nil { + return err + } + return nil +} + +// Validate validates this target token +func (m TargetToken) Validate(formats strfmt.Registry) error { + var res []error + + // value enum + if err := m.validateTargetTokenEnum("", "body", m); err != nil { + return err + } + + if len(res) > 0 { + return errors.CompositeValidationError(res...) + } + return nil +} + +// ContextValidate validates this target token based on context it is used +func (m TargetToken) ContextValidate(ctx context.Context, formats strfmt.Registry) error { + return nil +} diff --git a/source/client.yml b/source/client.yml index dfa9644..839f194 100644 --- a/source/client.yml +++ b/source/client.yml @@ -1,7 +1,7 @@ --- swagger: '2.0' info: - version: 0.26.38 + version: 0.26.39 title: Ziti Edge Client description: OpenZiti Edge Client API contact: diff --git a/source/client/ext-jwt-signers.yml b/source/client/ext-jwt-signers.yml index 6cd3b66..5fb2fd6 100644 --- a/source/client/ext-jwt-signers.yml +++ b/source/client/ext-jwt-signers.yml @@ -70,4 +70,6 @@ definitions: type: string audience: type: string - x-nullable: true \ No newline at end of file + x-nullable: true + targetToken: + $ref: "../shared/ext-jwt-signers.yml#/definitions/targetToken" \ No newline at end of file diff --git a/source/management.yml b/source/management.yml index 4ec23fe..1857ba2 100644 --- a/source/management.yml +++ b/source/management.yml @@ -1,7 +1,7 @@ --- swagger: '2.0' info: - version: 0.26.38 + version: 0.26.39 title: Ziti Edge Management description: OpenZiti Edge Management API contact: diff --git a/source/management/ext-jwt-signers.yml b/source/management/ext-jwt-signers.yml index 97c24f1..02603a9 100644 --- a/source/management/ext-jwt-signers.yml +++ b/source/management/ext-jwt-signers.yml @@ -220,6 +220,7 @@ definitions: - audience - clientId - scopes + - targetToken properties: name: type: string @@ -262,6 +263,8 @@ definitions: type: array items: type: string + targetToken: + $ref: "../shared/ext-jwt-signers.yml#/definitions/targetToken" externalJwtSignerCreate: description: A create Certificate Authority (CA) object type: object @@ -309,6 +312,8 @@ definitions: items: type: string x-nullable: true + targetToken: + $ref: "../shared/ext-jwt-signers.yml#/definitions/targetToken" tags: $ref: '../shared/base-entity.yml#/definitions/tags' externalJwtSignerUpdate: @@ -357,6 +362,8 @@ definitions: items: type: string x-nullable: true + targetToken: + $ref: "../shared/ext-jwt-signers.yml#/definitions/targetToken" tags: $ref: '../shared/base-entity.yml#/definitions/tags' externalJwtSignerPatch: @@ -402,5 +409,7 @@ definitions: type: array items: type: string + targetToken: + $ref: "../shared/ext-jwt-signers.yml#/definitions/targetToken" tags: $ref: '../shared/base-entity.yml#/definitions/tags' \ No newline at end of file diff --git a/source/shared/ext-jwt-signers.yml b/source/shared/ext-jwt-signers.yml new file mode 100644 index 0000000..5fa8a0f --- /dev/null +++ b/source/shared/ext-jwt-signers.yml @@ -0,0 +1,9 @@ +--- +definitions: + targetToken: + type: string + description: "Defines the target token type" + enum: + - ACCESS + - ID + x-nullable: true \ No newline at end of file