Skip to content

Commit 91647e6

Browse files
wilbrdtkernicPanel
authored andcommitted
🔥(terraform) remove unused AWS provisioning
As everything have now been migrated from AWS to Scaleway, removing all AWS provisioning and configuration.
1 parent a026a22 commit 91647e6

File tree

25 files changed

+1
-2207
lines changed

25 files changed

+1
-2207
lines changed

.circleci/config.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ jobs:
209209
DJANGO_AWS_ACCESS_KEY_ID: aws-access-key-id
210210
DJANGO_AWS_SECRET_ACCESS_KEY: aws-secret-access-key
211211
DJANGO_SCW_EDGE_SERVICE_DOMAIN: abc.svc.edge.scw.cloud
212-
DJANGO_AWS_MEDIALIVE_ROLE_ARN: aws:medialive:arn:role
213-
DJANGO_AWS_MEDIAPACKAGE_HARVEST_JOB_ARN: aws:mediapackage:arn:role
214212
DJANGO_BBB_API_SECRET: bbb-api-secret
215213
working_directory: ~/marsha/src/backend
216214
steps:
@@ -290,8 +288,6 @@ jobs:
290288
DJANGO_AWS_ACCESS_KEY_ID: aws-access-key-id
291289
DJANGO_AWS_SECRET_ACCESS_KEY: aws-secret-access-key
292290
DJANGO_SCW_EDGE_SERVICE_DOMAIN: abc.svc.edge.scw.cloud
293-
DJANGO_AWS_MEDIALIVE_ROLE_ARN: aws:medialive:arn:role
294-
DJANGO_AWS_MEDIAPACKAGE_HARVEST_JOB_ARN: aws:mediapackage:arn:role
295291
DJANGO_BBB_API_SECRET: bbb-api-secret
296292
DJANGO_MARKDOWN_ENABLED: 1
297293
- image: cimg/postgres:16.4
@@ -529,8 +525,6 @@ jobs:
529525
DJANGO_AWS_ACCESS_KEY_ID: aws-access-key-id
530526
DJANGO_AWS_SECRET_ACCESS_KEY: aws-secret-access-key
531527
DJANGO_SCW_EDGE_SERVICE_DOMAIN: abc.svc.edge.scw.cloud
532-
DJANGO_AWS_MEDIALIVE_ROLE_ARN: aws:medialive:arn:role
533-
DJANGO_AWS_MEDIAPACKAGE_HARVEST_JOB_ARN: aws:mediapackage:arn:role
534528
DJANGO_BBB_API_SECRET: bbb-api-secret
535529
DOCKERIZE_VERSION: v0.6.1
536530
DJANGO_ALLOW_ASYNC_UNSAFE: 1

docs/env.md

Lines changed: 1 addition & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -502,107 +502,8 @@ The default region used by the AWS provider. All resources managed by terraform
502502

503503
#### TF_VAR_s3_bucket_unique_suffix
504504

505-
A unique suffix added to all S3 bucket names. You choose this suffix once and can't change it afterwards as it is not allowed to rename a bucket (terraform would delete the current bucket and create a new one. All your data would be lost for ever). This suffix is needed because a bucket name is unique accross all existing AWS accounts: https://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html
505+
A unique suffix added to all S3 bucket names. You choose this suffix once and can't change it afterwards as it is not allowed to rename a bucket (terraform would delete the current bucket and create a new one. All your data would be lost for ever).
506506
A suffix can be your company name or any random string. If you don't add this variable, you will not be able to create any s3 bucket in your project.
507507

