Skip to content

Commit

Permalink
Merge pull request #7 from atea/renew
Browse files Browse the repository at this point in the history
Update jobs with proper names
  • Loading branch information
fwikestad authored Apr 12, 2024
2 parents 6f19e4e + 51c569a commit 641a630
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 60 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tf.deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ permissions:
pull-requests: write

concurrency:
group: Test
group: Core
cancel-in-progress: false

jobs:
terraform:
name: 'Terraform'
runs-on: ubuntu-latest
environment: Test
environment: Core

# Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest
defaults:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tf.destroy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ on:
workflow_dispatch:

concurrency:
group: Test
group: Core
cancel-in-progress: false

jobs:
terraform:
name: 'Terraform'
runs-on: ubuntu-latest
environment: Test
environment: Core

# Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest
defaults:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tf.plan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
workflow_dispatch:

concurrency:
group: Test
group: Core
cancel-in-progress: false


Expand All @@ -23,7 +23,7 @@ jobs:
terraform:
name: 'Terraform'
runs-on: ubuntu-latest
environment: Test
environment: Core

# Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest
defaults:
Expand Down
54 changes: 0 additions & 54 deletions .github/workflows/tf.validation.yml

This file was deleted.

19 changes: 19 additions & 0 deletions Core/rbac.tf
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,23 @@ resource "azurerm_role_assignment" "sandbox_contributor" {
scope = module.alz_architecture.azurerm_management_group.level_2["/providers/Microsoft.Management/managementGroups/${var.root_id}-sandboxes"].id
role_definition_name = "Contributor"
principal_id = azuread_group.sandbox_contributor.id
}


#TC24
data "azuread_group" "TC24-Deltakere" {
display_name = "TC24-Deltakere"
security_enabled = true
}

resource "azurerm_role_assignment" "Deltaker-LZ-Owner" {
scope = "/providers/Microsoft.Management/managementGroups/${var.root_id}-landing-zones"
role_definition_name = "Owner"
principal_id = data.azuread_group.TC24-Deltakere.object_id
}

resource "azurerm_role_assignment" "Deltaker-New-Subs-Owner" {
scope = "/providers/Microsoft.Management/managementGroups/new-subscriptions"
role_definition_name = "Owner"
principal_id = data.azuread_group.TC24-Deltakere.object_id
}

0 comments on commit 641a630

Please sign in to comment.