Skip to content

Commit 6897321

Browse files
authored
update to use non-deprecated modules and to use python3 (#73)
* update to use non-depracated modules and to use python3 * updated the workflow for aws-ansible to only run when changes are made to that directory
1 parent 1c92842 commit 6897321

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

.github/workflows/aws-ansible.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
paths: 'cloud_AWS/ansible/**'
88
branches: [ master ]
99
pull_request:
10+
paths: 'cloud_AWS/ansible/**'
1011
branches: [ master ]
1112

1213
jobs:

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ override.tf
2525
override.tf.json
2626
*_override.tf
2727
*_override.tf.json
28+
*_override.tfvars
2829

2930
# Include override files you do wish to add to version control using negated pattern
3031
#

cloud_Azure/terraform/module/examples/single_account_multiple_resource_groups/terraform.tfvars

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Azure
22
subscription_id = ""
33
location = ""
4-
resource_group_names = []
5-
storage_account_names = []
4+
resource_group_names = [""]
5+
storage_account_names = [""]
66

77
# Kentik
88
email= ""

cloud_Azure/terraform/module/network_watcher.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ data "azurerm_network_watcher" "network_watcher" {
1313
# "ResourceGroupName2" -> "NetworkSercurityGroupId3,NetworkSecurityGroupId4"
1414
# }
1515
data "external" "nsg_data_source" {
16-
program = ["python", "${path.module}/get_nsg.py"]
16+
program = ["python3", "${path.module}/get_nsg.py"]
1717
query = {
1818
resource_group_names = join(",", var.resource_group_names)
1919
}

cloud_Azure/terraform/module/service_principal.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
data "azuread_client_config" "current" {}
22

33
data "azuread_service_principals" "existing_nsg_flow_exporter" {
4-
application_ids = [var.flow_exporter_application_id]
4+
client_ids = [var.flow_exporter_application_id]
55
ignore_missing = true
66
}
77

@@ -14,7 +14,7 @@ locals {
1414
resource "azuread_service_principal" "new_nsg_flow_exporter" {
1515
count = local.nsg_flow_exporter_already_exists ? 0 : 1
1616

17-
application_id = var.flow_exporter_application_id
17+
client_id = var.flow_exporter_application_id
1818
app_role_assignment_required = false
1919
owners = [data.azuread_client_config.current.object_id]
2020

0 commit comments

Comments
 (0)