Go119 bump (cloudfoundry#1) (cloudfoundry#2373)

Upgrades go from 1.18 to 1.19

Co-authored-by: Juan Diego Gonzalez <gojuan@vmware.com>

.github/workflows/cf-env-setup.yml

@@ -137,24 +137,10 @@ jobs:
 
           # Copy Ops files
           mkdir ops-files
-          cp cf-deployment/operations/scale-to-one-az.yml ops-files/
           cp cf-deployment/operations/test/add-persistent-isolation-segment-diego-cell.yml ops-files/
-          cp cf-deployment/operations/use-compiled-releases.yml ops-files/
-          cp cf-deployment/operations/use-internal-lookup-for-route-services.yml ops-files/
-          cp cli-ci/ci/infrastructure/operations/add-dummy-windows-stack.yml ops-files/
           cp cli-ci/ci/infrastructure/operations/add-oidc-provider.yml ops-files/
           cp cli-ci/ci/infrastructure/operations/add-uaa-client-credentials.yml ops-files/
-          cp cli-ci/ci/infrastructure/operations/add-uaa-client-cf-custom.yml ops-files/
-          cp cli-ci/ci/infrastructure/operations/adjust-user-retry-attempts.yml ops-files/
-          cp cli-ci/ci/infrastructure/operations/cli-isolation-cell-overrides.yml ops-files/
-          cp cli-ci/ci/infrastructure/operations/default-app-memory.yml ops-files/
-          cp cli-ci/ci/infrastructure/operations/diego-cell-instances.yml ops-files/
-          cp cli-ci/ci/infrastructure/operations/doppler-instances.yml ops-files/
-          cp cli-ci/ci/infrastructure/operations/enable-v3-deployments-endpoint.yml ops-files/
-          cp cli-ci/ci/infrastructure/operations/give-cf-admin-clients-read-scope.yml ops-files/
-          cp cli-ci/ci/infrastructure/operations/reduce-async-service-polling.yml ops-files/
-          cp cli-ci/ci/infrastructure/operations/skip-ssl-override.yml ops-files/
-          cp cli-ci/ci/infrastructure/operations/uaa-vm_type-override.yml ops-files/
+
           # Deletes CF-D
           eval "$(bbl print-env --metadata-file metadata.json)"
           bosh -d cf delete-deployment -n
@@ -182,21 +168,6 @@ jobs:
           export BOSH_LITE=false
           export BBL_JSON_CONFIG=""
           export OPS_FILES="add-persistent-isolation-segment-diego-cell.yml \
-          use-compiled-releases.yml \
-          cli-isolation-cell-overrides.yml \
-          default-app-memory.yml \
-          skip-ssl-override.yml \
-          scale-to-one-az.yml \
-          diego-cell-instances.yml \
-          doppler-instances.yml \
-          uaa-vm_type-override.yml \
           add-uaa-client-credentials.yml \
-          add-dummy-windows-stack.yml \
-          reduce-async-service-polling.yml \
-          add-oidc-provider.yml \
-          adjust-user-retry-attempts.yml \
-          enable-v3-deployments-endpoint.yml \
-          give-cf-admin-clients-read-scope.yml \
-          add-uaa-client-cf-custom.yml \
-          use-internal-lookup-for-route-services.yml"
+          add-oidc-provider.yml"
           ./cf-deployment-concourse-tasks/bosh-deploy/task

go.mod

@@ -1,6 +1,6 @@
 module code.cloudfoundry.org/cli
 
-go 1.18
+go 1.19
 
 require (
 	code.cloudfoundry.org/bytefmt v0.0.0-20170428003108-f4415fafc561
@@ -39,9 +39,9 @@ require (
 	github.com/sirupsen/logrus v1.2.0
 	github.com/tedsuo/rata v1.0.1-0.20170830210128-07d200713958
 	github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec
-	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
-	golang.org/x/net v0.2.0
-	golang.org/x/text v0.4.0
+	golang.org/x/crypto v0.4.0
+	golang.org/x/net v0.3.0
+	golang.org/x/text v0.5.0
 	gopkg.in/cheggaaa/pb.v1 v1.0.28
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/apimachinery v0.22.2
@@ -83,8 +83,8 @@ require (
 	github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
 	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
-	golang.org/x/sys v0.2.0 // indirect
-	golang.org/x/term v0.2.0 // indirect
+	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/term v0.3.0 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
 	golang.org/x/tools v0.1.12 // indirect
 	google.golang.org/appengine v1.6.6 // indirect

go.sum

@@ -393,8 +393,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
-golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
+golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -466,8 +466,8 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
+golang.org/x/net v0.3.0 h1:VWL6FNY2bEEmsGVKabSlHu5Irp34xmMRoqb/9lF9lxk=
+golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -529,22 +529,22 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM=
-golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
+golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
+golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

integration/assets/go_calls_ruby/Gemfile

@@ -1 +1,2 @@
 source 'https://rubygems.org'
+ruby '~> 2.7.0' #TODO: Remove the ruby version once bundler issue(https://github.com/rubygems/rubygems/issues/6280) is solved

integration/helpers/app.go

@@ -142,7 +142,10 @@ console: bundle exec irb`,
 	), 0666)
 	Expect(err).ToNot(HaveOccurred())
 
+	//TODO: Remove the ruby version once bundler issue(https://github.com/rubygems/rubygems/issues/6280)
+	// is solved
 	err = ioutil.WriteFile(filepath.Join(dir, "Gemfile"), []byte(`source 'http://rubygems.org'
+ruby '~> 2.7.0'
 gem 'irb'`,
 	), 0666)
 	Expect(err).ToNot(HaveOccurred())

integration/v7/isolated/routes_command_test.go

@@ -186,7 +186,7 @@ var _ = Describe("routes command", func() {
 				Eventually(session).Should(Exit(0))
 				Expect(session).To(Say(`Getting routes for org %s / space %s as %s\.\.\.`, orgName, spaceName, userName))
 				Expect(session).To(Say(tableHeaders))
-				Eventually(session).Should(Say(`%s\s+route1\s+%s\s+http\s+http1, http2\s+%s\s+\n`, spaceName, domainName, fmt.Sprintf("%s, %s", appName1, appName2)))
+				Eventually(session).Should(Or(Say(`%s\s+route1\s+%s\s+http\s+http1, http2\s+%s\s+\n`, spaceName, domainName, fmt.Sprintf("%s, %s", appName2, appName1)), Say(`%s\s+route1\s+%s\s+http\s+http1, http2\s+%s\s+\n`, spaceName, domainName, fmt.Sprintf("%s, %s", appName1, appName2))))
 				Eventually(session).Should(Say(`%s\s+route2\s+%s\s+http\s+http1\s+%s\s+\n`, spaceName, domainName, appName2))
 			})
 		})

integration/v7/isolated/scale_command_test.go

@@ -3,6 +3,7 @@ package isolated
 import (
 	"fmt"
 	"strings"
+	"time"
 
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccversion"
 	. "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers"
@@ -300,6 +301,10 @@ var _ = Describe("scale command", func() {
 						buffer := NewBuffer()
 						_, err := buffer.Write([]byte("y\n"))
 						Expect(err).ToNot(HaveOccurred())
+
+						//Delay to reduce flakiness
+						time.Sleep(3 * time.Second)
+
 						session := helpers.CFWithStdin(buffer, "scale", appName, "-i", "2", "-k", "512M", "-m", "60M")
 						Eventually(session).Should(Exit(0))
 						Expect(session).To(Say(`Scaling app %s in org %s / space %s as %s\.\.\.`, appName, orgName, spaceName, userName))
@@ -309,6 +314,9 @@ var _ = Describe("scale command", func() {
 
 						helpers.WaitForAppMemoryToTakeEffect(appName, 0, 0, false, "60M")
 
+						//Delay to reduce flakiness
+						time.Sleep(5 * time.Second)
+
 						session = helpers.CF("app", appName)
 						Eventually(session).Should(Exit(0))
 

integration/v7/isolated/service_command_test.go

@@ -171,6 +171,8 @@ var _ = Describe("service command", func() {
 				})
 
 				It("displays the bound apps", func() {
+					//Delay to reduce flakiness
+					time.Sleep(10 * time.Second)
 					session := helpers.CF(serviceCommand, serviceInstanceName, "-v")
 					Eventually(session).Should(Exit(0))
 

integration/v7/push/instances_flag_test.go

@@ -29,7 +29,7 @@ var _ = Describe("push with instances flag", func() {
 				Eventually(session).Should(Exit(0))
 			})
 
-			time.Sleep(5 * time.Second)
+			time.Sleep(10 * time.Second)
 			session := helpers.CF("app", appName)
 			Eventually(session).Should(Say(`name:\s+%s`, appName))
 			Eventually(session).Should(Say(`last uploaded:\s+%s`, helpers.ReadableDateTimeRegex))