Skip to content

Commit d5d6766

Browse files
franciscojavierarceofranciscojavierarceo
authored
Revert "feat: Add s3 storage-based registry store in Go feature server" (#5351)
Revert "feat: Add s3 storage-based registry store in Go feature server (#5336)" This reverts commit abe18df.
1 parent abe18df commit d5d6766

File tree

7 files changed

+2
-265
lines changed

7 files changed

+2
-265
lines changed

‎Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -650,14 +650,11 @@ format-ui:
650650

651651
# Go SDK & embedded
652652
PB_REL = https://github.com/protocolbuffers/protobuf/releases
653-
PB_VERSION = 30.2
653+
PB_VERSION = 3.11.2
654654
PB_ARCH := $(shell uname -m)
655655
ifeq ($(PB_ARCH), arm64)
656656
PB_ARCH=aarch_64
657657
endif
658-
ifeq ($(PB_ARCH), aarch64)
659-
PB_ARCH=aarch_64
660-
endif
661658
PB_PROTO_FOLDERS=core registry serving types storage
662659

663660
$(TOOL_DIR)/protoc-$(PB_VERSION)-$(OS)-$(PB_ARCH).zip: $(TOOL_DIR)
@@ -672,7 +669,6 @@ install-go-proto-dependencies: $(TOOL_DIR)/protoc-$(PB_VERSION)-$(OS)-$(PB_ARCH)
672669

673670
.PHONY: compile-protos-go
674671
compile-protos-go: install-go-proto-dependencies
675-
mkdir -p $(ROOT_DIR)/go/protos
676672
$(foreach folder,$(PB_PROTO_FOLDERS), \
677673
protoc --proto_path=$(ROOT_DIR)/protos \
678674
--go_out=$(ROOT_DIR)/go/protos \

‎go.mod

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,6 @@ require (
2323
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
2424
github.com/andybalholm/brotli v1.1.0 // indirect
2525
github.com/apache/thrift v0.21.0 // indirect
26-
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
27-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
28-
github.com/aws/aws-sdk-go-v2/config v1.29.14 // indirect
29-
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect
30-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
31-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
32-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
33-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
34-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
35-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
36-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1 // indirect
37-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
38-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
39-
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3 // indirect
40-
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
41-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
42-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect
43-
github.com/aws/smithy-go v1.22.2 // indirect
4426
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4527
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4628
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect

‎go.sum

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,6 @@ github.com/apache/arrow/go/v17 v17.0.0 h1:RRR2bdqKcdbss9Gxy2NS/hK8i4LDMh23L6BbkN
66
github.com/apache/arrow/go/v17 v17.0.0/go.mod h1:jR7QHkODl15PfYyjM2nU+yTLScZ/qfj7OSUZmJ8putc=
77
github.com/apache/thrift v0.21.0 h1:tdPmh/ptjE1IJnhbhrcl2++TauVjy242rkV/UzJChnE=
88
github.com/apache/thrift v0.21.0/go.mod h1:W1H8aR/QRtYNvrPeFXBtobyRkd0/YVhTc6i07XIAgDw=
9-
github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM=
10-
github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg=
11-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 h1:zAybnyUQXIZ5mok5Jqwlf58/TFE7uvd3IAsa1aF9cXs=
12-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10/go.mod h1:qqvMj6gHLR/EXWZw4ZbqlPbQUyenf4h82UQUlKc+l14=
13-
github.com/aws/aws-sdk-go-v2/config v1.29.14 h1:f+eEi/2cKCg9pqKBoAIwRGzVb70MRKqWX4dg1BDcSJM=
14-
github.com/aws/aws-sdk-go-v2/config v1.29.14/go.mod h1:wVPHWcIFv3WO89w0rE10gzf17ZYy+UVS1Geq8Iei34g=
15-
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 h1:9KxtdcIA/5xPNQyZRgUSpYOE6j9Bc4+D7nZua0KGYOM=
16-
github.com/aws/aws-sdk-go-v2/credentials v1.17.67/go.mod h1:p3C44m+cfnbv763s52gCqrjaqyPikj9Sg47kUVaNZQQ=
17-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 h1:x793wxmUWVDhshP8WW2mlnXuFrO4cOd3HLBroh1paFw=
18-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30/go.mod h1:Jpne2tDnYiFascUEs2AWHJL9Yp7A5ZVy3TNyxaAjD6M=
19-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 h1:ZK5jHhnrioRkUNOc+hOgQKlUL5JeC3S6JgLxtQ+Rm0Q=
20-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34/go.mod h1:p4VfIceZokChbA9FzMbRGz5OV+lekcVtHlPKEO0gSZY=
21-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 h1:SZwFm17ZUNNg5Np0ioo/gq8Mn6u9w19Mri8DnJ15Jf0=
22-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34/go.mod h1:dFZsC0BLo346mvKQLWmoJxT+Sjp+qcVR1tRVHQGOH9Q=
23-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
24-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
25-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 h1:ZNTqv4nIdE/DiBfUUfXcLZ/Spcuz+RjeziUtNJackkM=
26-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34/go.mod h1:zf7Vcd1ViW7cPqYWEHLHJkS50X0JS2IKz9Cgaj6ugrs=
27-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE=
28-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA=
29-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1 h1:4nm2G6A4pV9rdlWzGMPv4BNtQp22v1hg3yrtkYpeLl8=
30-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1/go.mod h1:iu6FSzgt+M2/x3Dk8zhycdIcHjEFb36IS8HVUVFoMg0=
31-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM=
32-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY=
33-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 h1:moLQUoVq91LiqT1nbvzDukyqAlCv89ZmwaHw/ZFlFZg=
34-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15/go.mod h1:ZH34PJUc8ApjBIfgQCFvkWcUDBtl/WTD+uiYHjd8igA=
35-
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3 h1:BRXS0U76Z8wfF+bnkilA2QwpIch6URlm++yPUt9QPmQ=
36-
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3/go.mod h1:bNXKFFyaiVvWuR6O16h/I1724+aXe/tAkA9/QS01t5k=
37-
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 h1:1Gw+9ajCV1jogloEv1RRnvfRFia2cL6c9cuKV2Ps+G8=
38-
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI=
39-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 h1:hXmVKytPfTy5axZ+fYbR5d0cFmC3JvwLm5kM83luako=
40-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1/go.mod h1:MlYRNmYu/fGPoxBQVvBYr9nyr948aY/WLUvwBMBJubs=
41-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 h1:1XuUZ8mYJw9B6lzAkXhqHlJd/XvaX32evhproijJEZY=
42-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4=
43-
github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
44-
github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
459
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
4610
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
4711
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=

‎go/internal/feast/registry/local.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package registry
22

33
import (
4-
"github.com/google/uuid"
54
"io/ioutil"
65
"os"
76
"path/filepath"
87

8+
"github.com/google/uuid"
99
"google.golang.org/protobuf/proto"
1010
"google.golang.org/protobuf/types/known/timestamppb"
1111

‎go/internal/feast/registry/registry.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,6 @@ func getRegistryStoreFromType(registryStoreType string, registryConfig *Registry
364364
switch registryStoreType {
365365
case "FileRegistryStore":
366366
return NewFileRegistryStore(registryConfig, repoPath), nil
367-
case "S3RegistryStore":
368-
return NewS3RegistryStore(registryConfig, repoPath), nil
369367
}
370368
return nil, errors.New("only FileRegistryStore as a RegistryStore is supported at this moment")
371369
}

‎go/internal/feast/registry/registry_test.go

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎go/internal/feast/registry/s3.go

Lines changed: 0 additions & 109 deletions
This file was deleted.

0 commit comments

Comments
 (0)