release version v0.24.0

BeryJu · Jan 14, 2025 · dcab3aa · dcab3aa
1 parent ab69dd3
commit dcab3aa
Show file tree

Hide file tree

Showing 127 changed files with 1,089 additions and 137 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@
 PWD = $(shell pwd)
 UID = $(shell id -u)
 GID = $(shell id -g)
-VERSION = "0.23.1"
+VERSION = "0.24.0"
 LD_FLAGS = -X beryju.io/gravity/pkg/extconfig.Version=${VERSION}
 GO_FLAGS = -ldflags "${LD_FLAGS}" -v
 SCHEMA_FILE = schema.yml

diff --git a/api/.openapi-generator/FILES b/api/.openapi-generator/FILES
@@ -64,6 +64,9 @@ docs/DhcpAPIRoleConfigOutput.md
 docs/DhcpAPIScope.md
 docs/DhcpAPIScopeStatistics.md
 docs/DhcpAPIScopesGetOutput.md
+docs/DhcpAPIScopesImportInput.md
+docs/DhcpAPIScopesImportOutput.md
+docs/DhcpAPIScopesImporterType.md
 docs/DhcpAPIScopesPutInput.md
 docs/DhcpRoleConfig.md
 docs/DhcpScopeDNS.md
@@ -85,6 +88,7 @@ docs/DnsAPIZone.md
 docs/DnsAPIZonesGetOutput.md
 docs/DnsAPIZonesImportInput.md
 docs/DnsAPIZonesImportOutput.md
+docs/DnsAPIZonesImporterType.md
 docs/DnsAPIZonesPutInput.md
 docs/DnsRoleConfig.md
 docs/ExtconfigExtConfigDirs.md
@@ -170,6 +174,9 @@ model_dhcp_api_role_config_output.go
 model_dhcp_api_scope.go
 model_dhcp_api_scope_statistics.go
 model_dhcp_api_scopes_get_output.go
+model_dhcp_api_scopes_import_input.go
+model_dhcp_api_scopes_import_output.go
+model_dhcp_api_scopes_importer_type.go
 model_dhcp_api_scopes_put_input.go
 model_dhcp_role_config.go
 model_dhcp_scope_dns.go
@@ -191,6 +198,7 @@ model_dns_api_zone.go
 model_dns_api_zones_get_output.go
 model_dns_api_zones_import_input.go
 model_dns_api_zones_import_output.go
+model_dns_api_zones_importer_type.go
 model_dns_api_zones_put_input.go
 model_dns_role_config.go
 model_extconfig_ext_config_dirs.go

