From edddeecdd0fc9a81dfcb06fdb85b43d3f43ac53c Mon Sep 17 00:00:00 2001 From: Karthik Sivadas Date: Mon, 15 Apr 2024 08:57:04 +0530 Subject: [PATCH] feat: Remove changes associated with multiwoven-integrations repository --- CONTRIBUTING.md | 14 +---------- README.md | 23 ++++++++++++++----- integrations/Gemfile.lock | 2 +- .../integrations/core/base_connector.rb | 2 +- .../multiwoven/integrations/core/constants.rb | 5 ---- .../lib/multiwoven/integrations/rollout.rb | 2 +- integrations/multiwoven-integrations.gemspec | 6 ++--- .../destination/google_sheets/client_spec.rb | 2 +- .../destination/hubspot/client_spec.rb | 2 +- .../client_spec.rb | 2 +- .../destination/salesforce_crm/client_spec.rb | 2 +- .../destination/sftp/client_spec.rb | 2 +- .../destination/stripe/client_spec.rb | 2 +- .../salesforce_consumer_goods/client_spec.rb | 2 +- 14 files changed, 31 insertions(+), 37 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f100fa4c..50b514b3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,13 +13,7 @@ We use GitHub to host code, to track issues and feature requests, as well as acc ## We Use [GitHub Flow](https://guides.github.com/introduction/flow/index.html), So All Code Changes Happen Through Pull Requests -Pull requests are the best way to propose changes to the codebase. We actively welcome your pull requests: - -Based on your contribution, please create a pull request in the respective repository. For example, if you are contributing to the `multiwoven-integrations` repository, please create a pull request in the `multiwoven-integrations` repository. - -- Multiwoven Server: [pull requests](https://github.com/Multiwoven/multiwoven-server) -- Multiwoven Integrations: [pull requests](https://github.com/Multiwoven/multiwoven-integrations) -- Multiwoven UI: [pull requests](https://github.com/Multiwoven/multiwoven-ui) +Pull requests are the best way to propose changes to the codebase. We actively welcome your pull requests. 1. Fork the repo and create your branch from `main`. 2. If you've added code that should be tested, add tests. @@ -35,12 +29,6 @@ In short, when you submit code changes, your submissions are understood to be un ## Report bugs using GitHub's issues We use GitHub issues to track public bugs. Report a bug by opening a new issue it's that easy! -Since we are a mono repo, we insist creating issues in respective repositories. For example, if you find a bug in the `multiwoven-integrations` repository, please create an issue in the `multiwoven-integrations` repository. - -- Multiwoven Server: [issues](https://github.com/Multiwoven/multiwoven-server) -- Multiwoven Integrations: [issues](https://github.com/Multiwoven/multiwoven-integrations) -- Multiwoven UI: [issues](https://github.com/Multiwoven/multiwoven-ui) - ## Write bug reports with detail, background, and sample code Great Bug Reports tend to have: diff --git a/README.md b/README.md index 24791017..91d26dad 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ Turns any data warehouse (like Snowflake, Redshift, BigQuery, DataBricks, Postgr GitHub commit activity License
- server-ci - integrations-ci - ui-ci + server-ci + integrations-ci + ui-ci

