From 023a1a3d967ce6ae14404d44eafd40cb42499046 Mon Sep 17 00:00:00 2001 From: Vishnu Bharathi Date: Tue, 13 Aug 2024 15:57:20 +0530 Subject: [PATCH 1/5] postgres: add v1.0.2 version (#234) Co-authored-by: Karthikeyan C --- .github/workflows/registry-updates.yaml | 3 +-- registry-automation/cmd/ci.go | 4 ++-- .../postgres/releases/v1.0.2/connector-packaging.json | 11 +++++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 registry/hasura/postgres/releases/v1.0.2/connector-packaging.json diff --git a/.github/workflows/registry-updates.yaml b/.github/workflows/registry-updates.yaml index 56a6af14..6c95b010 100644 --- a/.github/workflows/registry-updates.yaml +++ b/.github/workflows/registry-updates.yaml @@ -28,7 +28,6 @@ jobs: files: | registry/** - - name: Print out all the changed filse env: ADDED_FILES: ${{ steps.connector-version-changed-files.outputs.added_files }} @@ -52,7 +51,7 @@ jobs: CHANGED_FILES_PATH: "changed_files.json" PUBLICATION_ENV: "staging" CONNECTOR_REGISTRY_GQL_URL: ${{ secrets.CONNECTOR_REGISTRY_GQL_URL }} - GCP_BUCKET_NAME: dev-connector-platform-registry + GCP_BUCKET_NAME: ${{ secrets.GCP_BUCKET_NAME }} GCP_SERVICE_ACCOUNT_DETAILS: ${{ secrets.GCP_SERVICE_ACCOUNT_DETAILS }} CONNECTOR_PUBLICATION_KEY: ${{ secrets.CONNECTOR_PUBLICATION_KEY }} run: | diff --git a/registry-automation/cmd/ci.go b/registry-automation/cmd/ci.go index 5f701888..d80dd6e6 100644 --- a/registry-automation/cmd/ci.go +++ b/registry-automation/cmd/ci.go @@ -297,7 +297,7 @@ func uploadConnectorVersionPackage(client *storage.Client, connector Connector, return connectorVersion, err } - uploadedTgzUrl, err := uploadConnectorVersionDefinition(client, connector.Name, connector.Namespace, version, connectorMetadataTgzPath) + uploadedTgzUrl, err := uploadConnectorVersionDefinition(client, connector.Namespace, connector.Name, version, connectorMetadataTgzPath) if err != nil { return connectorVersion, fmt.Errorf("failed to upload the connector version definition - connector: %v version:%v - err: %v", connector.Name, version, err) } else { @@ -503,7 +503,7 @@ func updateRegistryGQL(payload []ConnectorVersion) error { req := graphql.NewRequest(` mutation InsertConnectorVersion($connectorVersion: [hub_registry_connector_version_insert_input!]!) { - insert_hub_registry_connector_version(objects: $connectorVersion, on_conflict: {constraint: connector_version_namespace_name_version_key, update_columns: [image, package_definition_url]}) { + insert_hub_registry_connector_version(objects: $connectorVersion, on_conflict: {constraint: connector_version_namespace_name_version_key, update_columns: [image, package_definition_url, is_multitenant]}) { affected_rows returning { id diff --git a/registry/hasura/postgres/releases/v1.0.2/connector-packaging.json b/registry/hasura/postgres/releases/v1.0.2/connector-packaging.json new file mode 100644 index 00000000..6ecbb324 --- /dev/null +++ b/registry/hasura/postgres/releases/v1.0.2/connector-packaging.json @@ -0,0 +1,11 @@ +{ + "version": "1.0.2", + "uri": "https://github.com/hasura/ndc-postgres/releases/download/v1.0.2/package.tar.gz", + "checksum": { + "type": "sha256", + "value": "38d4f4a843b3cc7c1b798c21594c8ffcbcd7595c5d456927ea61fe02a7f9d80f" + }, + "source": { + "hash": "1378805c72a16934788d3ab6a5bc767f8f0b9741" + } +} From fea5f1df82622572d44b9c3e346de64331997042 Mon Sep 17 00:00:00 2001 From: pranshi06 <85474619+pranshi06@users.noreply.github.com> Date: Tue, 13 Aug 2024 19:21:39 +0530 Subject: [PATCH 2/5] Add SQL Server and Snowflake registration automation releases folder (#235) --- .../releases/v0.1.0/connector-packaging.json | 11 +++++++++++ .../releases/v0.1.0/connector-packaging.json | 11 +++++++++++ .../releases/v0.1.1/connector-packaging.json | 11 +++++++++++ .../releases/v0.1.2/connector-packaging.json | 11 +++++++++++ 4 files changed, 44 insertions(+) create mode 100644 registry/hasura/snowflake/releases/v0.1.0/connector-packaging.json create mode 100644 registry/hasura/sqlserver/releases/v0.1.0/connector-packaging.json create mode 100644 registry/hasura/sqlserver/releases/v0.1.1/connector-packaging.json create mode 100644 registry/hasura/sqlserver/releases/v0.1.2/connector-packaging.json diff --git a/registry/hasura/snowflake/releases/v0.1.0/connector-packaging.json b/registry/hasura/snowflake/releases/v0.1.0/connector-packaging.json new file mode 100644 index 00000000..55a37c1c --- /dev/null +++ b/registry/hasura/snowflake/releases/v0.1.0/connector-packaging.json @@ -0,0 +1,11 @@ +{ + "version": "0.1.0", + "uri": "https://github.com/hasura/ndc-jvm-mono/releases/download/snowflake%2Fv0.1.0/package.tar.gz", + "checksum": { + "type": "sha256", + "value": "564757bc44bebe56560fe21a1306507d160caf084d69556bded4a7ed392e1b41" + }, + "source": { + "hash": "145792746281b606bcef2dfe20d1f0ad69efe01e" + } +} diff --git a/registry/hasura/sqlserver/releases/v0.1.0/connector-packaging.json b/registry/hasura/sqlserver/releases/v0.1.0/connector-packaging.json new file mode 100644 index 00000000..f0200516 --- /dev/null +++ b/registry/hasura/sqlserver/releases/v0.1.0/connector-packaging.json @@ -0,0 +1,11 @@ +{ + "version": "0.1.0", + "uri": "https://github.com/hasura/ndc-sqlserver/releases/download/v0.1.0/package.tar.gz", + "checksum": { + "type": "sha256", + "value": "5f47a1df3055b694ffaf13058e201ac0fa83db53ce2044cd15eeaaa841565cb4" + }, + "source": { + "hash": "e26d6bd1a22540dcf5c5b29460260c2d23ff2657" + } +} diff --git a/registry/hasura/sqlserver/releases/v0.1.1/connector-packaging.json b/registry/hasura/sqlserver/releases/v0.1.1/connector-packaging.json new file mode 100644 index 00000000..d1836ef5 --- /dev/null +++ b/registry/hasura/sqlserver/releases/v0.1.1/connector-packaging.json @@ -0,0 +1,11 @@ +{ + "version": "0.1.1", + "uri": "https://github.com/hasura/ndc-sqlserver/releases/download/v0.1.1/package.tar.gz", + "checksum": { + "type": "sha256", + "value": "340f11a2dbc180af838327c09949ac0dc14c94eb87b0d6b5a28c765ec928b1a9" + }, + "source": { + "hash": "638a2b608f7a9c4625de7df35c61c909d2ce16b1" + } +} diff --git a/registry/hasura/sqlserver/releases/v0.1.2/connector-packaging.json b/registry/hasura/sqlserver/releases/v0.1.2/connector-packaging.json new file mode 100644 index 00000000..7757b0bd --- /dev/null +++ b/registry/hasura/sqlserver/releases/v0.1.2/connector-packaging.json @@ -0,0 +1,11 @@ +{ + "version": "0.1.2", + "uri": "https://github.com/hasura/ndc-sqlserver/releases/download/v0.1.2/package.tar.gz", + "checksum": { + "type": "sha256", + "value": "102c642b2e0ddea1eaa471c5189ecd3423a20f91ad83995e09f9d4721dd85732" + }, + "source": { + "hash": "bc0fd3d126f6c142587e014aa900fc6bc90cd59d" + } +} From e67621a20fe1ba2ba086a9484068bdf38913bbf4 Mon Sep 17 00:00:00 2001 From: Karthikeyan Chinnakonda Date: Wed, 14 Aug 2024 02:09:52 +0530 Subject: [PATCH 3/5] Add releases folder for `azure-cosmos` and `mysql` (#233) --- registry-automation/cmd/ci.go | 12 ++++++++-- registry/hasura/azure-cosmos/metadata.json | 23 +------------------ .../releases/v0.1.2/connector-packaging.json | 11 +++++++++ .../releases/v0.1.3/connector-packaging.json | 11 +++++++++ .../releases/v0.1.0/connector-packaging.json | 11 +++++++++ .../releases/v0.1.0/connector-packaging.json | 11 +++++++++ 6 files changed, 55 insertions(+), 24 deletions(-) create mode 100644 registry/hasura/azure-cosmos/releases/v0.1.2/connector-packaging.json create mode 100644 registry/hasura/azure-cosmos/releases/v0.1.3/connector-packaging.json create mode 100644 registry/hasura/mysql/releases/v0.1.0/connector-packaging.json create mode 100644 registry/hasura/oracle/releases/v0.1.0/connector-packaging.json diff --git a/registry-automation/cmd/ci.go b/registry-automation/cmd/ci.go index d80dd6e6..9bfdbf9c 100644 --- a/registry-automation/cmd/ci.go +++ b/registry-automation/cmd/ci.go @@ -446,7 +446,7 @@ func buildRegistryPayload( uploadedConnectorDefinitionTgzUrl string, ) (ConnectorVersion, error) { var connectorVersion ConnectorVersion - var connectorVersionDockerImage string + var connectorVersionDockerImage string = "" connectorVersionPackagingDefinition, ok := connectorVersionMetadata["packagingDefinition"].(map[interface{}]interface{}) if !ok { return connectorVersion, fmt.Errorf("could not find the 'packagingDefinition' of the connector %s version %s in the connector's metadata", connectorName, version) @@ -483,11 +483,19 @@ func buildRegistryPayload( connectorVersionType = ManagedDockerBuild } + var connectorVersionImage *string + + if connectorVersionDockerImage == "" { + connectorVersionImage = nil + } else { + connectorVersionImage = &connectorVersionDockerImage + } + connectorVersion = ConnectorVersion{ Namespace: connectorNamespace, Name: connectorName, Version: version, - Image: &connectorVersionDockerImage, + Image: connectorVersionImage, PackageDefinitionURL: uploadedConnectorDefinitionTgzUrl, IsMultitenant: connectorInfo.HubRegistryConnector[0].MultitenantConnector != nil, Type: connectorVersionType, diff --git a/registry/hasura/azure-cosmos/metadata.json b/registry/hasura/azure-cosmos/metadata.json index 46b72c45..74caad96 100644 --- a/registry/hasura/azure-cosmos/metadata.json +++ b/registry/hasura/azure-cosmos/metadata.json @@ -15,28 +15,7 @@ "is_verified": true, "is_hosted_by_hasura": true, "packages": [ - { - "version": "0.1.3", - "uri": "https://github.com/hasura/ndc-azure-cosmos-connector/releases/download/v0.1.3/connector-definition.tgz", - "checksum": { - "type": "sha256", - "value": "34655ff615be0d5738ffe1811972776808e9880a6fa3ec673123844c648154d7" - }, - "source": { - "hash": "97032d1a41fd932d637b5ba24ca6611d9e1f4905" - } - }, - { - "version": "0.1.2", - "uri": "https://github.com/hasura/ndc-azure-cosmos-connector/releases/download/v0.1.2/connector-definition.tgz", - "checksum": { - "type": "sha256", - "value": "09ce246a9039d2aaf799a7e0402b243fb3763ba802535348a9fee243de1bf1b7" - }, - "source": { - "hash": "f67b2f80d64175a055a9489d4e59f30d5d3870a0" - } - } + ], "source_code": { "is_open_source": true, diff --git a/registry/hasura/azure-cosmos/releases/v0.1.2/connector-packaging.json b/registry/hasura/azure-cosmos/releases/v0.1.2/connector-packaging.json new file mode 100644 index 00000000..4feb205e --- /dev/null +++ b/registry/hasura/azure-cosmos/releases/v0.1.2/connector-packaging.json @@ -0,0 +1,11 @@ +{ + "version": "0.1.2", + "uri": "https://github.com/hasura/ndc-azure-cosmos-connector/releases/download/v0.1.2/connector-definition.tgz", + "checksum": { + "type": "sha256", + "value": "09ce246a9039d2aaf799a7e0402b243fb3763ba802535348a9fee243de1bf1b7" + }, + "source": { + "hash": "f67b2f80d64175a055a9489d4e59f30d5d3870a0" + } +} diff --git a/registry/hasura/azure-cosmos/releases/v0.1.3/connector-packaging.json b/registry/hasura/azure-cosmos/releases/v0.1.3/connector-packaging.json new file mode 100644 index 00000000..3d4242c9 --- /dev/null +++ b/registry/hasura/azure-cosmos/releases/v0.1.3/connector-packaging.json @@ -0,0 +1,11 @@ +{ + "version": "0.1.3", + "uri": "https://github.com/hasura/ndc-azure-cosmos-connector/releases/download/v0.1.3/connector-definition.tgz", + "checksum": { + "type": "sha256", + "value": "34655ff615be0d5738ffe1811972776808e9880a6fa3ec673123844c648154d7" + }, + "source": { + "hash": "97032d1a41fd932d637b5ba24ca6611d9e1f4905" + } +} diff --git a/registry/hasura/mysql/releases/v0.1.0/connector-packaging.json b/registry/hasura/mysql/releases/v0.1.0/connector-packaging.json new file mode 100644 index 00000000..ef79399f --- /dev/null +++ b/registry/hasura/mysql/releases/v0.1.0/connector-packaging.json @@ -0,0 +1,11 @@ +{ + "version": "0.1.0", + "uri": "https://github.com/hasura/ndc-jvm-mono/releases/download/mysql%2Fv0.1.0/package.tar.gz", + "checksum": { + "type": "sha256", + "value": "09b51f9be725099345159880d21efb712776bfd09291a0daa81d7e7b1418ca2c" + }, + "source": { + "hash": "145792746281b606bcef2dfe20d1f0ad69efe01e" + } +} diff --git a/registry/hasura/oracle/releases/v0.1.0/connector-packaging.json b/registry/hasura/oracle/releases/v0.1.0/connector-packaging.json new file mode 100644 index 00000000..535615bc --- /dev/null +++ b/registry/hasura/oracle/releases/v0.1.0/connector-packaging.json @@ -0,0 +1,11 @@ +{ + "version": "0.1.0", + "uri": "https://github.com/hasura/ndc-jvm-mono/releases/download/oracle%2Fv0.1.0/package.tar.gz", + "checksum": { + "type": "sha256", + "value": "0d837408a213f55df34062b96a2ac7fabcf8c61891918b6b2754d90fc61dd24c" + }, + "source": { + "hash": "145792746281b606bcef2dfe20d1f0ad69efe01e" + } +} From 765197ab5cdfd746d7c71d301c5fa08d89016c6f Mon Sep 17 00:00:00 2001 From: gneeri Date: Tue, 13 Aug 2024 17:17:05 -0400 Subject: [PATCH 4/5] Update metadata.json (#239) --- registry/hasura/open-api-lambda/metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/registry/hasura/open-api-lambda/metadata.json b/registry/hasura/open-api-lambda/metadata.json index 1a5a25eb..9163d8f5 100644 --- a/registry/hasura/open-api-lambda/metadata.json +++ b/registry/hasura/open-api-lambda/metadata.json @@ -1,8 +1,8 @@ { "overview": { "namespace": "hasura", - "description": "The Open API Lambda Connector allows you to import already existing APIs specified by the Open API Spec into you Hasura DDN subgraphs", - "title": "Open API Lambda Connector", + "description": "The OpenAPI Lambda Connector allows you to import already existing APIs specified by the Open API Spec into you Hasura DDN subgraphs", + "title": "OpenAPI Lambda Connector", "logo": "logo.png", "tags": [], "latest_version": "v0.1.1" From 8a2bb13f900b5d0b19dee4b9f4c133f5508b10ec Mon Sep 17 00:00:00 2001 From: gneeri Date: Tue, 13 Aug 2024 17:17:30 -0400 Subject: [PATCH 5/5] added registration automation files for elasticsearch (#236) --- registry/hasura/elasticsearch/README.md | 24 +++++++++---------- .../releases/v0.1.0/connector-packaging.json | 11 +++++++++ .../releases/v0.1.1/connector-packaging.json | 11 +++++++++ .../releases/v0.2.0/connector-packaging.json | 11 +++++++++ .../releases/v1.0.0/connector-packaging.json | 11 +++++++++ .../releases/v1.0.1/connector-packaging.json | 11 +++++++++ 6 files changed, 67 insertions(+), 12 deletions(-) create mode 100644 registry/hasura/elasticsearch/releases/v0.1.0/connector-packaging.json create mode 100644 registry/hasura/elasticsearch/releases/v0.1.1/connector-packaging.json create mode 100644 registry/hasura/elasticsearch/releases/v0.2.0/connector-packaging.json create mode 100644 registry/hasura/elasticsearch/releases/v1.0.0/connector-packaging.json create mode 100644 registry/hasura/elasticsearch/releases/v1.0.1/connector-packaging.json diff --git a/registry/hasura/elasticsearch/README.md b/registry/hasura/elasticsearch/README.md index 52c529ed..1fa8fc77 100644 --- a/registry/hasura/elasticsearch/README.md +++ b/registry/hasura/elasticsearch/README.md @@ -19,18 +19,18 @@ Below, you'll find a matrix of all supported features for the Elasticsearch conn | Feature | Supported | Notes | -| ------------------------------- | --------- | ----- | -| Native Queries + Logical Models | ❌ | | -| Simple Object Query | ✅ | | -| Filter / Search | ✅ | | -| Simple Aggregation | ✅ | | -| Sort | ✅ | | -| Paginate | ✅ | | -| Nested Objects | ✅ | | -| Nested Arrays | ✅ | | -| Nested Filtering | ❌ | | -| Nested Sorting | ❌ | | -| Nested Relationships | ❌ | | +| ------------------------------- | -------- | ----- | +| Native Queries + Logical Models | ✅ | | +| Simple Object Query | ✅ | | +| Filter / Search | ✅ | | +| Simple Aggregation | ✅ | | +| Sort | ✅ | | +| Paginate | ✅ | | +| Nested Objects | ✅ | | +| Nested Arrays | ✅ | | +| Nested Filtering | ❌ | | +| Nested Sorting | ❌ | | +| Nested Relationships | ❌ | | ## Before you get Started diff --git a/registry/hasura/elasticsearch/releases/v0.1.0/connector-packaging.json b/registry/hasura/elasticsearch/releases/v0.1.0/connector-packaging.json new file mode 100644 index 00000000..e0a3d864 --- /dev/null +++ b/registry/hasura/elasticsearch/releases/v0.1.0/connector-packaging.json @@ -0,0 +1,11 @@ +{ + "version": "0.1.0", + "uri": "https://github.com/hasura/ndc-elasticsearch/releases/download/v0.1.0/connector-definition.tgz", + "checksum": { + "type": "sha256", + "value": "a856e10b6b30b516db2bb38af08037ad5db32bfd4ec072270fb8685872e13d5b" + }, + "source": { + "hash": "4c6fabedaf3a28cdd6c55a18a37e1db974a83262" + } +} diff --git a/registry/hasura/elasticsearch/releases/v0.1.1/connector-packaging.json b/registry/hasura/elasticsearch/releases/v0.1.1/connector-packaging.json new file mode 100644 index 00000000..000cd437 --- /dev/null +++ b/registry/hasura/elasticsearch/releases/v0.1.1/connector-packaging.json @@ -0,0 +1,11 @@ +{ + "version": "0.1.1", + "uri": "https://github.com/hasura/ndc-elasticsearch/releases/download/v0.1.1/connector-definition.tgz", + "checksum": { + "type": "sha256", + "value": "60629c9b24467fa4ed58c87732410203eedbdee31cdd18e90c635f10d23a8e23" + }, + "source": { + "hash": "413a2a4ddfd1910757c40c38e9a18148bc3b3bdc" + } +} diff --git a/registry/hasura/elasticsearch/releases/v0.2.0/connector-packaging.json b/registry/hasura/elasticsearch/releases/v0.2.0/connector-packaging.json new file mode 100644 index 00000000..d794b284 --- /dev/null +++ b/registry/hasura/elasticsearch/releases/v0.2.0/connector-packaging.json @@ -0,0 +1,11 @@ +{ + "version": "0.2.0", + "uri": "https://github.com/hasura/ndc-elasticsearch/releases/download/v0.2.0/connector-definition.tgz", + "checksum": { + "type": "sha256", + "value": "7ba4762ae3863a2ea149a5ecf4a93f19a7889f9d36dde27b1cb60b6758ad0e3a" + }, + "source": { + "hash": "f5938f8c76829de7f16cf291c95a06f590b16d9a" + } +} diff --git a/registry/hasura/elasticsearch/releases/v1.0.0/connector-packaging.json b/registry/hasura/elasticsearch/releases/v1.0.0/connector-packaging.json new file mode 100644 index 00000000..adf38221 --- /dev/null +++ b/registry/hasura/elasticsearch/releases/v1.0.0/connector-packaging.json @@ -0,0 +1,11 @@ +{ + "version": "1.0.0", + "uri": "https://github.com/hasura/ndc-elasticsearch/releases/download/v1.0.0/connector-definition.tgz", + "checksum": { + "type": "sha256", + "value": "6ca06b00361a272b0afd7ce5ac314a12460b9c99336e43a4a317de00f00ae6ae" + }, + "source": { + "hash": "9f1f508f551b4a9dec02c49e3312f38c24bb16c4" + } +} diff --git a/registry/hasura/elasticsearch/releases/v1.0.1/connector-packaging.json b/registry/hasura/elasticsearch/releases/v1.0.1/connector-packaging.json new file mode 100644 index 00000000..79c1cbd2 --- /dev/null +++ b/registry/hasura/elasticsearch/releases/v1.0.1/connector-packaging.json @@ -0,0 +1,11 @@ +{ + "version": "1.0.1", + "uri": "https://github.com/hasura/ndc-elasticsearch/releases/download/v1.0.1/connector-definition.tgz", + "checksum": { + "type": "sha256", + "value": "83b0b4f5b1f60a50e303f6354c4d48d397fc7d0a361eb8a14d8fe11b63fe6abd" + }, + "source": { + "hash": "72fad205f57e88781da6acafe1e03a7d220467c7" + } +}