Skip to content

Commit

Permalink
Fixing build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jcrichlake committed Feb 29, 2024
1 parent 2f27df4 commit bf1c917
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 22 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/terraform-deploy_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ jobs:
echo "DATABASE_HOSTNAME=$DATABASE_HOSTNAME" >> "$GITHUB_ENV"
echo "DATABASE_PASSWORD=$DATABASE_PASSWORD" >> "$GITHUB_ENV"
- name: Run Db migration
uses: liquibase-github-actions/[email protected]
with:
changelogFile: ./etor/databaseMigrations/root.yml
url: "jdbc:postgresql://${{ env.DATABASE_HOSTNAME }}:5432/postgres"
username: cdcti-github
password: ${{ env.DATABASE_PASSWORD }}
logLevel: INFO
# - name: Run Db migration
# uses: liquibase-github-actions/[email protected]
# with:
# changelogFile: ./etor/databaseMigrations/root.yml
# url: "jdbc:postgresql://${{ env.DATABASE_HOSTNAME }}:5432/postgres"
# username: cdcti-github
# password: ${{ env.DATABASE_PASSWORD }}
# logLevel: INFO

- id: export-terraform-output
name: Export Terraform Output
Expand Down
15 changes: 1 addition & 14 deletions operations/template/net.tf
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ resource "azurerm_subnet" "database" {
virtual_network_name = data.azurerm_virtual_network.app.name
address_prefixes = ["172.17.67.192/27"]

service_endpoints = ["Microsoft.AzureActiveDirectory", "Microsoft.EventHub", "Microsoft.ServiceBus", "Microsoft.Sql", "Microsoft.ContainerRegistry", "Microsoft.KeyVault", "Microsoft.Storage", "Microsoft.Web"]
# service_endpoints = ["Microsoft.AzureActiveDirectory", "Microsoft.EventHub", "Microsoft.ServiceBus", "Microsoft.Sql", "Microsoft.ContainerRegistry", "Microsoft.KeyVault", "Microsoft.Storage", "Microsoft.Web"]

delegation {
name = "delegation"
Expand Down Expand Up @@ -197,19 +197,6 @@ resource "azurerm_network_security_rule" "db_inbound_allow" {
network_security_group_name = azurerm_network_security_group.db_security_group.name
}

resource "azurerm_network_security_rule" "db_inbound_allow_web" {
name = "db_inbound_allow_web"
priority = 120
direction = "Inbound"
access = "Allow"
protocol = "Tcp"
source_port_range = "*"
destination_port_ranges = ["5432"]
source_address_prefix = "Internet"
destination_address_prefix = "VirtualNetwork"
resource_group_name = data.azurerm_resource_group.group.name
network_security_group_name = azurerm_network_security_group.db_security_group.name
}

resource "azurerm_subnet_network_security_group_association" "database_security_group" {
subnet_id = azurerm_subnet.database.id
Expand Down

0 comments on commit bf1c917

Please sign in to comment.