508508
- Type: string
509509
- Required: Yes
510-
511-
#### TF_VAR_cloudfront_trusted_signer_id
512-
513-
The ID of the AWS master account (not its access key!) with which we want to sign urls (it is declared in the CloudFront distribution as a signing account).
514-
515-
- Type: string
516-
- Required: Yes
517-
- Default: None
518-
519-
#### TF_VAR_update_state_secret
520-
521-
Secret used to sign messages exchanged between the Django backend & AWS lambdas.
522-
523-
Note: should be included in the list of values declared in `DJANGO_UPDATE_STATE_SHARED_SECRETS` for the Django backend deployment with which our deployment's lambdas will communicate.
524-
525-
- Type: string <br> ⚠️ *MUST NOT INCLUDE ANY COMMAS* as the corresponding Django setting is a comma-separated list.
526-
- Required: Yes
527-
- Default: None
528-
529-
#### TF_VAR_marsha_base_url
530-
531-
The marsha backend url. This url will be used in the lambda as base url to build all the url called from all lambdas.
532-
533-
Example: `marsha.education`
534-
535-
- Type: string
536-
- Required: Yes
537-
- Default: None
538-
539-
#### TF_VAR_update_state_endpoint
540-
541-
The endpoint in Marsha to which our lambdas should POST state updates when they process files.
542-
543-
Example: `/api/update-state`.
544-
545-
- Type: string
546-
- Required: Yes
547-
- Default: None
548-
549-
#### TF_VAR_update_state_disable_ssl_validation
550-
551-
Whether SSL certificate validation in requests made by the AWS lambdas should be disabled. This allows Django to run on a domain with a self-signed or otherwise invalid certificate in non-production environments.
552-
553-
- Type: boolean
554-
- Required: No
555-
- Default: false
556-
557-
#### TF_VAR_migrations
558-
559-
A list of migrations to execute by the migration lambda without the extension (`.js`). List of migrations are available in `src/aws/lambda-migrate/src/migrations`.
560-
To execute the migration `0001_encode_timed_text_tracks.js` set this variable with `0001_encode_timed_text_tracks`
561-
562-
Example: ["0001_encode_timed_text_tracks"]
563-
564-
- Type: list of strings
565-
- Required: No
566-
- Default: []
567-
568-
#### TF_VAR_lambda_image_name
569-
570-
The [ECR](https://aws.amazon.com/ecr/) image name you want to use. All lambdas are built in one docker image and hosted in this repository
571-
572-
- Type: string
573-
- Required: Yes
574-
- Default: None
575-
576-
#### TF_VAR_lambda_image_tag
577-
578-
The lambda docker image tag used by all the lambdas
579-
580-
- Type: string
581-
- Required: Yes
582-
- Default: None
583-
584-
#### TF_VAR_ecr_lambda_marsha_arn
585-
586-
The [arn](https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html) associated with the ECR image name.
587-
This value can be found in the shared_resources terraform output.
588-
589-
- Type: string
590-
- Required: Yes
591-
- Default: None
592-
593-
#### TF_VAR_medialive_lambda_name
594-
595-
This variable is used by the medialive routing lambda. This lambda will use the variable to determine on which lambda
596-
the event should be routed.
597-
598-
- Type: string
599-
- Required: Yes
600-
- Default: marsha-medialive
601-
602-
#### TF_VAR_lambda_convert_memory
603-
604-
This variable allow you to configure the amount of memory allocated for the lambda convert. Depending the environment you are using you would like to increase this value.
605-
606-
- Type: number
607-
- Required: No
608-
- Default: 1536

src/aws/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ output: ## Display Terraform config output
3838
init: env.d/development ## Initialize Terraform
3939
init:
4040
bin/terraform init
41-
bin/shared-resources init
42-
bin/shared-resources apply -target aws_ecr_repository.marsha_lambda
4341
.PHONY: init
4442

4543
help: ## Show this help

src/aws/bin/shared-resources

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

src/aws/bin/terraform

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ function terraform() {
6666
-v "${PWD}/:/app" \
6767
-w "/app" \
6868
--env-file ./env.d/${MARSHA_TERRAFORM_ENV_FILE} \
69-
-e TF_VAR_marsha_base_url="${TUNNEL_URL}" \
7069
"hashicorp/terraform:${TERRAFORM_VERSION}" \
7170
"$@"
7271
fi

0 commit comments

Comments
 (0)