Skip to content

Commit

Permalink
Merge pull request #46 from meraki/develop
Browse files Browse the repository at this point in the history 
## [3.0.10] - 2024-11-27
  • Loading branch information
@fmunozmiranda
fmunozmiranda authored Nov 27, 2024
2 parents 25b775d + 99abd47 commit 873fa0e
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 36 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [3.0.10] - 2024-11-27
### Changed
- update networks.go, GetOrganizationPolicyObjectsGroups returns an array.
- update networks.go, ObjectIDs is now an `[]string`

## [3.0.9] - 2024-08-05
### Changed
- update wireless.go, RequestWirelessUpdateDeviceWirelessRadioSettingsFiveGhzSettings.ChannelWidth is now string.
Expand Down
75 changes: 39 additions & 36 deletions sdk/organizations.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2072,41 +2072,44 @@ type ResponseOrganizationsCreateOrganizationPolicyObject struct {
Type string `json:"type,omitempty"` // Type of a policy object (one of: adaptivePolicyIpv4Cidr, cidr, fqdn, ipAndMask)
UpdatedAt string `json:"updatedAt,omitempty"` // Time Stamp of policy object updation.
}

type ResponseOrganizationsGetOrganizationPolicyObjectsGroupsArray []ResponseOrganizationsGetOrganizationPolicyObjectsGroups

