From 0a3e48c2ea5d894e60f6a884f0012134e5560cc9 Mon Sep 17 00:00:00 2001 From: Stephan Freudl <41970000+freudl@users.noreply.github.com> Date: Sat, 18 May 2024 07:49:40 +0200 Subject: [PATCH 1/2] Add query parameters supported by CC 3.165.0 list operations Signed-off-by: Stephan Freudl --- client/app.go | 19 +++++++++++-------- client/app_usage.go | 4 ++++ client/audit_event.go | 2 ++ client/buildpack.go | 7 +++++-- client/deployment.go | 11 +++++++---- client/domain.go | 9 ++++++--- client/droplet.go | 13 ++++++++----- client/feature_flag.go | 1 + client/isolation_segment.go | 9 ++++++--- client/organization.go | 7 +++++-- client/organization_quota.go | 8 +++++--- client/package.go | 12 +++++++++--- client/process.go | 14 ++++++++------ client/revision.go | 5 ++++- client/role.go | 12 +++++++----- client/route.go | 9 ++++++--- client/security_group.go | 3 +++ client/service_broker.go | 7 +++++-- client/service_credential_binding.go | 5 ++++- client/service_instance.go | 4 ++++ client/service_offering.go | 15 +++++++++------ client/service_plan.go | 22 ++++++++++++---------- client/service_route_binding.go | 11 +++++++---- client/service_usage.go | 10 ++++++---- client/sidecar.go | 2 ++ client/space.go | 9 ++++++--- client/space_quota.go | 10 ++++++---- client/stack.go | 6 +++++- client/task.go | 14 +++++++++----- client/user.go | 4 ++++ 30 files changed, 176 insertions(+), 88 deletions(-) diff --git a/client/app.go b/client/app.go index 6c3932c..817de27 100644 --- a/client/app.go +++ b/client/app.go @@ -14,14 +14,17 @@ type AppClient commonClient type AppListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - Names Filter `qs:"names"` - OrganizationGUIDs Filter `qs:"organization_guids"` - SpaceGUIDs Filter `qs:"space_guids"` - Stacks Filter `qs:"stacks"` - - LifecycleType resource.LifecycleType `qs:"lifecycle_type"` - Include resource.AppIncludeType `qs:"include"` + GUIDs Filter `qs:"guids"` + Names Filter `qs:"names"` + OrganizationGUIDs Filter `qs:"organization_guids"` + SpaceGUIDs Filter `qs:"space_guids"` + Stacks Filter `qs:"stacks"` + LifecycleType resource.LifecycleType `qs:"lifecycle_type"` + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` + + Include resource.AppIncludeType `qs:"include"` } // NewAppListOptions creates new options to pass to list diff --git a/client/app_usage.go b/client/app_usage.go index db452f9..a1fd8ee 100644 --- a/client/app_usage.go +++ b/client/app_usage.go @@ -13,6 +13,10 @@ type AppUsageClient commonClient // AppUsageListOptions list filters type AppUsageListOptions struct { *ListOptions + + AfterGUID string `qs:"after_guid"` + GUIDs Filter `qs:"guids"` + CreatedAts TimestampFilter `qs:"created_ats"` } // NewAppUsageOptions creates new options to pass to list diff --git a/client/audit_event.go b/client/audit_event.go index 224f8c3..b283798 100644 --- a/client/audit_event.go +++ b/client/audit_event.go @@ -18,6 +18,8 @@ type AuditEventListOptions struct { TargetGUIDs ExclusionFilter `qs:"target_guids"` // list of target guids to filter by OrganizationGUIDs Filter `qs:"organization_guids"` SpaceGUIDs Filter `qs:"space_guids"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewAuditEventListOptions creates new options to pass to list diff --git a/client/buildpack.go b/client/buildpack.go index df0c840..826ef68 100644 --- a/client/buildpack.go +++ b/client/buildpack.go @@ -15,8 +15,11 @@ type BuildpackClient commonClient type BuildpackListOptions struct { *ListOptions - Names Filter `qs:"names"` // list of buildpack names to filter by - Stacks Filter `qs:"stacks"` // list of stack names to filter by + Names Filter `qs:"names"` // list of buildpack names to filter by + Stacks Filter `qs:"stacks"` // list of stack names to filter by + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewBuildpackListOptions creates new options to pass to list diff --git a/client/deployment.go b/client/deployment.go index 48984d8..796b758 100644 --- a/client/deployment.go +++ b/client/deployment.go @@ -15,10 +15,13 @@ type DeploymentClient commonClient type DeploymentListOptions struct { *ListOptions - AppGUIDs Filter `qs:"app_guids"` - States Filter `qs:"states"` - StatusReasons Filter `qs:"status_reasons"` - StatusValues Filter `qs:"status_values"` + AppGUIDs Filter `qs:"app_guids"` + States Filter `qs:"states"` + StatusReasons Filter `qs:"status_reasons"` + StatusValues Filter `qs:"status_values"` + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewDeploymentListOptions creates new options to pass to list diff --git a/client/domain.go b/client/domain.go index 2ff272b..11cd8b8 100644 --- a/client/domain.go +++ b/client/domain.go @@ -14,9 +14,12 @@ type DomainClient commonClient type DomainListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - Names Filter `qs:"names"` - OrganizationGUIDs Filter `qs:"organization_guids"` + GUIDs Filter `qs:"guids"` + Names Filter `qs:"names"` + OrganizationGUIDs Filter `qs:"organization_guids"` + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewDomainListOptions creates new options to pass to list diff --git a/client/droplet.go b/client/droplet.go index 06a1113..a84bcc4 100644 --- a/client/droplet.go +++ b/client/droplet.go @@ -15,11 +15,14 @@ type DropletClient commonClient type DropletListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` // list of droplet guids to filter by - States Filter `qs:"states"` // list of droplet states to filter by - AppGUIDs Filter `qs:"app_guids"` // list of app guids to filter by - SpaceGUIDs Filter `qs:"space_guids"` // list of space guids to filter by - OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by + GUIDs Filter `qs:"guids"` // list of droplet guids to filter by + States Filter `qs:"states"` // list of droplet states to filter by + AppGUIDs Filter `qs:"app_guids"` // list of app guids to filter by + SpaceGUIDs Filter `qs:"space_guids"` // list of space guids to filter by + OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewDropletListOptions creates new options to pass to list diff --git a/client/feature_flag.go b/client/feature_flag.go index 07ad908..1fad0dc 100644 --- a/client/feature_flag.go +++ b/client/feature_flag.go @@ -13,6 +13,7 @@ type FeatureFlagClient commonClient // FeatureFlagListOptions list filters type FeatureFlagListOptions struct { *ListOptions + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewFeatureFlagListOptions creates new options to pass to list diff --git a/client/isolation_segment.go b/client/isolation_segment.go index 5f238c7..d963128 100644 --- a/client/isolation_segment.go +++ b/client/isolation_segment.go @@ -14,9 +14,12 @@ type IsolationSegmentClient commonClient type IsolationSegmentListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - Names Filter `qs:"names"` - OrganizationGUIDs Filter `qs:"organization_guids"` + GUIDs Filter `qs:"guids"` + Names Filter `qs:"names"` + OrganizationGUIDs Filter `qs:"organization_guids"` + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewIsolationSegmentOptions creates new options to pass to list diff --git a/client/organization.go b/client/organization.go index 1e7cfb5..4424db9 100644 --- a/client/organization.go +++ b/client/organization.go @@ -13,8 +13,11 @@ type OrganizationClient commonClient type OrganizationListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` // list of organization guids to filter by - Names Filter `qs:"names"` // list of organization names to filter by + GUIDs Filter `qs:"guids"` // list of organization guids to filter by + Names Filter `qs:"names"` // list of organization names to filter by + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewOrganizationListOptions creates new options to pass to list diff --git a/client/organization_quota.go b/client/organization_quota.go index b64710b..9d5c819 100644 --- a/client/organization_quota.go +++ b/client/organization_quota.go @@ -14,9 +14,11 @@ type OrganizationQuotaClient commonClient type OrganizationQuotaListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - Names Filter `qs:"names"` - OrganizationGUIDs Filter `qs:"organization_guids"` + GUIDs Filter `qs:"guids"` + Names Filter `qs:"names"` + OrganizationGUIDs Filter `qs:"organization_guids"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewOrganizationQuotaListOptions creates new options to pass to list diff --git a/client/package.go b/client/package.go index 94b74d4..25afd09 100644 --- a/client/package.go +++ b/client/package.go @@ -15,9 +15,15 @@ type PackageClient commonClient type PackageListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` // list of package guids to filter by - States Filter `qs:"states"` // list of package states to filter by - Types Filter `qs:"types"` // list of package types to filter by, docker or bits + GUIDs Filter `qs:"guids"` // list of package guids to filter by + States Filter `qs:"states"` // list of package states to filter by + Types Filter `qs:"types"` // list of package types to filter by, docker or bits + AppGUIDs Filter `qs:"app_guids"` // list of app guids to filter by + SpaceGUIDs Filter `qs:"space_guids"` // list of space guids to filter by + OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewPackageListOptions creates new options to pass to list diff --git a/client/process.go b/client/process.go index 3e38ec5..414f9e3 100644 --- a/client/process.go +++ b/client/process.go @@ -14,12 +14,14 @@ type ProcessClient commonClient type ProcessListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - Types Filter `qs:"types"` - Names Filter `qs:"names"` - AppGUIDs Filter `qs:"app_guids"` - SpaceGUIDs Filter `qs:"space_guids"` - OrganizationGUIDs Filter `qs:"organization_guids"` + GUIDs Filter `qs:"guids"` + Types Filter `qs:"types"` + AppGUIDs Filter `qs:"app_guids"` + SpaceGUIDs Filter `qs:"space_guids"` + OrganizationGUIDs Filter `qs:"organization_guids"` + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewProcessOptions creates new options to pass to list diff --git a/client/revision.go b/client/revision.go index e587602..ab99441 100644 --- a/client/revision.go +++ b/client/revision.go @@ -14,7 +14,10 @@ type RevisionClient commonClient type RevisionListOptions struct { *ListOptions - Versions Filter `qs:"versions"` + Versions Filter `qs:"versions"` + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewRevisionListOptions creates new options to pass to list diff --git a/client/role.go b/client/role.go index a0cd66d..ae5cab3 100644 --- a/client/role.go +++ b/client/role.go @@ -14,11 +14,13 @@ type RoleClient commonClient type RoleListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` // list of role guids to filter by - Types Filter `qs:"types"` // list of role types to filter by - OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by - SpaceGUIDs Filter `qs:"space_guids"` // list of space guids to filter by - UserGUIDs Filter `qs:"user_guids"` // list of user guids to filter by + GUIDs Filter `qs:"guids"` // list of role guids to filter by + Types Filter `qs:"types"` // list of role types to filter by + OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by + SpaceGUIDs Filter `qs:"space_guids"` // list of space guids to filter by + UserGUIDs Filter `qs:"user_guids"` // list of user guids to filter by + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` Include resource.RoleIncludeType `qs:"include"` } diff --git a/client/route.go b/client/route.go index 7c297e8..cc641b6 100644 --- a/client/route.go +++ b/client/route.go @@ -20,9 +20,12 @@ type RouteListOptions struct { OrganizationGUIDs Filter `qs:"organization_guids"` ServiceInstanceGUIDs Filter `qs:"service_instance_guids"` - Hosts Filter `qs:"hosts"` - Paths Filter `qs:"paths"` - Ports Filter `qs:"ports"` + Hosts Filter `qs:"hosts"` + Paths Filter `qs:"paths"` + Ports Filter `qs:"ports"` + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` Include resource.RouteIncludeType `qs:"include"` } diff --git a/client/security_group.go b/client/security_group.go index 55cae6e..8feb293 100644 --- a/client/security_group.go +++ b/client/security_group.go @@ -21,6 +21,9 @@ type SecurityGroupListOptions struct { GloballyEnabledRunning *bool `qs:"globally_enabled_running"` // If true, only include the security groups that are enabled for running GloballyEnabledStaging *bool `qs:"globally_enabled_staging"` // If true, only include the security groups that are enabled for staging + + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewSecurityGroupListOptions creates new options to pass to list diff --git a/client/service_broker.go b/client/service_broker.go index 734aee4..2a4dad0 100644 --- a/client/service_broker.go +++ b/client/service_broker.go @@ -14,8 +14,11 @@ type ServiceBrokerClient commonClient type ServiceBrokerListOptions struct { *ListOptions - SpaceGUIDs Filter `qs:"space_guids"` - Names Filter `qs:"names"` + SpaceGUIDs Filter `qs:"space_guids"` + Names Filter `qs:"names"` + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewServiceBrokerListOptions creates new options to pass to list diff --git a/client/service_credential_binding.go b/client/service_credential_binding.go index e1ac790..6cea3bc 100644 --- a/client/service_credential_binding.go +++ b/client/service_credential_binding.go @@ -26,7 +26,10 @@ type ServiceCredentialBindingListOptions struct { Type Filter `qs:"type"` // list of service credential binding types to filter by, app or key GUIDs Filter `qs:"guids"` // list of service route binding guids to filter by - Include resource.ServiceCredentialBindingIncludeType `qs:"include"` + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` + Include resource.ServiceCredentialBindingIncludeType `qs:"include"` } // NewServiceCredentialBindingListOptions creates new options to pass to list diff --git a/client/service_instance.go b/client/service_instance.go index a32705f..bc3578d 100644 --- a/client/service_instance.go +++ b/client/service_instance.go @@ -22,6 +22,10 @@ type ServiceInstanceListOptions struct { OrganizationGUIDs Filter `qs:"organization_guids"` ServicePlanGUIDs Filter `qs:"service_plan_guids"` ServicePlanNames Filter `qs:"service_plan_names"` + + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewServiceInstanceListOptions creates new options to pass to list diff --git a/client/service_offering.go b/client/service_offering.go index 3d55622..8635544 100644 --- a/client/service_offering.go +++ b/client/service_offering.go @@ -14,12 +14,15 @@ type ServiceOfferingClient commonClient type ServiceOfferingListOptions struct { *ListOptions - Names Filter `qs:"names"` - ServiceBrokerGUIDs Filter `qs:"service_broker_guids"` - ServiceBrokerNames Filter `qs:"service_broker_names"` - SpaceGUIDs Filter `qs:"space_guids"` - OrganizationGUIDs Filter `qs:"organization_guids"` - Available *bool `qs:"available"` + Names Filter `qs:"names"` + ServiceBrokerGUIDs Filter `qs:"service_broker_guids"` + ServiceBrokerNames Filter `qs:"service_broker_names"` + SpaceGUIDs Filter `qs:"space_guids"` + OrganizationGUIDs Filter `qs:"organization_guids"` + Available *bool `qs:"available"` + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewServiceOfferingListOptions creates new options to pass to list diff --git a/client/service_plan.go b/client/service_plan.go index 671735c..76d9142 100644 --- a/client/service_plan.go +++ b/client/service_plan.go @@ -15,16 +15,18 @@ type ServicePlanClient commonClient type ServicePlanListOptions struct { *ListOptions - Names Filter `qs:"names"` - BrokerCatalogIDs Filter `qs:"broker_catalog_ids"` - SpaceGUIDs Filter `qs:"space_guids"` - OrganizationGUIDs Filter `qs:"organization_guids"` - ServiceBrokerGUIDs Filter `qs:"service_broker_guids"` - ServiceBrokerNames Filter `qs:"service_broker_names"` - ServiceOfferingGUIDs Filter `qs:"service_offering_guids"` - ServiceOfferingNames Filter `qs:"service_offering_names"` - ServiceInstanceGUIDs Filter `qs:"service_instance_guids"` - Available *bool `qs:"available"` + Names Filter `qs:"names"` + BrokerCatalogIDs Filter `qs:"broker_catalog_ids"` + SpaceGUIDs Filter `qs:"space_guids"` + OrganizationGUIDs Filter `qs:"organization_guids"` + ServiceBrokerGUIDs Filter `qs:"service_broker_guids"` + ServiceBrokerNames Filter `qs:"service_broker_names"` + ServiceOfferingGUIDs Filter `qs:"service_offering_guids"` + ServiceOfferingNames Filter `qs:"service_offering_names"` + ServiceInstanceGUIDs Filter `qs:"service_instance_guids"` + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` Include resource.ServicePlanIncludeType `qs:"include"` } diff --git a/client/service_route_binding.go b/client/service_route_binding.go index b6d0603..629b3c5 100644 --- a/client/service_route_binding.go +++ b/client/service_route_binding.go @@ -14,10 +14,13 @@ type ServiceRouteBindingClient commonClient type ServiceRouteBindingListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - RouteGUIDs Filter `qs:"route_guids"` - ServiceInstanceGUIDs Filter `qs:"service_instance_guids"` - ServiceInstanceNames Filter `qs:"service_instance_names"` + GUIDs Filter `qs:"guids"` + RouteGUIDs Filter `qs:"route_guids"` + ServiceInstanceGUIDs Filter `qs:"service_instance_guids"` + ServiceInstanceNames Filter `qs:"service_instance_names"` + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` Include resource.ServiceRouteBindingIncludeType `qs:"include"` } diff --git a/client/service_usage.go b/client/service_usage.go index d7d02f1..cec3b52 100644 --- a/client/service_usage.go +++ b/client/service_usage.go @@ -14,10 +14,12 @@ type ServiceUsageClient commonClient type ServiceUsageListOptions struct { *ListOptions - AfterGUID string `qs:"after_guid"` - GUIDs Filter `qs:"guids"` - ServiceInstanceTypes Filter `qs:"service_instance_types"` - ServiceOfferingGUIDs Filter `qs:"service_offering_guids"` + AfterGUID string `qs:"after_guid"` + GUIDs Filter `qs:"guids"` + ServiceInstanceTypes Filter `qs:"service_instance_types"` + ServiceOfferingGUIDs Filter `qs:"service_offering_guids"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewServiceUsageOptions creates new options to pass to list diff --git a/client/sidecar.go b/client/sidecar.go index 8520c17..f3fcc38 100644 --- a/client/sidecar.go +++ b/client/sidecar.go @@ -13,6 +13,8 @@ type SidecarClient commonClient // SidecarListOptions list filters type SidecarListOptions struct { *ListOptions + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewSidecarListOptions creates new options to pass to list diff --git a/client/space.go b/client/space.go index 9840fd9..e82e9d7 100644 --- a/client/space.go +++ b/client/space.go @@ -14,9 +14,12 @@ type SpaceClient commonClient type SpaceListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` // list of space guids to filter by - Names Filter `qs:"names"` // list of space names to filter by - OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by + GUIDs Filter `qs:"guids"` // list of space guids to filter by + Names Filter `qs:"names"` // list of space names to filter by + OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` Include resource.SpaceIncludeType `qs:"include"` // include parent objects if any } diff --git a/client/space_quota.go b/client/space_quota.go index 9c33429..e8b86ea 100644 --- a/client/space_quota.go +++ b/client/space_quota.go @@ -14,10 +14,12 @@ type SpaceQuotaClient commonClient type SpaceQuotaListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - Names Filter `qs:"names"` - OrganizationGUIDs Filter `qs:"organization_guids"` - SpaceGUIDs Filter `qs:"space_guids"` + GUIDs Filter `qs:"guids"` + Names Filter `qs:"names"` + OrganizationGUIDs Filter `qs:"organization_guids"` + SpaceGUIDs Filter `qs:"space_guids"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewSpaceQuotaListOptions creates new options to pass to list diff --git a/client/stack.go b/client/stack.go index 2baf94d..8ccbe5f 100644 --- a/client/stack.go +++ b/client/stack.go @@ -14,7 +14,11 @@ type StackClient commonClient type StackListOptions struct { *ListOptions - Names Filter `qs:"names"` // list of stack names to filter by + Names Filter `qs:"names"` // list of stack names to filter by + Default *bool `qs:"default"` + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewStackListOptions creates new options to pass to list diff --git a/client/task.go b/client/task.go index 28e84e1..cc9fbc1 100644 --- a/client/task.go +++ b/client/task.go @@ -14,11 +14,15 @@ type TaskClient commonClient type TaskListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - Names Filter `qs:"names"` - States Filter `qs:"states"` - SpaceGUIDs Filter `qs:"space_guids"` - OrganizationGUIDs Filter `qs:"organization_guids"` + GUIDs Filter `qs:"guids"` + Names Filter `qs:"names"` + States Filter `qs:"states"` + AppGUIDs Filter `qs:"app_guids"` + SpaceGUIDs Filter `qs:"space_guids"` + OrganizationGUIDs Filter `qs:"organization_guids"` + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewTaskListOptions creates new options to pass to list diff --git a/client/user.go b/client/user.go index c5da731..08c452a 100644 --- a/client/user.go +++ b/client/user.go @@ -28,6 +28,10 @@ type UserListOptions struct { // UAA have the origin “uaa”; users authenticated by an LDAP provider have the // origin ldap when filtering by origins, usernames must be included Origins Filter `qs:"origins"` + + LabelSel LabelSelector `qs:"label_selector"` + CreatedAts TimestampFilter `qs:"created_ats"` + UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewUserListOptions creates new options to pass to list From 61eb1eed478eb5ec6efde9f045cf58e28ed27d86 Mon Sep 17 00:00:00 2001 From: Stephan Freudl <41970000+freudl@users.noreply.github.com> Date: Thu, 23 May 2024 05:59:35 +0200 Subject: [PATCH 2/2] Remove common parameters defined already Signed-off-by: Stephan Freudl <41970000+freudl@users.noreply.github.com> --- client/app.go | 19 ++++++++----------- client/app_usage.go | 5 ++--- client/audit_event.go | 2 -- client/buildpack.go | 7 ++----- client/deployment.go | 11 ++++------- client/domain.go | 9 +++------ client/droplet.go | 13 +++++-------- client/feature_flag.go | 1 - client/isolation_segment.go | 9 +++------ client/organization.go | 7 ++----- client/organization_quota.go | 8 +++----- client/package.go | 15 ++++++--------- client/process.go | 13 +++++-------- client/revision.go | 5 +---- client/role.go | 12 +++++------- client/route.go | 9 +++------ client/security_group.go | 3 --- client/service_broker.go | 7 ++----- client/service_credential_binding.go | 5 +---- client/service_instance.go | 4 ---- client/service_offering.go | 15 ++++++--------- client/service_plan.go | 22 ++++++++++------------ client/service_route_binding.go | 11 ++++------- client/service_usage.go | 10 ++++------ client/sidecar.go | 2 -- client/space.go | 9 +++------ client/space_quota.go | 10 ++++------ client/stack.go | 7 ++----- client/task.go | 15 ++++++--------- client/user.go | 4 ---- 30 files changed, 94 insertions(+), 175 deletions(-) diff --git a/client/app.go b/client/app.go index 817de27..6c3932c 100644 --- a/client/app.go +++ b/client/app.go @@ -14,17 +14,14 @@ type AppClient commonClient type AppListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - Names Filter `qs:"names"` - OrganizationGUIDs Filter `qs:"organization_guids"` - SpaceGUIDs Filter `qs:"space_guids"` - Stacks Filter `qs:"stacks"` - LifecycleType resource.LifecycleType `qs:"lifecycle_type"` - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` - - Include resource.AppIncludeType `qs:"include"` + GUIDs Filter `qs:"guids"` + Names Filter `qs:"names"` + OrganizationGUIDs Filter `qs:"organization_guids"` + SpaceGUIDs Filter `qs:"space_guids"` + Stacks Filter `qs:"stacks"` + + LifecycleType resource.LifecycleType `qs:"lifecycle_type"` + Include resource.AppIncludeType `qs:"include"` } // NewAppListOptions creates new options to pass to list diff --git a/client/app_usage.go b/client/app_usage.go index a1fd8ee..8e1abbb 100644 --- a/client/app_usage.go +++ b/client/app_usage.go @@ -14,9 +14,8 @@ type AppUsageClient commonClient type AppUsageListOptions struct { *ListOptions - AfterGUID string `qs:"after_guid"` - GUIDs Filter `qs:"guids"` - CreatedAts TimestampFilter `qs:"created_ats"` + AfterGUID string `qs:"after_guid"` + GUIDs Filter `qs:"guids"` } // NewAppUsageOptions creates new options to pass to list diff --git a/client/audit_event.go b/client/audit_event.go index b283798..224f8c3 100644 --- a/client/audit_event.go +++ b/client/audit_event.go @@ -18,8 +18,6 @@ type AuditEventListOptions struct { TargetGUIDs ExclusionFilter `qs:"target_guids"` // list of target guids to filter by OrganizationGUIDs Filter `qs:"organization_guids"` SpaceGUIDs Filter `qs:"space_guids"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewAuditEventListOptions creates new options to pass to list diff --git a/client/buildpack.go b/client/buildpack.go index 826ef68..df0c840 100644 --- a/client/buildpack.go +++ b/client/buildpack.go @@ -15,11 +15,8 @@ type BuildpackClient commonClient type BuildpackListOptions struct { *ListOptions - Names Filter `qs:"names"` // list of buildpack names to filter by - Stacks Filter `qs:"stacks"` // list of stack names to filter by - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + Names Filter `qs:"names"` // list of buildpack names to filter by + Stacks Filter `qs:"stacks"` // list of stack names to filter by } // NewBuildpackListOptions creates new options to pass to list diff --git a/client/deployment.go b/client/deployment.go index 796b758..48984d8 100644 --- a/client/deployment.go +++ b/client/deployment.go @@ -15,13 +15,10 @@ type DeploymentClient commonClient type DeploymentListOptions struct { *ListOptions - AppGUIDs Filter `qs:"app_guids"` - States Filter `qs:"states"` - StatusReasons Filter `qs:"status_reasons"` - StatusValues Filter `qs:"status_values"` - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + AppGUIDs Filter `qs:"app_guids"` + States Filter `qs:"states"` + StatusReasons Filter `qs:"status_reasons"` + StatusValues Filter `qs:"status_values"` } // NewDeploymentListOptions creates new options to pass to list diff --git a/client/domain.go b/client/domain.go index 11cd8b8..2ff272b 100644 --- a/client/domain.go +++ b/client/domain.go @@ -14,12 +14,9 @@ type DomainClient commonClient type DomainListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - Names Filter `qs:"names"` - OrganizationGUIDs Filter `qs:"organization_guids"` - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + GUIDs Filter `qs:"guids"` + Names Filter `qs:"names"` + OrganizationGUIDs Filter `qs:"organization_guids"` } // NewDomainListOptions creates new options to pass to list diff --git a/client/droplet.go b/client/droplet.go index a84bcc4..06a1113 100644 --- a/client/droplet.go +++ b/client/droplet.go @@ -15,14 +15,11 @@ type DropletClient commonClient type DropletListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` // list of droplet guids to filter by - States Filter `qs:"states"` // list of droplet states to filter by - AppGUIDs Filter `qs:"app_guids"` // list of app guids to filter by - SpaceGUIDs Filter `qs:"space_guids"` // list of space guids to filter by - OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + GUIDs Filter `qs:"guids"` // list of droplet guids to filter by + States Filter `qs:"states"` // list of droplet states to filter by + AppGUIDs Filter `qs:"app_guids"` // list of app guids to filter by + SpaceGUIDs Filter `qs:"space_guids"` // list of space guids to filter by + OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by } // NewDropletListOptions creates new options to pass to list diff --git a/client/feature_flag.go b/client/feature_flag.go index 1fad0dc..07ad908 100644 --- a/client/feature_flag.go +++ b/client/feature_flag.go @@ -13,7 +13,6 @@ type FeatureFlagClient commonClient // FeatureFlagListOptions list filters type FeatureFlagListOptions struct { *ListOptions - UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewFeatureFlagListOptions creates new options to pass to list diff --git a/client/isolation_segment.go b/client/isolation_segment.go index d963128..5f238c7 100644 --- a/client/isolation_segment.go +++ b/client/isolation_segment.go @@ -14,12 +14,9 @@ type IsolationSegmentClient commonClient type IsolationSegmentListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - Names Filter `qs:"names"` - OrganizationGUIDs Filter `qs:"organization_guids"` - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + GUIDs Filter `qs:"guids"` + Names Filter `qs:"names"` + OrganizationGUIDs Filter `qs:"organization_guids"` } // NewIsolationSegmentOptions creates new options to pass to list diff --git a/client/organization.go b/client/organization.go index 4424db9..1e7cfb5 100644 --- a/client/organization.go +++ b/client/organization.go @@ -13,11 +13,8 @@ type OrganizationClient commonClient type OrganizationListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` // list of organization guids to filter by - Names Filter `qs:"names"` // list of organization names to filter by - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + GUIDs Filter `qs:"guids"` // list of organization guids to filter by + Names Filter `qs:"names"` // list of organization names to filter by } // NewOrganizationListOptions creates new options to pass to list diff --git a/client/organization_quota.go b/client/organization_quota.go index 9d5c819..b64710b 100644 --- a/client/organization_quota.go +++ b/client/organization_quota.go @@ -14,11 +14,9 @@ type OrganizationQuotaClient commonClient type OrganizationQuotaListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - Names Filter `qs:"names"` - OrganizationGUIDs Filter `qs:"organization_guids"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + GUIDs Filter `qs:"guids"` + Names Filter `qs:"names"` + OrganizationGUIDs Filter `qs:"organization_guids"` } // NewOrganizationQuotaListOptions creates new options to pass to list diff --git a/client/package.go b/client/package.go index 25afd09..5743d1a 100644 --- a/client/package.go +++ b/client/package.go @@ -15,15 +15,12 @@ type PackageClient commonClient type PackageListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` // list of package guids to filter by - States Filter `qs:"states"` // list of package states to filter by - Types Filter `qs:"types"` // list of package types to filter by, docker or bits - AppGUIDs Filter `qs:"app_guids"` // list of app guids to filter by - SpaceGUIDs Filter `qs:"space_guids"` // list of space guids to filter by - OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + GUIDs Filter `qs:"guids"` // list of package guids to filter by + States Filter `qs:"states"` // list of package states to filter by + Types Filter `qs:"types"` // list of package types to filter by, docker or bits + AppGUIDs Filter `qs:"app_guids"` // list of app guids to filter by + SpaceGUIDs Filter `qs:"space_guids"` // list of space guids to filter by + OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by } // NewPackageListOptions creates new options to pass to list diff --git a/client/process.go b/client/process.go index 414f9e3..72bd94f 100644 --- a/client/process.go +++ b/client/process.go @@ -14,14 +14,11 @@ type ProcessClient commonClient type ProcessListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - Types Filter `qs:"types"` - AppGUIDs Filter `qs:"app_guids"` - SpaceGUIDs Filter `qs:"space_guids"` - OrganizationGUIDs Filter `qs:"organization_guids"` - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + GUIDs Filter `qs:"guids"` + Types Filter `qs:"types"` + AppGUIDs Filter `qs:"app_guids"` + SpaceGUIDs Filter `qs:"space_guids"` + OrganizationGUIDs Filter `qs:"organization_guids"` } // NewProcessOptions creates new options to pass to list diff --git a/client/revision.go b/client/revision.go index ab99441..e587602 100644 --- a/client/revision.go +++ b/client/revision.go @@ -14,10 +14,7 @@ type RevisionClient commonClient type RevisionListOptions struct { *ListOptions - Versions Filter `qs:"versions"` - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + Versions Filter `qs:"versions"` } // NewRevisionListOptions creates new options to pass to list diff --git a/client/role.go b/client/role.go index ae5cab3..a0cd66d 100644 --- a/client/role.go +++ b/client/role.go @@ -14,13 +14,11 @@ type RoleClient commonClient type RoleListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` // list of role guids to filter by - Types Filter `qs:"types"` // list of role types to filter by - OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by - SpaceGUIDs Filter `qs:"space_guids"` // list of space guids to filter by - UserGUIDs Filter `qs:"user_guids"` // list of user guids to filter by - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + GUIDs Filter `qs:"guids"` // list of role guids to filter by + Types Filter `qs:"types"` // list of role types to filter by + OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by + SpaceGUIDs Filter `qs:"space_guids"` // list of space guids to filter by + UserGUIDs Filter `qs:"user_guids"` // list of user guids to filter by Include resource.RoleIncludeType `qs:"include"` } diff --git a/client/route.go b/client/route.go index cc641b6..7c297e8 100644 --- a/client/route.go +++ b/client/route.go @@ -20,12 +20,9 @@ type RouteListOptions struct { OrganizationGUIDs Filter `qs:"organization_guids"` ServiceInstanceGUIDs Filter `qs:"service_instance_guids"` - Hosts Filter `qs:"hosts"` - Paths Filter `qs:"paths"` - Ports Filter `qs:"ports"` - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + Hosts Filter `qs:"hosts"` + Paths Filter `qs:"paths"` + Ports Filter `qs:"ports"` Include resource.RouteIncludeType `qs:"include"` } diff --git a/client/security_group.go b/client/security_group.go index 8feb293..55cae6e 100644 --- a/client/security_group.go +++ b/client/security_group.go @@ -21,9 +21,6 @@ type SecurityGroupListOptions struct { GloballyEnabledRunning *bool `qs:"globally_enabled_running"` // If true, only include the security groups that are enabled for running GloballyEnabledStaging *bool `qs:"globally_enabled_staging"` // If true, only include the security groups that are enabled for staging - - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewSecurityGroupListOptions creates new options to pass to list diff --git a/client/service_broker.go b/client/service_broker.go index 2a4dad0..734aee4 100644 --- a/client/service_broker.go +++ b/client/service_broker.go @@ -14,11 +14,8 @@ type ServiceBrokerClient commonClient type ServiceBrokerListOptions struct { *ListOptions - SpaceGUIDs Filter `qs:"space_guids"` - Names Filter `qs:"names"` - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + SpaceGUIDs Filter `qs:"space_guids"` + Names Filter `qs:"names"` } // NewServiceBrokerListOptions creates new options to pass to list diff --git a/client/service_credential_binding.go b/client/service_credential_binding.go index 6cea3bc..e1ac790 100644 --- a/client/service_credential_binding.go +++ b/client/service_credential_binding.go @@ -26,10 +26,7 @@ type ServiceCredentialBindingListOptions struct { Type Filter `qs:"type"` // list of service credential binding types to filter by, app or key GUIDs Filter `qs:"guids"` // list of service route binding guids to filter by - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` - Include resource.ServiceCredentialBindingIncludeType `qs:"include"` + Include resource.ServiceCredentialBindingIncludeType `qs:"include"` } // NewServiceCredentialBindingListOptions creates new options to pass to list diff --git a/client/service_instance.go b/client/service_instance.go index bc3578d..a32705f 100644 --- a/client/service_instance.go +++ b/client/service_instance.go @@ -22,10 +22,6 @@ type ServiceInstanceListOptions struct { OrganizationGUIDs Filter `qs:"organization_guids"` ServicePlanGUIDs Filter `qs:"service_plan_guids"` ServicePlanNames Filter `qs:"service_plan_names"` - - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewServiceInstanceListOptions creates new options to pass to list diff --git a/client/service_offering.go b/client/service_offering.go index 8635544..3d55622 100644 --- a/client/service_offering.go +++ b/client/service_offering.go @@ -14,15 +14,12 @@ type ServiceOfferingClient commonClient type ServiceOfferingListOptions struct { *ListOptions - Names Filter `qs:"names"` - ServiceBrokerGUIDs Filter `qs:"service_broker_guids"` - ServiceBrokerNames Filter `qs:"service_broker_names"` - SpaceGUIDs Filter `qs:"space_guids"` - OrganizationGUIDs Filter `qs:"organization_guids"` - Available *bool `qs:"available"` - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + Names Filter `qs:"names"` + ServiceBrokerGUIDs Filter `qs:"service_broker_guids"` + ServiceBrokerNames Filter `qs:"service_broker_names"` + SpaceGUIDs Filter `qs:"space_guids"` + OrganizationGUIDs Filter `qs:"organization_guids"` + Available *bool `qs:"available"` } // NewServiceOfferingListOptions creates new options to pass to list diff --git a/client/service_plan.go b/client/service_plan.go index 76d9142..671735c 100644 --- a/client/service_plan.go +++ b/client/service_plan.go @@ -15,18 +15,16 @@ type ServicePlanClient commonClient type ServicePlanListOptions struct { *ListOptions - Names Filter `qs:"names"` - BrokerCatalogIDs Filter `qs:"broker_catalog_ids"` - SpaceGUIDs Filter `qs:"space_guids"` - OrganizationGUIDs Filter `qs:"organization_guids"` - ServiceBrokerGUIDs Filter `qs:"service_broker_guids"` - ServiceBrokerNames Filter `qs:"service_broker_names"` - ServiceOfferingGUIDs Filter `qs:"service_offering_guids"` - ServiceOfferingNames Filter `qs:"service_offering_names"` - ServiceInstanceGUIDs Filter `qs:"service_instance_guids"` - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + Names Filter `qs:"names"` + BrokerCatalogIDs Filter `qs:"broker_catalog_ids"` + SpaceGUIDs Filter `qs:"space_guids"` + OrganizationGUIDs Filter `qs:"organization_guids"` + ServiceBrokerGUIDs Filter `qs:"service_broker_guids"` + ServiceBrokerNames Filter `qs:"service_broker_names"` + ServiceOfferingGUIDs Filter `qs:"service_offering_guids"` + ServiceOfferingNames Filter `qs:"service_offering_names"` + ServiceInstanceGUIDs Filter `qs:"service_instance_guids"` + Available *bool `qs:"available"` Include resource.ServicePlanIncludeType `qs:"include"` } diff --git a/client/service_route_binding.go b/client/service_route_binding.go index 629b3c5..b6d0603 100644 --- a/client/service_route_binding.go +++ b/client/service_route_binding.go @@ -14,13 +14,10 @@ type ServiceRouteBindingClient commonClient type ServiceRouteBindingListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - RouteGUIDs Filter `qs:"route_guids"` - ServiceInstanceGUIDs Filter `qs:"service_instance_guids"` - ServiceInstanceNames Filter `qs:"service_instance_names"` - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + GUIDs Filter `qs:"guids"` + RouteGUIDs Filter `qs:"route_guids"` + ServiceInstanceGUIDs Filter `qs:"service_instance_guids"` + ServiceInstanceNames Filter `qs:"service_instance_names"` Include resource.ServiceRouteBindingIncludeType `qs:"include"` } diff --git a/client/service_usage.go b/client/service_usage.go index cec3b52..d7d02f1 100644 --- a/client/service_usage.go +++ b/client/service_usage.go @@ -14,12 +14,10 @@ type ServiceUsageClient commonClient type ServiceUsageListOptions struct { *ListOptions - AfterGUID string `qs:"after_guid"` - GUIDs Filter `qs:"guids"` - ServiceInstanceTypes Filter `qs:"service_instance_types"` - ServiceOfferingGUIDs Filter `qs:"service_offering_guids"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + AfterGUID string `qs:"after_guid"` + GUIDs Filter `qs:"guids"` + ServiceInstanceTypes Filter `qs:"service_instance_types"` + ServiceOfferingGUIDs Filter `qs:"service_offering_guids"` } // NewServiceUsageOptions creates new options to pass to list diff --git a/client/sidecar.go b/client/sidecar.go index f3fcc38..8520c17 100644 --- a/client/sidecar.go +++ b/client/sidecar.go @@ -13,8 +13,6 @@ type SidecarClient commonClient // SidecarListOptions list filters type SidecarListOptions struct { *ListOptions - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewSidecarListOptions creates new options to pass to list diff --git a/client/space.go b/client/space.go index e82e9d7..9840fd9 100644 --- a/client/space.go +++ b/client/space.go @@ -14,12 +14,9 @@ type SpaceClient commonClient type SpaceListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` // list of space guids to filter by - Names Filter `qs:"names"` // list of space names to filter by - OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + GUIDs Filter `qs:"guids"` // list of space guids to filter by + Names Filter `qs:"names"` // list of space names to filter by + OrganizationGUIDs Filter `qs:"organization_guids"` // list of organization guids to filter by Include resource.SpaceIncludeType `qs:"include"` // include parent objects if any } diff --git a/client/space_quota.go b/client/space_quota.go index e8b86ea..9c33429 100644 --- a/client/space_quota.go +++ b/client/space_quota.go @@ -14,12 +14,10 @@ type SpaceQuotaClient commonClient type SpaceQuotaListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - Names Filter `qs:"names"` - OrganizationGUIDs Filter `qs:"organization_guids"` - SpaceGUIDs Filter `qs:"space_guids"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + GUIDs Filter `qs:"guids"` + Names Filter `qs:"names"` + OrganizationGUIDs Filter `qs:"organization_guids"` + SpaceGUIDs Filter `qs:"space_guids"` } // NewSpaceQuotaListOptions creates new options to pass to list diff --git a/client/stack.go b/client/stack.go index 8ccbe5f..1671f6d 100644 --- a/client/stack.go +++ b/client/stack.go @@ -14,11 +14,8 @@ type StackClient commonClient type StackListOptions struct { *ListOptions - Names Filter `qs:"names"` // list of stack names to filter by - Default *bool `qs:"default"` - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + Names Filter `qs:"names"` // list of stack names to filter by + Default *bool `qs:"default"` } // NewStackListOptions creates new options to pass to list diff --git a/client/task.go b/client/task.go index cc9fbc1..150f376 100644 --- a/client/task.go +++ b/client/task.go @@ -14,15 +14,12 @@ type TaskClient commonClient type TaskListOptions struct { *ListOptions - GUIDs Filter `qs:"guids"` - Names Filter `qs:"names"` - States Filter `qs:"states"` - AppGUIDs Filter `qs:"app_guids"` - SpaceGUIDs Filter `qs:"space_guids"` - OrganizationGUIDs Filter `qs:"organization_guids"` - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` + GUIDs Filter `qs:"guids"` + Names Filter `qs:"names"` + States Filter `qs:"states"` + AppGUIDs Filter `qs:"app_guids"` + SpaceGUIDs Filter `qs:"space_guids"` + OrganizationGUIDs Filter `qs:"organization_guids"` } // NewTaskListOptions creates new options to pass to list diff --git a/client/user.go b/client/user.go index 08c452a..c5da731 100644 --- a/client/user.go +++ b/client/user.go @@ -28,10 +28,6 @@ type UserListOptions struct { // UAA have the origin “uaa”; users authenticated by an LDAP provider have the // origin ldap when filtering by origins, usernames must be included Origins Filter `qs:"origins"` - - LabelSel LabelSelector `qs:"label_selector"` - CreatedAts TimestampFilter `qs:"created_ats"` - UpdatedAts TimestampFilter `qs:"updated_ats"` } // NewUserListOptions creates new options to pass to list