Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(server/feature flags): adds multi-region blob storage ff #3643

Merged
merged 1 commit into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,7 @@ jobs:
MULTI_REGION_CONFIG_PATH: '../../.circleci/multiregion.test-ci.json'
FF_WORKSPACES_MODULE_ENABLED: 'true'
FF_WORKSPACES_MULTI_REGION_ENABLED: 'true'
FF_WORKSPACES_MULTI_REGION_BLOB_STORAGE_ENABLED: 'true'
RUN_TESTS_IN_MULTIREGION_MODE: true

test-frontend-2:
Expand Down
2 changes: 1 addition & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"dev:clean": "yarn build:clean && yarn dev",
"dev:server:test": "cross-env DISABLE_NOTIFICATIONS_CONSUMPTION=true NODE_ENV=test LOG_LEVEL=silent LOG_PRETTY=true node ./bin/ts-www",
"test": "cross-env NODE_ENV=test LOG_LEVEL=silent LOG_PRETTY=true mocha",
"test:multiregion": "cross-env RUN_TESTS_IN_MULTIREGION_MODE=true FF_WORKSPACES_MODULE_ENABLED=true FF_WORKSPACES_MULTI_REGION_ENABLED=true yarn test",
"test:multiregion": "cross-env RUN_TESTS_IN_MULTIREGION_MODE=true FF_WORKSPACES_MODULE_ENABLED=true FF_WORKSPACES_MULTI_REGION_ENABLED=true FF_WORKSPACES_MULTI_REGION_BLOB_STORAGE_ENABLED=true yarn test",
"test:no-ff": "cross-env DISABLE_ALL_FFS=true yarn test",
"test:coverage": "cross-env NODE_ENV=test LOG_LEVEL=silent LOG_PRETTY=true nyc --reporter lcov mocha",
"test:report": "yarn test:coverage -- --reporter mocha-junit-reporter --reporter-options mochaFile=reports/test-results.xml",
Expand Down
5 changes: 5 additions & 0 deletions packages/shared/src/environment/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ const parseFeatureFlags = () => {
schema: z.boolean(),
defaults: { production: false, _: false }
},
FF_WORKSPACES_MULTI_REGION_BLOB_STORAGE_ENABLED: {
schema: z.boolean(),
defaults: { production: false, _: false }
},
// Toggles IFC parsing with experimental .Net parser
FF_FILEIMPORT_IFC_DOTNET_ENABLED: {
schema: z.boolean(),
Expand Down Expand Up @@ -79,6 +83,7 @@ export function getFeatureFlags(): {
FF_GATEKEEPER_MODULE_ENABLED: boolean
FF_BILLING_INTEGRATION_ENABLED: boolean
FF_WORKSPACES_MULTI_REGION_ENABLED: boolean
FF_WORKSPACES_MULTI_REGION_BLOB_STORAGE_ENABLED: boolean
FF_FILEIMPORT_IFC_DOTNET_ENABLED: boolean
} {
if (!parsedFlags) parsedFlags = parseFeatureFlags()
Expand Down
3 changes: 2 additions & 1 deletion packages/webhook-service/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"runtimeArgs": ["dev"],
"skipFiles": ["<node_internals>/**"],
"env": {
"FF_WORKSPACES_MULTI_REGION_ENABLED": "false"
"FF_WORKSPACES_MULTI_REGION_ENABLED": "false",
"FF_WORKSPACES_MULTI_REGION_BLOB_STORAGE_ENABLED": "false"
}
}
]
Expand Down
3 changes: 3 additions & 0 deletions utils/helm/speckle-server/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,9 @@ Generate the environment variables for Speckle server and Speckle objects deploy
- name: FF_WORKSPACES_MULTI_REGION_ENABLED
value: {{ .Values.featureFlags.workspacesMultiRegionEnabled | quote }}

- name: FF_WORKSPACES_MULTI_REGION_BLOB_STORAGE_ENABLED
value: {{ .Values.featureFlags.workspacesMultiRegionBlobStorageEnabled | quote }}

{{- if .Values.featureFlags.billingIntegrationEnabled }}
- name: STRIPE_API_KEY
valueFrom:
Expand Down
2 changes: 2 additions & 0 deletions utils/helm/speckle-server/templates/frontend_2/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ spec:
value: {{ .Values.featureFlags.billingIntegrationEnabled | quote }}
- name: NUXT_PUBLIC_FF_WORKSPACES_MULTI_REGION_ENABLED
value: {{ .Values.featureFlags.workspacesMultiRegionEnabled | quote }}
- name: NUXT_PUBLIC_FF_WORKSPACES_MULTI_REGION_BLOB_STORAGE_ENABLED
value: {{ .Values.featureFlags.workspacesMultiRegionBlobStorageEnabled | quote }}
- name: NUXT_PUBLIC_FF_GENDOAI_MODULE_ENABLED
value: {{ .Values.featureFlags.gendoAIModuleEnabled | quote }}
{{- if .Values.analytics.survicate_workspace_key }}
Expand Down
Loading