Browse Source
Merge pull request #5723 from Budibase/fix/gsheets
Re-enable gsheets for verification
master
Rory Powell
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
24 additions and
28 deletions
-
charts/budibase/templates/app-service-deployment.yaml
-
packages/backend-core/src/featureFlags/index.js
-
packages/server/src/api/controllers/integration.js
-
packages/server/yarn.lock
-
packages/worker/yarn.lock
|
|
|
@ -114,8 +114,8 @@ spec: |
|
|
|
value: {{ .Values.globals.google.secret | quote }} |
|
|
|
- name: AUTOMATION_MAX_ITERATIONS |
|
|
|
value: {{ .Values.globals.automationMaxIterations | quote }} |
|
|
|
- name: EXCLUDE_QUOTAS_TENANTS |
|
|
|
value: {{ .Values.globals.excludeQuotasTenants | quote }} |
|
|
|
- name: TENANT_FEATURE_FLAGS |
|
|
|
value: {{ .Values.globals.tenantFeatureFlags | quote }} |
|
|
|
|
|
|
|
image: budibase/apps:{{ .Values.globals.appVersion }} |
|
|
|
imagePullPolicy: Always |
|
|
|
|
|
|
|
@ -49,4 +49,5 @@ exports.getTenantFeatureFlags = tenantId => { |
|
|
|
|
|
|
|
exports.FeatureFlag = { |
|
|
|
LICENSING: "LICENSING", |
|
|
|
GOOGLE_SHEETS: "GOOGLE_SHEETS", |
|
|
|
} |
|
|
|
|
|
|
|
@ -1,21 +1,16 @@ |
|
|
|
const { cloneDeep } = require("lodash") |
|
|
|
const { definitions } = require("../../integrations") |
|
|
|
const { getTenantId } = require("@budibase/backend-core/tenancy") |
|
|
|
const { SourceNames } = require("../../definitions/datasource") |
|
|
|
const googlesheets = require("../../integrations/googlesheets") |
|
|
|
const env = require("../../environment") |
|
|
|
const { featureFlags } = require("@budibase/backend-core") |
|
|
|
|
|
|
|
exports.fetch = async function (ctx) { |
|
|
|
ctx.status = 200 |
|
|
|
const defs = cloneDeep(definitions) |
|
|
|
|
|
|
|
// for google sheets integration google verification
|
|
|
|
if (env.EXCLUDE_QUOTAS_TENANTS) { |
|
|
|
const excludedTenants = env.EXCLUDE_QUOTAS_TENANTS.split(",") |
|
|
|
const tenantId = getTenantId() |
|
|
|
if (excludedTenants.includes(tenantId)) { |
|
|
|
defs[SourceNames.GOOGLE_SHEETS] = googlesheets.schema |
|
|
|
} |
|
|
|
if (featureFlags.isEnabled(featureFlags.FeatureFlag.GOOGLE_SHEETS)) { |
|
|
|
defs[SourceNames.GOOGLE_SHEETS] = googlesheets.schema |
|
|
|
} |
|
|
|
|
|
|
|
ctx.body = defs |
|
|
|
|
|
|
|
@ -1014,10 +1014,10 @@ |
|
|
|
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" |
|
|
|
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== |
|
|
|
|
|
|
|
"@budibase/backend-core@1.0.138": |
|
|
|
version "1.0.138" |
|
|
|
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.138.tgz#5297d6cf5b9ec8c15f0a6df4c7d8273b8ac900f0" |
|
|
|
integrity sha512-1qN/5urKX8bBXwEz266Z94rco8dTI7VqIh75m8ZcqrAfoUpjvZJS76gZxfc5U/QWPwrgVFnLtYvnEjaLbGEflg== |
|
|
|
"@budibase/backend-core@1.0.142": |
|
|
|
version "1.0.142" |
|
|
|
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.142.tgz#cbfa426dbf064dff0ea5f9840baae595c0f5343c" |
|
|
|
integrity sha512-gd52tOm4mytHa3OQQVcEiwnVCvq0pC0q3YN+5D1uoGt9WaAZoshB5AhXnUPZohvpo5j8isO07qXvF+5YffPVaw== |
|
|
|
dependencies: |
|
|
|
"@techpass/passport-openidconnect" "^0.3.0" |
|
|
|
aws-sdk "^2.901.0" |
|
|
|
@ -1091,12 +1091,12 @@ |
|
|
|
svelte-flatpickr "^3.2.3" |
|
|
|
svelte-portal "^1.0.0" |
|
|
|
|
|
|
|
"@budibase/pro@1.0.138": |
|
|
|
version "1.0.138" |
|
|
|
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.138.tgz#cacbebe5ce93eb533af62a794a638944c2c61544" |
|
|
|
integrity sha512-4ABlUZvl2h8sd8awJATf3KJeoFWV/8SoqdbKiH1ICdUcM/6dad7nhbJ15QqJL+Uuh/+mN2yEbr8V6Un2+yF+CA== |
|
|
|
"@budibase/pro@1.0.142": |
|
|
|
version "1.0.142" |
|
|
|
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.142.tgz#17cd53d67ce80e0cce2179caee0c03e6a0d7084e" |
|
|
|
integrity sha512-c1SaRoVik/AVn4zNNsDciFeIr+P3J6Sc8hsE5M3pb0Zj/NzSEHXTesxcBVLlD2PYlwnvWPSoMvdDJKrEFHvOYQ== |
|
|
|
dependencies: |
|
|
|
"@budibase/backend-core" "1.0.138" |
|
|
|
"@budibase/backend-core" "1.0.142" |
|
|
|
node-fetch "^2.6.1" |
|
|
|
|
|
|
|
"@budibase/standard-components@^0.9.139": |
|
|
|
|
|
|
|
@ -293,10 +293,10 @@ |
|
|
|
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" |
|
|
|
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== |
|
|
|
|
|
|
|
"@budibase/backend-core@1.0.138": |
|
|
|
version "1.0.138" |
|
|
|
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.138.tgz#5297d6cf5b9ec8c15f0a6df4c7d8273b8ac900f0" |
|
|
|
integrity sha512-1qN/5urKX8bBXwEz266Z94rco8dTI7VqIh75m8ZcqrAfoUpjvZJS76gZxfc5U/QWPwrgVFnLtYvnEjaLbGEflg== |
|
|
|
"@budibase/backend-core@1.0.142": |
|
|
|
version "1.0.142" |
|
|
|
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.142.tgz#cbfa426dbf064dff0ea5f9840baae595c0f5343c" |
|
|
|
integrity sha512-gd52tOm4mytHa3OQQVcEiwnVCvq0pC0q3YN+5D1uoGt9WaAZoshB5AhXnUPZohvpo5j8isO07qXvF+5YffPVaw== |
|
|
|
dependencies: |
|
|
|
"@techpass/passport-openidconnect" "^0.3.0" |
|
|
|
aws-sdk "^2.901.0" |
|
|
|
@ -321,12 +321,12 @@ |
|
|
|
uuid "^8.3.2" |
|
|
|
zlib "^1.0.5" |
|
|
|
|
|
|
|
"@budibase/pro@1.0.138": |
|
|
|
version "1.0.138" |
|
|
|
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.138.tgz#cacbebe5ce93eb533af62a794a638944c2c61544" |
|
|
|
integrity sha512-4ABlUZvl2h8sd8awJATf3KJeoFWV/8SoqdbKiH1ICdUcM/6dad7nhbJ15QqJL+Uuh/+mN2yEbr8V6Un2+yF+CA== |
|
|
|
"@budibase/pro@1.0.142": |
|
|
|
version "1.0.142" |
|
|
|
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.142.tgz#17cd53d67ce80e0cce2179caee0c03e6a0d7084e" |
|
|
|
integrity sha512-c1SaRoVik/AVn4zNNsDciFeIr+P3J6Sc8hsE5M3pb0Zj/NzSEHXTesxcBVLlD2PYlwnvWPSoMvdDJKrEFHvOYQ== |
|
|
|
dependencies: |
|
|
|
"@budibase/backend-core" "1.0.138" |
|
|
|
"@budibase/backend-core" "1.0.142" |
|
|
|
node-fetch "^2.6.1" |
|
|
|
|
|
|
|
"@cspotcode/source-map-consumer@0.8.0": |
|
|
|
|
