From fadc6ef3d14068f706a07574fca527ca2b383877 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Tue, 17 Jun 2025 14:03:19 -0400 Subject: [PATCH] specifically 'secretsAccessIdentityZId' (#983) --- controller/addSecretsAccess.go | 2 +- controller/deleteSecretsAccess.go | 2 +- rest_client_zrok/admin/add_secrets_access_responses.go | 4 ++-- rest_client_zrok/admin/delete_secrets_access_responses.go | 4 ++-- rest_server_zrok/embedded_spec.go | 8 ++++---- rest_server_zrok/operations/admin/add_secrets_access.go | 4 ++-- .../operations/admin/delete_secrets_access.go | 4 ++-- sdk/nodejs/sdk/src/api/models/AddSecretsAccessRequest.ts | 6 +++--- sdk/python/src/docs/AddSecretsAccessRequest.md | 2 +- sdk/python/src/test/test_add_secrets_access_request.py | 2 +- .../src/zrok_api/models/add_secrets_access_request.py | 6 +++--- specs/zrok.yml | 4 ++-- ui/src/api/models/AddSecretsAccessRequest.ts | 6 +++--- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/controller/addSecretsAccess.go b/controller/addSecretsAccess.go index 2713d1b9..863e7cf3 100644 --- a/controller/addSecretsAccess.go +++ b/controller/addSecretsAccess.go @@ -18,7 +18,7 @@ func newAddSecretsAccessHandler() *addSecretsAccessHandler { } func (h *addSecretsAccessHandler) Handle(params admin.AddSecretsAccessParams, principal *rest_model_zrok.Principal) middleware.Responder { - secretsAccessIdentityZId := params.Body.SecretsIdentityZID + secretsAccessIdentityZId := params.Body.SecretsAccessIdentityZID if !principal.Admin { logrus.Errorf("invalid admin principal") diff --git a/controller/deleteSecretsAccess.go b/controller/deleteSecretsAccess.go index 3815274b..ee0986a2 100644 --- a/controller/deleteSecretsAccess.go +++ b/controller/deleteSecretsAccess.go @@ -20,7 +20,7 @@ func newDeleteSecretsAccessHandler() *deleteSecretsAccessHandler { } func (h *deleteSecretsAccessHandler) Handle(params admin.DeleteSecretsAccessParams, principal *rest_model_zrok.Principal) middleware.Responder { - secretsAccessIdentityZId := params.Body.SecretsIdentityZID + secretsAccessIdentityZId := params.Body.SecretsAccessIdentityZID if !principal.Admin { logrus.Errorf("invalid admin principal") diff --git a/rest_client_zrok/admin/add_secrets_access_responses.go b/rest_client_zrok/admin/add_secrets_access_responses.go index 57fe4662..81f8eb3c 100644 --- a/rest_client_zrok/admin/add_secrets_access_responses.go +++ b/rest_client_zrok/admin/add_secrets_access_responses.go @@ -281,8 +281,8 @@ swagger:model AddSecretsAccessBody */ type AddSecretsAccessBody struct { - // secrets identity z Id - SecretsIdentityZID string `json:"secretsIdentityZId,omitempty"` + // secrets access identity z Id + SecretsAccessIdentityZID string `json:"secretsAccessIdentityZId,omitempty"` } // Validate validates this add secrets access body diff --git a/rest_client_zrok/admin/delete_secrets_access_responses.go b/rest_client_zrok/admin/delete_secrets_access_responses.go index ee06b46a..93ccd9e9 100644 --- a/rest_client_zrok/admin/delete_secrets_access_responses.go +++ b/rest_client_zrok/admin/delete_secrets_access_responses.go @@ -281,8 +281,8 @@ swagger:model DeleteSecretsAccessBody */ type DeleteSecretsAccessBody struct { - // secrets identity z Id - SecretsIdentityZID string `json:"secretsIdentityZId,omitempty"` + // secrets access identity z Id + SecretsAccessIdentityZID string `json:"secretsAccessIdentityZId,omitempty"` } // Validate validates this delete secrets access body diff --git a/rest_server_zrok/embedded_spec.go b/rest_server_zrok/embedded_spec.go index 9d4947aa..43c43c01 100644 --- a/rest_server_zrok/embedded_spec.go +++ b/rest_server_zrok/embedded_spec.go @@ -2160,7 +2160,7 @@ func init() { "in": "body", "schema": { "properties": { - "secretsIdentityZId": { + "secretsAccessIdentityZId": { "type": "string" } } @@ -2198,7 +2198,7 @@ func init() { "in": "body", "schema": { "properties": { - "secretsIdentityZId": { + "secretsAccessIdentityZId": { "type": "string" } } @@ -4968,7 +4968,7 @@ func init() { "in": "body", "schema": { "properties": { - "secretsIdentityZId": { + "secretsAccessIdentityZId": { "type": "string" } } @@ -5006,7 +5006,7 @@ func init() { "in": "body", "schema": { "properties": { - "secretsIdentityZId": { + "secretsAccessIdentityZId": { "type": "string" } } diff --git a/rest_server_zrok/operations/admin/add_secrets_access.go b/rest_server_zrok/operations/admin/add_secrets_access.go index 54502c8e..10e3935a 100644 --- a/rest_server_zrok/operations/admin/add_secrets_access.go +++ b/rest_server_zrok/operations/admin/add_secrets_access.go @@ -78,8 +78,8 @@ func (o *AddSecretsAccess) ServeHTTP(rw http.ResponseWriter, r *http.Request) { // swagger:model AddSecretsAccessBody type AddSecretsAccessBody struct { - // secrets identity z Id - SecretsIdentityZID string `json:"secretsIdentityZId,omitempty"` + // secrets access identity z Id + SecretsAccessIdentityZID string `json:"secretsAccessIdentityZId,omitempty"` } // Validate validates this add secrets access body diff --git a/rest_server_zrok/operations/admin/delete_secrets_access.go b/rest_server_zrok/operations/admin/delete_secrets_access.go index c1d324c4..9ae08fc0 100644 --- a/rest_server_zrok/operations/admin/delete_secrets_access.go +++ b/rest_server_zrok/operations/admin/delete_secrets_access.go @@ -78,8 +78,8 @@ func (o *DeleteSecretsAccess) ServeHTTP(rw http.ResponseWriter, r *http.Request) // swagger:model DeleteSecretsAccessBody type DeleteSecretsAccessBody struct { - // secrets identity z Id - SecretsIdentityZID string `json:"secretsIdentityZId,omitempty"` + // secrets access identity z Id + SecretsAccessIdentityZID string `json:"secretsAccessIdentityZId,omitempty"` } // Validate validates this delete secrets access body diff --git a/sdk/nodejs/sdk/src/api/models/AddSecretsAccessRequest.ts b/sdk/nodejs/sdk/src/api/models/AddSecretsAccessRequest.ts index f5d7e12d..862e4ceb 100644 --- a/sdk/nodejs/sdk/src/api/models/AddSecretsAccessRequest.ts +++ b/sdk/nodejs/sdk/src/api/models/AddSecretsAccessRequest.ts @@ -24,7 +24,7 @@ export interface AddSecretsAccessRequest { * @type {string} * @memberof AddSecretsAccessRequest */ - secretsIdentityZId?: string; + secretsAccessIdentityZId?: string; } /** @@ -44,7 +44,7 @@ export function AddSecretsAccessRequestFromJSONTyped(json: any, ignoreDiscrimina } return { - 'secretsIdentityZId': json['secretsIdentityZId'] == null ? undefined : json['secretsIdentityZId'], + 'secretsAccessIdentityZId': json['secretsAccessIdentityZId'] == null ? undefined : json['secretsAccessIdentityZId'], }; } @@ -59,7 +59,7 @@ export function AddSecretsAccessRequestToJSONTyped(value?: AddSecretsAccessReque return { - 'secretsIdentityZId': value['secretsIdentityZId'], + 'secretsAccessIdentityZId': value['secretsAccessIdentityZId'], }; } diff --git a/sdk/python/src/docs/AddSecretsAccessRequest.md b/sdk/python/src/docs/AddSecretsAccessRequest.md index 19181336..7fb98146 100644 --- a/sdk/python/src/docs/AddSecretsAccessRequest.md +++ b/sdk/python/src/docs/AddSecretsAccessRequest.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**secrets_identity_zid** | **str** | | [optional] +**secrets_access_identity_zid** | **str** | | [optional] ## Example diff --git a/sdk/python/src/test/test_add_secrets_access_request.py b/sdk/python/src/test/test_add_secrets_access_request.py index a717193a..bc50e2ac 100644 --- a/sdk/python/src/test/test_add_secrets_access_request.py +++ b/sdk/python/src/test/test_add_secrets_access_request.py @@ -35,7 +35,7 @@ class TestAddSecretsAccessRequest(unittest.TestCase): model = AddSecretsAccessRequest() if include_optional: return AddSecretsAccessRequest( - secrets_identity_zid = '' + secrets_access_identity_zid = '' ) else: return AddSecretsAccessRequest( diff --git a/sdk/python/src/zrok_api/models/add_secrets_access_request.py b/sdk/python/src/zrok_api/models/add_secrets_access_request.py index 24febfbf..9b65324e 100644 --- a/sdk/python/src/zrok_api/models/add_secrets_access_request.py +++ b/sdk/python/src/zrok_api/models/add_secrets_access_request.py @@ -26,8 +26,8 @@ class AddSecretsAccessRequest(BaseModel): """ AddSecretsAccessRequest """ # noqa: E501 - secrets_identity_zid: Optional[StrictStr] = Field(default=None, alias="secretsIdentityZId") - __properties: ClassVar[List[str]] = ["secretsIdentityZId"] + secrets_access_identity_zid: Optional[StrictStr] = Field(default=None, alias="secretsAccessIdentityZId") + __properties: ClassVar[List[str]] = ["secretsAccessIdentityZId"] model_config = ConfigDict( populate_by_name=True, @@ -80,7 +80,7 @@ class AddSecretsAccessRequest(BaseModel): return cls.model_validate(obj) _obj = cls.model_validate({ - "secretsIdentityZId": obj.get("secretsIdentityZId") + "secretsAccessIdentityZId": obj.get("secretsAccessIdentityZId") }) return _obj diff --git a/specs/zrok.yml b/specs/zrok.yml index 78ff89eb..9bbf9052 100644 --- a/specs/zrok.yml +++ b/specs/zrok.yml @@ -625,7 +625,7 @@ paths: in: body schema: properties: - secretsIdentityZId: + secretsAccessIdentityZId: type: string responses: 200: @@ -647,7 +647,7 @@ paths: in: body schema: properties: - secretsIdentityZId: + secretsAccessIdentityZId: type: string responses: 200: diff --git a/ui/src/api/models/AddSecretsAccessRequest.ts b/ui/src/api/models/AddSecretsAccessRequest.ts index f5d7e12d..862e4ceb 100644 --- a/ui/src/api/models/AddSecretsAccessRequest.ts +++ b/ui/src/api/models/AddSecretsAccessRequest.ts @@ -24,7 +24,7 @@ export interface AddSecretsAccessRequest { * @type {string} * @memberof AddSecretsAccessRequest */ - secretsIdentityZId?: string; + secretsAccessIdentityZId?: string; } /** @@ -44,7 +44,7 @@ export function AddSecretsAccessRequestFromJSONTyped(json: any, ignoreDiscrimina } return { - 'secretsIdentityZId': json['secretsIdentityZId'] == null ? undefined : json['secretsIdentityZId'], + 'secretsAccessIdentityZId': json['secretsAccessIdentityZId'] == null ? undefined : json['secretsAccessIdentityZId'], }; } @@ -59,7 +59,7 @@ export function AddSecretsAccessRequestToJSONTyped(value?: AddSecretsAccessReque return { - 'secretsIdentityZId': value['secretsIdentityZId'], + 'secretsAccessIdentityZId': value['secretsAccessIdentityZId'], }; }