Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v7] upgrade module to v7 standard go version workflow #3261

Open
wants to merge 9 commits into
base: v7
Choose a base branch
from
Open

[v7] upgrade module to v7 standard go version workflow #3261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
425f941
upgrade module to v7 standard go version workflow
jcvrabo Oct 21, 2024
537bc3d
revert import cleanup from IDE tidying up
jcvrabo Oct 21, 2024
d9a7b6b
Merge branch 'v7' into v7
jcvrabo Oct 22, 2024
e3917c3
Merge branch 'v7' into v7
jcvrabo Oct 23, 2024
a0decda
Merge branch 'v7' into v7
jcvrabo Oct 30, 2024
43edf81
Merge remote-tracking branch 'upstream/v7' into v7
jcvrabo Dec 23, 2024
3fcb422
merge cfnetworking updates from main and regenerate fakes with new pa…
jcvrabo Jan 6, 2025
e430330
Merge remote-tracking branch 'upstream/v7' into v7
jcvrabo Jan 7, 2025
e6dead5
refresh go.sum with upstream dependency updates
jcvrabo Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/license/CF_NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ Copyright (c) 2015-Present CloudFoundry.org Foundation, Inc. All Rights Reserved
Copyright (c) 2014-2015 Pivotal Software, Inc.
and is licensed under the Apache License, Version 2.0.

This product includes software from https://github.com/code.cloudfoundry.org/cli/tree/main/vendor/code.cloudfoundry.org/ykk that is:
This product includes software from https://github.com/code.cloudfoundry.org/cli/v7/tree/main/vendor/code.cloudfoundry.org/ykk that is:
Copyright (c) 2015-Present CloudFoundry.org Foundation, Inc. All Rights Reserved.
and is licensed under the Apache License, Version 2.0.

This product includes software from https://github.com/code.cloudfoundry.org/cli/tree/main/vendor/code.cloudfoundry.org/cfnetworking-cli-api that is:
This product includes software from https://github.com/code.cloudfoundry.org/cli/v7/tree/main/vendor/code.cloudfoundry.org/cli/v7/api that is:
Copyright (c) 2016-Present CloudFoundry.org Foundation, Inc. All Rights Reserved.
and is licensed under the Apache License, Version 2.0.

Expand Down
4 changes: 2 additions & 2 deletions .github/win/integrations/integration-tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ $Env:CF_DIAL_TIMEOUT=15
Import-Certificate -Filepath "$pwd\$CF_INT_NAME.router.ca" -CertStoreLocation "cert:\LocalMachine\root"

New-Item "go/src/code.cloudfoundry.org" -Type Directory
New-Item -ItemType SymbolicLink -Path "$pwd/go/src/code.cloudfoundry.org/cli" -Target "$pwd"
New-Item -ItemType SymbolicLink -Path "$pwd/go/src/code.cloudfoundry.org/cli/v7" -Target "$pwd"

cd go/src/code.cloudfoundry.org/cli
cd go/src/code.cloudfoundry.org/cli/v7
go install github.com/akavel/[email protected]

Get-Command make
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-update-repos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ jobs:
cat <<EOF > cf-cli@${VERSION_MAJOR}.rb
class CfCliAT${VERSION_MAJOR} < Formula
desc "Cloud Foundry CLI"
homepage "https://code.cloudfoundry.org/cli"
homepage "https://code.cloudfoundry.org/cli/v7"
version "${VERSION_BUILD}"

if OS.mac?
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ 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 \
-X code.cloudfoundry.org/cli/version.binarySHA=$(CF_BUILD_SHA) \
-X code.cloudfoundry.org/cli/version.binaryBuildDate=$(CF_BUILD_DATE)
-X code.cloudfoundry.org/cli/v7/version.binarySHA=$(CF_BUILD_SHA) \
-X code.cloudfoundry.org/cli/v7/version.binaryBuildDate=$(CF_BUILD_DATE)
LD_FLAGS =$(LD_FLAGS_COMMON) \
-X code.cloudfoundry.org/cli/version.binaryVersion=$(CF_BUILD_VERSION)
-X code.cloudfoundry.org/cli/v7/version.binaryVersion=$(CF_BUILD_VERSION)
LD_FLAGS_LINUX = -extldflags \"-static\" $(LD_FLAGS)
REQUIRED_FOR_STATIC_BINARY =-a -tags "netgo" -installsuffix netgo
GOSRC = $(shell find . -name "*.go" ! -name "*test.go" ! -name "*fake*" ! -path "./integration/*")
Expand Down
2 changes: 1 addition & 1 deletion actor/actionerror/duplicate_service_error_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package actionerror_test

