Fix edge api publishing (#622)

* apply publishing setup to edge-api module * update edge-api spec and regenerate client
openziti · Sep 4, 2024 · 783a9c0 · 783a9c0
1 parent de6ae33
commit 783a9c0
Show file tree

Hide file tree

Showing 153 changed files with 1,649 additions and 800 deletions.
diff --git a/edge-api/.openapi-generator/VERSION b/edge-api/.openapi-generator/VERSION
@@ -1 +1 @@
-7.6.0
+7.8.0
diff --git a/edge-api/README.md b/edge-api/README.md
@@ -2,11 +2,11 @@
 
 Ziti Edge Client
 
-- API version: 0.26.20
+- API version: 0.26.27
 
-- Build date: 2024-06-07T09:12:49.062759-04:00[America/New_York]
+- Build date: 2024-09-04T10:11:22.635226-04:00[America/New_York]
 
-- Generator version: 7.6.0
+- Generator version: 7.8.0
 
 OpenZiti Edge Client API
 
@@ -45,7 +45,7 @@ Add this dependency to your project's POM:
 <dependency>
   <groupId>org.openziti</groupId>
   <artifactId>edge-api</artifactId>
-  <version>0.26.20</version>
+  <version>0.26.27</version>
   <scope>compile</scope>
 </dependency>
 ```
@@ -55,7 +55,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "org.openziti:edge-api:0.26.20"
+compile "org.openziti:edge-api:0.26.27"
 ```
 
 ### Others
@@ -68,7 +68,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-- `target/edge-api-0.26.20.jar`
+- `target/edge-api-0.26.27.jar`
 - `target/lib/*.jar`
 
 ## Getting Started

diff --git a/edge-api/api/openapi.yaml b/edge-api/api/openapi.yaml
@@ -9,7 +9,7 @@ info:
     name: Apache 2.0
     url: https://www.apache.org/licenses/LICENSE-2.0.html
   title: Ziti Edge Client
-  version: 0.26.20
+  version: 0.26.27
 servers:
 - url: https://demo.ziti.dev/edge/client/v1
 paths:
@@ -2627,10 +2627,6 @@ paths:
                 $ref: "#/components/schemas/apiErrorEnvelope"
           description: The resource requested is rate limited and the rate limit has
             been exceeded
-      security:
-      - ztSession: []
-      - oauth2:
-        - openid
       summary: List Client Authentication External JWT
       tags:
       - External JWT Signer
@@ -4336,6 +4332,8 @@ components:
             type: string
           ipAddress:
             type: string
+          isCertExtendable:
+            type: boolean
           isMfaComplete:
             type: boolean
           isMfaRequired:
@@ -4352,6 +4350,7 @@ components:
         - identity
         - identityId
         - ipAddress
+        - isCertExtendable
         - isMfaComplete
         - isMfaRequired
         - token
@@ -4449,6 +4448,8 @@ components:
             $ref: "#/components/schemas/entityRef"
           identityId:
             type: string
+          isIssuedByNetwork:
+            type: boolean
           method:
             type: string
           username:
@@ -4480,6 +4481,7 @@ components:
         fingerprint: fingerprint
         certPem: certPem
         id: id
+        isIssuedByNetwork: true
         tags: {}
         updatedAt: 2000-01-23T04:56:07.000+00:00
         username: username
@@ -4577,19 +4579,27 @@ components:
       allOf:
       - $ref: "#/components/schemas/baseEntity"
       - properties:
+          clientId:
+            nullable: true
+            type: string
           externalAuthUrl:
             format: url
             type: string
           name:
             example: MyApps Signer
             type: string
+          scopes:
+            items:
+              type: string
+            type: array
         required:
         - externalAuthUrl
         - name
         type: object
       description: A External JWT Signer resource
       example:
         createdAt: 2000-01-23T04:56:07.000+00:00
+        clientId: clientId
         externalAuthUrl: http://example.com/aeiou
         _links:
           key:
@@ -4598,6 +4608,9 @@ components:
             href: https://openapi-generator.tech
         name: MyApps Signer
         id: id
+        scopes:
+        - scopes
+        - scopes
         tags: {}
         updatedAt: 2000-01-23T04:56:07.000+00:00
     clientExternalJwtSignerList:
@@ -4909,6 +4922,7 @@ components:
         identityId: identityId
         authenticatorId: authenticatorId
         id: id
+        isCertExtendable: true
         updatedAt: 2000-01-23T04:56:07.000+00:00
     currentApiSessionDetailEnvelope:
       example:
@@ -4958,6 +4972,7 @@ components:
           identityId: identityId
           authenticatorId: authenticatorId
           id: id
+          isCertExtendable: true
           updatedAt: 2000-01-23T04:56:07.000+00:00
         meta:
           apiEnrollmentVersion: apiEnrollmentVersion
@@ -5157,6 +5172,7 @@ components:
           fingerprint: fingerprint
           certPem: certPem
           id: id
+          isIssuedByNetwork: true
           tags: {}
           updatedAt: 2000-01-23T04:56:07.000+00:00
           username: username
@@ -6245,6 +6261,7 @@ components:
           fingerprint: fingerprint
           certPem: certPem
           id: id
+          isIssuedByNetwork: true
           tags: {}
           updatedAt: 2000-01-23T04:56:07.000+00:00
           username: username
@@ -6268,6 +6285,7 @@ components:
           fingerprint: fingerprint
           certPem: certPem
           id: id
+          isIssuedByNetwork: true
           tags: {}
           updatedAt: 2000-01-23T04:56:07.000+00:00
           username: username
@@ -6294,6 +6312,7 @@ components:
       example:
         data:
         - createdAt: 2000-01-23T04:56:07.000+00:00
+          clientId: clientId
           externalAuthUrl: http://example.com/aeiou
           _links:
             key:
@@ -6302,9 +6321,13 @@ components:
               href: https://openapi-generator.tech
           name: MyApps Signer
           id: id
+          scopes:
+          - scopes
+          - scopes
           tags: {}
           updatedAt: 2000-01-23T04:56:07.000+00:00
         - createdAt: 2000-01-23T04:56:07.000+00:00
+          clientId: clientId
           externalAuthUrl: http://example.com/aeiou
           _links:
             key:
@@ -6313,6 +6336,9 @@ components:
               href: https://openapi-generator.tech
           name: MyApps Signer
           id: id
+          scopes:
+          - scopes
+          - scopes
           tags: {}
           updatedAt: 2000-01-23T04:56:07.000+00:00
         meta:

diff --git a/edge-api/build.gradle b/edge-api/build.gradle
@@ -89,4 +89,6 @@ tasks.named('spotlessApply').get().mustRunAfter(':openApiGenerate')
 tasks.named('spotlessJava').get().mustRunAfter(':openApiGenerate')
 tasks.named('spotlessMisc').get().mustRunAfter(':openApiGenerate')
 
+apply from: rootProject.file('publish.gradle')
+
 
diff --git a/edge-api/docs/ApiSessionDetail.md b/edge-api/docs/ApiSessionDetail.md
@@ -20,6 +20,7 @@ An API Session object
 |**identity** | [**EntityRef**](EntityRef.md) |  |  |
 |**identityId** | **String** |  |  |
 |**ipAddress** | **String** |  |  |
+|**isCertExtendable** | **Boolean** |  |  |
 |**isMfaComplete** | **Boolean** |  |  |
 |**isMfaRequired** | **Boolean** |  |  |
 |**lastActivityAt** | **OffsetDateTime** |  |  [optional] |

diff --git a/edge-api/docs/AuthenticatorDetail.md b/edge-api/docs/AuthenticatorDetail.md
@@ -17,6 +17,7 @@ A singular authenticator resource
 |**fingerprint** | **String** |  |  [optional] |
 |**identity** | [**EntityRef**](EntityRef.md) |  |  |
 |**identityId** | **String** |  |  |
+|**isIssuedByNetwork** | **Boolean** |  |  [optional] |
 |**method** | **String** |  |  |
 |**username** | **String** |  |  [optional] |
 

diff --git a/edge-api/docs/ClientExternalJwtSignerDetail.md b/edge-api/docs/ClientExternalJwtSignerDetail.md
@@ -13,8 +13,10 @@ A External JWT Signer resource
 |**id** | **String** |  |  |
 |**tags** | [**Tags**](Tags.md) |  |  [optional] |
 |**updatedAt** | **OffsetDateTime** |  |  |
+|**clientId** | **String** |  |  [optional] |
 |**externalAuthUrl** | **String** |  |  |
 |**name** | **String** |  |  |
+|**scopes** | **List&lt;String&gt;** |  |  [optional] |
 
 
 
diff --git a/edge-api/docs/CurrentApiSessionDetail.md b/edge-api/docs/CurrentApiSessionDetail.md
@@ -20,6 +20,7 @@ An API Session object for the current API session
 |**identity** | [**EntityRef**](EntityRef.md) |  |  |
 |**identityId** | **String** |  |  |
 |**ipAddress** | **String** |  |  |
+|**isCertExtendable** | **Boolean** |  |  |
 |**isMfaComplete** | **Boolean** |  |  |
 |**isMfaRequired** | **Boolean** |  |  |
 |**lastActivityAt** | **OffsetDateTime** |  |  [optional] |

diff --git a/edge-api/docs/ExternalJwtSignerApi.md b/edge-api/docs/ExternalJwtSignerApi.md
@@ -24,7 +24,6 @@ Retrieves a list of external JWT signers for authentication
 import org.openziti.edge.ApiClient;
 import org.openziti.edge.ApiException;
 import org.openziti.edge.Configuration;
-import org.openziti.edge.auth.*;
 import org.openziti.edge.models.*;
 import org.openziti.edge.api.ExternalJwtSignerApi;
 import java.util.concurrent.CompletableFuture;
@@ -33,16 +32,6 @@ public class Example {
     public static void main(String[] args) {
         ApiClient defaultClient = Configuration.getDefaultApiClient();
         defaultClient.setBasePath("https://demo.ziti.dev/edge/client/v1");
-
-        // Configure API key authorization: ztSession
-        ApiKeyAuth ztSession = (ApiKeyAuth) defaultClient.getAuthentication("ztSession");
-        ztSession.setApiKey("YOUR API KEY");
-        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-        //ztSession.setApiKeyPrefix("Token");
-
-        // Configure OAuth2 access token for authorization: oauth2
-        OAuth oauth2 = (OAuth) defaultClient.getAuthentication("oauth2");
-        oauth2.setAccessToken("YOUR ACCESS TOKEN");
 
         ExternalJwtSignerApi apiInstance = new ExternalJwtSignerApi(defaultClient);
         Integer limit = 56; // Integer | 
@@ -78,7 +67,7 @@ CompletableFuture<[**ListClientExternalJwtSignersEnvelope**](ListClientExternalJ
 
 ### Authorization
 
-[ztSession](../README.md#ztSession), [oauth2](../README.md#oauth2)
+No authorization required
 
 ### HTTP request headers
 
@@ -109,7 +98,6 @@ import org.openziti.edge.ApiClient;
 import org.openziti.edge.ApiException;
 import org.openziti.edge.ApiResponse;
 import org.openziti.edge.Configuration;
-import org.openziti.edge.auth.*;
 import org.openziti.edge.models.*;
 import org.openziti.edge.api.ExternalJwtSignerApi;
 import java.util.concurrent.CompletableFuture;
@@ -118,16 +106,6 @@ public class Example {
     public static void main(String[] args) {
         ApiClient defaultClient = Configuration.getDefaultApiClient();
         defaultClient.setBasePath("https://demo.ziti.dev/edge/client/v1");
-
-        // Configure API key authorization: ztSession
-        ApiKeyAuth ztSession = (ApiKeyAuth) defaultClient.getAuthentication("ztSession");
-        ztSession.setApiKey("YOUR API KEY");
-        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
-        //ztSession.setApiKeyPrefix("Token");
-
-        // Configure OAuth2 access token for authorization: oauth2
-        OAuth oauth2 = (OAuth) defaultClient.getAuthentication("oauth2");
-        oauth2.setAccessToken("YOUR ACCESS TOKEN");
 
         ExternalJwtSignerApi apiInstance = new ExternalJwtSignerApi(defaultClient);
         Integer limit = 56; // Integer | 
@@ -172,7 +150,7 @@ CompletableFuture<ApiResponse<[**ListClientExternalJwtSignersEnvelope**](ListCli
 
 ### Authorization
 
-[ztSession](../README.md#ztSession), [oauth2](../README.md#oauth2)
+No authorization required
 
 ### HTTP request headers
 

diff --git a/edge-api/docs/MfaFormats.md b/edge-api/docs/MfaFormats.md
@@ -9,7 +9,7 @@
 
 * `ALPHA` (value: `"alpha"`)
 
-* `ALPHANUMERIC` (value: `"alphaNumeric"`)
+* `ALPHA_NUMERIC` (value: `"alphaNumeric"`)
 
 
 
diff --git a/edge-api/docs/OsType.md b/edge-api/docs/OsType.md
@@ -7,15 +7,15 @@
 
 * `WINDOWS` (value: `"Windows"`)
 
-* `WINDOWSSERVER` (value: `"WindowsServer"`)
+* `WINDOWS_SERVER` (value: `"WindowsServer"`)
 
 * `ANDROID` (value: `"Android"`)
 
-* `IOS` (value: `"iOS"`)
+* `I_OS` (value: `"iOS"`)
 
 * `LINUX` (value: `"Linux"`)
 
-* `MACOS` (value: `"macOS"`)
+* `MAC_OS` (value: `"macOS"`)
 
 
 
diff --git a/edge-api/src/main/java/org/openziti/edge/ApiClient.java b/edge-api/src/main/java/org/openziti/edge/ApiClient.java
@@ -2,7 +2,7 @@
  * Ziti Edge Client
  * OpenZiti Edge Client API
  *
- * The version of the OpenAPI document: 0.26.20
+ * The version of the OpenAPI document: 0.26.27
  * Contact: [email protected]
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -52,8 +52,8 @@
  */
 @javax.annotation.Generated(
         value = "org.openapitools.codegen.languages.JavaClientCodegen",
-        date = "2024-06-07T09:12:49.062759-04:00[America/New_York]",
-        comments = "Generator version: 7.6.0")
+        date = "2024-09-04T10:11:22.635226-04:00[America/New_York]",
+        comments = "Generator version: 7.8.0")
 public class ApiClient {
 
     private HttpClient.Builder builder;
@@ -68,7 +68,7 @@ public class ApiClient {
     private Duration readTimeout;
     private Duration connectTimeout;
 
-    private static String valueToString(Object value) {
+    public static String valueToString(Object value) {
         if (value == null) {
             return "";
         }

diff --git a/edge-api/src/main/java/org/openziti/edge/ApiException.java b/edge-api/src/main/java/org/openziti/edge/ApiException.java
@@ -2,7 +2,7 @@
  * Ziti Edge Client
  * OpenZiti Edge Client API
  *
- * The version of the OpenAPI document: 0.26.20
+ * The version of the OpenAPI document: 0.26.27
  * Contact: [email protected]
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -16,8 +16,8 @@
 
 @javax.annotation.Generated(
         value = "org.openapitools.codegen.languages.JavaClientCodegen",
-        date = "2024-06-07T09:12:49.062759-04:00[America/New_York]",
-        comments = "Generator version: 7.6.0")
+        date = "2024-09-04T10:11:22.635226-04:00[America/New_York]",
+        comments = "Generator version: 7.8.0")
 public class ApiException extends Exception {
     private static final long serialVersionUID = 1L;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -89,4 +89,6 @@ tasks.named('spotlessApply').get().mustRunAfter(':openApiGenerate')
		tasks.named('spotlessJava').get().mustRunAfter(':openApiGenerate')
		tasks.named('spotlessMisc').get().mustRunAfter(':openApiGenerate')

		apply from: rootProject.file('publish.gradle')
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,7 +9,7 @@

		* `ALPHA` (value: `"alpha"`)

		* `ALPHANUMERIC` (value: `"alphaNumeric"`)
		* `ALPHA_NUMERIC` (value: `"alphaNumeric"`)