Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

Commit

Permalink
Few fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
JakeGinnivan committed Dec 6, 2022
1 parent 315425e commit aa5f406
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
1 change: 1 addition & 0 deletions libs/nx-terraform/src/common/getEnvTfVars.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export function getTfEnvVars(projectName: string, envConfig: EnvConfig, repoConf
`project_name_tag=${projectName || ''}`,
`cost_centre_tag=${repoConfig.azureCostCentre || ''}`,
`resource_prefix=${repoConfig.azureResourcePrefix || ''}`,
`github_service_principal=${envConfig.github_service_principal_name || ''}`,
`github_service_principal_id=${envConfig.github_service_principal_id || ''}`,
]
}
Expand Down
3 changes: 3 additions & 0 deletions libs/nx-terraform/src/executors/apply/executor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ export default async function runExecutor(options: ApplyExecutorSchema, context:
await execa('terragrunt', terragruntArguments, {
stdio: 'inherit',
cwd: projectRoot,
env: {
...process.env,
},
})
} finally {
if (options.leaveFirewallExceptions !== true) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ export default async function (
appIdPlaceholder,
'--api',
// Graph
'00000002-0000-0000-c000-000000000000',
'00000003-0000-0000-c000-000000000000',
'--api-permissions',
// Application.ReadWrite.OwnedBy
'824c81eb-e3f8-4ee6-8f6d-de7f50d565b7=Role',
'18a4783c-866b-4cc7-a460-3d5e5662c884=Role',
]

if (isDryRun()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ variable "cost_centre_tag" {
type = string
}

variable "github_service_principal" {
description = "The id of the github service principal which deploys this environment (if configured through NX)."
type = string
nullable = true
}

variable "github_service_principal_id" {
description = "The id of the github service principal which deploys this environment (if configured through NX)."
type = string
Expand Down

0 comments on commit aa5f406

Please sign in to comment.