From 40b873eb3493843c73c92f5c552ff67bce0ef310 Mon Sep 17 00:00:00 2001 From: candiduslynx Date: Fri, 5 Jan 2024 11:15:06 +0200 Subject: [PATCH 1/8] tidy --- plugins/source/oracle/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/source/oracle/go.mod b/plugins/source/oracle/go.mod index 20fd8c5bb5666f..93d81499371662 100644 --- a/plugins/source/oracle/go.mod +++ b/plugins/source/oracle/go.mod @@ -8,6 +8,7 @@ require ( github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/oracle/oci-go-sdk/v65 v65.28.3 github.com/rs/zerolog v1.31.0 + github.com/stretchr/testify v1.8.4 golang.org/x/exp v0.0.0-20231226003508-02704c960a9b ) @@ -88,7 +89,6 @@ require ( github.com/sony/gobreaker v0.5.0 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/testify v1.8.4 // indirect github.com/tdewolff/minify/v2 v2.20.10 // indirect github.com/tdewolff/parse/v2 v2.7.7 // indirect github.com/thoas/go-funk v0.9.3 // indirect From 1e55be74e6793021164ee56a6a8a750ad484e121 Mon Sep 17 00:00:00 2001 From: candiduslynx Date: Fri, 5 Jan 2024 11:36:53 +0200 Subject: [PATCH 2/8] add RegionMetadata spec --- .../oracle/client/spec/region_metadata.go | 12 ++ .../client/spec/region_metadata_test.go | 110 ++++++++++++++++++ plugins/source/oracle/client/spec/schema.json | 40 +++++++ plugins/source/oracle/client/spec/spec.go | 4 + .../source/oracle/client/spec/spec_test.go | 5 + 5 files changed, 171 insertions(+) create mode 100644 plugins/source/oracle/client/spec/region_metadata.go create mode 100644 plugins/source/oracle/client/spec/region_metadata_test.go diff --git a/plugins/source/oracle/client/spec/region_metadata.go b/plugins/source/oracle/client/spec/region_metadata.go new file mode 100644 index 00000000000000..24978781a8d3ae --- /dev/null +++ b/plugins/source/oracle/client/spec/region_metadata.go @@ -0,0 +1,12 @@ +package spec + +// Region metadata. +// For more information see +// [Adding Regions](https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdk_adding_new_region_endpoints.htm) +// in Oracle documentation. +type RegionMetadata struct { + RealmKey string `json:"realmKey" jsonschema:"required,minLength=1"` + RealmDomainComponent string `json:"realmDomainComponent" jsonschema:"required,minLength=1"` + RegionKey string `json:"regionKey" jsonschema:"required,minLength=1"` + RegionIdentifier string `json:"regionIdentifier" jsonschema:"required,minLength=1"` +} diff --git a/plugins/source/oracle/client/spec/region_metadata_test.go b/plugins/source/oracle/client/spec/region_metadata_test.go new file mode 100644 index 00000000000000..e8a3752a82b554 --- /dev/null +++ b/plugins/source/oracle/client/spec/region_metadata_test.go @@ -0,0 +1,110 @@ +package spec + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" + "github.com/stretchr/testify/require" +) + +func TestRegionMetadata(t *testing.T) { + data, err := jsonschema.Generate(RegionMetadata{}) + require.NoError(t, err) + + jsonschema.TestJSONSchema(t, string(data), []jsonschema.TestCase{ + { + Name: "empty", + Err: true, + Spec: `{}`, + }, + { + Name: "bad type", + Err: true, + Spec: `123`, + }, + { + Name: "proper", + Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, + }, + { + Name: "missing realmKey", + Err: true, + Spec: `{"realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, + }, + { + Name: "empty realmKey", + Err: true, + Spec: `{"realmKey":"","realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, + }, + { + Name: "null realmKey", + Err: true, + Spec: `{"realmKey":null,"realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, + }, + { + Name: "bad realmKey", + Err: true, + Spec: `{"realmKey":123,"realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, + }, + { + Name: "missing realmDomainComponent", + Err: true, + Spec: `{"realmKey":"OC1","regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, + }, + { + Name: "empty realmDomainComponent", + Err: true, + Spec: `{"realmKey":"OC1","realmDomainComponent":"","regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, + }, + { + Name: "null realmDomainComponent", + Err: true, + Spec: `{"realmKey":"OC1","realmDomainComponent":null,"regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, + }, + { + Name: "bad realmDomainComponent", + Err: true, + Spec: `{"realmKey":"OC1","realmDomainComponent":123,"regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, + }, + { + Name: "missing regionKey", + Err: true, + Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionIdentifier":"ap-sydney-1"}`, + }, + { + Name: "empty regionKey", + Err: true, + Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":"","regionIdentifier":"ap-sydney-1"}`, + }, + { + Name: "null regionKey", + Err: true, + Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":null,"regionIdentifier":"ap-sydney-1"}`, + }, + { + Name: "bad regionKey", + Err: true, + Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":123,"regionIdentifier":"ap-sydney-1"}`, + }, + { + Name: "missing regionIdentifier", + Err: true, + Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":"SYD"}`, + }, + { + Name: "empty regionIdentifier", + Err: true, + Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":""}`, + }, + { + Name: "null regionIdentifier", + Err: true, + Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":null}`, + }, + { + Name: "bad regionIdentifier", + Err: true, + Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":123}`, + }, + }) +} diff --git a/plugins/source/oracle/client/spec/schema.json b/plugins/source/oracle/client/spec/schema.json index c48ad57f2941ee..7e52dc87f30c16 100644 --- a/plugins/source/oracle/client/spec/schema.json +++ b/plugins/source/oracle/client/spec/schema.json @@ -3,6 +3,35 @@ "$id": "https://github.com/cloudquery/cloudquery/plugins/source/oracle/client/spec/spec", "$ref": "#/$defs/Spec", "$defs": { + "RegionMetadata": { + "properties": { + "realmKey": { + "type": "string", + "minLength": 1 + }, + "realmDomainComponent": { + "type": "string", + "minLength": 1 + }, + "regionKey": { + "type": "string", + "minLength": 1 + }, + "regionIdentifier": { + "type": "string", + "minLength": 1 + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "realmKey", + "realmDomainComponent", + "regionKey", + "regionIdentifier" + ], + "description": "Region metadata." + }, "Spec": { "properties": { "concurrency": { @@ -10,6 +39,17 @@ "minimum": 1, "description": "The best effort maximum number of Go routines to use.\nLower this number to reduce memory usage.", "default": 10000 + }, + "region_metadata": { + "oneOf": [ + { + "$ref": "#/$defs/RegionMetadata", + "description": "Custom region metadata.\nUse this when you need to access a dedicated OCI region." + }, + { + "type": "null" + } + ] } }, "additionalProperties": false, diff --git a/plugins/source/oracle/client/spec/spec.go b/plugins/source/oracle/client/spec/spec.go index b0692d06e2aa7d..d28a918b9bcafa 100644 --- a/plugins/source/oracle/client/spec/spec.go +++ b/plugins/source/oracle/client/spec/spec.go @@ -7,6 +7,10 @@ type Spec struct { // The best effort maximum number of Go routines to use. // Lower this number to reduce memory usage. Concurrency int `json:"concurrency,omitempty" jsonschema:"minimum=1,default=10000"` + + // Custom region metadata. + // Use this when you need to access a dedicated OCI region. + RegionMetadata *RegionMetadata `json:"region_metadata"` } func (s *Spec) SetDefaults() { diff --git a/plugins/source/oracle/client/spec/spec_test.go b/plugins/source/oracle/client/spec/spec_test.go index 72b4267a808b7d..fe8f0da18def7b 100644 --- a/plugins/source/oracle/client/spec/spec_test.go +++ b/plugins/source/oracle/client/spec/spec_test.go @@ -36,5 +36,10 @@ func TestSpec(t *testing.T) { Name: "proper concurrency", Spec: `{"concurrency": 123}`, }, + { + Name: "null region_metadata", + Spec: `{"region_metadata": null}`, + }, + // other cases for region_metadata are tested separately }) } From 3316637ceaf8cdf6957ed779a17ac851f961eead Mon Sep 17 00:00:00 2001 From: candiduslynx Date: Fri, 5 Jan 2024 12:36:18 +0200 Subject: [PATCH 3/8] use custom region for discovery --- plugins/source/oracle/client/client.go | 14 ++- .../oracle/client/spec/region_metadata.go | 12 -- .../client/spec/region_metadata_test.go | 110 ------------------ plugins/source/oracle/client/spec/schema.json | 40 ------- plugins/source/oracle/client/spec/spec.go | 4 - .../source/oracle/client/spec/spec_test.go | 5 - 6 files changed, 12 insertions(+), 173 deletions(-) delete mode 100644 plugins/source/oracle/client/spec/region_metadata.go delete mode 100644 plugins/source/oracle/client/spec/region_metadata_test.go diff --git a/plugins/source/oracle/client/client.go b/plugins/source/oracle/client/client.go index 7becbf460e8a48..778bf419bcf83d 100644 --- a/plugins/source/oracle/client/client.go +++ b/plugins/source/oracle/client/client.go @@ -36,7 +36,7 @@ type Client struct { logger zerolog.Logger } -func New(ctx context.Context, logger zerolog.Logger, _ spec.Spec) (schema.ClientMeta, error) { +func New(ctx context.Context, logger zerolog.Logger, s spec.Spec) (schema.ClientMeta, error) { // common.DefaultRetryPolicy handles (409, IncorrectState), (429, TooManyRequests) + 5XX errors defaultRetryPolicy := common.DefaultRetryPolicy() common.GlobalRetry = &defaultRetryPolicy @@ -57,6 +57,13 @@ func New(ctx context.Context, logger zerolog.Logger, _ spec.Spec) (schema.Client return nil, err } + if region, _ := configProvider.Region(); len(region) > 0 { + // custom region specified either via env vars or file + // use it for discovery + logger.Warn().Str("region", region).Msg("custom region specified, use it for discovery") + homeIdentityClient.SetRegion(region) + } + allCompartmentOcids, err := getAllCompartmentIdsInTenancy(ctx, homeIdentityClient, tenancyOcid) if err != nil { return nil, err @@ -67,7 +74,10 @@ func New(ctx context.Context, logger zerolog.Logger, _ spec.Spec) (schema.Client if err != nil { return nil, err } - logger.Info().Int("num_regions", len(allRegions)).Msg("syncing from all subscribed regions") + logger.Info(). + Str("regions", "["+strings.Join(allRegions, ",")+"]"). + Int("num_regions", len(allRegions)). + Msg("syncing from all subscribed regions") oracleClients, err := initOracleClientsInAllRegions(configProvider, allRegions) if err != nil { diff --git a/plugins/source/oracle/client/spec/region_metadata.go b/plugins/source/oracle/client/spec/region_metadata.go deleted file mode 100644 index 24978781a8d3ae..00000000000000 --- a/plugins/source/oracle/client/spec/region_metadata.go +++ /dev/null @@ -1,12 +0,0 @@ -package spec - -// Region metadata. -// For more information see -// [Adding Regions](https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdk_adding_new_region_endpoints.htm) -// in Oracle documentation. -type RegionMetadata struct { - RealmKey string `json:"realmKey" jsonschema:"required,minLength=1"` - RealmDomainComponent string `json:"realmDomainComponent" jsonschema:"required,minLength=1"` - RegionKey string `json:"regionKey" jsonschema:"required,minLength=1"` - RegionIdentifier string `json:"regionIdentifier" jsonschema:"required,minLength=1"` -} diff --git a/plugins/source/oracle/client/spec/region_metadata_test.go b/plugins/source/oracle/client/spec/region_metadata_test.go deleted file mode 100644 index e8a3752a82b554..00000000000000 --- a/plugins/source/oracle/client/spec/region_metadata_test.go +++ /dev/null @@ -1,110 +0,0 @@ -package spec - -import ( - "testing" - - "github.com/cloudquery/codegen/jsonschema" - "github.com/stretchr/testify/require" -) - -func TestRegionMetadata(t *testing.T) { - data, err := jsonschema.Generate(RegionMetadata{}) - require.NoError(t, err) - - jsonschema.TestJSONSchema(t, string(data), []jsonschema.TestCase{ - { - Name: "empty", - Err: true, - Spec: `{}`, - }, - { - Name: "bad type", - Err: true, - Spec: `123`, - }, - { - Name: "proper", - Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, - }, - { - Name: "missing realmKey", - Err: true, - Spec: `{"realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, - }, - { - Name: "empty realmKey", - Err: true, - Spec: `{"realmKey":"","realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, - }, - { - Name: "null realmKey", - Err: true, - Spec: `{"realmKey":null,"realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, - }, - { - Name: "bad realmKey", - Err: true, - Spec: `{"realmKey":123,"realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, - }, - { - Name: "missing realmDomainComponent", - Err: true, - Spec: `{"realmKey":"OC1","regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, - }, - { - Name: "empty realmDomainComponent", - Err: true, - Spec: `{"realmKey":"OC1","realmDomainComponent":"","regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, - }, - { - Name: "null realmDomainComponent", - Err: true, - Spec: `{"realmKey":"OC1","realmDomainComponent":null,"regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, - }, - { - Name: "bad realmDomainComponent", - Err: true, - Spec: `{"realmKey":"OC1","realmDomainComponent":123,"regionKey":"SYD","regionIdentifier":"ap-sydney-1"}`, - }, - { - Name: "missing regionKey", - Err: true, - Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionIdentifier":"ap-sydney-1"}`, - }, - { - Name: "empty regionKey", - Err: true, - Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":"","regionIdentifier":"ap-sydney-1"}`, - }, - { - Name: "null regionKey", - Err: true, - Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":null,"regionIdentifier":"ap-sydney-1"}`, - }, - { - Name: "bad regionKey", - Err: true, - Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":123,"regionIdentifier":"ap-sydney-1"}`, - }, - { - Name: "missing regionIdentifier", - Err: true, - Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":"SYD"}`, - }, - { - Name: "empty regionIdentifier", - Err: true, - Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":""}`, - }, - { - Name: "null regionIdentifier", - Err: true, - Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":null}`, - }, - { - Name: "bad regionIdentifier", - Err: true, - Spec: `{"realmKey":"OC1","realmDomainComponent":"oraclecloud.com","regionKey":"SYD","regionIdentifier":123}`, - }, - }) -} diff --git a/plugins/source/oracle/client/spec/schema.json b/plugins/source/oracle/client/spec/schema.json index 7e52dc87f30c16..c48ad57f2941ee 100644 --- a/plugins/source/oracle/client/spec/schema.json +++ b/plugins/source/oracle/client/spec/schema.json @@ -3,35 +3,6 @@ "$id": "https://github.com/cloudquery/cloudquery/plugins/source/oracle/client/spec/spec", "$ref": "#/$defs/Spec", "$defs": { - "RegionMetadata": { - "properties": { - "realmKey": { - "type": "string", - "minLength": 1 - }, - "realmDomainComponent": { - "type": "string", - "minLength": 1 - }, - "regionKey": { - "type": "string", - "minLength": 1 - }, - "regionIdentifier": { - "type": "string", - "minLength": 1 - } - }, - "additionalProperties": false, - "type": "object", - "required": [ - "realmKey", - "realmDomainComponent", - "regionKey", - "regionIdentifier" - ], - "description": "Region metadata." - }, "Spec": { "properties": { "concurrency": { @@ -39,17 +10,6 @@ "minimum": 1, "description": "The best effort maximum number of Go routines to use.\nLower this number to reduce memory usage.", "default": 10000 - }, - "region_metadata": { - "oneOf": [ - { - "$ref": "#/$defs/RegionMetadata", - "description": "Custom region metadata.\nUse this when you need to access a dedicated OCI region." - }, - { - "type": "null" - } - ] } }, "additionalProperties": false, diff --git a/plugins/source/oracle/client/spec/spec.go b/plugins/source/oracle/client/spec/spec.go index d28a918b9bcafa..b0692d06e2aa7d 100644 --- a/plugins/source/oracle/client/spec/spec.go +++ b/plugins/source/oracle/client/spec/spec.go @@ -7,10 +7,6 @@ type Spec struct { // The best effort maximum number of Go routines to use. // Lower this number to reduce memory usage. Concurrency int `json:"concurrency,omitempty" jsonschema:"minimum=1,default=10000"` - - // Custom region metadata. - // Use this when you need to access a dedicated OCI region. - RegionMetadata *RegionMetadata `json:"region_metadata"` } func (s *Spec) SetDefaults() { diff --git a/plugins/source/oracle/client/spec/spec_test.go b/plugins/source/oracle/client/spec/spec_test.go index fe8f0da18def7b..72b4267a808b7d 100644 --- a/plugins/source/oracle/client/spec/spec_test.go +++ b/plugins/source/oracle/client/spec/spec_test.go @@ -36,10 +36,5 @@ func TestSpec(t *testing.T) { Name: "proper concurrency", Spec: `{"concurrency": 123}`, }, - { - Name: "null region_metadata", - Spec: `{"region_metadata": null}`, - }, - // other cases for region_metadata are tested separately }) } From 8f1610d77922d7d2cd8b2e89ef0cc2498e877463 Mon Sep 17 00:00:00 2001 From: candiduslynx Date: Fri, 5 Jan 2024 13:07:57 +0200 Subject: [PATCH 4/8] doc --- plugins/source/oracle/docs/overview.md | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/plugins/source/oracle/docs/overview.md b/plugins/source/oracle/docs/overview.md index 489391cae7663c..9c76a1cda32d8f 100644 --- a/plugins/source/oracle/docs/overview.md +++ b/plugins/source/oracle/docs/overview.md @@ -25,10 +25,29 @@ The following example sets up the Oracle plugin, and connects it to a postgresql See [tables](/docs/plugins/sources/oracle/tables) for a full list of available tables. -## Oracle Spec +### Oracle Spec This is the (nested) spec used by Oracle Source Plugin -- `concurrency` (int, optional, default: 10000): +- `concurrency` (`integer`) (optional) (default: `10000`) + The best effort maximum number of Go routines to use. Lower this number to reduce memory usage. + +## Dedicated regions + +[OCI Dedicated regions](https://docs.oracle.com/en-us/iaas/Content/General/Concepts/dedicatedregions.htm) +can be accessed via the following procedure: + +1. Specify the region to be used for the discovery as the dedicated region. + The following options are available: + * Set `OCI_CLI_region` environment variable + * Set `TF_VAR_region` environment variable + * Set `region` value in the configuration file + +2. Specify the dedicated region information: + The following options are available: + * Set `OCI_REGION_METADATA` + [environment variable](https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdk_adding_new_region_endpoints.htm#SDK_Adding_Regions_Environment_Variable) + * Add information to the + [regions config file](https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdk_adding_new_region_endpoints.htm#SDK_Adding_Regions_Config_File) From 1147d3d7ea23ecdaef37a600830fdabbb111338b Mon Sep 17 00:00:00 2001 From: candiduslynx Date: Fri, 5 Jan 2024 13:11:11 +0200 Subject: [PATCH 5/8] less diff --- plugins/source/oracle/client/client.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/plugins/source/oracle/client/client.go b/plugins/source/oracle/client/client.go index 778bf419bcf83d..04fea1b71f06a2 100644 --- a/plugins/source/oracle/client/client.go +++ b/plugins/source/oracle/client/client.go @@ -57,13 +57,6 @@ func New(ctx context.Context, logger zerolog.Logger, s spec.Spec) (schema.Client return nil, err } - if region, _ := configProvider.Region(); len(region) > 0 { - // custom region specified either via env vars or file - // use it for discovery - logger.Warn().Str("region", region).Msg("custom region specified, use it for discovery") - homeIdentityClient.SetRegion(region) - } - allCompartmentOcids, err := getAllCompartmentIdsInTenancy(ctx, homeIdentityClient, tenancyOcid) if err != nil { return nil, err @@ -74,10 +67,7 @@ func New(ctx context.Context, logger zerolog.Logger, s spec.Spec) (schema.Client if err != nil { return nil, err } - logger.Info(). - Str("regions", "["+strings.Join(allRegions, ",")+"]"). - Int("num_regions", len(allRegions)). - Msg("syncing from all subscribed regions") + logger.Info().Int("num_regions", len(allRegions)).Msg("syncing from all subscribed regions") oracleClients, err := initOracleClientsInAllRegions(configProvider, allRegions) if err != nil { From bb9b68f0f7f01643a369af05f697c417834bbefc Mon Sep 17 00:00:00 2001 From: candiduslynx Date: Fri, 5 Jan 2024 13:11:56 +0200 Subject: [PATCH 6/8] no need for spec --- plugins/source/oracle/client/client.go | 3 +-- plugins/source/oracle/resources/plugin/client.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/source/oracle/client/client.go b/plugins/source/oracle/client/client.go index 04fea1b71f06a2..b736eacab5551d 100644 --- a/plugins/source/oracle/client/client.go +++ b/plugins/source/oracle/client/client.go @@ -5,7 +5,6 @@ import ( "fmt" "strings" - "github.com/cloudquery/cloudquery/plugins/source/oracle/client/spec" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/oracle/oci-go-sdk/v65/common" "github.com/oracle/oci-go-sdk/v65/identity" @@ -36,7 +35,7 @@ type Client struct { logger zerolog.Logger } -func New(ctx context.Context, logger zerolog.Logger, s spec.Spec) (schema.ClientMeta, error) { +func New(ctx context.Context, logger zerolog.Logger) (schema.ClientMeta, error) { // common.DefaultRetryPolicy handles (409, IncorrectState), (429, TooManyRequests) + 5XX errors defaultRetryPolicy := common.DefaultRetryPolicy() common.GlobalRetry = &defaultRetryPolicy diff --git a/plugins/source/oracle/resources/plugin/client.go b/plugins/source/oracle/resources/plugin/client.go index 2ca432a0be8ee3..a2a8aff1489e23 100644 --- a/plugins/source/oracle/resources/plugin/client.go +++ b/plugins/source/oracle/resources/plugin/client.go @@ -38,7 +38,7 @@ func (c *Client) Sync(ctx context.Context, options plugin.SyncOptions, res chan< c.logger.Warn().Msg("State backend not supported in plugin, skipping") } - schedulerClient, err := client.New(ctx, c.logger, c.config) + schedulerClient, err := client.New(ctx, c.logger) if err != nil { return err } From ce652aa4b0c1a8c92a99b68769df7e8385f6b416 Mon Sep 17 00:00:00 2001 From: candiduslynx Date: Fri, 5 Jan 2024 13:14:44 +0200 Subject: [PATCH 7/8] github md, too --- plugins/source/oracle/docs/overview.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/plugins/source/oracle/docs/overview.md b/plugins/source/oracle/docs/overview.md index 9c76a1cda32d8f..e0d136cceef8f1 100644 --- a/plugins/source/oracle/docs/overview.md +++ b/plugins/source/oracle/docs/overview.md @@ -36,8 +36,7 @@ This is the (nested) spec used by Oracle Source Plugin ## Dedicated regions -[OCI Dedicated regions](https://docs.oracle.com/en-us/iaas/Content/General/Concepts/dedicatedregions.htm) -can be accessed via the following procedure: +[OCI Dedicated regions](https://docs.oracle.com/en-us/iaas/Content/General/Concepts/dedicatedregions.htm) can be accessed via the following procedure: 1. Specify the region to be used for the discovery as the dedicated region. The following options are available: @@ -47,7 +46,5 @@ can be accessed via the following procedure: 2. Specify the dedicated region information: The following options are available: - * Set `OCI_REGION_METADATA` - [environment variable](https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdk_adding_new_region_endpoints.htm#SDK_Adding_Regions_Environment_Variable) - * Add information to the - [regions config file](https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdk_adding_new_region_endpoints.htm#SDK_Adding_Regions_Config_File) + * Set `OCI_REGION_METADATA` [environment variable](https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdk_adding_new_region_endpoints.htm#SDK_Adding_Regions_Environment_Variable) + * Add information to the [regions config file](https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdk_adding_new_region_endpoints.htm#SDK_Adding_Regions_Config_File) From 01b45bc6ba18b8ebded805e32abb02204213abe2 Mon Sep 17 00:00:00 2001 From: candiduslynx Date: Fri, 5 Jan 2024 13:32:18 +0200 Subject: [PATCH 8/8] rm tf var --- plugins/source/oracle/docs/overview.md | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/source/oracle/docs/overview.md b/plugins/source/oracle/docs/overview.md index e0d136cceef8f1..2cec7d3ea96f9f 100644 --- a/plugins/source/oracle/docs/overview.md +++ b/plugins/source/oracle/docs/overview.md @@ -41,7 +41,6 @@ This is the (nested) spec used by Oracle Source Plugin 1. Specify the region to be used for the discovery as the dedicated region. The following options are available: * Set `OCI_CLI_region` environment variable - * Set `TF_VAR_region` environment variable * Set `region` value in the configuration file 2. Specify the dedicated region information: