Merge branch 'main' into dependabot/go_modules/dependencies-e98c3f305f

.github/workflows/tests-integration-reusable.yml

@@ -50,6 +50,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         ref: ${{inputs.gitRef}}
+        fetch-depth: 0
 
     - name: Checkout cf-acceptance-tests
       if: ${{ inputs.name == 'cats' }}

.github/workflows/tests-integration.yml

@@ -104,6 +104,7 @@ jobs:
         if: ${{ inputs.run_unit_tests || inputs.run_unit_tests == '' }}
         with:
           ref: ${{needs.get-sha.outputs.gitRef}}
+          fetch-depth: 0
       - name: Set Up Go
         uses: actions/setup-go@v5
         if: ${{ inputs.run_unit_tests || inputs.run_unit_tests == '' }}

.grype.yaml

@@ -1,2 +1,3 @@
 exclude:
   - './integration/assets'
+  - './fixtures/applications'

Makefile

@@ -4,6 +4,9 @@ FLAKE_ATTEMPTS ?=5
 PACKAGES ?= api actor command types util version integration/helpers
 LC_ALL = "en_US.UTF-8"
 
+## TODO: Change when new version is released
+CF_BUILD_VERSION ?= v9.0.0
+#CF_BUILD_VERSION ?= $$(git describe --tags --abbrev=0)
 CF_BUILD_SHA ?= $$(git rev-parse --short HEAD)
 CF_BUILD_DATE ?= $$(date -u +"%Y-%m-%d")
 LD_FLAGS_COMMON=-w -s \

api/cloudcontroller/ccv3/included_resources.go

@@ -12,3 +12,14 @@ type IncludedResources struct {
 	ServicePlans     []resources.ServicePlan     `json:"service_plans,omitempty"`
 	Apps             []resources.Application     `json:"apps,omitempty"`
 }
+
+func (i *IncludedResources) Merge(resources IncludedResources) {
+	i.Apps = append(i.Apps, resources.Apps...)
+	i.Users = append(i.Users, resources.Users...)
+	i.Organizations = append(i.Organizations, resources.Organizations...)
+	i.Spaces = append(i.Spaces, resources.Spaces...)
+	i.ServiceBrokers = append(i.ServiceBrokers, resources.ServiceBrokers...)
+	i.ServiceInstances = append(i.ServiceInstances, resources.ServiceInstances...)
+	i.ServiceOfferings = append(i.ServiceOfferings, resources.ServiceOfferings...)
+	i.ServicePlans = append(i.ServicePlans, resources.ServicePlans...)
+}

api/cloudcontroller/ccv3/paginate.go

@@ -17,14 +17,7 @@ func (requester RealRequester) paginate(request *cloudcontroller.Request, obj in
 			return IncludedResources{}, fullWarningsList, err
 		}
 
