From 1670da1c767ec6c8fc5cd5c889e0d7f7411886bb Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Thu, 5 Dec 2024 12:13:48 +0800 Subject: [PATCH 1/6] Update to use /v2 --- coherence/aggregators/aggregators.go | 8 ++++---- coherence/cache.go | 6 +++--- coherence/coherence_test_helpers.go | 4 ++-- coherence/common.go | 12 ++++++------ coherence/doc.go | 2 +- coherence/event.go | 4 ++-- coherence/filters/filters.go | 4 ++-- coherence/iterator.go | 4 ++-- coherence/named_cache_client.go | 2 +- coherence/named_map_client.go | 8 ++++---- coherence/processors/processors.go | 4 ++-- coherence/queue.go | 2 +- coherence/queue_dequeue.go | 2 +- coherence/resolver.go | 2 +- coherence/v1client.go | 4 ++-- coherence/v1event.go | 4 ++-- coherence/v1queues.go | 2 +- coherence/v1requests.go | 2 +- examples/aggregators/main.go | 10 +++++----- examples/basic/contains/main.go | 4 ++-- examples/basic/crud/main.go | 4 ++-- examples/basic/expiry/main.go | 4 ++-- examples/basic/expiry_cache/main.go | 4 ++-- examples/basic/near_cache/high_units/main.go | 2 +- examples/basic/near_cache/memory/main.go | 2 +- examples/basic/near_cache/ttl/main.go | 6 +++--- examples/basic/struct/main.go | 6 +++--- examples/basic/struct_keys/main.go | 6 +++--- examples/events/cache/all/main.go | 6 +++--- examples/events/cache/delete/main.go | 6 +++--- examples/events/cache/filters/main.go | 8 ++++---- examples/events/cache/insert/main.go | 6 +++--- examples/events/cache/key/main.go | 6 +++--- examples/events/cache/people_insert/main.go | 4 ++-- examples/events/cache/people_listen/main.go | 4 ++-- examples/events/cache/update/main.go | 6 +++--- examples/events/lifecycle/all/main.go | 4 ++-- examples/events/lifecycle/destroyed/main.go | 4 ++-- examples/events/lifecycle/released/main.go | 4 ++-- examples/events/lifecycle/truncated/main.go | 4 ++-- examples/events/session/all/main.go | 4 ++-- examples/indexes/main.go | 10 +++++----- examples/processors/blind/main.go | 8 ++++---- examples/processors/standard/main.go | 8 ++++---- examples/querying/filters/main.go | 8 ++++---- examples/querying/keys/main.go | 4 ++-- examples/querying/main.go | 4 ++-- examples/queues/dequeue/main.go | 2 +- examples/queues/events/main.go | 2 +- examples/queues/standard/main.go | 2 +- examples/rest/main.go | 4 ++-- go.mod | 6 ++---- go.sum | 6 +++--- test/e2e/discovery/run_test.go | 4 ++-- test/e2e/queues/queues_test.go | 4 ++-- test/e2e/queues/suite_test.go | 2 +- test/e2e/resolver/run_test.go | 4 ++-- test/e2e/resolver_cluster/run_test.go | 4 ++-- test/e2e/scope/named_map_test.go | 4 ++-- test/e2e/scope/suite_test.go | 2 +- test/e2e/standalone/aggregator_test.go | 10 +++++----- test/e2e/standalone/event_test.go | 8 ++++---- test/e2e/standalone/filter_test.go | 10 +++++----- test/e2e/standalone/index_test.go | 10 +++++----- test/e2e/standalone/java_object_test.go | 4 ++-- test/e2e/standalone/lifecycle_test.go | 4 ++-- test/e2e/standalone/named_cache_test.go | 12 ++++++------ test/e2e/standalone/named_map_test.go | 10 +++++----- test/e2e/standalone/near_cache_test.go | 8 ++++---- test/e2e/standalone/processor_test.go | 10 +++++----- test/e2e/standalone/session_test.go | 4 ++-- test/e2e/standalone/suite_test.go | 2 +- test/utils/utils.go | 2 +- test/v1/base/base_events_test.go | 8 ++++---- test/v1/base/base_test.go | 12 ++++++------ test/v1/base/suite_test.go | 2 +- 76 files changed, 196 insertions(+), 198 deletions(-) diff --git a/coherence/aggregators/aggregators.go b/coherence/aggregators/aggregators.go index 1002ef35..1e4df064 100644 --- a/coherence/aggregators/aggregators.go +++ b/coherence/aggregators/aggregators.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -7,9 +7,9 @@ package aggregators import ( - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/coherence/processors" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/processors" "math/big" ) diff --git a/coherence/cache.go b/coherence/cache.go index b21504a2..b3c248b1 100644 --- a/coherence/cache.go +++ b/coherence/cache.go @@ -8,9 +8,9 @@ package coherence import ( "context" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/coherence/processors" - pb1 "github.com/oracle/coherence-go-client/proto/v1" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/processors" + pb1 "github.com/oracle/coherence-go-client/v2/proto/v1" "time" ) diff --git a/coherence/coherence_test_helpers.go b/coherence/coherence_test_helpers.go index 56fc1f7d..ee5785f8 100644 --- a/coherence/coherence_test_helpers.go +++ b/coherence/coherence_test_helpers.go @@ -8,8 +8,8 @@ package coherence import ( "context" - "github.com/oracle/coherence-go-client/coherence/filters" - pb1 "github.com/oracle/coherence-go-client/proto/v1" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + pb1 "github.com/oracle/coherence-go-client/v2/proto/v1" "time" ) diff --git a/coherence/common.go b/coherence/common.go index d360fcf9..7cd84d56 100644 --- a/coherence/common.go +++ b/coherence/common.go @@ -10,12 +10,12 @@ import ( "context" "errors" "fmt" - "github.com/oracle/coherence-go-client/coherence/aggregators" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/coherence/processors" - pb "github.com/oracle/coherence-go-client/proto" - pb1 "github.com/oracle/coherence-go-client/proto/v1" + "github.com/oracle/coherence-go-client/v2/coherence/aggregators" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/processors" + pb "github.com/oracle/coherence-go-client/v2/proto" + pb1 "github.com/oracle/coherence-go-client/v2/proto/v1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/wrapperspb" diff --git a/coherence/doc.go b/coherence/doc.go index d5c7a249..429417b2 100644 --- a/coherence/doc.go +++ b/coherence/doc.go @@ -40,7 +40,7 @@ This API fully supports Go Generics and is only supported for use with Go versio Example: import ( - coherence "github.com/oracle/coherence-go-client/coherence" + coherence "github.com/oracle/coherence-go-client/v2/coherence" ) ... diff --git a/coherence/event.go b/coherence/event.go index 6580dd24..36260c76 100644 --- a/coherence/event.go +++ b/coherence/event.go @@ -10,8 +10,8 @@ import ( "context" "errors" "fmt" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/proto" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/proto" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "io" diff --git a/coherence/filters/filters.go b/coherence/filters/filters.go index 1fc2404d..b4c8d837 100644 --- a/coherence/filters/filters.go +++ b/coherence/filters/filters.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -8,7 +8,7 @@ package filters import ( "fmt" - "github.com/oracle/coherence-go-client/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" ) const ( diff --git a/coherence/iterator.go b/coherence/iterator.go index 2cec108a..9b453eb1 100644 --- a/coherence/iterator.go +++ b/coherence/iterator.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -10,7 +10,7 @@ import ( "container/list" "context" "errors" - pb "github.com/oracle/coherence-go-client/proto" + pb "github.com/oracle/coherence-go-client/v2/proto" "google.golang.org/protobuf/types/known/wrapperspb" "io" "sync" diff --git a/coherence/named_cache_client.go b/coherence/named_cache_client.go index 2eb12ab6..262de720 100644 --- a/coherence/named_cache_client.go +++ b/coherence/named_cache_client.go @@ -9,7 +9,7 @@ package coherence import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/filters" "time" ) diff --git a/coherence/named_map_client.go b/coherence/named_map_client.go index bf77c5d0..4b21ab2a 100644 --- a/coherence/named_map_client.go +++ b/coherence/named_map_client.go @@ -10,10 +10,10 @@ import ( "context" "errors" "fmt" - "github.com/oracle/coherence-go-client/coherence/aggregators" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/coherence/processors" + "github.com/oracle/coherence-go-client/v2/coherence/aggregators" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/processors" "log" "sync" "time" diff --git a/coherence/processors/processors.go b/coherence/processors/processors.go index a5743e84..bbae06cc 100644 --- a/coherence/processors/processors.go +++ b/coherence/processors/processors.go @@ -7,8 +7,8 @@ package processors import ( - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" "math/big" ) diff --git a/coherence/queue.go b/coherence/queue.go index e02a4307..5c371030 100644 --- a/coherence/queue.go +++ b/coherence/queue.go @@ -10,7 +10,7 @@ import ( "context" "errors" "fmt" - pb1 "github.com/oracle/coherence-go-client/proto/v1" + pb1 "github.com/oracle/coherence-go-client/v2/proto/v1" "strings" "sync" ) diff --git a/coherence/queue_dequeue.go b/coherence/queue_dequeue.go index e44bc6f3..29a466c6 100644 --- a/coherence/queue_dequeue.go +++ b/coherence/queue_dequeue.go @@ -8,7 +8,7 @@ package coherence import ( "context" - pb1 "github.com/oracle/coherence-go-client/proto/v1" + pb1 "github.com/oracle/coherence-go-client/v2/proto/v1" ) var ( diff --git a/coherence/resolver.go b/coherence/resolver.go index 2686e4e2..53874d2a 100644 --- a/coherence/resolver.go +++ b/coherence/resolver.go @@ -9,7 +9,7 @@ package coherence import ( "errors" "fmt" - "github.com/oracle/coherence-go-client/coherence/discovery" + "github.com/oracle/coherence-go-client/v2/coherence/discovery" "google.golang.org/grpc/resolver" "math/rand" "strings" diff --git a/coherence/v1client.go b/coherence/v1client.go index 09b3a120..ab996ff5 100644 --- a/coherence/v1client.go +++ b/coherence/v1client.go @@ -10,8 +10,8 @@ import ( "context" "errors" "fmt" - "github.com/oracle/coherence-go-client/proto/v1" - pb1 "github.com/oracle/coherence-go-client/proto/v1" + "github.com/oracle/coherence-go-client/v2/proto/v1" + pb1 "github.com/oracle/coherence-go-client/v2/proto/v1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/anypb" diff --git a/coherence/v1event.go b/coherence/v1event.go index 46459738..1ae26775 100644 --- a/coherence/v1event.go +++ b/coherence/v1event.go @@ -8,8 +8,8 @@ package coherence import ( "context" - "github.com/oracle/coherence-go-client/coherence/filters" - pb1 "github.com/oracle/coherence-go-client/proto/v1" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + pb1 "github.com/oracle/coherence-go-client/v2/proto/v1" "reflect" "strings" "sync" diff --git a/coherence/v1queues.go b/coherence/v1queues.go index 807c1acc..44816b47 100644 --- a/coherence/v1queues.go +++ b/coherence/v1queues.go @@ -8,7 +8,7 @@ package coherence import ( "context" - pb1 "github.com/oracle/coherence-go-client/proto/v1" + pb1 "github.com/oracle/coherence-go-client/v2/proto/v1" "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/coherence/v1requests.go b/coherence/v1requests.go index 9d7898c0..0b0aaec4 100644 --- a/coherence/v1requests.go +++ b/coherence/v1requests.go @@ -7,7 +7,7 @@ package coherence import ( - pb1 "github.com/oracle/coherence-go-client/proto/v1" + pb1 "github.com/oracle/coherence-go-client/v2/proto/v1" "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/wrapperspb" "time" diff --git a/examples/aggregators/main.go b/examples/aggregators/main.go index 0974a047..eb117f53 100644 --- a/examples/aggregators/main.go +++ b/examples/aggregators/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -12,10 +12,10 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/aggregators" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/aggregators" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" "math/big" ) diff --git a/examples/basic/contains/main.go b/examples/basic/contains/main.go index dbea5551..4d0a3fdb 100644 --- a/examples/basic/contains/main.go +++ b/examples/basic/contains/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 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 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" ) func main() { diff --git a/examples/basic/crud/main.go b/examples/basic/crud/main.go index 11ff66d0..9f1b2449 100644 --- a/examples/basic/crud/main.go +++ b/examples/basic/crud/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 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 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" ) func main() { diff --git a/examples/basic/expiry/main.go b/examples/basic/expiry/main.go index f1bf612d..4a334a34 100644 --- a/examples/basic/expiry/main.go +++ b/examples/basic/expiry/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 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 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" "time" ) diff --git a/examples/basic/expiry_cache/main.go b/examples/basic/expiry_cache/main.go index ca32f12b..6eea7735 100644 --- a/examples/basic/expiry_cache/main.go +++ b/examples/basic/expiry_cache/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 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 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" "time" ) diff --git a/examples/basic/near_cache/high_units/main.go b/examples/basic/near_cache/high_units/main.go index 036c2f49..9bca0c36 100644 --- a/examples/basic/near_cache/high_units/main.go +++ b/examples/basic/near_cache/high_units/main.go @@ -12,7 +12,7 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" ) func main() { diff --git a/examples/basic/near_cache/memory/main.go b/examples/basic/near_cache/memory/main.go index 5d463fa0..8cfc88fb 100644 --- a/examples/basic/near_cache/memory/main.go +++ b/examples/basic/near_cache/memory/main.go @@ -12,7 +12,7 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" ) func main() { diff --git a/examples/basic/near_cache/ttl/main.go b/examples/basic/near_cache/ttl/main.go index 6f181b03..93494d91 100644 --- a/examples/basic/near_cache/ttl/main.go +++ b/examples/basic/near_cache/ttl/main.go @@ -12,9 +12,9 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/coherence/processors" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/processors" "time" ) diff --git a/examples/basic/struct/main.go b/examples/basic/struct/main.go index 6fc71cae..e26258d2 100644 --- a/examples/basic/struct/main.go +++ b/examples/basic/struct/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -12,8 +12,8 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/processors" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/processors" ) type Person struct { diff --git a/examples/basic/struct_keys/main.go b/examples/basic/struct_keys/main.go index 31f3cfae..94a5d79a 100644 --- a/examples/basic/struct_keys/main.go +++ b/examples/basic/struct_keys/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -12,8 +12,8 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/processors" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/processors" ) // AccountKey defines the key for an account. diff --git a/examples/events/cache/all/main.go b/examples/events/cache/all/main.go index 51946049..aa78b7f2 100644 --- a/examples/events/cache/all/main.go +++ b/examples/events/cache/all/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -12,8 +12,8 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/processors" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/processors" ) type Person struct { diff --git a/examples/events/cache/delete/main.go b/examples/events/cache/delete/main.go index 533faa6b..022027aa 100644 --- a/examples/events/cache/delete/main.go +++ b/examples/events/cache/delete/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -12,8 +12,8 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/processors" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/processors" ) type Person struct { diff --git a/examples/events/cache/filters/main.go b/examples/events/cache/filters/main.go index d266b400..2f917f6b 100644 --- a/examples/events/cache/filters/main.go +++ b/examples/events/cache/filters/main.go @@ -12,10 +12,10 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/coherence/processors" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/processors" "sync" "sync/atomic" "time" diff --git a/examples/events/cache/insert/main.go b/examples/events/cache/insert/main.go index 83486fe6..18557a28 100644 --- a/examples/events/cache/insert/main.go +++ b/examples/events/cache/insert/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -12,8 +12,8 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/processors" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/processors" ) type Person struct { diff --git a/examples/events/cache/key/main.go b/examples/events/cache/key/main.go index bd725b6a..be919263 100644 --- a/examples/events/cache/key/main.go +++ b/examples/events/cache/key/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -12,8 +12,8 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/processors" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/processors" ) type Person struct { diff --git a/examples/events/cache/people_insert/main.go b/examples/events/cache/people_insert/main.go index 26194606..796e9a09 100644 --- a/examples/events/cache/people_insert/main.go +++ b/examples/events/cache/people_insert/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 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 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" "log" "os" "strconv" diff --git a/examples/events/cache/people_listen/main.go b/examples/events/cache/people_listen/main.go index cb16ad24..e0b81c3f 100644 --- a/examples/events/cache/people_listen/main.go +++ b/examples/events/cache/people_listen/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 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 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" "log" "time" ) diff --git a/examples/events/cache/update/main.go b/examples/events/cache/update/main.go index d7fe6084..ecb8be67 100644 --- a/examples/events/cache/update/main.go +++ b/examples/events/cache/update/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -12,8 +12,8 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/processors" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/processors" ) type Person struct { diff --git a/examples/events/lifecycle/all/main.go b/examples/events/lifecycle/all/main.go index a0b1a61b..56a8d618 100644 --- a/examples/events/lifecycle/all/main.go +++ b/examples/events/lifecycle/all/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 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 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" "time" ) diff --git a/examples/events/lifecycle/destroyed/main.go b/examples/events/lifecycle/destroyed/main.go index a890a779..c8967292 100644 --- a/examples/events/lifecycle/destroyed/main.go +++ b/examples/events/lifecycle/destroyed/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 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 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" "time" ) diff --git a/examples/events/lifecycle/released/main.go b/examples/events/lifecycle/released/main.go index cff94bea..0c104547 100644 --- a/examples/events/lifecycle/released/main.go +++ b/examples/events/lifecycle/released/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 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 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" "time" ) diff --git a/examples/events/lifecycle/truncated/main.go b/examples/events/lifecycle/truncated/main.go index 845641bd..3935b72b 100644 --- a/examples/events/lifecycle/truncated/main.go +++ b/examples/events/lifecycle/truncated/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 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 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" "time" ) diff --git a/examples/events/session/all/main.go b/examples/events/session/all/main.go index 27bf468a..1084925a 100644 --- a/examples/events/session/all/main.go +++ b/examples/events/session/all/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 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 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" "time" ) diff --git a/examples/indexes/main.go b/examples/indexes/main.go index 4a6807bd..82510953 100644 --- a/examples/indexes/main.go +++ b/examples/indexes/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. + * Copyright (c) 2023, 2024 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -12,10 +12,10 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/aggregators" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/aggregators" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" "time" ) diff --git a/examples/processors/blind/main.go b/examples/processors/blind/main.go index e4235228..4444d15f 100644 --- a/examples/processors/blind/main.go +++ b/examples/processors/blind/main.go @@ -12,10 +12,10 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/coherence/processors" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/processors" ) type Person struct { diff --git a/examples/processors/standard/main.go b/examples/processors/standard/main.go index f2ef8a34..e5d17133 100644 --- a/examples/processors/standard/main.go +++ b/examples/processors/standard/main.go @@ -12,10 +12,10 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/coherence/processors" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/processors" ) type Person struct { diff --git a/examples/querying/filters/main.go b/examples/querying/filters/main.go index 9712afbf..777a72e1 100644 --- a/examples/querying/filters/main.go +++ b/examples/querying/filters/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -12,9 +12,9 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" ) type Person struct { diff --git a/examples/querying/keys/main.go b/examples/querying/keys/main.go index 47b24c5a..9891a467 100644 --- a/examples/querying/keys/main.go +++ b/examples/querying/keys/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 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 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" ) type Person struct { diff --git a/examples/querying/main.go b/examples/querying/main.go index 5ef1bb1e..bfbee837 100644 --- a/examples/querying/main.go +++ b/examples/querying/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 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 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" ) func main() { diff --git a/examples/queues/dequeue/main.go b/examples/queues/dequeue/main.go index 4ff3c5ec..a803b59a 100644 --- a/examples/queues/dequeue/main.go +++ b/examples/queues/dequeue/main.go @@ -12,7 +12,7 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" "log" ) diff --git a/examples/queues/events/main.go b/examples/queues/events/main.go index d1eebf68..1b8ee257 100644 --- a/examples/queues/events/main.go +++ b/examples/queues/events/main.go @@ -12,7 +12,7 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" "time" ) diff --git a/examples/queues/standard/main.go b/examples/queues/standard/main.go index 381fc7a2..98599bc1 100644 --- a/examples/queues/standard/main.go +++ b/examples/queues/standard/main.go @@ -12,7 +12,7 @@ package main import ( "context" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" "log" ) diff --git a/examples/rest/main.go b/examples/rest/main.go index 76b22446..b08bf21e 100644 --- a/examples/rest/main.go +++ b/examples/rest/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -69,7 +69,7 @@ import ( "context" "encoding/json" "fmt" - "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" "io" "log" "net/http" diff --git a/go.mod b/go.mod index e030b213..10b56ec4 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ // Licensed under the Universal Permissive License v 1.0 as shown at // https://oss.oracle.com/licenses/upl. // -module github.com/oracle/coherence-go-client +module github.com/oracle/coherence-go-client/v2 go 1.19 @@ -17,11 +17,9 @@ require ( require ( github.com/golang/protobuf v1.5.3 // indirect - github.com/kr/pretty v0.1.0 // indirect - github.com/onsi/ginkgo/v2 v2.1.1 // indirect + github.com/kr/text v0.1.0 // indirect golang.org/x/net v0.23.0 // indirect golang.org/x/sys v0.18.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect - gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index ae5d8014..c8d96a08 100644 --- a/go.sum +++ b/go.sum @@ -28,7 +28,6 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -36,15 +35,17 @@ github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.1 h1:LCnPB85AvFNr91s0B2aDzEiiIg6MUwLYbryC1NSlWi8= -github.com/onsi/ginkgo/v2 v2.1.1/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= +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/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= @@ -108,7 +109,6 @@ google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGm google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/test/e2e/discovery/run_test.go b/test/e2e/discovery/run_test.go index 3708bf58..bbcdc846 100644 --- a/test/e2e/discovery/run_test.go +++ b/test/e2e/discovery/run_test.go @@ -9,8 +9,8 @@ package standalone import ( "fmt" "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence/discovery" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence/discovery" + "github.com/oracle/coherence-go-client/v2/test/utils" "strings" "testing" ) diff --git a/test/e2e/queues/queues_test.go b/test/e2e/queues/queues_test.go index 38d5c328..185a4176 100644 --- a/test/e2e/queues/queues_test.go +++ b/test/e2e/queues/queues_test.go @@ -10,8 +10,8 @@ import ( "context" "fmt" "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/test/utils" "sync" "sync/atomic" "testing" diff --git a/test/e2e/queues/suite_test.go b/test/e2e/queues/suite_test.go index 0803711c..afa1de64 100644 --- a/test/e2e/queues/suite_test.go +++ b/test/e2e/queues/suite_test.go @@ -7,7 +7,7 @@ package queues import ( - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/test/utils" "testing" ) diff --git a/test/e2e/resolver/run_test.go b/test/e2e/resolver/run_test.go index 4a78e2bc..062db306 100644 --- a/test/e2e/resolver/run_test.go +++ b/test/e2e/resolver/run_test.go @@ -9,8 +9,8 @@ package standalone import ( "context" "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/test/utils" "testing" ) diff --git a/test/e2e/resolver_cluster/run_test.go b/test/e2e/resolver_cluster/run_test.go index 216eed02..3ec7cb9a 100644 --- a/test/e2e/resolver_cluster/run_test.go +++ b/test/e2e/resolver_cluster/run_test.go @@ -9,8 +9,8 @@ package standalone import ( "context" "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/test/utils" "testing" ) diff --git a/test/e2e/scope/named_map_test.go b/test/e2e/scope/named_map_test.go index 79534520..c95694ac 100644 --- a/test/e2e/scope/named_map_test.go +++ b/test/e2e/scope/named_map_test.go @@ -8,8 +8,8 @@ package scope import ( "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/test/utils" "testing" ) diff --git a/test/e2e/scope/suite_test.go b/test/e2e/scope/suite_test.go index a2d6d38f..d4f53fa6 100644 --- a/test/e2e/scope/suite_test.go +++ b/test/e2e/scope/suite_test.go @@ -7,7 +7,7 @@ package scope import ( - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/test/utils" "testing" ) diff --git a/test/e2e/standalone/aggregator_test.go b/test/e2e/standalone/aggregator_test.go index 85d4d1e3..d0ffb0f0 100644 --- a/test/e2e/standalone/aggregator_test.go +++ b/test/e2e/standalone/aggregator_test.go @@ -8,11 +8,11 @@ package standalone import ( "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/aggregators" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/aggregators" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/test/utils" "math/big" "sort" "testing" diff --git a/test/e2e/standalone/event_test.go b/test/e2e/standalone/event_test.go index e9e1a0a7..e952de4a 100644 --- a/test/e2e/standalone/event_test.go +++ b/test/e2e/standalone/event_test.go @@ -10,10 +10,10 @@ import ( "context" "fmt" "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/test/utils" "log" "sync" "sync/atomic" diff --git a/test/e2e/standalone/filter_test.go b/test/e2e/standalone/filter_test.go index 632f3b22..5ca34add 100644 --- a/test/e2e/standalone/filter_test.go +++ b/test/e2e/standalone/filter_test.go @@ -8,11 +8,11 @@ package standalone import ( "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/coherence/processors" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/processors" + "github.com/oracle/coherence-go-client/v2/test/utils" "testing" ) diff --git a/test/e2e/standalone/index_test.go b/test/e2e/standalone/index_test.go index 17cc39fc..5b33cf80 100644 --- a/test/e2e/standalone/index_test.go +++ b/test/e2e/standalone/index_test.go @@ -9,11 +9,11 @@ package standalone import ( "encoding/json" "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/aggregators" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/aggregators" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/test/utils" "log" "strings" "testing" diff --git a/test/e2e/standalone/java_object_test.go b/test/e2e/standalone/java_object_test.go index 8a97fede..e747e38a 100644 --- a/test/e2e/standalone/java_object_test.go +++ b/test/e2e/standalone/java_object_test.go @@ -8,8 +8,8 @@ package standalone import ( "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/test/utils" "testing" ) diff --git a/test/e2e/standalone/lifecycle_test.go b/test/e2e/standalone/lifecycle_test.go index eddd069c..9fa275c5 100644 --- a/test/e2e/standalone/lifecycle_test.go +++ b/test/e2e/standalone/lifecycle_test.go @@ -8,8 +8,8 @@ package standalone import ( "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/test/utils" "testing" ) diff --git a/test/e2e/standalone/named_cache_test.go b/test/e2e/standalone/named_cache_test.go index fa25b8fa..b413ca95 100644 --- a/test/e2e/standalone/named_cache_test.go +++ b/test/e2e/standalone/named_cache_test.go @@ -8,12 +8,12 @@ package standalone import ( "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/aggregators" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/coherence/processors" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/aggregators" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/processors" + "github.com/oracle/coherence-go-client/v2/test/utils" "testing" "time" ) diff --git a/test/e2e/standalone/named_map_test.go b/test/e2e/standalone/named_map_test.go index 8c0eebd3..45daa383 100644 --- a/test/e2e/standalone/named_map_test.go +++ b/test/e2e/standalone/named_map_test.go @@ -10,11 +10,11 @@ import ( "context" "fmt" "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/coherence/processors" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/processors" + "github.com/oracle/coherence-go-client/v2/test/utils" "log" "os" "sync" diff --git a/test/e2e/standalone/near_cache_test.go b/test/e2e/standalone/near_cache_test.go index 2b77150b..c6d07ced 100644 --- a/test/e2e/standalone/near_cache_test.go +++ b/test/e2e/standalone/near_cache_test.go @@ -9,10 +9,10 @@ package standalone import ( "fmt" "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/coherence/processors" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/processors" + "github.com/oracle/coherence-go-client/v2/test/utils" "math" "testing" "time" diff --git a/test/e2e/standalone/processor_test.go b/test/e2e/standalone/processor_test.go index ced791d0..e7bef5df 100644 --- a/test/e2e/standalone/processor_test.go +++ b/test/e2e/standalone/processor_test.go @@ -8,11 +8,11 @@ package standalone import ( "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/extractors" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/coherence/processors" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/extractors" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/processors" + "github.com/oracle/coherence-go-client/v2/test/utils" "testing" ) diff --git a/test/e2e/standalone/session_test.go b/test/e2e/standalone/session_test.go index 4acc04cb..0b1bd7b2 100644 --- a/test/e2e/standalone/session_test.go +++ b/test/e2e/standalone/session_test.go @@ -9,8 +9,8 @@ package standalone import ( "fmt" "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/test/utils" "sync/atomic" "testing" ) diff --git a/test/e2e/standalone/suite_test.go b/test/e2e/standalone/suite_test.go index ee8c1a0a..783a7559 100644 --- a/test/e2e/standalone/suite_test.go +++ b/test/e2e/standalone/suite_test.go @@ -7,7 +7,7 @@ package standalone import ( - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/test/utils" "testing" ) diff --git a/test/utils/utils.go b/test/utils/utils.go index 17e54ddf..3d4e3bda 100644 --- a/test/utils/utils.go +++ b/test/utils/utils.go @@ -14,7 +14,7 @@ import ( "errors" "fmt" "github.com/onsi/gomega" - coherence "github.com/oracle/coherence-go-client/coherence" + "github.com/oracle/coherence-go-client/v2/coherence" "io" "log" "net/http" diff --git a/test/v1/base/base_events_test.go b/test/v1/base/base_events_test.go index 5034bf18..b5f95219 100644 --- a/test/v1/base/base_events_test.go +++ b/test/v1/base/base_events_test.go @@ -9,10 +9,10 @@ package base import ( "context" "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/filters" - pb1 "github.com/oracle/coherence-go-client/proto/v1" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + pb1 "github.com/oracle/coherence-go-client/v2/proto/v1" + "github.com/oracle/coherence-go-client/v2/test/utils" "sync/atomic" "testing" ) diff --git a/test/v1/base/base_test.go b/test/v1/base/base_test.go index bc7d51c3..3149e07f 100644 --- a/test/v1/base/base_test.go +++ b/test/v1/base/base_test.go @@ -11,12 +11,12 @@ import ( "fmt" "github.com/google/uuid" "github.com/onsi/gomega" - "github.com/oracle/coherence-go-client/coherence" - "github.com/oracle/coherence-go-client/coherence/aggregators" - "github.com/oracle/coherence-go-client/coherence/filters" - "github.com/oracle/coherence-go-client/coherence/processors" - pb1 "github.com/oracle/coherence-go-client/proto/v1" - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/coherence" + "github.com/oracle/coherence-go-client/v2/coherence/aggregators" + "github.com/oracle/coherence-go-client/v2/coherence/filters" + "github.com/oracle/coherence-go-client/v2/coherence/processors" + pb1 "github.com/oracle/coherence-go-client/v2/proto/v1" + "github.com/oracle/coherence-go-client/v2/test/utils" "sync" "testing" "time" diff --git a/test/v1/base/suite_test.go b/test/v1/base/suite_test.go index 7cf495cf..6b96809d 100644 --- a/test/v1/base/suite_test.go +++ b/test/v1/base/suite_test.go @@ -7,7 +7,7 @@ package base import ( - "github.com/oracle/coherence-go-client/test/utils" + "github.com/oracle/coherence-go-client/v2/test/utils" "testing" ) From ecf9cd6704d3587984c99e412fa65ffebebe30bb Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Thu, 5 Dec 2024 12:21:30 +0800 Subject: [PATCH 2/6] Update readme --- Makefile | 2 +- README.md | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a852a4e8..78bdafc0 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------------------------------------------------------- # This is the version of the coherence-go-client -VERSION ?=2.0.0 +VERSION ?=2.0.0-rc1 CURRDIR := $(shell pwd) USER_ID := $(shell echo "`id -u`:`id -g`") diff --git a/README.md b/README.md index 8398719f..afde6102 100644 --- a/README.md +++ b/README.md @@ -50,11 +50,12 @@ docker run -d -p 1408:1408 -p 30000:30000 ghcr.io/oracle/coherence-ce:24.09 ```bash go get github.com/oracle/coherence-go-client@latest ```` -After executing this command coherence-go-client is ready to use, and it's source will be in: + +> Note: If you wish to use the latest v2.0.0-rc1, please use the following: ```bash -$GOPATH/pkg/mod/github.com/oracle/coherence-go-client@version -``` +go get github.com/oracle/coherence-go-client/v2@v2.0.0-rc1 +```` ## Documentation @@ -72,6 +73,8 @@ issues `Put()`, `Get()` and `Size()` operations. > Note: Keys and values can also be Go `structs`. See detailed examples [here](examples#basic). +> Note: for v2.0.0-rc1, please import `github.com/oracle/coherence-go-client/v2/coherence` + ```go package main From 3e8c0b8587d73e947273010f231210a75f9e93d1 Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Thu, 5 Dec 2024 13:24:22 +0800 Subject: [PATCH 3/6] Fixup coverage failure --- .../build-compatability-2206-v122.yaml | 120 ++++++++++++++++++ .../workflows/build-compatability-v122.yaml | 118 +++++++++++++++++ Makefile | 33 ++--- 3 files changed, 248 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/build-compatability-2206-v122.yaml create mode 100644 .github/workflows/build-compatability-v122.yaml diff --git a/.github/workflows/build-compatability-2206-v122.yaml b/.github/workflows/build-compatability-2206-v122.yaml new file mode 100644 index 00000000..4b73cfb4 --- /dev/null +++ b/.github/workflows/build-compatability-2206-v122.yaml @@ -0,0 +1,120 @@ +# Copyright 2021, 2024 Oracle Corporation and/or its affiliates. +# Licensed under the Universal Permissive License v 1.0 as shown at +# https://oss.oracle.com/licenses/upl. + +# --------------------------------------------------------------------------- +# Coherence Go Client GitHub Actions CI build Against v22.06+ against v1.2.2 +# --------------------------------------------------------------------------- +name: CI Compatability v22.06 - v1.2.2 + +on: + workflow_dispatch: + push: + branches: + - '*' + schedule: + # Every day at midnight + - cron: '0 0 * * *' + +jobs: + build: + runs-on: ubuntu-22.04 + strategy: + fail-fast: false + matrix: + coherenceVersion: + - 22.06.10 + - 22.06.11-SNAPSHOT + go-version: + - 1.19.x + - 1.20.x + - 1.21.x + - 1.22.x + - 1.23.x + +# Checkout the source, we need a depth of zero to fetch all of the history otherwise +# the copyright check cannot work out the date of the files from Git. + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Get Docker Images + shell: bash + run: | + docker pull gcr.io/distroless/java17 + + - name: Set up JDK 11 for Build + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'zulu' + + - name: Cache Go Modules + uses: actions/cache@v4 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-mods-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go-mods- + + - name: Cache Maven packages + uses: actions/cache@v4 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + + - name: Set up Go + uses: actions/setup-go@v5 + with: + go-version: '${{ matrix.go-version }}' + + - name: E2E Local Tests + env: + COH_VERSION: ${{ matrix.coherenceVersion }} + shell: bash + run: | + get checkout v1.2.2 + echo "Running verify against $COH_VERSION" + go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 + COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 INCLUDE_LONG_RUNNING=true COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax make clean generate-proto build-test-images test-e2e-standalone + + - name: E2E Local Tests With Scope + env: + COH_VERSION: ${{ matrix.coherenceVersion }} + shell: bash + run: | + go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 + COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope + + - uses: actions/upload-artifact@v4 + if: failure() + with: + name: test-output-${{ matrix.go-version }}-${{ matrix.coherenceVersion }} + path: build/_output/test-logs + + - uses: actions/upload-artifact@v4 + if: failure() + with: + name: test-output-${{ matrix.go-version }}-${{ matrix.coherenceVersion }} + path: build/_output/test-logs + + - name: E2E Local Tests SSL + env: + COH_VERSION: ${{ matrix.coherenceVersion }} + shell: bash + run: | + echo "Running verify against $COH_VERSION" + go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 + COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \ + COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \ + COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \ + COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \ + COHERENCE_VERSION=$COH_VERSION PROFILES=,secure,-jakarta,javax make clean certs generate-proto build-test-images test-e2e-standalone + + - uses: actions/upload-artifact@v4 + if: failure() + with: + name: test-output-${{ matrix.go-version }}-${{ matrix.coherenceVersion }} + path: build/_output/test-logs diff --git a/.github/workflows/build-compatability-v122.yaml b/.github/workflows/build-compatability-v122.yaml new file mode 100644 index 00000000..f125a9a0 --- /dev/null +++ b/.github/workflows/build-compatability-v122.yaml @@ -0,0 +1,118 @@ +# Copyright 2022, 2024 Oracle Corporation and/or its affiliates. +# Licensed under the Universal Permissive License v 1.0 as shown at +# https://oss.oracle.com/licenses/upl. + +# --------------------------------------------------------------------------- +# Coherence Go Client GitHub Actions CI build Against v23.03+ for v1.2.2 +# --------------------------------------------------------------------------- +name: CI Compatability Jakarta - v1.2.2. + +on: + workflow_dispatch: + push: + branches: + - '*' + schedule: + # Every day at midnight + - cron: '0 0 * * *' + +jobs: + build: + runs-on: ubuntu-22.04 + strategy: + fail-fast: false + matrix: + coherenceVersion: + - 24.09 + go-version: + - 1.19.x + - 1.20.x + - 1.21.x + - 1.22.x + - 1.23.x + +# Checkout the source, we need a depth of zero to fetch all of the history otherwise +# the copyright check cannot work out the date of the files from Git. + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Get Docker Images + shell: bash + run: | + docker pull gcr.io/distroless/java17 + + - name: Set up JDK 17 for Build + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'zulu' + + - name: Cache Go Modules + uses: actions/cache@v4 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-mods-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go-mods- + + - name: Cache Maven packages + uses: actions/cache@v4 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + + - name: Set up Go + uses: actions/setup-go@v5 + with: + go-version: '${{ matrix.go-version }}' + + - name: E2E Local Tests + env: + COH_VERSION: ${{ matrix.coherenceVersion }} + shell: bash + run: | + git checkout v1.2.2 + go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 + COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 INCLUDE_LONG_RUNNING=true PROFILES=,jakarta,-javax COHERENCE_VERSION=$COH_VERSION make clean generate-proto build-test-images test-e2e-standalone + + - uses: actions/upload-artifact@v4 + if: failure() + with: + name: test-output-${{ matrix.go-version }}-${{ matrix.coherenceVersion }} + path: build/_output/test-logs + + - name: E2E Local Tests With Scope + env: + COH_VERSION: ${{ matrix.coherenceVersion }} + shell: bash + run: | + go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 + COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=$COH_VERSION PROFILES=,jakarta,-javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope + + - uses: actions/upload-artifact@v4 + if: failure() + with: + name: test-output-${{ matrix.go-version }}-${{ matrix.coherenceVersion }} + path: build/_output/test-logs + + - name: E2E Local Tests SSL + env: + COH_VERSION: ${{ matrix.coherenceVersion }} + shell: bash + run: | + echo "Running verify against $COH_VERSION" + go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 + COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \ + COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \ + COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \ + COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \ + COHERENCE_VERSION=$COH_VERSION PROFILES=,secure,jakarta,-javax make clean certs generate-proto build-test-images test-e2e-standalone + + - uses: actions/upload-artifact@v4 + if: failure() + with: + name: test-output-${{ matrix.go-version }}-${{ matrix.coherenceVersion }} + path: build/_output/test-logs diff --git a/Makefile b/Makefile index 78bdafc0..96c21661 100644 --- a/Makefile +++ b/Makefile @@ -271,7 +271,7 @@ trivy-scan: gettrivy ## Scan the CLI using trivy test: test-clean gotestsum $(BUILD_PROPS) ## Run the unit tests CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/coherence-test.xml \ -- $(GO_TEST_FLAGS) -v -coverprofile=$(COVERAGE_DIR)/cover-unit.out ./coherence/... - go tool cover -html=$(COVERAGE_DIR)/cover-unit.out -o $(COVERAGE_DIR)/cover-unit.html + go tool cover -func=$(COVERAGE_DIR)/cover-unit.out | grep -v '0.0%' # ---------------------------------------------------------------------------------------------------------------------- @@ -280,11 +280,8 @@ test: test-clean gotestsum $(BUILD_PROPS) ## Run the unit tests .PHONY: test-e2e-standalone test-e2e-standalone: test-clean test gotestsum $(BUILD_PROPS) ## Run e2e tests with Coherence CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/go-client-test.xml \ - -- $(GO_TEST_FLAGS) -v -coverprofile=$(COVERAGE_DIR)/cover-functional.out -v ./test/e2e/standalone/... -coverpkg=./coherence/... - go tool cover -html=$(COVERAGE_DIR)/cover-functional.out -o $(COVERAGE_DIR)/cover-functional.html - @echo - @echo "**** CODE COVERAGE ****" - @cat $(COVERAGE_DIR)/cover-functional.html | grep 'github.com/oracle/coherence-go-client/coherence' | grep option | sed 's/^.*github/github/' | sed 's, Date: Thu, 5 Dec 2024 13:32:43 +0800 Subject: [PATCH 4/6] Add tests for v1.2.2 --- .../build-compatability-2206-v122.yaml | 120 ------------------ .../workflows/build-compatability-v122.yaml | 118 ----------------- .../workflows/examples-jakarta-v1.2.2.yaml | 84 ++++++++++++ .github/workflows/examples-jakarta.yaml | 5 - .github/workflows/examples-v1.2.2.yaml | 84 ++++++++++++ .github/workflows/examples.yaml | 7 +- 6 files changed, 169 insertions(+), 249 deletions(-) delete mode 100644 .github/workflows/build-compatability-2206-v122.yaml delete mode 100644 .github/workflows/build-compatability-v122.yaml create mode 100644 .github/workflows/examples-jakarta-v1.2.2.yaml create mode 100644 .github/workflows/examples-v1.2.2.yaml diff --git a/.github/workflows/build-compatability-2206-v122.yaml b/.github/workflows/build-compatability-2206-v122.yaml deleted file mode 100644 index 4b73cfb4..00000000 --- a/.github/workflows/build-compatability-2206-v122.yaml +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 2021, 2024 Oracle Corporation and/or its affiliates. -# Licensed under the Universal Permissive License v 1.0 as shown at -# https://oss.oracle.com/licenses/upl. - -# --------------------------------------------------------------------------- -# Coherence Go Client GitHub Actions CI build Against v22.06+ against v1.2.2 -# --------------------------------------------------------------------------- -name: CI Compatability v22.06 - v1.2.2 - -on: - workflow_dispatch: - push: - branches: - - '*' - schedule: - # Every day at midnight - - cron: '0 0 * * *' - -jobs: - build: - runs-on: ubuntu-22.04 - strategy: - fail-fast: false - matrix: - coherenceVersion: - - 22.06.10 - - 22.06.11-SNAPSHOT - go-version: - - 1.19.x - - 1.20.x - - 1.21.x - - 1.22.x - - 1.23.x - -# Checkout the source, we need a depth of zero to fetch all of the history otherwise -# the copyright check cannot work out the date of the files from Git. - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Get Docker Images - shell: bash - run: | - docker pull gcr.io/distroless/java17 - - - name: Set up JDK 11 for Build - uses: actions/setup-java@v4 - with: - java-version: '11' - distribution: 'zulu' - - - name: Cache Go Modules - uses: actions/cache@v4 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-mods-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go-mods- - - - name: Cache Maven packages - uses: actions/cache@v4 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - - - name: Set up Go - uses: actions/setup-go@v5 - with: - go-version: '${{ matrix.go-version }}' - - - name: E2E Local Tests - env: - COH_VERSION: ${{ matrix.coherenceVersion }} - shell: bash - run: | - get checkout v1.2.2 - echo "Running verify against $COH_VERSION" - go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 - COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 INCLUDE_LONG_RUNNING=true COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax make clean generate-proto build-test-images test-e2e-standalone - - - name: E2E Local Tests With Scope - env: - COH_VERSION: ${{ matrix.coherenceVersion }} - shell: bash - run: | - go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 - COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope - - - uses: actions/upload-artifact@v4 - if: failure() - with: - name: test-output-${{ matrix.go-version }}-${{ matrix.coherenceVersion }} - path: build/_output/test-logs - - - uses: actions/upload-artifact@v4 - if: failure() - with: - name: test-output-${{ matrix.go-version }}-${{ matrix.coherenceVersion }} - path: build/_output/test-logs - - - name: E2E Local Tests SSL - env: - COH_VERSION: ${{ matrix.coherenceVersion }} - shell: bash - run: | - echo "Running verify against $COH_VERSION" - go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 - COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \ - COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \ - COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \ - COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \ - COHERENCE_VERSION=$COH_VERSION PROFILES=,secure,-jakarta,javax make clean certs generate-proto build-test-images test-e2e-standalone - - - uses: actions/upload-artifact@v4 - if: failure() - with: - name: test-output-${{ matrix.go-version }}-${{ matrix.coherenceVersion }} - path: build/_output/test-logs diff --git a/.github/workflows/build-compatability-v122.yaml b/.github/workflows/build-compatability-v122.yaml deleted file mode 100644 index f125a9a0..00000000 --- a/.github/workflows/build-compatability-v122.yaml +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 2022, 2024 Oracle Corporation and/or its affiliates. -# Licensed under the Universal Permissive License v 1.0 as shown at -# https://oss.oracle.com/licenses/upl. - -# --------------------------------------------------------------------------- -# Coherence Go Client GitHub Actions CI build Against v23.03+ for v1.2.2 -# --------------------------------------------------------------------------- -name: CI Compatability Jakarta - v1.2.2. - -on: - workflow_dispatch: - push: - branches: - - '*' - schedule: - # Every day at midnight - - cron: '0 0 * * *' - -jobs: - build: - runs-on: ubuntu-22.04 - strategy: - fail-fast: false - matrix: - coherenceVersion: - - 24.09 - go-version: - - 1.19.x - - 1.20.x - - 1.21.x - - 1.22.x - - 1.23.x - -# Checkout the source, we need a depth of zero to fetch all of the history otherwise -# the copyright check cannot work out the date of the files from Git. - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Get Docker Images - shell: bash - run: | - docker pull gcr.io/distroless/java17 - - - name: Set up JDK 17 for Build - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'zulu' - - - name: Cache Go Modules - uses: actions/cache@v4 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-mods-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go-mods- - - - name: Cache Maven packages - uses: actions/cache@v4 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - - - name: Set up Go - uses: actions/setup-go@v5 - with: - go-version: '${{ matrix.go-version }}' - - - name: E2E Local Tests - env: - COH_VERSION: ${{ matrix.coherenceVersion }} - shell: bash - run: | - git checkout v1.2.2 - go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 - COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 INCLUDE_LONG_RUNNING=true PROFILES=,jakarta,-javax COHERENCE_VERSION=$COH_VERSION make clean generate-proto build-test-images test-e2e-standalone - - - uses: actions/upload-artifact@v4 - if: failure() - with: - name: test-output-${{ matrix.go-version }}-${{ matrix.coherenceVersion }} - path: build/_output/test-logs - - - name: E2E Local Tests With Scope - env: - COH_VERSION: ${{ matrix.coherenceVersion }} - shell: bash - run: | - go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 - COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=$COH_VERSION PROFILES=,jakarta,-javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope - - - uses: actions/upload-artifact@v4 - if: failure() - with: - name: test-output-${{ matrix.go-version }}-${{ matrix.coherenceVersion }} - path: build/_output/test-logs - - - name: E2E Local Tests SSL - env: - COH_VERSION: ${{ matrix.coherenceVersion }} - shell: bash - run: | - echo "Running verify against $COH_VERSION" - go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 - COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \ - COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \ - COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \ - COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \ - COHERENCE_VERSION=$COH_VERSION PROFILES=,secure,jakarta,-javax make clean certs generate-proto build-test-images test-e2e-standalone - - - uses: actions/upload-artifact@v4 - if: failure() - with: - name: test-output-${{ matrix.go-version }}-${{ matrix.coherenceVersion }} - path: build/_output/test-logs diff --git a/.github/workflows/examples-jakarta-v1.2.2.yaml b/.github/workflows/examples-jakarta-v1.2.2.yaml new file mode 100644 index 00000000..a22bced7 --- /dev/null +++ b/.github/workflows/examples-jakarta-v1.2.2.yaml @@ -0,0 +1,84 @@ +# Copyright 2023, 2024 Oracle Corporation and/or its affiliates. +# Licensed under the Universal Permissive License v 1.0 as shown at +# https://oss.oracle.com/licenses/upl. + +# --------------------------------------------------------------------------- +# Coherence Go Client GitHub Actions test examples against v23.03+ +# and v1.2.2 client +# --------------------------------------------------------------------------- +name: CI-Examples Jakarta + +on: + workflow_dispatch: + push: + branches: + - '*' + +jobs: + build: + runs-on: ubuntu-22.04 + strategy: + fail-fast: false + matrix: + coherenceVersion: + - 24.09 + - 24.09.1-SNAPSHOT + go-version: + - 1.19.x + - 1.20.x + - 1.21.x + - 1.22.x + - 1.23.x + +# Checkout the source, we need a depth of zero to fetch all of the history otherwise +# the copyright check cannot work out the date of the files from Git. + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Get Docker Images + shell: bash + run: | + docker pull gcr.io/distroless/java17 + uname -a + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'zulu' + + - name: Cache Go Modules + uses: actions/cache@v4 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-mods-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go-mods- + + - name: Cache Maven packages + uses: actions/cache@v4 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + + - name: Set up Go + uses: actions/setup-go@v5 + with: + go-version: '${{ matrix.go-version }}' + + - name: Verify Examples + shell: bash + run: | + git checkout v1.2.2 + go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 + COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=${{ matrix.coherenceVersion }} PROFILES=,jakarta,-javax make clean generate-proto build-test-images test-cluster-startup test-examples + make test-cluster-shutdown || true + + - uses: actions/upload-artifact@v4 + if: failure() + with: + name: test-output-${{ matrix.go-version }}-${{ matrix.coherenceVersion }} + path: build/_output/test-logs diff --git a/.github/workflows/examples-jakarta.yaml b/.github/workflows/examples-jakarta.yaml index 0e9c7a97..13eed1be 100644 --- a/.github/workflows/examples-jakarta.yaml +++ b/.github/workflows/examples-jakarta.yaml @@ -68,11 +68,6 @@ jobs: with: go-version: '${{ matrix.go-version }}' - - name: Copyright Check - shell: bash - run: | - make copyright - - name: Verify Examples shell: bash run: | diff --git a/.github/workflows/examples-v1.2.2.yaml b/.github/workflows/examples-v1.2.2.yaml new file mode 100644 index 00000000..2df4b3e7 --- /dev/null +++ b/.github/workflows/examples-v1.2.2.yaml @@ -0,0 +1,84 @@ +# Copyright 2022, 2024 Oracle Corporation and/or its affiliates. +# Licensed under the Universal Permissive License v 1.0 as shown at +# https://oss.oracle.com/licenses/upl. + +# --------------------------------------------------------------------------- +# Coherence Go Client GitHub Actions test examples against v22.06 versions +# and v1.2.2 client +# --------------------------------------------------------------------------- +name: CI-Examples v22.06 - v1.2.2 + +on: + workflow_dispatch: + push: + branches: + - '*' + +jobs: + build: + runs-on: ubuntu-22.04 + strategy: + fail-fast: false + matrix: + coherenceVersion: + - 22.06.11-SNAPSHOT + - 22.06.10 + go-version: + - 1.19.x + - 1.20.x + - 1.21.x + - 1.22.x + - 1.23.x + +# Checkout the source, we need a depth of zero to fetch all of the history otherwise +# the copyright check cannot work out the date of the files from Git. + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Get Docker Images + shell: bash + run: | + docker pull gcr.io/distroless/java:11 + uname -a + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'zulu' + + - name: Cache Go Modules + uses: actions/cache@v4 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-mods-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go-mods- + + - name: Cache Maven packages + uses: actions/cache@v4 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + + - name: Set up Go + uses: actions/setup-go@v5 + with: + go-version: '${{ matrix.go-version }}' + + - name: Verify Examples + shell: bash + run: | + git checkout v1.2.2 + go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 + COHERENCE_VERSION=${{ matrix.coherenceVersion }} PROFILES=,-jakarta,javax make clean generate-proto build-test-images test-cluster-startup test-examples + make test-cluster-shutdown || true + + - uses: actions/upload-artifact@v4 + if: failure() + with: + name: test-output-${{ matrix.go-version }}-${{ matrix.coherenceVersion }} + path: build/_output/test-logs diff --git a/.github/workflows/examples.yaml b/.github/workflows/examples.yaml index 211bead2..c08df95f 100644 --- a/.github/workflows/examples.yaml +++ b/.github/workflows/examples.yaml @@ -1,4 +1,4 @@ -# Copyright 2022, 2023 Oracle Corporation and/or its affiliates. +# Copyright 2022, 2024 Oracle Corporation and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at # https://oss.oracle.com/licenses/upl. @@ -68,11 +68,6 @@ jobs: with: go-version: '${{ matrix.go-version }}' - - name: Copyright Check - shell: bash - run: | - make copyright - - name: Verify Examples shell: bash run: | From a87cb2e1ed2cc1e2a48ad689ad39e909e9cbaa21 Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Thu, 5 Dec 2024 13:43:31 +0800 Subject: [PATCH 5/6] Fix workflow --- .github/workflows/examples-jakarta-v1.2.2.yaml | 4 +++- .github/workflows/examples-v1.2.2.yaml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/examples-jakarta-v1.2.2.yaml b/.github/workflows/examples-jakarta-v1.2.2.yaml index a22bced7..0e53d318 100644 --- a/.github/workflows/examples-jakarta-v1.2.2.yaml +++ b/.github/workflows/examples-jakarta-v1.2.2.yaml @@ -6,7 +6,7 @@ # Coherence Go Client GitHub Actions test examples against v23.03+ # and v1.2.2 client # --------------------------------------------------------------------------- -name: CI-Examples Jakarta +name: CI-Examples Jakarta - v1.2.2 on: workflow_dispatch: @@ -73,6 +73,8 @@ jobs: shell: bash run: | git checkout v1.2.2 + # Change the jib-maven-plugin as this version fails + sed -i.bak 's/3\.3\.0<\/version.plugin.jib>/3.4.3<\/version.plugin.jib>/' java/pom.xml go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=${{ matrix.coherenceVersion }} PROFILES=,jakarta,-javax make clean generate-proto build-test-images test-cluster-startup test-examples make test-cluster-shutdown || true diff --git a/.github/workflows/examples-v1.2.2.yaml b/.github/workflows/examples-v1.2.2.yaml index 2df4b3e7..19508f4d 100644 --- a/.github/workflows/examples-v1.2.2.yaml +++ b/.github/workflows/examples-v1.2.2.yaml @@ -73,6 +73,8 @@ jobs: shell: bash run: | git checkout v1.2.2 + # Change the jib-maven-plugin as this version fails + sed -i.bak 's/3\.3\.0<\/version.plugin.jib>/3.4.3<\/version.plugin.jib>/' java/pom.xml go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 COHERENCE_VERSION=${{ matrix.coherenceVersion }} PROFILES=,-jakarta,javax make clean generate-proto build-test-images test-cluster-startup test-examples make test-cluster-shutdown || true From d0aeda413d1bbe79eaddf1c86b20d7913bc63bd3 Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Thu, 5 Dec 2024 14:12:53 +0800 Subject: [PATCH 6/6] Exclude queues examples on old versions --- scripts/run-test-examples.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/run-test-examples.sh b/scripts/run-test-examples.sh index 42d3f449..310f69ef 100755 --- a/scripts/run-test-examples.sh +++ b/scripts/run-test-examples.sh @@ -52,9 +52,9 @@ do echo "===========================================" if [ ! -z `echo $file | grep queues` ]; then - # Check for queues which cannot be run unless 24.03+ - if [ ! -z `echo $COHERENCE_VERSION | grep 24.03`]; then - go run -race $file + # Check for queues which cannot be run unless we have versions 24.09, 14.1.2, or 15.1.1 + if echo "$COHERENCE_VERSION" | grep -q -e 24.09 -e 14.1.2 -e 15.1.1; then + go run -race "$file" fi else go run -race $file