import (
"code.cloudfoundry.org/cli/actor/actionerror"
"code.cloudfoundry.org/cli/v7/actor/actionerror"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion actor/actionerror/duplicate_service_plan_error_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package actionerror_test

import (
"code.cloudfoundry.org/cli/actor/actionerror"
"code.cloudfoundry.org/cli/v7/actor/actionerror"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion actor/actionerror/enrich_api_errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package actionerror

import "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror"
import "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror"

func EnrichAPIErrors(e error) error {
switch err := e.(type) {
Expand Down
4 changes: 2 additions & 2 deletions actor/actionerror/enrich_api_errors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package actionerror_test
import (
"errors"

"code.cloudfoundry.org/cli/api/cloudcontroller/ccerror"
"code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror"

"code.cloudfoundry.org/cli/actor/actionerror"
"code.cloudfoundry.org/cli/v7/actor/actionerror"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion actor/actionerror/package_not_found_in_app_error_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package actionerror_test

import (
"code.cloudfoundry.org/cli/actor/actionerror"
"code.cloudfoundry.org/cli/v7/actor/actionerror"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion actor/actionerror/route_not_found_error_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package actionerror_test

import (
"code.cloudfoundry.org/cli/actor/actionerror"
"code.cloudfoundry.org/cli/v7/actor/actionerror"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion actor/actionerror/security_group_not_bound_error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package actionerror
import (
"fmt"

"code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant"
"code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant"
)

// SecurityGroupNotBoundError is returned when a requested security group is
Expand Down
2 changes: 1 addition & 1 deletion actor/actionerror/security_group_not_bound_to_space_error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package actionerror
import (
"fmt"

"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant"
"code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant"
)

// SecurityGroupNotBoundToSpaceError is returned when a requested security group is
Expand Down
2 changes: 1 addition & 1 deletion actor/actionerror/service_not_found_error_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package actionerror_test

import (
"code.cloudfoundry.org/cli/actor/actionerror"
"code.cloudfoundry.org/cli/v7/actor/actionerror"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion actor/actionerror/service_offering_name_ambiguity_error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package actionerror

import "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror"
import "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror"

type ServiceOfferingNameAmbiguityError struct {
ccerror.ServiceOfferingNameAmbiguityError
Expand Down
2 changes: 1 addition & 1 deletion actor/actionerror/service_plan_not_found_error_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package actionerror_test
import (
"fmt"

"code.cloudfoundry.org/cli/actor/actionerror"
"code.cloudfoundry.org/cli/v7/actor/actionerror"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion actor/actionerror/space_not_found_error_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package actionerror_test

import (
"code.cloudfoundry.org/cli/actor/actionerror"
"code.cloudfoundry.org/cli/v7/actor/actionerror"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion actor/actionerror/user_not_found.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package actionerror
import (
"fmt"

"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant"
"code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant"
)

// UserNotFoundError is an error wrapper that represents the case
Expand Down
34 changes: 19 additions & 15 deletions actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 14 additions & 11 deletions actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions actor/cfnetworkingaction/cloud_controller_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cfnetworkingaction

import (
"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
"code.cloudfoundry.org/cli/resources"
"code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3"
"code.cloudfoundry.org/cli/v7/resources"
)

//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient
Expand Down
2 changes: 1 addition & 1 deletion actor/cfnetworkingaction/networking_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package cfnetworkingaction

import "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1"
import "code.cloudfoundry.org/cli/v7/api/cfnetworking/cfnetv1"

//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . NetworkingClient

Expand Down
12 changes: 6 additions & 6 deletions actor/cfnetworkingaction/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package cfnetworkingaction

import (
"code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1"
"code.cloudfoundry.org/cli/actor/actionerror"
"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant"
"code.cloudfoundry.org/cli/resources"
"code.cloudfoundry.org/cli/util/batcher"
"code.cloudfoundry.org/cli/v7/actor/actionerror"
"code.cloudfoundry.org/cli/v7/api/cfnetworking/cfnetv1"
"code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3"
"code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant"
"code.cloudfoundry.org/cli/v7/resources"
"code.cloudfoundry.org/cli/v7/util/batcher"
)

type Policy struct {
Expand Down
18 changes: 9 additions & 9 deletions actor/cfnetworkingaction/policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import (
"errors"
"fmt"

"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant"
"code.cloudfoundry.org/cli/resources"
"code.cloudfoundry.org/cli/util/batcher"

"code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1"
"code.cloudfoundry.org/cli/actor/actionerror"
. "code.cloudfoundry.org/cli/actor/cfnetworkingaction"
"code.cloudfoundry.org/cli/actor/cfnetworkingaction/cfnetworkingactionfakes"
"code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3"
"code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant"
"code.cloudfoundry.org/cli/v7/resources"
"code.cloudfoundry.org/cli/v7/util/batcher"

"code.cloudfoundry.org/cli/v7/actor/actionerror"
. "code.cloudfoundry.org/cli/v7/actor/cfnetworkingaction"
"code.cloudfoundry.org/cli/v7/actor/cfnetworkingaction/cfnetworkingactionfakes"
"code.cloudfoundry.org/cli/v7/api/cfnetworking/cfnetv1"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)
Expand Down
Loading
Loading