diff --git a/api/README.md b/api/README.md
@@ -5,7 +5,7 @@ No description provided (generated by Openapi Generator https://github.com/opena
 ## Overview
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [OpenAPI-spec](https://www.openapis.org/) from a remote server, you can easily generate an API client.
 
-- API version: 0.23.1
+- API version: 0.24.0
 - Package version: 1.0.0
 - Build package: org.openapitools.codegen.languages.GoClientCodegen
 
@@ -107,6 +107,7 @@ Class | Method | HTTP request | Description
 *RolesDhcpApi* | [**DhcpGetLeases**](docs/RolesDhcpApi.md#dhcpgetleases) | **Get** /api/v1/dhcp/scopes/leases | DHCP Leases
 *RolesDhcpApi* | [**DhcpGetRoleConfig**](docs/RolesDhcpApi.md#dhcpgetroleconfig) | **Get** /api/v1/roles/dhcp | DHCP role config
 *RolesDhcpApi* | [**DhcpGetScopes**](docs/RolesDhcpApi.md#dhcpgetscopes) | **Get** /api/v1/dhcp/scopes | DHCP Scopes
+*RolesDhcpApi* | [**DhcpImportScopes**](docs/RolesDhcpApi.md#dhcpimportscopes) | **Post** /api/v1/dhcp/scopes/import | DHCP Scopes
 *RolesDhcpApi* | [**DhcpPutLeases**](docs/RolesDhcpApi.md#dhcpputleases) | **Post** /api/v1/dhcp/scopes/leases | DHCP Leases
 *RolesDhcpApi* | [**DhcpPutRoleConfig**](docs/RolesDhcpApi.md#dhcpputroleconfig) | **Post** /api/v1/roles/dhcp | DHCP role config
 *RolesDhcpApi* | [**DhcpPutScopes**](docs/RolesDhcpApi.md#dhcpputscopes) | **Post** /api/v1/dhcp/scopes | DHCP Scopes
@@ -192,6 +193,9 @@ Class | Method | HTTP request | Description
  - [DhcpAPIScope](docs/DhcpAPIScope.md)
  - [DhcpAPIScopeStatistics](docs/DhcpAPIScopeStatistics.md)
  - [DhcpAPIScopesGetOutput](docs/DhcpAPIScopesGetOutput.md)
+ - [DhcpAPIScopesImportInput](docs/DhcpAPIScopesImportInput.md)
+ - [DhcpAPIScopesImportOutput](docs/DhcpAPIScopesImportOutput.md)
+ - [DhcpAPIScopesImporterType](docs/DhcpAPIScopesImporterType.md)
  - [DhcpAPIScopesPutInput](docs/DhcpAPIScopesPutInput.md)
  - [DhcpRoleConfig](docs/DhcpRoleConfig.md)
  - [DhcpScopeDNS](docs/DhcpScopeDNS.md)
@@ -213,6 +217,7 @@ Class | Method | HTTP request | Description
  - [DnsAPIZonesGetOutput](docs/DnsAPIZonesGetOutput.md)
  - [DnsAPIZonesImportInput](docs/DnsAPIZonesImportInput.md)
  - [DnsAPIZonesImportOutput](docs/DnsAPIZonesImportOutput.md)
+ - [DnsAPIZonesImporterType](docs/DnsAPIZonesImporterType.md)
  - [DnsAPIZonesPutInput](docs/DnsAPIZonesPutInput.md)
  - [DnsRoleConfig](docs/DnsRoleConfig.md)
  - [ExtconfigExtConfigDirs](docs/ExtconfigExtConfigDirs.md)

diff --git a/api/api/openapi.yaml b/api/api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.3
 info:
   title: gravity
-  version: 0.23.1
+  version: 0.24.0
 servers:
 - url: /
 paths:
@@ -470,6 +470,44 @@ paths:
       summary: DHCP Scopes
       tags:
       - roles/dhcp
+  /api/v1/dhcp/scopes/import:
+    post:
+      operationId: dhcp.import_scopes
+      parameters:
+      - explode: true
+        in: query
+        name: scope
+        required: false
+        schema:
+          type: string
+        style: form
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/DhcpAPIScopesImportInput'
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/DhcpAPIScopesImportOutput'
+          description: OK
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RestErrResponse'
+          description: Bad Request
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RestErrResponse'
+          description: Internal Server Error
+      summary: DHCP Scopes
+      tags:
+      - roles/dhcp
   /api/v1/dhcp/scopes/leases:
     delete:
       operationId: dhcp.delete_leases
@@ -2678,6 +2716,27 @@ components:
       - scopes
       - statistics
       type: object
+    DhcpAPIScopesImportInput:
+      example:
+        payload: payload
+        type: null
+      properties:
+        payload:
+          type: string
+        type:
+          $ref: '#/components/schemas/DhcpAPIScopesImporterType'
+      type: object
+    DhcpAPIScopesImportOutput:
+      example:
+        successful: true
+      properties:
+        successful:
+          type: boolean
+      type: object
+    DhcpAPIScopesImporterType:
+      enum:
+      - ms_dhcp
+      type: string
     DhcpAPIScopesPutInput:
       example:
         subnetCidr: subnetCidr
@@ -3099,14 +3158,12 @@ components:
     DnsAPIZonesImportInput:
       example:
         payload: payload
-        type: bind
+        type: null
       properties:
         payload:
           type: string
         type:
-          enum:
-          - bind
-          type: string
+          $ref: '#/components/schemas/DnsAPIZonesImporterType'
       type: object
     DnsAPIZonesImportOutput:
       example:
@@ -3115,6 +3172,11 @@ components:
         successful:
           type: boolean
       type: object
+    DnsAPIZonesImporterType:
+      enum:
+      - bind
+      - opnsense
+      type: string
     DnsAPIZonesPutInput:
       example:
         handlerConfigs:

diff --git a/api/api_cluster.go b/api/api_cluster.go
diff --git a/api/api_cluster_instances.go b/api/api_cluster_instances.go
diff --git a/api/api_roles_api.go b/api/api_roles_api.go
diff --git a/api/api_roles_backup.go b/api/api_roles_backup.go
diff --git a/api/api_roles_dhcp.go b/api/api_roles_dhcp.go
diff --git a/api/api_roles_discovery.go b/api/api_roles_discovery.go
diff --git a/api/api_roles_dns.go b/api/api_roles_dns.go