Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
dimbleby committed Aug 1, 2024
1 parent 0346fbf commit e0676ad
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 77 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Setting up a development environment

1. Install Python 3.10 or 3.11
1. Install Python 3.12
2. Install poetry - see [the poetry docs](https://python-poetry.org/docs/)
3. Run `poetry install --extras azure` to install the project's dependencies

Expand All @@ -10,7 +10,7 @@ See [linting.yml](.github/workflows/linting.yml) for the list of linting
commands run by the CI on Github, such as:

```shell
$ poetry run ruff .
$ poetry run ruff check .
$ poetry run ruff format --check .
$ poetry run mypy .
```
26 changes: 13 additions & 13 deletions azure/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 11 additions & 10 deletions azure/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ terraform {
provider "azurerm" {
features {}
storage_use_azuread = true
subscription_id = var.subscription_id
}

resource "random_password" "azuread_password" {
Expand Down Expand Up @@ -56,7 +57,7 @@ resource "azurerm_storage_account" "treasure" {
account_replication_type = "LRS"
account_tier = "Standard"
min_tls_version = "TLS1_2"
enable_https_traffic_only = true
https_traffic_only_enabled = true
shared_access_key_enabled = false
allow_nested_items_to_be_public = false
default_to_oauth_authentication = true
Expand Down Expand Up @@ -91,18 +92,18 @@ resource "azurerm_mssql_database" "treasure" {
}

resource "azurerm_redis_cache" "treasure" {
name = "${var.app_name}-cache"
location = var.region
resource_group_name = azurerm_resource_group.treasure.name
capacity = 0
family = "C"
sku_name = "Basic"
enable_non_ssl_port = false
minimum_tls_version = "1.2"
name = "${var.app_name}-cache"
location = var.region
resource_group_name = azurerm_resource_group.treasure.name
capacity = 0
family = "C"
sku_name = "Basic"
non_ssl_port_enabled = false
minimum_tls_version = "1.2"

redis_configuration {
# active_directory_authentication_enabled = true
enable_authentication = true
authentication_enabled = true
}
}

Expand Down
1 change: 1 addition & 0 deletions azure/terraform.tfvars.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
app_name = "best-app-name-ever"
# arcgis_api_key = "<ARCGIS_API_KEY>"
# google_maps_api_key = "<GOOGLE_MAPS_API_KEY>"
# subscription_id = "<SUBSCRIPTION_ID>"
4 changes: 4 additions & 0 deletions azure/variables.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
variable "subscription_id" {
type = string
}

variable "app_name" {
type = string
}
Expand Down
104 changes: 52 additions & 52 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e0676ad

Please sign in to comment.