Skip to content

Commit c07b82c

Browse files
vladhssvladhanzha
andauthored
Split connectors, ip services and applications for networks and hosts (#49)
* Split connectors, ip services and applications for networks and hosts Remove getByName functions * Fix tests --------- Co-authored-by: vladhanzha <[email protected]>
1 parent 57ad0f1 commit c07b82c

13 files changed

+776
-417
lines changed

cloudconnexa/access_groups.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,23 @@ func (c *AccessGroupsService) List() ([]AccessGroup, error) {
7979
}
8080

8181
func (c *AccessGroupsService) Get(id string) (*AccessGroup, error) {
82-
groups, err := c.List()
82+
endpoint := fmt.Sprintf("%s/access-groups/%s", c.client.GetV1Url(), id)
83+
req, err := http.NewRequest(http.MethodGet, endpoint, nil)
8384
if err != nil {
8485
return nil, err
8586
}
8687

87-
for _, n := range groups {
88-
if n.Id == id {
89-
return &n, nil
90-
}
88+
body, err := c.client.DoRequest(req)
89+
if err != nil {
90+
return nil, err
91+
}
92+
93+
var accessGroup AccessGroup
94+
err = json.Unmarshal(body, &accessGroup)
95+
if err != nil {
96+
return nil, err
9197
}
92-
return nil, nil
98+
return &accessGroup, nil
9399
}
94100

95101
func (c *AccessGroupsService) Create(accessGroup *AccessGroup) (*AccessGroup, error) {

cloudconnexa/cloudconnexa.go

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,21 @@ type Client struct {
2828

2929
common service
3030

31-
Connectors *ConnectorsService
32-
DnsRecords *DNSRecordsService
33-
Hosts *HostsService
34-
IPServices *IPServicesService
35-
Applications *ApplicationsService
36-
Networks *NetworksService
37-
Routes *RoutesService
38-
Users *UsersService
39-
UserGroups *UserGroupsService
40-
VPNRegions *VPNRegionsService
41-
LocationContexts *LocationContextsService
42-
AccessGroups *AccessGroupsService
31+
HostConnectors *HostConnectorsService
32+
NetworkConnectors *NetworkConnectorsService
33+
DnsRecords *DNSRecordsService
34+
Hosts *HostsService
35+
HostIPServices *HostIPServicesService
36+
NetworkIPServices *NetworkIPServicesService
37+
HostApplications *HostApplicationsService
38+
NetworkApplications *NetworkApplicationsService
39+
Networks *NetworksService
40+
Routes *RoutesService
41+
Users *UsersService
42+
UserGroups *UserGroupsService
43+
VPNRegions *VPNRegionsService
44+
LocationContexts *LocationContextsService
45+
AccessGroups *AccessGroupsService
4346
}
4447

4548
type service struct {
@@ -105,11 +108,14 @@ func NewClient(baseURL, clientId, clientSecret string) (*Client, error) {
105108
RateLimiter: rate.NewLimiter(rate.Every(1*time.Second), 5),
106109
}
107110
c.common.client = c
108-
c.Connectors = (*ConnectorsService)(&c.common)
111+
c.HostConnectors = (*HostConnectorsService)(&c.common)
112+
c.NetworkConnectors = (*NetworkConnectorsService)(&c.common)
109113
c.DnsRecords = (*DNSRecordsService)(&c.common)
110114
c.Hosts = (*HostsService)(&c.common)
111-
c.IPServices = (*IPServicesService)(&c.common)
112-
c.Applications = (*ApplicationsService)(&c.common)
115+
c.HostIPServices = (*HostIPServicesService)(&c.common)
116+
c.NetworkIPServices = (*NetworkIPServicesService)(&c.common)
117+
c.HostApplications = (*HostApplicationsService)(&c.common)
118+
c.NetworkApplications = (*NetworkApplicationsService)(&c.common)
113119
c.Networks = (*NetworksService)(&c.common)
114120
c.Routes = (*RoutesService)(&c.common)
115121
c.Users = (*UsersService)(&c.common)

cloudconnexa/connectors.go

Lines changed: 0 additions & 240 deletions
This file was deleted.

0 commit comments

Comments
 (0)