@@ -53,25 +53,36 @@ Multiwoven makes it easy to self-host and deploy a fully secure, scalable, and c ## Table of Contents +- [Why Multiwoven?](#why-multiwoven) +- [Table of Contents](#table-of-contents) - [Getting Started](#getting-started) - [Local Setup](#local-setup) - [Self-hosted Options](#self-hosted-options) - [Connectors](#connectors) - [Sources](#sources) - [Destinations](#destinations) + - [CRM](#crm) + - [Marketing Automation](#marketing-automation) + - [Customer Support](#customer-support) + - [Advertising](#advertising) + - [Collaboration](#collaboration) + - [Analytics](#analytics) + - [Others](#others) - [Contributing](#contributing) - [Need Help?](#need-help) + - [⚠️ Development Status: Under Active Development](#️-development-status-under-active-development) - [License](#license) +- [Contributors](#contributors) ## Getting Started Multiwoven repo is a monorepo that contains the following services: -- [multiwoven-server](https://github.com/Multiwoven/multiwoven-server) - The backend service that handles data extraction, modeling, and syncing. +- [multiwoven-server](https://github.com/Multiwoven/multiwoven/tree/main/server) - The backend service that handles data extraction, modeling, and syncing. -- [multiwoven-ui](https://github.com/Multiwoven/multiwoven-ui) - The frontend service that provides a user interface for managing data sources, models, and syncs. +- [multiwoven-ui](https://github.com/Multiwoven/multiwoven/tree/main/ui) - The frontend service that provides a user interface for managing data sources, models, and syncs. -- [multiwoven-integrations](https://github.com/Multiwoven/multiwoven-integrations) - The connector service that provides a list of connectors to various data sources and destinations. +- [multiwoven-integrations](https://github.com/Multiwoven/multiwoven/tree/main/integrations) - The connector service that provides a list of connectors to various data sources and destinations. ### Local Setup diff --git a/integrations/Gemfile.lock b/integrations/Gemfile.lock index d120a689..f4506cb9 100644 --- a/integrations/Gemfile.lock +++ b/integrations/Gemfile.lock @@ -7,7 +7,7 @@ GIT PATH remote: . specs: - multiwoven-integrations (0.1.56) + multiwoven-integrations (0.1.57) activesupport async-websocket csv diff --git a/integrations/lib/multiwoven/integrations/core/base_connector.rb b/integrations/lib/multiwoven/integrations/core/base_connector.rb index c00806fc..b594f517 100644 --- a/integrations/lib/multiwoven/integrations/core/base_connector.rb +++ b/integrations/lib/multiwoven/integrations/core/base_connector.rb @@ -18,7 +18,7 @@ def connector_spec def meta_data client_meta_data = read_json(META_DATA_PATH).deep_symbolize_keys icon_name = client_meta_data[:data][:icon] - icon_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven-integrations/#{MAIN_BRANCH_SHA}#{relative_path}/#{icon_name}" + icon_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven/main/integrations#{relative_path}/#{icon_name}" client_meta_data[:data][:icon] = icon_url # returns hash @meta_data ||= client_meta_data diff --git a/integrations/lib/multiwoven/integrations/core/constants.rb b/integrations/lib/multiwoven/integrations/core/constants.rb index d97554f3..77febc91 100644 --- a/integrations/lib/multiwoven/integrations/core/constants.rb +++ b/integrations/lib/multiwoven/integrations/core/constants.rb @@ -4,16 +4,11 @@ module Multiwoven module Integrations::Core module Constants # CONFIG - INTEGRATIONS_PATH = File.join( - Gem.loaded_specs["multiwoven-integrations"].full_gem_path, - "/lib/multiwoven/integrations" - ) META_DATA_PATH = "config/meta.json" CONNECTOR_SPEC_PATH = "config/spec.json" CATALOG_SPEC_PATH = "config/catalog.json" SNOWFLAKE_MAC_DRIVER_PATH = "/opt/snowflake/snowflakeodbc/lib/universal/libSnowflake.dylib" DATABRICKS_MAC_DRIVER_PATH = "/Library/simba/spark/lib/libsparkodbc_sb64-universal.dylib" - MAIN_BRANCH_SHA = Git.ls_remote("https://github.com/Multiwoven/multiwoven-integrations")["head"][:sha] SNOWFLAKE_DRIVER_PATH = ENV["SNOWFLAKE_DRIVER_PATH"] || SNOWFLAKE_MAC_DRIVER_PATH DATABRICKS_DRIVER_PATH = ENV["DATABRICKS_DRIVER_PATH"] || DATABRICKS_MAC_DRIVER_PATH diff --git a/integrations/lib/multiwoven/integrations/rollout.rb b/integrations/lib/multiwoven/integrations/rollout.rb index 045592b9..d324a350 100644 --- a/integrations/lib/multiwoven/integrations/rollout.rb +++ b/integrations/lib/multiwoven/integrations/rollout.rb @@ -2,7 +2,7 @@ module Multiwoven module Integrations - VERSION = "0.1.56" + VERSION = "0.1.57" ENABLED_SOURCES = %w[ Snowflake diff --git a/integrations/multiwoven-integrations.gemspec b/integrations/multiwoven-integrations.gemspec index d215644a..a98ea19c 100644 --- a/integrations/multiwoven-integrations.gemspec +++ b/integrations/multiwoven-integrations.gemspec @@ -16,10 +16,10 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.6.0" # spec.metadata["allowed_push_host"] = nil - spec.metadata["github_repo"] = "https://github.com/Multiwoven/multiwoven-integrations" + spec.metadata["github_repo"] = "https://github.com/Multiwoven/multiwoven" spec.metadata["homepage_uri"] = spec.homepage - spec.metadata["source_code_uri"] = "https://github.com/Multiwoven/multiwoven-integrations" - spec.metadata["changelog_uri"] = "https://github.com/Multiwoven/multiwoven-integrations/blob/master/CHANGELOG.md" + spec.metadata["source_code_uri"] = "https://github.com/Multiwoven/multiwoven/tree/main/integrations" + spec.metadata["changelog_uri"] = "https://github.com/Multiwoven/multiwoven/blob/main/integrations/CHANGELOG.md" # Specify which files should be added to the gem when it is released. # The `git ls-files -z` loads the files in the RubyGem that have been added into git. diff --git a/integrations/spec/multiwoven/integrations/destination/google_sheets/client_spec.rb b/integrations/spec/multiwoven/integrations/destination/google_sheets/client_spec.rb index c99e30dd..814f9f0e 100644 --- a/integrations/spec/multiwoven/integrations/destination/google_sheets/client_spec.rb +++ b/integrations/spec/multiwoven/integrations/destination/google_sheets/client_spec.rb @@ -267,7 +267,7 @@ describe "#meta_data" do it "serves it github image url as icon" do - image_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven-integrations/#{client.class::MAIN_BRANCH_SHA}/lib/multiwoven/integrations/destination/google_sheets/icon.svg" + image_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven/main/integrations/lib/multiwoven/integrations/destination/google_sheets/icon.svg" expect(client.send(:meta_data)[:data][:icon]).to eq(image_url) end end diff --git a/integrations/spec/multiwoven/integrations/destination/hubspot/client_spec.rb b/integrations/spec/multiwoven/integrations/destination/hubspot/client_spec.rb index 6b341d67..0ee4b6eb 100644 --- a/integrations/spec/multiwoven/integrations/destination/hubspot/client_spec.rb +++ b/integrations/spec/multiwoven/integrations/destination/hubspot/client_spec.rb @@ -139,7 +139,7 @@ describe "#meta_data" do it "serves it github image url as icon" do - image_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven-integrations/#{client.class::MAIN_BRANCH_SHA}/lib/multiwoven/integrations/destination/hubspot/icon.svg" + image_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven/main/integrations/lib/multiwoven/integrations/destination/hubspot/icon.svg" expect(client.send(:meta_data)[:data][:icon]).to eq(image_url) end end diff --git a/integrations/spec/multiwoven/integrations/destination/salesforce_consumer_goods_cloud/client_spec.rb b/integrations/spec/multiwoven/integrations/destination/salesforce_consumer_goods_cloud/client_spec.rb index 218bf3c1..4ca77bb9 100644 --- a/integrations/spec/multiwoven/integrations/destination/salesforce_consumer_goods_cloud/client_spec.rb +++ b/integrations/spec/multiwoven/integrations/destination/salesforce_consumer_goods_cloud/client_spec.rb @@ -213,7 +213,7 @@ describe "#meta_data" do it "serves it github image url as icon" do - image_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven-integrations/#{client.class::MAIN_BRANCH_SHA}/lib/multiwoven/integrations/destination/salesforce_consumer_goods_cloud/icon.svg" + image_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven/main/integrations/lib/multiwoven/integrations/destination/salesforce_consumer_goods_cloud/icon.svg" expect(client.send(:meta_data)[:data][:icon]).to eq(image_url) end end diff --git a/integrations/spec/multiwoven/integrations/destination/salesforce_crm/client_spec.rb b/integrations/spec/multiwoven/integrations/destination/salesforce_crm/client_spec.rb index 8bd46a89..b8eef317 100644 --- a/integrations/spec/multiwoven/integrations/destination/salesforce_crm/client_spec.rb +++ b/integrations/spec/multiwoven/integrations/destination/salesforce_crm/client_spec.rb @@ -123,7 +123,7 @@ describe "#meta_data" do it "serves it github image url as icon" do - image_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven-integrations/#{client.class::MAIN_BRANCH_SHA}/lib/multiwoven/integrations/destination/salesforce_crm/icon.svg" + image_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven/main/integrations/lib/multiwoven/integrations/destination/salesforce_crm/icon.svg" expect(client.send(:meta_data)[:data][:icon]).to eq(image_url) end end diff --git a/integrations/spec/multiwoven/integrations/destination/sftp/client_spec.rb b/integrations/spec/multiwoven/integrations/destination/sftp/client_spec.rb index bf74abc8..c777361e 100644 --- a/integrations/spec/multiwoven/integrations/destination/sftp/client_spec.rb +++ b/integrations/spec/multiwoven/integrations/destination/sftp/client_spec.rb @@ -124,7 +124,7 @@ describe "#meta_data" do it "serves it github image url as icon" do - image_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven-integrations/#{client.class::MAIN_BRANCH_SHA}/lib/multiwoven/integrations/destination/sftp/icon.svg" + image_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven/main/integrations/lib/multiwoven/integrations/destination/sftp/icon.svg" expect(client.send(:meta_data)[:data][:icon]).to eq(image_url) end end diff --git a/integrations/spec/multiwoven/integrations/destination/stripe/client_spec.rb b/integrations/spec/multiwoven/integrations/destination/stripe/client_spec.rb index e5cb3ee1..b8591523 100644 --- a/integrations/spec/multiwoven/integrations/destination/stripe/client_spec.rb +++ b/integrations/spec/multiwoven/integrations/destination/stripe/client_spec.rb @@ -117,7 +117,7 @@ describe "#meta_data" do it "serves it github image url as icon" do - image_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven-integrations/#{client.class::MAIN_BRANCH_SHA}/lib/multiwoven/integrations/destination/stripe/icon.svg" + image_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven/main/integrations/lib/multiwoven/integrations/destination/stripe/icon.svg" expect(client.send(:meta_data)[:data][:icon]).to eq(image_url) end end diff --git a/integrations/spec/multiwoven/integrations/source/salesforce_consumer_goods/client_spec.rb b/integrations/spec/multiwoven/integrations/source/salesforce_consumer_goods/client_spec.rb index 534ba87a..29ddce66 100644 --- a/integrations/spec/multiwoven/integrations/source/salesforce_consumer_goods/client_spec.rb +++ b/integrations/spec/multiwoven/integrations/source/salesforce_consumer_goods/client_spec.rb @@ -170,7 +170,7 @@ describe "#meta_data" do it "serves it github image url as icon" do - image_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven-integrations/#{client.class::MAIN_BRANCH_SHA}/lib/multiwoven/integrations/source/salesforce_consumer_goods_cloud/icon.svg" + image_url = "https://raw.githubusercontent.com/Multiwoven/multiwoven/main/integrations/lib/multiwoven/integrations/source/salesforce_consumer_goods_cloud/icon.svg" expect(client.send(:meta_data)[:data][:icon]).to eq(image_url) end end