Skip to content

Commit 71480c2

Browse files
authored
chore: remove serverless and terraform backends (#89)
* chore: remove serverless and terraform backends * fix: update ci container image * fix(ci): install jq * fix(ci): add default shell * docs(deploy): update docs to remove extra backends * test(integration): adjust for flakiness * fix(ci): missing silence in make command * fix(integration): increase max retries * test(ci): run the tests in pl-waw * test(integrations): use current version when vendoring in tests * test(ci): remove clean up * fix: use scaleway runtime when vendoring deps * test(integration): upgrade to python311 runtime * fix: revert use runtime version when packaging * fix(integration): go back to using boto3 to get gateway key * refactor: rename upload timeout variable * refactor: remove gateway auth key in tests.constants
1 parent 1f524fb commit 71480c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+948
-1598
lines changed

.github/actions/setup-poetry/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ runs:
1919
- name: Install poetry dependencies
2020
shell: bash
2121
run: poetry install --no-interaction --no-root --with=dev
22-
if: steps.cache-deps.outputs.cache-hit != 'true'
22+
if: steps.cache-poetry-deps.outputs.cache-hit != 'true'
2323

2424
- name: Install scw_serverless
2525
shell: bash

.github/actions/setup-serverless-framework/action.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/integration-gateway.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,14 @@ env:
1515
S3_ENDPOINT: "https://s3.fr-par.scw.cloud"
1616
S3_REGION: "fr-par"
1717

18+
defaults:
19+
run:
20+
shell: bash
21+
1822
jobs:
1923
test-deployed-gateway:
20-
runs-on: ubuntu-latest
24+
runs-on: self-hosted
25+
container: python:3.11-bullseye
2126
steps:
2227
- uses: actions/checkout@v3
2328

@@ -38,6 +43,9 @@ jobs:
3843
default-organization-id: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
3944
save-config: true
4045

46+
- name: Install jq
47+
run: apt-get update && apt-get install -y jq
48+
4149
- name: Create Gateway namespace
4250
working-directory: ${{ env.GATEWAY_CHECKOUT_DIR }}
4351
run: |

.github/workflows/pytest-integration.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,10 @@ permissions:
1313
jobs:
1414
test:
1515
runs-on: self-hosted
16-
container: nikolaik/python-nodejs:python3.10-nodejs18
16+
container: python:3.11-bullseye
1717
steps:
1818
- uses: actions/checkout@v3
1919

20-
- name: Install terraform
21-
uses: hashicorp/setup-terraform@v2
22-
with:
23-
terraform_wrapper: false
24-
25-
- uses: ./.github/actions/setup-serverless-framework
26-
2720
- uses: ./.github/actions/setup-poetry
2821

2922
- name: Test with pytest

.github/workflows/pytest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414
jobs:
1515
test:
1616
runs-on: self-hosted
17-
container: nikolaik/python-nodejs:python3.10-nodejs18
17+
container: python:3.11-bullseye
1818
steps:
1919
- uses: actions/checkout@v3
2020

.github/workflows/python-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
jobs:
1212
deploy:
1313
runs-on: self-hosted
14-
container: nikolaik/python-nodejs:python3.10-nodejs18
14+
container: python:3.11-slim-bullseye
1515
steps:
1616
- uses: actions/checkout@v3
1717

docs/source/configuring.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ If do not want your function to be publicly available, set the privacy to `priva
6969
def handler(event, context):
7070
...
7171
72-
.. autofunction:: scw_serverless.app.Serverless.schedule
72+
.. autoclass:: scw_serverless.config.triggers.CronTrigger

docs/source/deploying.rst

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,8 @@ The `deploy` command will deploy your functions directly.
1414
1515
The command will wait until all functions are deployed and ready to be called. It will also deploy the corresponding triggers.
1616

17-
Generate
18-
--------
19-
20-
Generators will generate configuration files to use with other deployment tools.
21-
Currently, you can generate either a `serverless` or `terraform` configuration file. This can be useful to integrate with your existing tooling.
22-
23-
Config file generation is done with the `generate` command:
24-
25-
.. code-block:: console
26-
27-
scw-serverless generate -t serverless
28-
29-
Serverless Generator
30-
^^^^^^^^^^^^^^^^^^^^
31-
32-
.. autoclass:: scw_serverless.config.generators.ServerlessFrameworkGenerator
33-
34-
Terraform Generator
35-
^^^^^^^^^^^^^^^^^^^
36-
37-
.. autoclass:: scw_serverless.config.generators.TerraformGenerator
17+
If you have routed functions, the deploy command will also call your Serverless Gateway to update the routes to your function.
18+
For more information on the Gateway integration, see also :doc:`gateway`.
3819

3920
Dependencies
4021
------------

0 commit comments

Comments
 (0)