revert to sending addr field

netbirdio · Dec 17, 2024 · 94f73d2 · 94f73d2
1 parent 228672a
commit 94f73d2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 22 deletions.
diff --git a/management/server/http/api/openapi.yml b/management/server/http/api/openapi.yml
@@ -1272,17 +1272,18 @@ components:
           description: Network resource description
           type: string
           example: A remote resource inside network 1
+        address:
+          description: Network resource address (either a direct host like 1.1.1.1 or 1.1.1.1/32, or a subnet like 192.168.178.0/24, or a domain like example.com)
+          type: string
+          example: "1.1.1.1"
       required:
         - name
+        - address
     NetworkResourceRequest:
       allOf:
         - $ref: '#/components/schemas/NetworkResourceMinimum'
         - type: object
           properties:
-            address:
-              description: Network resource address (either a direct host like 1.1.1.1 or 1.1.1.1/32, or a subnet like 192.168.178.0/24, or a domain like example.com)
-              type: string
-              example: "1.1.1.1"
             groups:
               description: Group IDs containing the resource
               type: array
@@ -1307,20 +1308,10 @@ components:
               type: array
               items:
                 $ref: '#/components/schemas/GroupMinimum'
-            domain:
-              description: Domain name of the resource
-              type: string
-              example: example.com
-            prefix:
-              description: Prefix of the resource
-              type: string
-              example:
           required:
             - id
             - type
             - groups
-            - domain
-            - prefix
         - $ref: '#/components/schemas/NetworkResourceMinimum'
     NetworkResourceType:
       description: Network resource type based of the address

diff --git a/management/server/http/api/types.gen.go b/management/server/http/api/types.gen.go
diff --git a/management/server/networks/resources/types/resource.go b/management/server/networks/resources/types/resource.go
@@ -55,13 +55,17 @@ func NewNetworkResource(accountID, networkID, name, description, address string)
 }
 
 func (n *NetworkResource) ToAPIResponse(groups []api.GroupMinimum) *api.NetworkResource {
+	addr := n.Prefix.String()
+	if n.Type == domain {
+		addr = n.Domain
+	}
+
 	return &api.NetworkResource{
 		Id:          n.ID,
 		Name:        n.Name,
 		Description: &n.Description,
 		Type:        api.NetworkResourceType(n.Type.String()),
-		Domain:      n.Domain,
-		Prefix:      n.Prefix.String(),
+		Address:     addr,
 		Groups:      groups,
 	}
 }