Skip to content

Commit

Permalink
fix: Updated LE for finops module to align with Linux runners (Azure#…
Browse files Browse the repository at this point in the history
…3007)

## Description

- Update LE for finops
- Updated `.gitattributes`

Closes Azure#2653

## Pipeline Reference

<!-- Insert your Pipeline Status Badge below -->

| Pipeline |
| -------- |
|
[![avm.ptn.finops-toolkit.finops-hub](https://github.com/Azure/bicep-registry-modules/actions/workflows/avm.ptn.finops-toolkit.finops-hub.yml/badge.svg?branch=users%2Falsehr%2FlineEnding&event=workflow_dispatch)](https://github.com/Azure/bicep-registry-modules/actions/workflows/avm.ptn.finops-toolkit.finops-hub.yml)
|

## Type of Change

<!-- Use the checkboxes [x] on the options that are relevant. -->

- [x] Update to CI Environment or utilities (Non-module affecting
changes)
- [x] Azure Verified Module updates:
- [ ] Bugfix containing backwards-compatible bug fixes, and I have NOT
bumped the MAJOR or MINOR version in `version.json`:
- [ ] Someone has opened a bug report issue, and I have included "Closes
#{bug_report_issue_number}" in the PR description.
- [ ] The bug was found by the module author, and no one has opened an
issue to report it yet.
- [ ] Feature update backwards compatible feature updates, and I have
bumped the MINOR version in `version.json`.
- [ ] Breaking changes and I have bumped the MAJOR version in
`version.json`.
  - [ ] Update to documentation
  • Loading branch information
AlexanderSehr authored Aug 8, 2024
1 parent 5914e17 commit b684d47
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 70 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
* text=auto
*.bicep text eol=lf
*.ps1 text eol=lf
*.sh text eol=lf
6 changes: 2 additions & 4 deletions avm/ptn/finops-toolkit/finops-hub/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,7 @@ module storage 'modules/storage.bicep' = {
resource dataFactory 'Microsoft.DataFactory/factories@2018-06-01' = {
name: dataFactoryName
location: location
tags: union(
resourceTags,
contains(tagsByResource, 'Microsoft.DataFactory/factories') ? tagsByResource['Microsoft.DataFactory/factories'] : {}
)
tags: union(resourceTags, tagsByResource[?'Microsoft.DataFactory/factories'] ?? {})
identity: { type: 'SystemAssigned' }
properties: any(
// Using any() to hide the error that gets surfaced because globalConfigurations is not in the ADF schema yet.
Expand Down Expand Up @@ -174,6 +171,7 @@ resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableT
}
}

#disable-next-line no-deployments-resources
resource defaultTelemetry 'Microsoft.Resources/deployments@2023-07-01' = if (enableTelemetry) {
name: 'pid-${telemetryId}-${uniqueString(deployment().name, location)}'
properties: {
Expand Down
Loading

0 comments on commit b684d47

Please sign in to comment.