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

[main] upgrade module to v9 standard go version workflow #3260

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

[main] upgrade module to v9 standard go version workflow #3260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ecf9cf0
update module versioning to standard go format with /v8 suffix
jcvrabo Oct 16, 2024
7d96527
support 4 character timezone abbreviations
jcvrabo Oct 18, 2024
7a9526f
have the fake config not null to return the legacy uaa client
jcvrabo Oct 18, 2024
5c485a9
accommodate the extra config calls for the legacy uaa client init
jcvrabo Oct 18, 2024
698509c
upgrade module to v9 standard go version workflow
jcvrabo Oct 21, 2024
87c5248
update make to properly update the v9 module version variables
jcvrabo Oct 21, 2024
828c8b5
Merge branch 'main' into main
jcvrabo Oct 22, 2024
a22e05d
Merge branch 'main' into main
jcvrabo Oct 30, 2024
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
  •  
  •  
  •  
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 @@ LC_ALL = "en_US.UTF-8"
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/v9/version.binarySHA=$(CF_BUILD_SHA) \
-X code.cloudfoundry.org/cli/v9/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/v9/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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,6 @@ information follow:
* [The CF CLI plugin development guide](https://github.com/cloudfoundry/cli/tree/main/plugin/plugin_examples)
* [The official plugins repository](https://plugins.cloudfoundry.org/)

When importing the plugin code use `import "code.cloudfoundry.org/cli/plugin"`.
When importing the plugin code use `import "code.cloudfoundry.org/cli/v9/plugin"`.
Older plugins that import `github.com/cloudfoundry/cli/plugin` will still work
as long they vendor the plugins directory.
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/v9/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/v9/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/v9/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/v9/api/cloudcontroller/ccerror"

"code.cloudfoundry.org/cli/actor/actionerror"
"code.cloudfoundry.org/cli/v9/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/v9/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/v9/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_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/v9/api/cloudcontroller/ccv3/constant"
)

// SecurityGroupNotBoundToSpaceError is returned when a requested security group is
Expand Down
2 changes: 1 addition & 1 deletion actor/actionerror/service_instance_type_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/resources"
"code.cloudfoundry.org/cli/v9/resources"
)

type ServiceInstanceTypeError struct {
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/v9/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/v9/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/v9/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/v9/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/v9/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.

23 changes: 13 additions & 10 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/v9/api/cloudcontroller/ccv3"
"code.cloudfoundry.org/cli/v9/resources"
)

//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient
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
Expand Up @@ -2,12 +2,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/util/lookuptable"
"code.cloudfoundry.org/cli/v9/actor/actionerror"
"code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3"
"code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant"
"code.cloudfoundry.org/cli/v9/resources"
"code.cloudfoundry.org/cli/v9/util/batcher"
"code.cloudfoundry.org/cli/v9/util/lookuptable"
)

type Policy struct {
Expand Down
14 changes: 7 additions & 7 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/cli/v9/api/cloudcontroller/ccv3"
"code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant"
"code.cloudfoundry.org/cli/v9/resources"
"code.cloudfoundry.org/cli/v9/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/v9/actor/actionerror"
. "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction"
"code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction/cfnetworkingactionfakes"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion actor/pluginaction/checksum.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pluginaction

import "code.cloudfoundry.org/cli/util/configv3"
import "code.cloudfoundry.org/cli/v9/util/configv3"

func (actor Actor) ValidateFileChecksum(path string, checksum string) bool {
plugin := configv3.Plugin{Location: path}
Expand Down
4 changes: 2 additions & 2 deletions actor/pluginaction/checksum_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package pluginaction_test
import (
"os"

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

import "code.cloudfoundry.org/cli/util/configv3"
import "code.cloudfoundry.org/cli/v9/util/configv3"

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

Expand Down
8 changes: 4 additions & 4 deletions actor/pluginaction/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (

"github.com/blang/semver/v4"

"code.cloudfoundry.org/cli/actor/actionerror"
"code.cloudfoundry.org/cli/api/plugin"
"code.cloudfoundry.org/cli/util/configv3"
"code.cloudfoundry.org/cli/util/generic"
"code.cloudfoundry.org/cli/v9/actor/actionerror"
"code.cloudfoundry.org/cli/v9/api/plugin"
"code.cloudfoundry.org/cli/v9/util/configv3"
"code.cloudfoundry.org/cli/v9/util/generic"
"code.cloudfoundry.org/gofileutils/fileutils"
)

Expand Down
Loading
Loading