Merge pull request #14 from openziti/fix.edge.1391.auth.policy.ref

addresses openziti/edge#1391 adds auth policy ref to identity
openziti · Apr 5, 2023 · f28ddf8 · f28ddf8
2 parents f8a274e + 619629e
commit f28ddf8
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 13 deletions.
diff --git 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.25.9
+  version: 0.25.10
 host: demo.ziti.dev
 basePath: /edge/client/v1
 paths:
@@ -3466,11 +3466,14 @@ definitions:
       - serviceHostingCosts
       - defaultHostingCost
       - authPolicyId
+      - authPolicy
       - externalId
       - disabled
       properties:
         appData:
           $ref: '#/definitions/tags'
+        authPolicy:
+          $ref: '#/definitions/entityRef'
         authPolicyId:
           type: string
         authenticators:

diff --git a/go.mod b/go.mod
@@ -20,7 +20,7 @@ require (
 require (
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/analysis v0.21.4 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect

diff --git a/go.sum b/go.sum
@@ -13,8 +13,8 @@ github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa h1:RDBNVkRviHZtvDvId8XSGPu3rmpmSe+wKRcEWNgsfWU=
 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
-github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
+github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY=

diff --git 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.25.9
+  version: 0.25.10
 host: demo.ziti.dev
 basePath: /edge/management/v1
 paths:
@@ -14360,11 +14360,14 @@ definitions:
       - serviceHostingCosts
       - defaultHostingCost
       - authPolicyId
+      - authPolicy
       - externalId
       - disabled
       properties:
         appData:
           $ref: '#/definitions/tags'
+        authPolicy:
+          $ref: '#/definitions/entityRef'
         authPolicyId:
           type: string
         authenticators:

diff --git a/rest_client_api_server/doc.go b/rest_client_api_server/doc.go
diff --git a/rest_client_api_server/embedded_spec.go b/rest_client_api_server/embedded_spec.go
diff --git a/rest_management_api_server/doc.go b/rest_management_api_server/doc.go
diff --git a/rest_management_api_server/embedded_spec.go b/rest_management_api_server/embedded_spec.go
diff --git a/rest_model/identity_detail.go b/rest_model/identity_detail.go
diff --git a/source/client.yml b/source/client.yml
@@ -1,7 +1,7 @@
 ---
 swagger: '2.0'
 info:
-  version: 0.25.9
+  version: 0.25.10
   title: Ziti Edge Client
   description: OpenZiti Edge Client API
   contact:

diff --git a/source/management.yml b/source/management.yml
@@ -1,7 +1,7 @@
 ---
 swagger: '2.0'
 info:
-  version: 0.25.9
+  version: 0.25.10
   title: Ziti Edge Management
   description: OpenZiti Edge Management API
   contact:

diff --git a/source/shared/identities.yml b/source/shared/identities.yml
@@ -30,6 +30,7 @@ definitions:
           - serviceHostingCosts
           - defaultHostingCost
           - authPolicyId
+          - authPolicy
           - externalId
           - disabled
         properties:
@@ -61,6 +62,8 @@ definitions:
             type: boolean
           authPolicyId:
             type: string
+          authPolicy:
+              $ref: 'base-entity.yml#/definitions/entityRef'
           defaultHostingPrecedence:
             $ref: 'terminators.yml#/definitions/terminatorPrecedence'
           defaultHostingCost: