Skip to content

Commit

Permalink
upgrade to v6 of CAF module (#155)
Browse files Browse the repository at this point in the history
<!-- Thank you for submitting a Pull Request. Please fill out the
template below.-->
## Overview/Summary

Update to target v6 of the CAF module

## This PR fixes/adds/changes/removes

N/A

### Breaking Changes

See CAF module release notes

## Testing Evidence

Please provide any testing evidence to show that your Pull Request
works/fixes as described and planned (include screenshots, if
appropriate).

## As part of this Pull Request I have

- [x] Checked for duplicate [Pull
Requests](https://github.com/Azure/alz-terraform-accelerator/pulls)
- [x] Associated it with relevant
[issues](https://github.com/Azure/alz-terraform-accelerator/issues), for
tracking and closure.
- [x] Ensured my code/branch is up-to-date with the latest changes in
the `main`
[branch](https://github.com/Azure/alz-terraform-accelerator/tree/main)
- [x] Performed testing and provided evidence.
- [x] Updated relevant and associated documentation.
  • Loading branch information
jaredfholgate authored Jul 1, 2024
1 parent f03992c commit 8218210
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 13 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
# This workflow uses actions that are not certified by GitHub. They are provided
# by a third-party and are governed by separate terms of service, privacy
# policy, and support documentation.
Expand All @@ -12,7 +13,7 @@ on:
schedule:
- cron: '24 16 * * 1'
push:
branches: [ "main" ]
branches: ["main"]

# Declare default permissions as read only.
permissions: read-all
Expand All @@ -32,12 +33,12 @@ jobs:

steps:
- name: "Checkout code"
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -59,7 +60,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20
uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20
with:
name: SARIF file
path: results.sarif
Expand All @@ -68,6 +69,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard (optional).
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion templates/basic/main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "enterprise_scale" {
source = "Azure/caf-enterprise-scale/azurerm"
version = "~> 5.2.0"
version = "~> 6.0.0"

disable_telemetry = true

Expand Down
16 changes: 14 additions & 2 deletions templates/basic/terraform.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
terraform {
required_version = "~> 1.6"
required_version = "~> 1.8"
required_providers {
azurerm = "~> 3.88"
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.107"
}
azapi = {
source = "Azure/azapi"
version = "~> 1.13"
}
}
# backend "azurerm" {}
}

provider "azapi" {
skip_provider_registration = true
subscription_id = var.subscription_id_management
}

provider "azurerm" {
skip_provider_registration = true
features {}
Expand Down
2 changes: 1 addition & 1 deletion templates/complete/main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "enterprise_scale" {
source = "Azure/caf-enterprise-scale/azurerm"
version = "~> 5.2.0"
version = "~> 6.0.0"

count = length(local.archetypes) > 0 ? 1 : 0

Expand Down
16 changes: 14 additions & 2 deletions templates/complete/terraform.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
terraform {
required_version = "~> 1.6"
required_version = "~> 1.8"
required_providers {
azurerm = "~> 3.88"
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.107"
}
azapi = {
source = "Azure/azapi"
version = "~> 1.13"
}
}
# backend "azurerm" {}
}

provider "azapi" {
skip_provider_registration = true
subscription_id = var.subscription_id_management
}

provider "azurerm" {
skip_provider_registration = true
features {}
Expand Down
2 changes: 1 addition & 1 deletion templates/hubnetworking/main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "enterprise_scale" {
source = "Azure/caf-enterprise-scale/azurerm"
version = "~> 5.2.0"
version = "~> 6.0.0"

disable_telemetry = true

Expand Down
14 changes: 13 additions & 1 deletion templates/hubnetworking/terraform.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
terraform {
required_version = "~> 1.6"
required_providers {
azurerm = "~> 3.88"
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.107"
}
azapi = {
source = "Azure/azapi"
version = "~> 1.13"
}
}
# backend "azurerm" {}
}

provider "azapi" {
skip_provider_registration = true
subscription_id = var.subscription_id_management
}

provider "azurerm" {
skip_provider_registration = true
features {}
Expand Down

0 comments on commit 8218210

Please sign in to comment.