Skip to content

Commit

Permalink
remove unused variables
Browse files Browse the repository at this point in the history
  • Loading branch information
marycrawford committed Nov 24, 2024
1 parent 47014cd commit e51c5b5
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 25 deletions.
4 changes: 0 additions & 4 deletions .github/actions/tf-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ inputs:
azure-subscription-id:
description: The Azure subscription_id for this environment.
required: true
azure-object-id:
description: The Azure object_id for this environment.
required: true
app-name:
description: The name of the application being deployed in Terraform.
required: true
Expand Down Expand Up @@ -53,7 +50,6 @@ runs:
ARM_CLIENT_ID: ${{ inputs.azure-client-id }}
ARM_TENANT_ID: ${{ inputs.azure-tenant-id }}
ARM_SUBSCRIPTION_ID: ${{ inputs.azure-subscription-id }}
ARM_OBJECT_ID: ${{ inputs.azure-object-id }}
shell: bash
run: |
terraform init -backend-config=config/${{ inputs.deploy-env }}.config
Expand Down
2 changes: 1 addition & 1 deletion ops/terraform/modules/database/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resource "azurerm_postgresql_flexible_server" "postgres_flexible_server" {
name = "reportvisionpostgresql-flexible-server"
location = var.location
resource_group_name = var.resource_group_name
sku_name = var.sku_name
sku_name = var.postgres_sku_name
version = var.engine_version
storage_mb = 32768 # 32 GB, the lowest of the valid options
backup_retention_days = 7
Expand Down
6 changes: 2 additions & 4 deletions ops/terraform/modules/database/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@ variable "resource_group_name" {
description = "The Azure Resource Group to deploy to"
}

# Production may be able to scale to GP_Standard_D2ds_v4 (General Purpose Tier)
# which is designed for medium to high-performance workloads and is scalable.
variable "sku_name" {
variable "postgres_sku_name" {
type = string
description = "value"
default = "Standard_B1ms" # General Purpose tier for low cost virtual machines
default = "Standard_B1ms"
}

variable "subnet" {
Expand Down
24 changes: 10 additions & 14 deletions ops/terraform/providers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,26 @@ terraform {
azurerm = {
source = "hashicorp/azurerm"
version = "~>3.0"

}
random = {
source = "hashicorp/random"
version = "~>3.0"
}
azuread = {
source = "hashicorp/azuread"
}
# azuread = {
# source = "hashicorp/azuread"
# }
}
}

provider "azurerm" {
features {
key_vault {
purge_soft_delete_on_destroy = true
recover_soft_deleted_key_vaults = true
}
}
features {}
}

# Provider for Azure Active Directory resources (e.g., service principals)
provider "azuread" {
# # Provider for Azure Active Directory resources (e.g., service principals)
# provider "azuread" {

client_id = var.client_id
tenant_id = var.tenant_id
# client_id = var.client_id
# tenant_id = var.tenant_id

}
# }
2 changes: 0 additions & 2 deletions ops/terraform/variables.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
variable "client_id" {}
variable "name" {}
variable "tenant_id" {}

variable "sku_name" {
type = string
Expand Down

0 comments on commit e51c5b5

Please sign in to comment.