Skip to content

Commit

Permalink
Lint
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeDupuis committed Sep 10, 2024
1 parent 705b0ce commit c5b28a7
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 39 deletions.
12 changes: 6 additions & 6 deletions input.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,31 @@ variable "storage_account_name" {
}

variable "create_vm" {
type = bool
type = bool
default = false
}

variable "vm_size" {
type = string
type = string
default = "Standard_B2s"
}

variable "vm_username" {
type = string
type = string
default = "azureblob"
}

variable "vm_password" {
type = string
type = string
default = "qwe123QWE!@#"
}

variable "create_app_service" {
type = bool
type = bool
default = false
}

variable "ssh_key" {
type = string
type = string
default = ""
}
57 changes: 27 additions & 30 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,8 @@ resource "azurerm_storage_container" "public" {
container_access_type = "blob"
}


resource "azurerm_virtual_network" "main" {
count = var.create_vm ? 1 : 0
count = var.create_vm ? 1 : 0
name = "${var.prefix}-network"
address_space = ["10.0.0.0/16"]
location = azurerm_resource_group.main.location
Expand All @@ -61,15 +60,15 @@ resource "azurerm_virtual_network" "main" {
}

resource "azurerm_subnet" "main" {
count = var.create_vm ? 1 : 0
count = var.create_vm ? 1 : 0
name = "${var.prefix}-main"
resource_group_name = azurerm_resource_group.main.name
virtual_network_name = azurerm_virtual_network.main[0].name
address_prefixes = ["10.0.2.0/24"]
}

resource "azurerm_network_interface" "main" {
count = var.create_vm ? 1 : 0
count = var.create_vm ? 1 : 0
name = "${var.prefix}-nic"
location = azurerm_resource_group.main.location
resource_group_name = azurerm_resource_group.main.name
Expand All @@ -78,7 +77,7 @@ resource "azurerm_network_interface" "main" {
name = "${var.prefix}-ip-config"
subnet_id = azurerm_subnet.main[0].id
private_ip_address_allocation = "Dynamic"
public_ip_address_id = azurerm_public_ip.main[0].id
public_ip_address_id = azurerm_public_ip.main[0].id
}

tags = {
Expand All @@ -87,7 +86,7 @@ resource "azurerm_network_interface" "main" {
}

resource "azurerm_public_ip" "main" {
count = var.create_vm ? 1 : 0
count = var.create_vm ? 1 : 0
name = "${var.prefix}-public-ip"
resource_group_name = azurerm_resource_group.main.name
location = azurerm_resource_group.main.location
Expand All @@ -99,9 +98,9 @@ resource "azurerm_public_ip" "main" {
}

resource "azurerm_user_assigned_identity" "vm" {
location = azurerm_resource_group.main.location
name = "${var.prefix}-vm"
resource_group_name = azurerm_resource_group.main.name
location = azurerm_resource_group.main.location
name = "${var.prefix}-vm"
resource_group_name = azurerm_resource_group.main.name
}


Expand All @@ -112,24 +111,24 @@ resource "azurerm_role_assignment" "vm" {
}

resource "azurerm_linux_virtual_machine" "main" {
count = var.create_vm ? 1 : 0
name = "${var.prefix}-vm"
computer_name = var.prefix
resource_group_name = azurerm_resource_group.main.name
location = azurerm_resource_group.main.location
size = var.vm_size
admin_username = var.vm_username
admin_password = var.vm_password
count = var.create_vm ? 1 : 0
name = "${var.prefix}-vm"
computer_name = var.prefix
resource_group_name = azurerm_resource_group.main.name
location = azurerm_resource_group.main.location
size = var.vm_size
admin_username = var.vm_username
admin_password = var.vm_password
disable_password_authentication = true
network_interface_ids = [azurerm_network_interface.main[0].id]
network_interface_ids = [azurerm_network_interface.main[0].id]

identity {
type = "UserAssigned"
type = "UserAssigned"
identity_ids = [azurerm_user_assigned_identity.vm.id]
}

admin_ssh_key {
username = var.vm_username
username = var.vm_username
public_key = local.public_ssh_key
}

Expand All @@ -150,26 +149,24 @@ resource "azurerm_linux_virtual_machine" "main" {
}
}


resource "azurerm_service_plan" "main" {
count = var.create_app_service ? 1 : 0
count = var.create_app_service ? 1 : 0
name = "${var.prefix}-appserviceplan"
resource_group_name = azurerm_resource_group.main.name
location = azurerm_resource_group.main.location
os_type = "Linux"
sku_name = "B1"
}


resource "azurerm_linux_web_app" "main" {
count = var.create_app_service ? 1 : 0
count = var.create_app_service ? 1 : 0
name = "${var.prefix}-app"
service_plan_id = azurerm_service_plan.main[0].id
resource_group_name = azurerm_resource_group.main.name
location = azurerm_resource_group.main.location

identity {
type = "UserAssigned"
type = "UserAssigned"
identity_ids = [azurerm_user_assigned_identity.vm.id]
}

Expand All @@ -181,10 +178,10 @@ resource "azurerm_linux_web_app" "main" {
}

resource "azurerm_app_service_source_control" "main" {
count = var.create_app_service ? 1 : 0
app_id = azurerm_linux_web_app.main[0].id
repo_url = "https://github.com/Azure-Samples/nodejs-docs-hello-world"
branch = "master"
count = var.create_app_service ? 1 : 0
app_id = azurerm_linux_web_app.main[0].id
repo_url = "https://github.com/Azure-Samples/nodejs-docs-hello-world"
branch = "master"
use_manual_integration = true
use_mercurial = false
use_mercurial = false
}
2 changes: 1 addition & 1 deletion output.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
output "devenv_local_nix" {
sensitive = true
value = <<EOT
value = <<EOT
{pkgs, lib, ...}:{
env = {
AZURE_ACCOUNT_NAME = "${azurerm_storage_account.main.name}";
Expand Down
2 changes: 0 additions & 2 deletions test/client/test_identity_token.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ def test_do_not_refresh_under_expiration_buffer
token = nil
new_token = nil


AzureBlob::Http.stub :new, http_mock do
@identity_token = AzureBlob::IdentityToken.new(principal_id: @principal_id)
Time.stub :now, Time.now do
Expand All @@ -44,7 +43,6 @@ def test_refresh_when_over_expiration_buffer
token = nil
new_token = nil


AzureBlob::Http.stub :new, http_mock do
@identity_token = AzureBlob::IdentityToken.new(principal_id: @principal_id)
Time.stub :now, Time.now do
Expand Down

0 comments on commit c5b28a7

Please sign in to comment.