Storage: Add Oracle Cloud Infrastructure Object Storage Bucket support #4661
+757
−18
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,6 +60,7 @@ require ( | |
| github.com/olekukonko/tablewriter v0.0.5 | ||
| github.com/opentracing/basictracer-go v1.0.0 | ||
| github.com/opentracing/opentracing-go v1.2.0 | ||
| github.com/oracle/oci-go-sdk/v65 v65.13.0 | ||
| github.com/pkg/errors v0.9.1 | ||
| github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 | ||
| github.com/prometheus/alertmanager v0.23.1-0.20210914172521-e35efbddb66a | ||
|
|
@@ -150,6 +151,7 @@ require ( | |
| github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee // indirect | ||
| github.com/gobwas/pool v0.2.0 // indirect | ||
| github.com/gobwas/ws v1.0.2 // indirect | ||
| github.com/gofrs/flock v0.8.1 // indirect | ||
| github.com/gogo/googleapis v1.4.0 // indirect | ||
| github.com/golang-jwt/jwt/v4 v4.4.1 // indirect | ||
| github.com/golang/protobuf v1.5.2 // indirect | ||
|
|
@@ -189,7 +191,7 @@ require ( | |
| github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect | ||
| github.com/sercand/kuberesolver v2.4.0+incompatible // indirect | ||
| github.com/sirupsen/logrus v1.8.1 // indirect | ||
| github.com/sony/gobreaker v0.5.0 // indirect | ||
| github.com/stretchr/objx v0.2.0 // indirect | ||
| github.com/tidwall/pretty v1.2.0 // indirect | ||
| github.com/weaveworks/promrus v1.2.0 // indirect | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -867,6 +867,8 @@ github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6 | |
| github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= | ||
| github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= | ||
| github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= | ||
| github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= | ||
| github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= | ||
| github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= | ||
| github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= | ||
| github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= | ||
|
|
@@ -1540,6 +1542,8 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ | |
| github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= | ||
| github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= | ||
| github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= | ||
| github.com/oracle/oci-go-sdk/v65 v65.13.0 h1:0+9ea5goYfhI3/MPfbIQU6yzHYWE6sCk6VuUepxk5Nk= | ||
| github.com/oracle/oci-go-sdk/v65 v65.13.0/go.mod h1:oyMrMa1vOzzKTmPN+kqrTR9y9kPA2tU1igN3NUSNTIE= | ||
| github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= | ||
| github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= | ||
| github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= | ||
|
|
@@ -1738,8 +1742,9 @@ github.com/snowflakedb/gosnowflake v1.3.13/go.mod h1:6nfka9aTXkUNha1p1cjeeyjDvcy | |
| github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= | ||
| github.com/soheilhy/cmux v0.1.5-0.20210205191134-5ec6847320e5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= | ||
| github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= | ||
| github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= | ||
| github.com/sony/gobreaker v0.5.0 h1:dRCvqm0P490vZPmy7ppEk2qCnCieBooFJ+YoXGYB+yg= | ||
| github.com/sony/gobreaker v0.5.0/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= | ||
| github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a/go.mod h1:LeFCbQYJ3KJlPs/FvPz2dy1tkpxyeNESVyCNNzRXFR0= | ||
| github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= | ||
| github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,7 @@ import ( | |
| "github.com/thanos-io/thanos/pkg/objstore/cos" | ||
| "github.com/thanos-io/thanos/pkg/objstore/filesystem" | ||
| "github.com/thanos-io/thanos/pkg/objstore/gcs" | ||
| "github.com/thanos-io/thanos/pkg/objstore/oci" | ||
| "github.com/thanos-io/thanos/pkg/objstore/oss" | ||
| "github.com/thanos-io/thanos/pkg/objstore/s3" | ||
| "github.com/thanos-io/thanos/pkg/objstore/swift" | ||
|
|
@@ -36,6 +37,7 @@ const ( | |
| COS ObjProvider = "COS" | ||
| ALIYUNOSS ObjProvider = "ALIYUNOSS" | ||
| BOS ObjProvider = "BOS" | ||
| OCI ObjProvider = "OCI" | ||
| ) | ||
|
|
||
| type BucketConfig struct { | ||
|
|
@@ -76,6 +78,8 @@ func NewBucket(logger log.Logger, confContentYaml []byte, reg prometheus.Registe | |
| bucket, err = filesystem.NewBucketFromConfig(config) | ||
| case string(BOS): | ||
| bucket, err = bos.NewBucket(logger, config, component) | ||
| case string(OCI): | ||
| bucket, err = oci.NewBucket(logger, config) | ||
| default: | ||
| return nil, errors.Errorf("bucket with type %s is not supported", bucketConf.Type) | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,14 +17,15 @@ import ( | |
| "github.com/thanos-io/thanos/pkg/objstore/azure" | ||
| "github.com/thanos-io/thanos/pkg/objstore/cos" | ||
| "github.com/thanos-io/thanos/pkg/objstore/gcs" | ||
| "github.com/thanos-io/thanos/pkg/objstore/oci" | ||
| "github.com/thanos-io/thanos/pkg/objstore/oss" | ||
| "github.com/thanos-io/thanos/pkg/objstore/s3" | ||
| "github.com/thanos-io/thanos/pkg/objstore/swift" | ||
| "github.com/thanos-io/thanos/pkg/testutil" | ||
| ) | ||
|
|
||
| // IsObjStoreSkipped returns true if given provider ID is found in THANOS_TEST_OBJSTORE_SKIP array delimited by comma e.g: | ||
| // THANOS_TEST_OBJSTORE_SKIP=GCS,S3,AZURE,SWIFT,COS,ALIYUNOSS,BOS,OCI. | ||
| func IsObjStoreSkipped(t *testing.T, provider client.ObjProvider) bool { | ||
| if e, ok := os.LookupEnv("THANOS_TEST_OBJSTORE_SKIP"); ok { | ||
| obstores := strings.Split(e, ",") | ||
|
|
@@ -170,4 +171,18 @@ func ForeachStore(t *testing.T, testFn func(t *testing.T, bkt objstore.Bucket)) | |
| testFn(t, objstore.NewPrefixedBucket(bkt, "some_prefix")) | ||
| }) | ||
| } | ||
|
|
||
| // Optional OCI. | ||
| if !IsObjStoreSkipped(t, client.OCI) { | ||
| t.Run("oci", func(t *testing.T) { | ||
| bkt, closeFn, err := oci.NewTestBucket(t) | ||
| testutil.Ok(t, err) | ||
|
|
||
| t.Parallel() | ||
| defer closeFn() | ||
|
|
||
| testFn(t, bkt) | ||
| }) | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.