From 40d8aabf0bfa83d783bf4e63de8edd1fc22e2cf7 Mon Sep 17 00:00:00 2001 From: Dipu Date: Fri, 28 Feb 2025 14:14:03 +0545 Subject: [PATCH] refactor: move metadata to metadata folder --- providers/brevo/connector.go | 16 ++-------------- .../brevo/{ => metadata}/openapi/api.yaml | 0 .../brevo/{ => metadata}/openapi/file.go | 0 providers/brevo/{ => metadata}/schemas.json | 0 providers/brevo/metadata/scraping.go | 19 +++++++++++++++++++ scripts/openapi/brevo/metadata/main.go | 8 ++++---- 6 files changed, 25 insertions(+), 18 deletions(-) rename providers/brevo/{ => metadata}/openapi/api.yaml (100%) rename providers/brevo/{ => metadata}/openapi/file.go (100%) rename providers/brevo/{ => metadata}/schemas.json (100%) create mode 100644 providers/brevo/metadata/scraping.go diff --git a/providers/brevo/connector.go b/providers/brevo/connector.go index db686000b..e1a50b281 100644 --- a/providers/brevo/connector.go +++ b/providers/brevo/connector.go @@ -6,20 +6,8 @@ import ( "github.com/amp-labs/connectors/common" "github.com/amp-labs/connectors/internal/components" "github.com/amp-labs/connectors/internal/components/schema" - "github.com/amp-labs/connectors/internal/staticschema" "github.com/amp-labs/connectors/providers" - "github.com/amp-labs/connectors/tools/fileconv" - "github.com/amp-labs/connectors/tools/scrapper" -) - -// nolint:gochecknoglobals -var ( - //go:embed schemas.json - schemaContent []byte - FileManager = scrapper.NewMetadataFileManager[staticschema.FieldMetadataMapV2]( - schemaContent, fileconv.NewSiblingFileLocator()) - - schemas = FileManager.MustLoadSchemas() + "github.com/amp-labs/connectors/providers/brevo/metadata" ) type Connector struct { @@ -46,7 +34,7 @@ func constructor(base *components.Connector) (*Connector, error) { connector := &Connector{Connector: base} // Set the metadata provider for the connector - connector.SchemaProvider = schema.NewOpenAPISchemaProvider(connector.ProviderContext.Module(), schemas) + connector.SchemaProvider = schema.NewOpenAPISchemaProvider(connector.ProviderContext.Module(), metadata.Schemas) return connector, nil } diff --git a/providers/brevo/openapi/api.yaml b/providers/brevo/metadata/openapi/api.yaml similarity index 100% rename from providers/brevo/openapi/api.yaml rename to providers/brevo/metadata/openapi/api.yaml diff --git a/providers/brevo/openapi/file.go b/providers/brevo/metadata/openapi/file.go similarity index 100% rename from providers/brevo/openapi/file.go rename to providers/brevo/metadata/openapi/file.go diff --git a/providers/brevo/schemas.json b/providers/brevo/metadata/schemas.json similarity index 100% rename from providers/brevo/schemas.json rename to providers/brevo/metadata/schemas.json diff --git a/providers/brevo/metadata/scraping.go b/providers/brevo/metadata/scraping.go new file mode 100644 index 000000000..6aec1b9be --- /dev/null +++ b/providers/brevo/metadata/scraping.go @@ -0,0 +1,19 @@ +package metadata + +import ( + _ "embed" + + "github.com/amp-labs/connectors/internal/staticschema" + "github.com/amp-labs/connectors/tools/fileconv" + "github.com/amp-labs/connectors/tools/scrapper" +) + +// nolint:gochecknoglobals +var ( + //go:embed schemas.json + schemaContent []byte + FileManager = scrapper.NewMetadataFileManager[staticschema.FieldMetadataMapV2]( + schemaContent, fileconv.NewSiblingFileLocator()) + + Schemas = FileManager.MustLoadSchemas() +) diff --git a/scripts/openapi/brevo/metadata/main.go b/scripts/openapi/brevo/metadata/main.go index 795dd4065..f4fd1374c 100644 --- a/scripts/openapi/brevo/metadata/main.go +++ b/scripts/openapi/brevo/metadata/main.go @@ -6,8 +6,8 @@ import ( "github.com/amp-labs/connectors/internal/datautils" "github.com/amp-labs/connectors/internal/goutils" "github.com/amp-labs/connectors/internal/staticschema" - "github.com/amp-labs/connectors/providers/brevo" - "github.com/amp-labs/connectors/providers/brevo/openapi" + "github.com/amp-labs/connectors/providers/brevo/metadata" + "github.com/amp-labs/connectors/providers/brevo/metadata/openapi" utilsopenapi "github.com/amp-labs/connectors/scripts/openapi/utils" "github.com/amp-labs/connectors/tools/fileconv/api3" "github.com/amp-labs/connectors/tools/scrapper" @@ -113,8 +113,8 @@ func main() { } } - goutils.MustBeNil(brevo.FileManager.SaveSchemas(schemas)) - goutils.MustBeNil(brevo.FileManager.SaveQueryParamStats(scrapper.CalculateQueryParamStats(registry))) + goutils.MustBeNil(metadata.FileManager.SaveSchemas(schemas)) + goutils.MustBeNil(metadata.FileManager.SaveQueryParamStats(scrapper.CalculateQueryParamStats(registry))) slog.Info("Completed.") }