-		includes.Apps = append(includes.Apps, wrapper.IncludedResources.Apps...)
-		includes.Users = append(includes.Users, wrapper.IncludedResources.Users...)
-		includes.Organizations = append(includes.Organizations, wrapper.IncludedResources.Organizations...)
-		includes.Spaces = append(includes.Spaces, wrapper.IncludedResources.Spaces...)
-		includes.ServiceBrokers = append(includes.ServiceBrokers, wrapper.IncludedResources.ServiceBrokers...)
-		includes.ServiceInstances = append(includes.ServiceInstances, wrapper.IncludedResources.ServiceInstances...)
-		includes.ServiceOfferings = append(includes.ServiceOfferings, wrapper.IncludedResources.ServiceOfferings...)
-		includes.ServicePlans = append(includes.ServicePlans, wrapper.IncludedResources.ServicePlans...)
+		includes.Merge(wrapper.IncludedResources)
 
 		if specificPage || wrapper.NextPage() == "" {
 			break

api/cloudcontroller/ccv3/task.go

@@ -25,6 +25,16 @@ func (client *Client) CreateApplicationTask(appGUID string, task resources.Task)
 func (client *Client) GetApplicationTasks(appGUID string, query ...Query) ([]resources.Task, Warnings, error) {
 	var tasks []resources.Task
 
+	foundPerPageQuery := false
+	for _, keyVal := range query {
+		if keyVal.Key == PerPage {
+			foundPerPageQuery = true
+		}
+	}
+	if !foundPerPageQuery {
+		query = append(query, Query{Key: PerPage, Values: []string{MaxPerPage}})
+	}
+
 	_, warnings, err := client.MakeListRequest(RequestParams{
 		RequestName:  internal.GetApplicationTasksRequest,
 		URIParams:    internal.Params{"app_guid": appGUID},

api/cloudcontroller/ccv3/task_test.go

@@ -190,9 +190,18 @@ var _ = Describe("Task", func() {
 			warnings   Warnings
 			executeErr error
 		)
+		BeforeEach(func() {
+			// This is required because ginkgo does not instantiate variable per test context so the tests pollute the
+			// variables for the next tests.
+			submitQuery = Query{}
+		})
 
 		JustBeforeEach(func() {
-			tasks, warnings, executeErr = client.GetApplicationTasks("some-app-guid", submitQuery)
+			if submitQuery.Key == "" {
+				tasks, warnings, executeErr = client.GetApplicationTasks("some-app-guid")
+			} else {
+				tasks, warnings, executeErr = client.GetApplicationTasks("some-app-guid", submitQuery)
+			}
 		})
 
 		When("the application exists", func() {
@@ -201,7 +210,8 @@ var _ = Describe("Task", func() {
 					"pagination": {
 						"next": {
 							"href": "%s/v3/apps/some-app-guid/tasks?per_page=2&page=2"
-						}
+						},
+						"total_results": 3
 					},
 					"resources": [
 						{
@@ -245,7 +255,7 @@ var _ = Describe("Task", func() {
 				)
 				server.AppendHandlers(
 					CombineHandlers(
-						VerifyRequest(http.MethodGet, "/v3/apps/some-app-guid/tasks", "per_page=2&page=2"),
+						VerifyRequest(http.MethodGet, "/v3/apps/some-app-guid/tasks", "page=2&per_page=2"),
 						RespondWith(http.StatusOK, response2, http.Header{"X-Cf-Warnings": {"warning-2"}}),
 					),
 				)
@@ -353,6 +363,154 @@ var _ = Describe("Task", func() {
 				Expect(warnings).To(ConsistOf("warning"))
 			})
 		})
+
+		When("the application has 10000 tasks", func() {
+			BeforeEach(func() {
+				response2 := fmt.Sprintf(`{
+					"pagination": {
+						"next": {
+							"href": "%s/v3/apps/some-app-guid/tasks?per_page=5000&page=2"
+						},
+						"total_results": 10000
+					},
+					"resources": [
+						{
+							"guid": "task-1-guid",
+							"sequence_id": 1,
+							"name": "task-1",
+							"command": "some-command",
+							"state": "SUCCEEDED",
+							"created_at": "2016-11-07T05:59:01Z"
+						},
+						{
+							"guid": "task-2-guid",
+							"sequence_id": 2,
+							"name": "task-2",
+							"command": "some-command",
+							"state": "FAILED",
+							"created_at": "2016-11-07T06:59:01Z"
+						}
+					]
+				}`, server.URL())
+				response3 := fmt.Sprintf(`{
+					"pagination": {
+						"total_results": 10000
+					},
+					"resources": [
+						{
+							"guid": "task-1-guid",
+							"sequence_id": 1,
+							"name": "task-1",
+							"command": "some-command",
+							"state": "SUCCEEDED",
+							"created_at": "2016-11-07T05:59:01Z"
+						},
+						{
+							"guid": "task-2-guid",
+							"sequence_id": 2,
+							"name": "task-2",
+							"command": "some-command",
+							"state": "FAILED",
+							"created_at": "2016-11-07T06:59:01Z"
+						}
+					]
+				}`)
+
+				server.AppendHandlers(
+					CombineHandlers(
+						VerifyRequest(http.MethodGet, "/v3/apps/some-app-guid/tasks", "per_page=5000"),
+						RespondWith(http.StatusOK, response2, http.Header{"X-Cf-Warnings": {"warning-2"}}),
+					),
+				)
+				server.AppendHandlers(
+					CombineHandlers(
+						VerifyRequest(http.MethodGet, "/v3/apps/some-app-guid/tasks", "page=2&per_page=5000"),
+						RespondWith(http.StatusOK, response3, http.Header{"X-Cf-Warnings": {"warning-2"}}),
+					),
+				)
+			})
+
+			It("calls CAPI 2 times", func() {
+				Expect(executeErr).ToNot(HaveOccurred())
+			})
+		})
+
+		When("the application has 4999 tasks", func() {
+			BeforeEach(func() {
+				response2 := fmt.Sprintf(`{
+					"pagination": {
+						"total_results": 4999
+					},
+					"resources": [
+						{
+							"guid": "task-1-guid",
+							"sequence_id": 1,
+							"name": "task-1",
+							"command": "some-command",
+							"state": "SUCCEEDED",
+							"created_at": "2016-11-07T05:59:01Z"
+						},
+						{
+							"guid": "task-2-guid",
+							"sequence_id": 2,
+							"name": "task-2",
+							"command": "some-command",
+							"state": "FAILED",
+							"created_at": "2016-11-07T06:59:01Z"
+						}
+					]
+				}`)
+				server.AppendHandlers(
+					CombineHandlers(
+						VerifyRequest(http.MethodGet, "/v3/apps/some-app-guid/tasks", "per_page=5000"),
+						RespondWith(http.StatusOK, response2, http.Header{"X-Cf-Warnings": {"warning-2"}}),
+					),
+				)
+			})
+
+			It("calls CAPI 2 times", func() {
+				Expect(executeErr).ToNot(HaveOccurred())
+			})
+		})
+
+		When("the application has 2 tasks", func() {
+			BeforeEach(func() {
+				response1 := fmt.Sprintf(`{
+					"pagination": {
+						"total_results": 2
+					},
+					"resources": [
+						{
+							"guid": "task-1-guid",
+							"sequence_id": 1,
+							"name": "task-1",
+							"command": "some-command",
+							"state": "SUCCEEDED",
+							"created_at": "2016-11-07T05:59:01Z"
+						},
+						{
+							"guid": "task-2-guid",
+							"sequence_id": 2,
+							"name": "task-2",
+							"command": "some-command",
+							"state": "FAILED",
+							"created_at": "2016-11-07T06:59:01Z"
+						}
+					]
+				}`)
+
+				server.AppendHandlers(
+					CombineHandlers(
+						VerifyRequest(http.MethodGet, "/v3/apps/some-app-guid/tasks"),
+						RespondWith(http.StatusAccepted, response1, http.Header{"X-Cf-Warnings": {"warning"}}),
+					),
+				)
+			})
+
+			It("calls CAPI 1 time", func() {
+				Expect(executeErr).ToNot(HaveOccurred())
+			})
+		})
 	})
 
 	Describe("UpdateTaskCancel", func() {

version/version.go

@@ -1,6 +1,10 @@
 package version
 
-import "github.com/blang/semver/v4"
+import (
+	"strings"
+
+	"github.com/blang/semver/v4"
+)
 
 const DefaultVersion = "0.0.0-unknown-version"
 
@@ -11,6 +15,8 @@ var (
 )
 
 func VersionString() string {
+	// Remove the "v" prefix from the binary in case it is present
+	binaryVersion = strings.TrimPrefix(binaryVersion, "v")
 	versionString, err := semver.Make(binaryVersion)
 	if err != nil {
 		versionString = semver.MustParse(DefaultVersion)