From 0eb93d45eb51b398c80acfb3f201cbb627a5ba0b Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Mon, 10 Mar 2025 08:23:39 +0800 Subject: [PATCH 1/3] Minor docs updates --- Makefile | 2 +- docs/about/quickstart.adoc | 26 +++++++++++++------------- docs/config/overview.adoc | 4 ++++ docs/reference/overview.adoc | 35 ++++++++++++++++++++++++++++------- docs/sitegen.yaml | 8 ++++---- pkg/cmd/cluster.go | 2 +- pkg/cmd/cluster_test.go | 2 +- templates/helidon/pom.xml | 2 +- 8 files changed, 53 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 104d3bc..a5a3ae0 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ SHELL := /bin/bash MVN_VERSION ?= 1.0.0 # Coherence CE version to run base tests against -COHERENCE_VERSION ?= 22.06.11 +COHERENCE_VERSION ?= 14.1.2-0-1 COHERENCE_GROUP_ID ?= com.oracle.coherence.ce COHERENCE_WKA1 ?= server1 COHERENCE_WKA2 ?= server1 diff --git a/docs/about/quickstart.adoc b/docs/about/quickstart.adoc index 6ab4e4d..fe37801 100644 --- a/docs/about/quickstart.adoc +++ b/docs/about/quickstart.adoc @@ -113,10 +113,10 @@ Display the clusters cohctl get clusters ---- Output: -[source,bash] +[source,bash,subs="attributes"] ---- -CONNECTION TYPE URL VERSION CLUSTER NAME CLUSTER TYPE CTX LOCAL -local http http://localhost:30000/management/coherence/cluster 23.03 my-cluster Standalone false +CONNECTION TYPE URL VERSION CLUSTER NAME CLUSTER TYPE CTX LOCAL +local http http://localhost:30000/management/coherence/cluster {coherence-version} my-cluster Standalone false ---- NOTE: If you are not using a Docker container, you can also use the `cohctl discover clusters` command to automatically discover clusters using the Name Service. @@ -131,12 +131,12 @@ Now that the cluster connection is added, you can describe the cluster using the cohctl describe cluster local ---- Output: -[source,bash] +[source,bash,subs="attributes"] ---- CLUSTER ------- Cluster Name: my-cluster -Version: 23.03 +Version: {coherence-version} Cluster Size: 3 License Mode: Development Departure Count: 0 @@ -144,14 +144,14 @@ Running: true MACHINES -------- -MACHINE PROCESSORS LOAD TOTAL MEMORY FREE MEMORY % FREE OS ARCH VERSION -192.168.1.117 8 3.9067 34,359,738,368 1,671,991,296 4.87% Mac OS X x86_64 10.16 +MACHINE PROCESSORS LOAD TOTAL MEMORY FREE MEMORY % FREE OS ARCH VERSION +localhost 12 3.1376953 49,152 MB 802 MB 1.63% Mac OS X aarch64 15.3.1 MEMBERS ------- Total cluster members: 3 -Cluster Heap - Total: 4,563,402,752 Used: 171,966,464 Available: 4,391,436,288 (96.2%) -Storage Heap - Total: 4,294,967,296 Used: 117,440,512 Available: 4,177,526,784 (97.3%) +Cluster Heap - Total: 768 MB Used: 170 MB Available: 598 MB (77.9%) +Storage Heap - Total: 512 MB Used: 114 MB Available: 398 MB (77.7%) SERVICES -------- @@ -175,11 +175,11 @@ PartitionedCache 2 on-demand 0 0.000ms CACHES ------ -Total Caches: 2, Total primary storage: 19,030,328 +Total Caches: 2, Total primary storage: 13 MB -SERVICE CACHE COUNT SIZE -PartitionedCache customers 50,230 13,204,808 -PartitionedCache orders 5,022 5,825,520 +SERVICE CACHE COUNT SIZE +PartitionedCache customers 50,234 12 MB +PartitionedCache orders 1,234 1 MB TOPICS ------ diff --git a/docs/config/overview.adoc b/docs/config/overview.adoc index 474f3ba..db001ad 100644 --- a/docs/config/overview.adoc +++ b/docs/config/overview.adoc @@ -43,6 +43,10 @@ Changing configuration file locations. Changing how bytes values are displayed. -- +==== + +[PILLARS] +==== [CARD] .Sorting Table Output [link=sorting_table_output.adoc] diff --git a/docs/reference/overview.adoc b/docs/reference/overview.adoc index 4250254..c19ae1f 100644 --- a/docs/reference/overview.adoc +++ b/docs/reference/overview.adoc @@ -43,6 +43,10 @@ Display and describe member information. Display and describe machine information. -- +==== + +[PILLARS] +==== [CARD] .Services [link=services.adoc] @@ -71,6 +75,11 @@ Display and describe view cache information. Display Topics information. -- +==== + +[PILLARS] +==== + [CARD] .Persistence [link=persistence.adoc] @@ -98,6 +107,10 @@ Display and describe proxy server information. -- Display and describe Http proxy server information. -- +==== + +[PILLARS] +==== [CARD] .Elastic Data @@ -127,6 +140,10 @@ Display and describe Executors. Display and manage Coherence reporters. -- +==== + +[PILLARS] +==== [CARD] .Diagnostics [link=diagnostics.adoc] @@ -134,13 +151,6 @@ Display and manage Coherence reporters. Take multiple thread dumps, heap dumps or JFR's across members. -- -[CARD] -.Create Starter -[link=create_starter.adoc] --- -Create example starter Maven project integrating Coherence and various frameworks. --- - [CARD] .Health [link=health.adoc] @@ -161,6 +171,10 @@ Look up various Name Service endpoints for a cluster. -- Reset MBean Statistics for various resources. -- +==== + +[PILLARS] +==== [CARD] .Miscellaneous @@ -183,4 +197,11 @@ Experimental command to create development clusters. Experimental command to monitor clusters with text UI. -- +[CARD] +.Create Starter +[link=create_starter.adoc] +-- +Experimental command to create example starter Maven project integrating Coherence and various frameworks. +-- + ==== diff --git a/docs/sitegen.yaml b/docs/sitegen.yaml index 8ccc39f..95e1610 100644 --- a/docs/sitegen.yaml +++ b/docs/sitegen.yaml @@ -10,10 +10,10 @@ engine: - "asciidoctor-diagram" attributes: plantumlconfig: "_plantuml-config.txt" - commercial-docs-base-url: "https://docs.oracle.com/en/middleware/standalone/coherence/14.1.1.2206" + commercial-docs-base-url: "https://docs.oracle.com/en/middleware/fusion-middleware/coherence/14.1.2" cli-version: "1.8.1" - coherence-version: "22.06.11" - coherence-default-version: "22.06.11" + coherence-version: "14.1.2-0-1" + coherence-default-version: "14.1.2-0-1" assets: - target: "/" includes: @@ -104,12 +104,12 @@ backend: - "executors.adoc" - "reporters.adoc" - "diagnostics.adoc" - - "create_starter.adoc" - "health.adoc" - "reset.adoc" - "misc.adoc" - "create_clusters.adoc" - "monitor_clusters.adoc" + - "create_starter.adoc" - type: "PAGE" title: "Security" source: "docs/security/overview.adoc" diff --git a/pkg/cmd/cluster.go b/pkg/cmd/cluster.go index dbedec2..809f1bc 100644 --- a/pkg/cmd/cluster.go +++ b/pkg/cmd/cluster.go @@ -745,7 +745,7 @@ var ( ) const ( - defaultCoherenceVersion = "22.06.11" + defaultCoherenceVersion = "14.1.2-0-1" startClusterCommand = "start cluster" scaleClusterCommand = "scale cluster" stopClusterCommand = "stop cluster" diff --git a/pkg/cmd/cluster_test.go b/pkg/cmd/cluster_test.go index 33452ae..b905284 100644 --- a/pkg/cmd/cluster_test.go +++ b/pkg/cmd/cluster_test.go @@ -52,7 +52,7 @@ func TestGetMavenClasspath(t *testing.T) { ) home, _ := os.UserHomeDir() - path, err := getMavenClasspath(ce, "coherence", "22.06.11", fileTypeJar) + path, err := getMavenClasspath(ce, "coherence", "14.1.2-0-1", fileTypeJar) g.Expect(err).To(gomega.BeNil()) g.Expect(path).To(gomega.Equal(home + "/.m2/repository/com/oracle/coherence/ce/coherence/22.06.11/coherence-22.06.11.jar")) diff --git a/templates/helidon/pom.xml b/templates/helidon/pom.xml index 2933dc2..41ee862 100644 --- a/templates/helidon/pom.xml +++ b/templates/helidon/pom.xml @@ -13,7 +13,7 @@ io.helidon.applications helidon-mp - 4.1.7 + 4.2.0 From bde3f40138b6b795613cf4679f864d9f1877e3bf Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Mon, 10 Mar 2025 08:54:40 +0800 Subject: [PATCH 2/3] Fix failing test --- pkg/cmd/cluster_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cmd/cluster_test.go b/pkg/cmd/cluster_test.go index b905284..f04f21c 100644 --- a/pkg/cmd/cluster_test.go +++ b/pkg/cmd/cluster_test.go @@ -54,7 +54,7 @@ func TestGetMavenClasspath(t *testing.T) { path, err := getMavenClasspath(ce, "coherence", "14.1.2-0-1", fileTypeJar) g.Expect(err).To(gomega.BeNil()) - g.Expect(path).To(gomega.Equal(home + "/.m2/repository/com/oracle/coherence/ce/coherence/22.06.11/coherence-22.06.11.jar")) + g.Expect(path).To(gomega.Equal(home + "/.m2/repository/com/oracle/coherence/ce/coherence/14.1.2-0-1/coherence-14.1.2-0-1.jar")) path, err = getMavenClasspath(ce, "coherence", "22.09", fileTypeJar) g.Expect(err).To(gomega.BeNil()) From 345c87df93fb41f111b2fdd4152e77024cb3dfa9 Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Mon, 10 Mar 2025 11:22:26 +0800 Subject: [PATCH 3/3] Update go client version --- go.mod | 12 +++++----- go.sum | 49 +++++++++++++++++++++++++++++++---------- pkg/cmd/cluster.go | 2 +- pkg/cmd/cluster_test.go | 2 +- pkg/cmd/formatting.go | 2 +- pkg/cmd/health.go | 4 ++-- pkg/cmd/nslookup.go | 4 ++-- 7 files changed, 50 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index bd72d60..3efb75f 100644 --- a/go.mod +++ b/go.mod @@ -8,21 +8,21 @@ go 1.22 require ( github.com/fatih/color v1.18.0 - github.com/gdamore/tcell/v2 v2.7.4 + github.com/gdamore/tcell/v2 v2.8.1 github.com/ohler55/ojg v1.12.8 github.com/onsi/gomega v1.33.1 - github.com/oracle/coherence-go-client v1.2.2 + github.com/oracle/coherence-go-client/v2 v2.0.0 github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.19.0 go.uber.org/zap v1.27.0 - golang.org/x/term v0.27.0 + golang.org/x/term v0.28.0 golang.org/x/text v0.21.0 gopkg.in/yaml.v3 v3.0.1 ) require ( github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/gdamore/encoding v1.0.0 // indirect + github.com/gdamore/encoding v1.0.1 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -30,7 +30,7 @@ require ( github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/mattn/go-runewidth v0.0.16 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/rivo/uniseg v0.4.3 // indirect @@ -44,6 +44,6 @@ require ( go.uber.org/multierr v1.10.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/net v0.33.0 // indirect - golang.org/x/sys v0.28.0 // indirect + golang.org/x/sys v0.29.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect ) diff --git a/go.sum b/go.sum index 7c1b29f..d9fe945 100644 --- a/go.sum +++ b/go.sum @@ -9,10 +9,10 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= -github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= -github.com/gdamore/tcell/v2 v2.7.4 h1:sg6/UnTM9jGpZU+oFYAsDahfchWAFW8Xx2yFinNSAYU= -github.com/gdamore/tcell/v2 v2.7.4/go.mod h1:dSXtXTSK0VsW1biw65DZLZ2NKr7j0qP/0J7ONmsraWg= +github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw= +github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo= +github.com/gdamore/tcell/v2 v2.8.1 h1:KPNxyqclpWpWQlPLx6Xui1pMk8S+7+R37h3g07997NU= +github.com/gdamore/tcell/v2 v2.8.1/go.mod h1:bj8ori1BG3OYMjmb3IklZVWfZUJ1UBQt9JXrOCOhGWw= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= @@ -38,8 +38,8 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= -github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= +github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/ohler55/ojg v1.12.8 h1:0+OW0MXdi10gx9qUMBrOnrVzYeMw3jjQjqzIfO+DG0U= @@ -48,8 +48,8 @@ github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= -github.com/oracle/coherence-go-client v1.2.2 h1:TGK87WhV8MWeCiZKk0rC+aZbt40p2nRVvxDUbF+2gX8= -github.com/oracle/coherence-go-client v1.2.2/go.mod h1:8wy6v4KvDGJv6iIiCD95aU0g8UL34DaKRHs3zqQN/Bg= +github.com/oracle/coherence-go-client/v2 v2.0.0 h1:epRtq50pHgW0Wbl7piSPdDbwE3JVe+9XFyTS+j0YmEI= +github.com/oracle/coherence-go-client/v2 v2.0.0/go.mod h1:tiCK6dVyBf/GVabOPY73Cl6+eKoLtStx/uWEEdJfpKg= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -97,19 +97,33 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -118,26 +132,37 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= +golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkg/cmd/cluster.go b/pkg/cmd/cluster.go index 809f1bc..2ecdcae 100644 --- a/pkg/cmd/cluster.go +++ b/pkg/cmd/cluster.go @@ -14,7 +14,7 @@ import ( "github.com/oracle/coherence-cli/pkg/constants" "github.com/oracle/coherence-cli/pkg/fetcher" "github.com/oracle/coherence-cli/pkg/utils" - "github.com/oracle/coherence-go-client/coherence/discovery" + "github.com/oracle/coherence-go-client/v2/coherence/discovery" "github.com/spf13/cobra" "github.com/spf13/viper" "os" diff --git a/pkg/cmd/cluster_test.go b/pkg/cmd/cluster_test.go index f04f21c..75c8ef7 100644 --- a/pkg/cmd/cluster_test.go +++ b/pkg/cmd/cluster_test.go @@ -8,7 +8,7 @@ package cmd import ( "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence/discovery" + "github.com/oracle/coherence-go-client/v2/coherence/discovery" "os" "testing" ) diff --git a/pkg/cmd/formatting.go b/pkg/cmd/formatting.go index ba6a957..2e3ffb5 100644 --- a/pkg/cmd/formatting.go +++ b/pkg/cmd/formatting.go @@ -13,7 +13,7 @@ import ( "github.com/oracle/coherence-cli/pkg/config" "github.com/oracle/coherence-cli/pkg/constants" "github.com/oracle/coherence-cli/pkg/utils" - "github.com/oracle/coherence-go-client/coherence/discovery" + "github.com/oracle/coherence-go-client/v2/coherence/discovery" "golang.org/x/term" "golang.org/x/text/language" "golang.org/x/text/message" diff --git a/pkg/cmd/health.go b/pkg/cmd/health.go index d091008..647b099 100644 --- a/pkg/cmd/health.go +++ b/pkg/cmd/health.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2024 Oracle and/or its affiliates. + * Copyright (c) 2022, 2025 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -12,7 +12,7 @@ import ( "fmt" "github.com/oracle/coherence-cli/pkg/config" "github.com/oracle/coherence-cli/pkg/fetcher" - "github.com/oracle/coherence-go-client/coherence/discovery" + "github.com/oracle/coherence-go-client/v2/coherence/discovery" "github.com/spf13/cobra" "net/url" "strings" diff --git a/pkg/cmd/nslookup.go b/pkg/cmd/nslookup.go index 5451cbc..47d91ec 100644 --- a/pkg/cmd/nslookup.go +++ b/pkg/cmd/nslookup.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2023 Oracle and/or its affiliates. + * Copyright (c) 2021, 2025 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -7,7 +7,7 @@ package cmd import ( - "github.com/oracle/coherence-go-client/coherence/discovery" + "github.com/oracle/coherence-go-client/v2/coherence/discovery" "github.com/spf13/cobra" )