Merge branch 'master' into comp-md-bindings.gcp.bucket-2573

.github/scripts/test-info.mjs

@@ -542,7 +542,11 @@ const components = {
             'internal/component/sql',
         ],
     },
-    'state.etcd': {
+    'state.etcd.v1': {
+        conformance: true,
+        conformanceSetup: 'docker-compose.sh etcd',
+    },
+    'state.etcd.v2': {
         conformance: true,
         conformanceSetup: 'docker-compose.sh etcd',
     },

go.mod

@@ -119,6 +119,7 @@ require (
 	golang.org/x/oauth2 v0.8.0
 	google.golang.org/api v0.115.0
 	google.golang.org/grpc v1.54.0
+	google.golang.org/protobuf v1.30.0
 	gopkg.in/couchbase/gocb.v1 v1.6.7
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/yaml.v3 v3.0.1
@@ -371,7 +372,6 @@ require (
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/couchbase/gocbcore.v7 v7.1.18 // indirect
 	gopkg.in/couchbaselabs/gocbconnstr.v1 v1.0.4 // indirect

internal/proto/state/etcd/v2/value.proto

@@ -0,0 +1,39 @@
+/*
+Copyright 2021 The Dapr Authors
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+syntax = "proto3";
+
+package dapr.proto.components.state.v2;
+
+import "google/protobuf/timestamp.proto";
+import "google/protobuf/duration.proto";
+
+option go_package = "github.com/dapr/components-contrib/internal/proto/state/etcd/v2";
+
+
+// Value is the value of the state key item. It contains the underlying data as
+// well as necessary metadata.
+message Value {
+  // Required. The value of the state key item.
+  bytes data = 1;
+
+  // Required. The creation time of the state key item. This is an
+  // approximation by the components-contrib instance since ETCD does not
+  // provide this information natively.
+  google.protobuf.Timestamp ts = 2;
+
+  // Optional. The Time To Live of the state key item. The duration of the TTL
+  // is from the creation time of the key (`ts`). If not specified, the key has
+  // no TTL.
+  optional google.protobuf.Duration ttl = 3;
+}