type ResponseOrganizationsGetOrganizationPolicyObjectsGroups struct {
Category string `json:"category,omitempty"` // Type of object groups. (NetworkObjectGroup, GeoLocationGroup, PortObjectGroup, ApplicationGroup)
CreatedAt string `json:"createdAt,omitempty"` // Time Stamp of policy object creation.
ID string `json:"id,omitempty"` // Policy object ID
Name string `json:"name,omitempty"` // Name of the Policy object group.
NetworkIDs []string `json:"networkIds,omitempty"` // Network ID's associated with the policy objects.
ObjectIDs *[]int `json:"objectIds,omitempty"` // Policy objects associated with Network Object Group or Port Object Group
UpdatedAt string `json:"updatedAt,omitempty"` // Time Stamp of policy object updation.
Category string `json:"category,omitempty"` // Type of object groups. (NetworkObjectGroup, GeoLocationGroup, PortObjectGroup, ApplicationGroup)
CreatedAt string `json:"createdAt,omitempty"` // Time Stamp of policy object creation.
ID string `json:"id,omitempty"` // Policy object ID
Name string `json:"name,omitempty"` // Name of the Policy object group.
NetworkIDs []string `json:"networkIds,omitempty"` // Network ID's associated with the policy objects.
ObjectIDs *[]string `json:"objectIds,omitempty"` // Policy objects associated with Network Object Group or Port Object Group
UpdatedAt string `json:"updatedAt,omitempty"` // Time Stamp of policy object updation.
}
type ResponseOrganizationsCreateOrganizationPolicyObjectsGroup struct {
Category string `json:"category,omitempty"` // Type of object groups. (NetworkObjectGroup, GeoLocationGroup, PortObjectGroup, ApplicationGroup)
CreatedAt string `json:"createdAt,omitempty"` // Time Stamp of policy object creation.
ID string `json:"id,omitempty"` // Policy object ID
Name string `json:"name,omitempty"` // Name of the Policy object group.
NetworkIDs []string `json:"networkIds,omitempty"` // Network ID's associated with the policy objects.
ObjectIDs *[]int `json:"objectIds,omitempty"` // Policy objects associated with Network Object Group or Port Object Group
UpdatedAt string `json:"updatedAt,omitempty"` // Time Stamp of policy object updation.
Category string `json:"category,omitempty"` // Type of object groups. (NetworkObjectGroup, GeoLocationGroup, PortObjectGroup, ApplicationGroup)
CreatedAt string `json:"createdAt,omitempty"` // Time Stamp of policy object creation.
ID string `json:"id,omitempty"` // Policy object ID
Name string `json:"name,omitempty"` // Name of the Policy object group.
NetworkIDs []string `json:"networkIds,omitempty"` // Network ID's associated with the policy objects.
ObjectIDs *[]string `json:"objectIds,omitempty"` // Policy objects associated with Network Object Group or Port Object Group
UpdatedAt string `json:"updatedAt,omitempty"` // Time Stamp of policy object updation.
}
type ResponseOrganizationsGetOrganizationPolicyObjectsGroup struct {
Category string `json:"category,omitempty"` // Type of object groups. (NetworkObjectGroup, GeoLocationGroup, PortObjectGroup, ApplicationGroup)
CreatedAt string `json:"createdAt,omitempty"` // Time Stamp of policy object creation.
ID string `json:"id,omitempty"` // Policy object ID
Name string `json:"name,omitempty"` // Name of the Policy object group.
NetworkIDs []string `json:"networkIds,omitempty"` // Network ID's associated with the policy objects.
ObjectIDs *[]int `json:"objectIds,omitempty"` // Policy objects associated with Network Object Group or Port Object Group
UpdatedAt string `json:"updatedAt,omitempty"` // Time Stamp of policy object updation.
Category string `json:"category,omitempty"` // Type of object groups. (NetworkObjectGroup, GeoLocationGroup, PortObjectGroup, ApplicationGroup)
CreatedAt string `json:"createdAt,omitempty"` // Time Stamp of policy object creation.
ID string `json:"id,omitempty"` // Policy object ID
Name string `json:"name,omitempty"` // Name of the Policy object group.
NetworkIDs []string `json:"networkIds,omitempty"` // Network ID's associated with the policy objects.
ObjectIDs *[]string `json:"objectIds,omitempty"` // Policy objects associated with Network Object Group or Port Object Group
UpdatedAt string `json:"updatedAt,omitempty"` // Time Stamp of policy object updation.
}
type ResponseOrganizationsUpdateOrganizationPolicyObjectsGroup struct {
Category string `json:"category,omitempty"` // Type of object groups. (NetworkObjectGroup, GeoLocationGroup, PortObjectGroup, ApplicationGroup)
CreatedAt string `json:"createdAt,omitempty"` // Time Stamp of policy object creation.
ID string `json:"id,omitempty"` // Policy object ID
Name string `json:"name,omitempty"` // Name of the Policy object group.
NetworkIDs []string `json:"networkIds,omitempty"` // Network ID's associated with the policy objects.
ObjectIDs *[]int `json:"objectIds,omitempty"` // Policy objects associated with Network Object Group or Port Object Group
UpdatedAt string `json:"updatedAt,omitempty"` // Time Stamp of policy object updation.
Category string `json:"category,omitempty"` // Type of object groups. (NetworkObjectGroup, GeoLocationGroup, PortObjectGroup, ApplicationGroup)
CreatedAt string `json:"createdAt,omitempty"` // Time Stamp of policy object creation.
ID string `json:"id,omitempty"` // Policy object ID
Name string `json:"name,omitempty"` // Name of the Policy object group.
NetworkIDs []string `json:"networkIds,omitempty"` // Network ID's associated with the policy objects.
ObjectIDs *[]string `json:"objectIds,omitempty"` // Policy objects associated with Network Object Group or Port Object Group
UpdatedAt string `json:"updatedAt,omitempty"` // Time Stamp of policy object updation.
}
type ResponseOrganizationsGetOrganizationPolicyObject struct {
Category string `json:"category,omitempty"` // Category of a policy object (one of: adaptivePolicy, network)
Expand Down Expand Up @@ -2999,13 +3002,13 @@ type RequestOrganizationsCreateOrganizationPolicyObject struct {
Type string `json:"type,omitempty"` // Type of a policy object (one of: adaptivePolicyIpv4Cidr, cidr, fqdn, ipAndMask)
}
type RequestOrganizationsCreateOrganizationPolicyObjectsGroup struct {
Category string `json:"category,omitempty"` // Category of a policy object group (one of: NetworkObjectGroup, GeoLocationGroup, PortObjectGroup, ApplicationGroup)
Name string `json:"name,omitempty"` // A name for the group of network addresses, unique within the organization (alphanumeric, space, dash, or underscore characters only)
ObjectIDs *[]int `json:"objectIds,omitempty"` // A list of Policy Object ID's that this NetworkObjectGroup should be associated to (note: these ID's will replace the existing associated Policy Objects)
Category string `json:"category,omitempty"` // Category of a policy object group (one of: NetworkObjectGroup, GeoLocationGroup, PortObjectGroup, ApplicationGroup)
Name string `json:"name,omitempty"` // A name for the group of network addresses, unique within the organization (alphanumeric, space, dash, or underscore characters only)
ObjectIDs *[]string `json:"objectIds,omitempty"` // A list of Policy Object ID's that this NetworkObjectGroup should be associated to (note: these ID's will replace the existing associated Policy Objects)
}
type RequestOrganizationsUpdateOrganizationPolicyObjectsGroup struct {
Name string `json:"name,omitempty"` // A name for the group of network addresses, unique within the organization (alphanumeric, space, dash, or underscore characters only)
ObjectIDs *[]int `json:"objectIds,omitempty"` // A list of Policy Object ID's that this NetworkObjectGroup should be associated to (note: these ID's will replace the existing associated Policy Objects)
Name string `json:"name,omitempty"` // A name for the group of network addresses, unique within the organization (alphanumeric, space, dash, or underscore characters only)
ObjectIDs *[]string `json:"objectIds,omitempty"` // A list of Policy Object ID's that this NetworkObjectGroup should be associated to (note: these ID's will replace the existing associated Policy Objects)
}
type RequestOrganizationsUpdateOrganizationPolicyObject struct {
Cidr string `json:"cidr,omitempty"` // CIDR Value of a policy object (e.g. 10.11.12.1/24")
Expand Down Expand Up @@ -4923,7 +4926,7 @@ func (s *OrganizationsService) GetOrganizationPolicyObjects(organizationID strin


*/
func (s *OrganizationsService) GetOrganizationPolicyObjectsGroups(organizationID string, getOrganizationPolicyObjectsGroupsQueryParams *GetOrganizationPolicyObjectsGroupsQueryParams) (*ResponseOrganizationsGetOrganizationPolicyObjectsGroups, *resty.Response, error) {
func (s *OrganizationsService) GetOrganizationPolicyObjectsGroups(organizationID string, getOrganizationPolicyObjectsGroupsQueryParams *GetOrganizationPolicyObjectsGroupsQueryParams) (*ResponseOrganizationsGetOrganizationPolicyObjectsGroupsArray, *resty.Response, error) {
path := "/api/v1/organizations/{organizationId}/policyObjects/groups"
s.rateLimiterBucket.Wait(1)
path = strings.Replace(path, "{organizationId}", fmt.Sprintf("%v", organizationID), -1)
Expand All @@ -4933,7 +4936,7 @@ func (s *OrganizationsService) GetOrganizationPolicyObjectsGroups(organizationID
response, err := s.client.R().
SetHeader("Content-Type", "application/json").
SetHeader("Accept", "application/json").
SetQueryString(queryString.Encode()).SetResult(&ResponseOrganizationsGetOrganizationPolicyObjectsGroups{}).
SetQueryString(queryString.Encode()).SetResult(&ResponseOrganizationsGetOrganizationPolicyObjectsGroupsArray{}).
SetError(&Error).
Get(path)

Expand All @@ -4946,7 +4949,7 @@ func (s *OrganizationsService) GetOrganizationPolicyObjectsGroups(organizationID
return nil, response, fmt.Errorf("error with operation GetOrganizationPolicyObjectsGroups")
}

result := response.Result().(*ResponseOrganizationsGetOrganizationPolicyObjectsGroups)
result := response.Result().(*ResponseOrganizationsGetOrganizationPolicyObjectsGroupsArray)
return result, response, err

}
Expand Down

0 comments on commit 873fa0e

Please sign in to comment.